Merge remote-tracking branch 'origin/navigation_testing' into navigation_testing

Author: lwaghorn

OnLand/ControlLaptop/LocalStorage/ConfigStorage.json

@@ -1 +1 @@
-{"telemetry_port": 7000, "pod_address": "127.0.0.1", "heartbeat_timeout": 5000, "command_port": 6000, "pod_driver": "Simulation", "controlLaptopIpAddr": "192.168.0.2", "retrieval_timeout": 60000}
+{"retrieval_timeout": 60000, "telemetry_port": 7000, "command_port": 6000, "heartbeat_timeout": 5000, "pod_address": "127.0.0.1", "pod_driver": "Simulation", "controlLaptopIpAddr": "192.168.0.2"}

OnLand/ControlLaptop/templates/_cards/commands.html

@@ -27,7 +27,7 @@ <h4 class="title">Controls</h4>
                     <button class="btn btn-info btn-command" type="button" data-toggle="collapse" data-target="#overridesCollapse" aria-expanded="false" aria-controls="manualControlsCollapse"> OVERRIDES </button>
                 </div>
                 <div class="row text-center">
-                    <button class="btn btn-info btn-command" type="button" data-toggle="collapse" data-target=".multi-collapse" aria-expanded="false" aria-controls="manualControlsCollapse"> MANUAL CONTROL </button>
+                    <button class="btn btn-info btn-command" type="button" data-toggle="collapse" data-target=".multi-collapse" aria-expanded="false" aria-controls="manualControlsCollapse"> MANUAL </button>
                 </div>
            </div>
        </div>

OnLand/ControlLaptop/templates/tables/LVSensors.json

@@ -13,18 +13,18 @@
   },
   "gtPack1Voltage": {
     "name_pretty": "GT LP Voltage [V]",
-      "order": 6
+      "order": 3
   },
       "gtPack2Voltage": {
     "name_pretty": "GT HP Voltage [V]",
-      "order": 8
+      "order": 4
   },
       "gtPack1Current": {
     "name_pretty": "GT LP Current [A]",
-      "order": 7
+      "order": 5
   },
       "gtPack2Current": {
     "name_pretty": "GT HP Current [A]",
-      "order": 9
+      "order": 6
   }
 }

OnLand/ControlLaptop/templates/tables/SensorRanges.json

@@ -111,7 +111,7 @@
   },
   "maxIgbtTemperature": {
     "psBooting": [0,0],
-    "psStandby": [10,100],
+    "psStandby": [0,0],
     "psArming" : [10,100],
     "psArmed" : [10,100],
     "psPreFlight" : [10,150],
@@ -122,7 +122,7 @@
   },
   "gateDriverTemperature": {
     "psBooting": [0,0],
-    "psStandby": [10,80],
+    "psStandby": [0,0],
     "psArming" : [10,80],
     "psArmed" : [10,80],
     "psPreFlight" : [10,80],
@@ -133,7 +133,7 @@
   },
   "inverterControlBoardTemperature": {
     "psBooting": [0,0],
-    "psStandby": [10,80],
+    "psStandby": [0,0],
     "psArming" : [10,80],
     "psArmed" : [10,80],
     "psPreFlight" : [10,80],
@@ -144,7 +144,7 @@
   },
   "motorTemperature": {
     "psBooting": [0,0],
-    "psStandby": [15,40],
+    "psStandby": [0,0],
     "psArming" : [15,40],
     "psArmed" : [15,40],
     "psPreFlight" : [15,40],
@@ -406,14 +406,14 @@
     "psNone" : [0,0]
   },
     "gtPack2Current": {
-    "psBooting": [0,0],
-    "psStandby": [0,0],
-    "psArming" : [0,0],
-    "psArmed" : [0,0],
-    "psPreFlight" : [0,0],
-    "psAcceleration": [0,0],
-    "psCoasting": [0,0],
-    "psBraking" : [0,0],
+    "psBooting": [0.1,1],
+    "psStandby": [0,2],
+    "psArming" : [0,2],
+    "psArmed" : [0,2],
+    "psPreFlight" : [0.1,2],
+    "psAcceleration": [0.1,10],
+    "psCoasting": [0.1,10],
+    "psBraking" : [0,10],
     "psNone" : [0,0]
   }
 }

OnLand/config.py

@@ -20,7 +20,7 @@
 # Udp Telemetry Stream
 UDP_TELEM_TIMEOUT = 3  # How long to wait without receiving telemetry before deciding connection is lost
 UDP_TELEM_PORT = 7000  # Control Server Port to receive telemetry over
-TELEMETRY_BROADCAST_FREQUENCY = 500  # Minimum time between telemetry broadcasts
+TELEMETRY_BROADCAST_FREQUENCY = 1000  # Minimum time between telemetry broadcasts
 
 
 # SocketIO