Merge branch 'feature-network-manager' into feature-network-service

MissouriMRDT · Mar 5, 2019 · 08df3ec · 08df3ec
2 parents ac38b85 + aba9f77
commit 08df3ec
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 208 deletions.
diff --git a/RED/Models/ControlCenterModel.cs b/RED/Models/ControlCenterModel.cs
@@ -19,9 +19,7 @@ internal class ControlCenterModel
         internal Rovecomm _rovecomm;
         internal InputManagerViewModel _input;
         internal WaypointManagerViewModel _waypoint;
-        internal PingToolViewModel _pingTool;
         internal StopwatchToolViewModel _stopwatchTool;
-        internal TelemetryLogToolViewModel _telemetryLogTool;
 
         internal ScienceViewModel _science;
         internal GPSViewModel _GPS;

diff --git a/RED/Models/Tools/PingToolModel.cs b/RED/Models/Tools/PingToolModel.cs
diff --git a/RED/Models/Tools/TelemetryLogToolModel.cs b/RED/Models/Tools/TelemetryLogToolModel.cs
diff --git a/RED/RED.csproj b/RED/RED.csproj
@@ -176,7 +176,6 @@
     <Compile Include="Models\Modules\DriveModel.cs" />
     <Compile Include="Models\Modules\LightingModel.cs" />
     <Compile Include="Models\Navigation\MapModel.cs" />
-    <Compile Include="Models\Tools\PingToolModel.cs" />
     <Compile Include="Models\Navigation\WaypointModel.cs" />
     <Compile Include="Models\Navigation\WaypointManagerModel.cs" />
     <Compile Include="Models\Network\NetworkManagerModel.cs" />
@@ -187,7 +186,6 @@
     <Compile Include="Models\SettingsModel.cs" />
     <Compile Include="Models\Input\Controllers\KeyboardInputModel.cs" />
     <Compile Include="Models\Tools\StopwatchToolModel.cs" />
-    <Compile Include="Models\Tools\TelemetryLogToolModel.cs" />
     <Compile Include="Settings.cs" />
     <Compile Include="Models\Input\Controllers\XboxControllerInputModel.cs" />
     <Compile Include="ViewModels\Input\ControllerBase.cs" />
@@ -213,6 +211,8 @@
     <Compile Include="ViewModels\Modules\PowerViewModel.cs" />
     <Compile Include="ViewModels\Input\Controllers\XboxControllerInputViewModel.cs" />
     <Compile Include="ViewModels\Tools\PingToolViewModel.cs" />
+    <Compile Include="RoveProtocol\MetadataManager.cs" />
+    <Compile Include="RoveProtocol\Rovecomm.cs" />
     <Compile Include="ViewModels\Modules\ScienceViewModel.cs" />
     <Compile Include="ViewModels\Modules\SensorViewModel.cs" />
     <Compile Include="ViewModels\ControlCenterViewModel.cs" />
@@ -226,6 +226,7 @@
     <Compile Include="ViewModels\Settings\Network\NetworkManagerSettingsViewModel.cs" />
     <Compile Include="ViewModels\Tools\StopwatchToolViewModel.cs" />
     <Compile Include="ViewModels\Tools\TelemetryLogToolViewModel.cs" />
+    <Compile Include="ViewModels\XMLConfigManager.cs" />
     <Compile Include="Views\ControlCenterView.xaml.cs">
       <DependentUpon>ControlCenterView.xaml</DependentUpon>
     </Compile>
@@ -277,9 +278,6 @@
     <Compile Include="Views\Navigation\WaypointManagerView.xaml.cs">
       <DependentUpon>WaypointManagerView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\Tools\PingToolView.xaml.cs">
-      <DependentUpon>PingToolView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\SettingsManagerView.xaml.cs">
       <DependentUpon>SettingsManagerView.xaml</DependentUpon>
     </Compile>
@@ -304,9 +302,6 @@
     <Compile Include="Views\Tools\StopwatchToolView.xaml.cs">
       <DependentUpon>StopwatchToolView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\Tools\TelemetryLogToolView.xaml.cs">
-      <DependentUpon>TelemetryLogToolView.xaml</DependentUpon>
-    </Compile>
     <Page Include="Views\ControlCenterView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -388,10 +383,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\Tools\PingToolView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Views\Settings\Input\Controllers\XboxControllerInputSettingsView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -425,10 +416,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\Tools\TelemetryLogToolView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config">

