Merge pull request #41 from joshreed13/develop

Added More New Features for 2016
MissouriMRDT · May 17, 2016 · a68fbff · a68fbff
2 parents cc560d5 + 36e2b20
commit a68fbff
Show file tree

Hide file tree

Showing 31 changed files with 1,407 additions and 266 deletions.
diff --git a/RED/Models/ArmControllerModeModel.cs b/RED/Models/ArmControllerModeModel.cs
@@ -9,5 +9,11 @@ namespace RED.Models
     internal class ArmControllerModeModel
     {
         internal int CurrentEndEffectorMode;
+        internal float AngleJ1;
+        internal float AngleJ2;
+        internal float AngleJ3;
+        internal float AngleJ4;
+        internal float AngleJ5;
+        internal float AngleJ6;
     }
 }
diff --git a/RED/Models/CameraMuxModel.cs b/RED/Models/CameraMuxModel.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RED.Models
+{
+    public class CameraMuxModel
+    {
+        internal byte MuxIndex;
+    }
+}
diff --git a/RED/Models/ControlCenterModel.cs b/RED/Models/ControlCenterModel.cs
@@ -21,5 +21,7 @@ public class ControlCenterModel
         internal SensorCombinedViewModel _sensorCombined;
         internal GimbalControllerModeViewModel _gimbalControllerMode;
         internal DropBaysViewModel _dropBays;
+        internal PowerViewModel _power;
+        internal CameraMuxViewModel _cameraMux;
     }
 }
diff --git a/RED/Models/GimbalModel.cs b/RED/Models/GimbalModel.cs
@@ -8,6 +8,7 @@ namespace RED.Models
 {
     public class GimbalModel
     {
+        internal int gimbalIndex;
         internal int speedLimit;
     }
 }
diff --git a/RED/Models/PowerModel.cs b/RED/Models/PowerModel.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RED.Models
+{
+    public class PowerModel
+    {
+        internal float Motor1Current;
+        internal float Motor2Current;
+        internal float Motor3Current;
+        internal float Motor4Current;
+        internal float Motor5Current;
+        internal float Motor6Current;
+        internal float Motor7Current;
+        internal float Motor8Current;
+        internal float Bus5VCurrent;
+        internal float Bus12VCurrent;
+        internal float InputVoltage;
+
+        internal float Cell1Voltage;
+        internal float Cell2Voltage;
+        internal float Cell3Voltage;
+        internal float Cell4Voltage;
+        internal float Cell5Voltage;
+        internal float Cell6Voltage;
+        internal float Cell7Voltage;
+        internal float Cell8Voltage;
+        internal float TotalPackCurrent;
+        internal float TotalPackVoltage;
+    }
+}
diff --git a/RED/Models/ScienceModel.cs b/RED/Models/ScienceModel.cs
@@ -8,12 +8,17 @@ namespace RED.Models
 {
     internal class ScienceModel
     {
-        internal float Ph = 7.86f;
-        internal short Moisture;
+        internal float Temperature1Value;
+        internal float Temperature2Value;
+        internal float Temperature3Value;
+        internal float Temperature4Value;
+        internal float Moisture1Value;
+        internal float Moisture2Value;
+        internal float Moisture3Value;
+        internal float Moisture4Value;
 
-        internal short CCDPixelCount = 3684;
-        internal float CCDProgress = 0f;
+        internal System.Net.IPAddress CCDIPAddress;
+        internal ushort CCDPortNumber;
         internal string CCDFilePath = Environment.CurrentDirectory;
-        internal bool CCDIsReceiving = false;
     }
 }
diff --git a/RED/Properties/Settings.Designer.cs b/RED/Properties/Settings.Designer.cs
diff --git a/RED/Properties/Settings.settings b/RED/Properties/Settings.settings
@@ -8,9 +8,6 @@
     <Setting Name="DriveParabolicScaling" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="ScienceCCDPixelCount" Type="System.Int16" Scope="User">
