integrate

Author: mpkarpov-ui

MIDAS/src/b2b_interface.cpp

@@ -6,12 +6,14 @@ ErrorCode B2BInterface::init() {
     return ErrorCode::NoError;
 }
 
-void CameraB2B::update_cam_board_state() {
+uint8_t CameraB2B::read() {
     #ifdef B2B_I2C
     Wire.requestFrom(0x69, 1);
     uint8_t res = Wire.read();
-    cam_board_state = res;
+    return res;
     #endif
+
+    return 0xFF;
 }
 
 /** 

MIDAS/src/b2b_interface.h

@@ -45,8 +45,7 @@ struct CameraB2B {
     void vmux_set(int cam_select);
     void vmux_toggle();
 
-    void update_cam_board_state();
-    uint8_t cam_board_state;
+    uint8_t read();
 
     private:
     void transmit_command(CameraCommand command);

MIDAS/src/systems.cpp

@@ -300,7 +300,7 @@ void handle_tlm_command(TelemetryCommand& command, RocketSystems* arg, FSMState
 
 DECLARE_THREAD(cam, RocketSystems* arg) {
     while (true) {
-        arg->b2b.camera.update_cam_board_state();
+        arg->rocket_data.camera_state = arg->b2b.camera.read();
         THREAD_SLEEP(200);
     }
 }