diff --git a/RED/ViewModels/ControlCenterViewModel.cs b/RED/ViewModels/ControlCenterViewModel.cs
@@ -111,18 +111,6 @@ public WaypointManagerViewModel WaypointManager
                 NotifyOfPropertyChange(() => WaypointManager);
             }
         }
-        public PingToolViewModel PingTool
-        {
-            get
-            {
-                return _model._pingTool;
-            }
-            set
-            {
-                _model._pingTool = value;
-                NotifyOfPropertyChange(() => PingTool);
-            }
-        }
         public StopwatchToolViewModel StopwatchTool
         {
             get
@@ -135,19 +123,6 @@ public StopwatchToolViewModel StopwatchTool
                 NotifyOfPropertyChange(() => StopwatchTool);
             }
         }
-        public TelemetryLogToolViewModel TelemetryLogTool
-        {
-            get
-            {
-                return _model._telemetryLogTool;
-            }
-            set
-            {
-                _model._telemetryLogTool = value;
-                NotifyOfPropertyChange(() => TelemetryLogTool);
-            }
-        }
-
         public ScienceViewModel Science
         {
             get
@@ -419,9 +394,7 @@ public ControlCenterViewModel()
 
             WaypointManager = new WaypointManagerViewModel(Map, GPS);
             Autonomy = new AutonomyViewModel(Rovecomm, MetadataManager, Console, WaypointManager);
-            PingTool = new PingToolViewModel(Rovecomm, ConfigManager);
             StopwatchTool = new StopwatchToolViewModel(ConfigManager);
-            TelemetryLogTool = new TelemetryLogToolViewModel(MetadataManager);
 
             SettingsManager = new SettingsManagerViewModel(ConfigManager, this);
 

diff --git a/RED/Views/ControlCenterView.xaml b/RED/Views/ControlCenterView.xaml
@@ -96,12 +96,6 @@
                                     </DockPanel>
                                 </StackPanel>
                             </TabItem>
-                            <TabItem Header="Telemetry" controls:ControlsHelper.HeaderFontSize="12">
-                                <ContentControl x:Name="TelemetryLogTool" />
-                            </TabItem>
-                            <TabItem Header="Ping" controls:ControlsHelper.HeaderFontSize="12">
-                                <ContentControl x:Name="PingTool" />
-                            </TabItem>
                             <TabItem Header="Stopwatch" controls:ControlsHelper.HeaderFontSize="12">
                                 <ContentControl x:Name="StopwatchTool" />
                             </TabItem>

diff --git a/RED/Views/Tools/PingToolView.xaml b/RED/Views/Tools/PingToolView.xaml
diff --git a/RED/Views/Tools/PingToolView.xaml.cs b/RED/Views/Tools/PingToolView.xaml.cs
diff --git a/RED/Views/Tools/TelemetryLogToolView.xaml b/RED/Views/Tools/TelemetryLogToolView.xaml
diff --git a/RED/Views/Tools/TelemetryLogToolView.xaml.cs b/RED/Views/Tools/TelemetryLogToolView.xaml.cs
diff --git a/RoverNetworkManager/Views/PingToolView.xaml b/RoverNetworkManager/Views/PingToolView.xaml
@@ -31,7 +31,7 @@
 					<Bold>Address</Bold>
 				</TextBlock>
 				<TextBlock Grid.Column="3" Grid.Row="0" TextAlignment="Center">
-					<Bold>Round-Trip Time (ms)</Bold>
+					<Bold>Time (ms)</Bold>
 				</TextBlock>
 			</Grid>
 			<ItemsControl ItemsSource="{Binding PingServers}" Grid.IsSharedSizeScope="True">
@@ -42,7 +42,7 @@
 								<ColumnDefinition Width="auto" SharedSizeGroup="Checkmark" />
 								<ColumnDefinition Width="*" SharedSizeGroup="Name" />
 								<ColumnDefinition Width="*" SharedSizeGroup="Address" />
-								<ColumnDefinition Width="*" SharedSizeGroup="Result" />
+								<ColumnDefinition Width="75" SharedSizeGroup="Result" />
 								<ColumnDefinition Width="auto" SharedSizeGroup="Button" />
 								<ColumnDefinition Width="auto" SharedSizeGroup="Button" />
 							</Grid.ColumnDefinitions>