-      <Value Profile="(Default)">3684</Value>
-    </Setting>
     <Setting Name="ScienceCCDFilePath" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
@@ -29,5 +26,11 @@
     <Setting Name="GPSBaseStationLocationLongitude" Type="System.Double" Scope="User">
       <Value Profile="(Default)">0</Value>
     </Setting>
+    <Setting Name="ScienceCCDPortNumber" Type="System.UInt16" Scope="User">
+      <Value Profile="(Default)">11001</Value>
+    </Setting>
+    <Setting Name="ScienceCCDIPAddress" Type="System.String" Scope="User">
+      <Value Profile="(Default)">192.168.1.135</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/RED/RED.csproj b/RED/RED.csproj
@@ -120,11 +120,13 @@
     <Compile Include="Interfaces\INetworkTransportProtocol.cs" />
     <Compile Include="Interfaces\ISequenceNumberProvider.cs" />
     <Compile Include="Models\ArmControllerModeModel.cs" />
+    <Compile Include="Models\CameraMuxModel.cs" />
     <Compile Include="Models\GimbalModel.cs" />
     <Compile Include="Models\InputManagerModel.cs" />
     <Compile Include="Models\DataRouterModel.cs" />
     <Compile Include="Models\DriveControllerModeModel.cs" />
     <Compile Include="Models\NetworkManagerModel.cs" />
+    <Compile Include="Models\PowerModel.cs" />
     <Compile Include="Models\ScienceModel.cs" />
     <Compile Include="Models\GPSModel.cs" />
     <Compile Include="Models\SensorModel.cs" />
@@ -134,6 +136,7 @@
     <Compile Include="Settings.cs" />
     <Compile Include="Models\XboxControllerInputModel.cs" />
     <Compile Include="ViewModels\ControlCenter\ArmControllerModeViewModel.cs" />
+    <Compile Include="ViewModels\ControlCenter\CameraMuxViewModel.cs" />
     <Compile Include="ViewModels\ControlCenter\GimbalControllerModeViewModel.cs" />
     <Compile Include="ViewModels\ControlCenter\DropBaysViewModel.cs" />
     <Compile Include="ViewModels\ControlCenter\NetworkManagerViewModel.cs" />
@@ -144,6 +147,7 @@
     <Compile Include="ViewModels\ControlCenter\DriveControllerModeViewModel.cs" />
     <Compile Include="ViewModels\ControlCenter\GPSViewModel.cs" />
     <Compile Include="ViewModels\ControlCenter\KeyboardInputViewModel.cs" />
+    <Compile Include="ViewModels\ControlCenter\PowerViewModel.cs" />
     <Compile Include="ViewModels\ControlCenter\XboxControllerInputViewModel.cs" />
     <Compile Include="ViewModels\ControlCenter\MetadataManager.cs" />
     <Compile Include="ViewModels\ControlCenter\RoverProtocol.cs" />
@@ -166,6 +170,9 @@
     <Compile Include="Views\ControlCenter\ArmControllerModeView.xaml.cs">
       <DependentUpon>ArmControllerModeView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\ControlCenter\CameraMuxView.xaml.cs">
+      <DependentUpon>CameraMuxView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\ControlCenter\DriveControllerModeView.xaml.cs">
       <DependentUpon>DriveControllerModeView.xaml</DependentUpon>
     </Compile>
@@ -175,6 +182,9 @@
     <Compile Include="Views\ControlCenter\DropBaysView.xaml.cs">
       <DependentUpon>DropBaysView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\ControlCenter\PowerView.xaml.cs">
+      <DependentUpon>PowerView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\ControlCenter\ScienceView.xaml.cs">
       <DependentUpon>ScienceView.xaml</DependentUpon>
     </Compile>
@@ -207,6 +217,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\ControlCenter\CameraMuxView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\ControlCenter\DriveControllerModeView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -244,6 +258,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>-->
+    <Page Include="Views\ControlCenter\PowerView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\ControlCenter\ScienceView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>