Merge pull request #17 from waterloo-rocketry/camera

Add camera
waterloo-rocketry · Aug 5, 2024 · 02cc4a0 · 02cc4a0
2 parents ab591a0 + 8f182ae
commit 02cc4a0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/parsley/message_definitions.py b/parsley/message_definitions.py
@@ -36,6 +36,7 @@
     'E_LOGGING':                [Enum('error', 8, mt.logger_error)],
     'E_GPS':                    [],
     'E_SENSOR':                 [Enum('sensor_id', 8, mt.sensor_id)],
+    'E_VIDEO':                  [Enum('state', 8, mt.video_state)],
 
     'E_ILLEGAL_CAN_MSG':        [],
     'E_SEGFAULT':               [],

diff --git a/parsley/message_types.py b/parsley/message_types.py
@@ -117,11 +117,12 @@
     'E_LOGGING':                0x10,
     'E_GPS':                    0x11,
     'E_SENSOR':                 0x12,
+    'E_VIDEO':                  0x13,
 
-    'E_ILLEGAL_CAN_MSG':        0x13,
-    'E_SEGFAULT':               0x14,
-    'E_UNHANDLED_INTERRUPT':    0x15,
-    'E_CODING_FUCKUP':          0x16
+    'E_ILLEGAL_CAN_MSG':        0x14,
+    'E_SEGFAULT':               0x15,
+    'E_UNHANDLED_INTERRUPT':    0x16,
+    'E_CODING_FUCKUP':          0x17
 }
 
 logger_error = {
@@ -141,6 +142,13 @@
     'E_SYSLOG_ALL_BUFFERS_FULL':        0x0B
 }
 
+video_state = {
+    'VIDEO_OFF':      0x00,
+    'VIDEO_ON':       0x01,
+    'VIDEO_ERR_SD':   0x02,
+    'VIDEO_ERR_CAM':  0x03
+}
+
 sensor_id = {
     'SENSOR_5V_CURR':               0x00,
     'SENSOR_BATT_CURR':             0x01,
@@ -167,7 +175,8 @@
     'SENSOR_PAYLOAD_TEMP':          0x16,
     'SENSOR_PAYLOAD_FLOW_RATE':     0x17,
     'SENSOR_9V_BATT_CURR_1':        0x18,
-    'SENSOR_9V_BATT_CURR_2':        0x19
+    'SENSOR_9V_BATT_CURR_2':        0x19,
+    'SENSOR_FPS':                   0x1A
 }
 
 fill_direction = {