Merge pull request #2 from UofSSpaceDesignTeam/Test-Branch

Some stuff
UofSSpaceTeam · Sep 10, 2015 · d92a10f · d92a10f
2 parents ca83b91 + 6d002ae
commit d92a10f
Show file tree

Hide file tree

Showing 9 changed files with 702 additions and 9 deletions.
diff --git a/base/SensorSender/SensorSender.sdf b/base/SensorSender/SensorSender.sdf
diff --git a/base/SensorSender/SensorSender.v12.suo b/base/SensorSender/SensorSender.v12.suo
diff --git a/base/usstgui/.vs/usstgui/v14/.suo b/base/usstgui/.vs/usstgui/v14/.suo
diff --git a/base/usstgui/usstgui/Windows/ArmStatus.xaml b/base/usstgui/usstgui/Windows/ArmStatus.xaml
@@ -37,7 +37,6 @@
         <ProgressBar x:Name="ArmYStat" HorizontalAlignment="Left" Height="10" Margin="91,149,0,0" VerticalAlignment="Top" Width="100" LargeChange="0.1" Maximum="1"/>
         <Label x:Name="ArmXMaxLbl" Content="??/??" HorizontalAlignment="Left" Margin="19,66,0,0" VerticalAlignment="Top" RenderTransformOrigin="-0.25,0.654"/>
         <Label x:Name="ArmYMaxLbl" Content="??/??" HorizontalAlignment="Left" Margin="19,133,0,0" VerticalAlignment="Top"/>
-        <Button x:Name="BtnnvKFocus" Content="Button" HorizontalAlignment="Left" Margin="108,426,0,0" VerticalAlignment="Top" Width="75" Keyboard.KeyDown="ArmDrawing_KeyDown"/>
 
     </Grid>
 </Window>
diff --git a/base/usstgui/usstgui/Windows/ArmStatus.xaml.cs b/base/usstgui/usstgui/Windows/ArmStatus.xaml.cs
@@ -186,7 +186,7 @@ private void updateArmDrawing()
         }
 
         double m_stepSize;
-        private void ArmDrawing_KeyDown(object sender, KeyEventArgs e)
+        /*private void ArmDrawing_KeyDown(object sender, KeyEventArgs e)
         {
             switch (e.Key) {
                 // wasd controls for when using the figure
@@ -230,6 +230,6 @@ private void ArmDrawing_KeyDown(object sender, KeyEventArgs e)
             {
                 ArmDrawing.Children.Clear();
             }
-        }
+        }*/
     }
 }
diff --git a/base/usstgui/usstgui/Windows/DrillStatus.xaml b/base/usstgui/usstgui/Windows/DrillStatus.xaml
@@ -27,8 +27,8 @@
 
 		<Button Content="Stop" Grid.Column="2" Grid.Row="1" HorizontalAlignment="Left" Width="40" VerticalAlignment="Bottom" Click="drillStop"/>
 		<Label Content="Fast" Grid.Column="2" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-		<RadioButton x:Name="Cw" Content="CW" IsChecked="True" Grid.Column="2" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" Width="75" GroupName="Feed" Margin="-5,0,0,20" Click="radioButtonClick"/>
-		<RadioButton x:Name="Ccw" Content="CCW" Grid.Column="2" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" Width="75" GroupName="Feed" Grid.ColumnSpan="2" Margin="-5,20,0,0" Click="radioButtonClick"/>
+		<RadioButton x:Name="Cw" Content="Drill Out" IsChecked="True" Grid.Column="2" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" Width="75" GroupName="Feed" Margin="-5,0,0,20" Click="radioButtonClick"/>
+		<RadioButton x:Name="Ccw" Content="Drill IN" Grid.Column="2" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" Width="75" GroupName="Feed" Grid.ColumnSpan="2" Margin="-5,20,0,0" Click="radioButtonClick"/>
 		<Slider x:Name="DrillSpeed" Grid.Column="2" Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Center" Width="25" Orientation="Vertical" Height="100" ValueChanged="drillSet" Maximum="1" LargeChange="0.1"/>
 		<Label Content="Rotation" Grid.Column="2" Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 

diff --git a/base/usstgui/usstgui/Windows/NavStatus.xaml.cs b/base/usstgui/usstgui/Windows/NavStatus.xaml.cs
@@ -32,7 +32,7 @@ public NavStatus()
                 MessageBox.Show("No internet connection available, going to CacheOnly mode.");
             }
 
-            MainMap.MapProvider = GMapProviders.OpenStreetMap;
+            MainMap.MapProvider = GMapProviders.GoogleHybridMap;
             MainMap.Position = new PointLatLng(52.132452, -106.628350);
 
             // Add rover icon to list
@@ -229,11 +229,11 @@ public static string GetDelta(GeoAngle[] A, GeoAngle[] B)
 
         public void UpdateRoverPosition(double lat, double lng, double hdg)
         {
-            WaypointStorage rover = PointsList.Items.GetItemAt(0) as WaypointStorage;
+            /*WaypointStorage rover = PointsList.Items.GetItemAt(0) as WaypointStorage;
             RoverMarker roverIcon = rover.Marker.Shape as RoverMarker;
             roverIcon.MarkerArrowHeading(hdg);
             rover.UpdatePosDD(lat, lng);
-            rover.Marker.Position = new PointLatLng(rover.Lat.DecimalDegrees, rover.Lng.DecimalDegrees);
+            rover.Marker.Position = new PointLatLng(rover.Lat.DecimalDegrees, rover.Lng.DecimalDegrees);*/
         }
 
         private void CenterMap_Click(object sender, RoutedEventArgs e)