Revert Telem (#835)

* Revert "Mission state telemetry (#824)" This reverts commit e729af0. * revert and merge conflicts
pathfinder-for-autonomous-navigation · Oct 18, 2021 · 5ed3ece · 5ed3ece
1 parent d4314cd
commit 5ed3ece
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 443 deletions.
diff --git a/constants b/constants
@@ -54,28 +54,28 @@ src/fsw/FCCode/EEPROMController.hpp:60: "eeprom_size" = "4096"
 src/fsw/FCCode/GomspaceController.hpp:10: "default_pv_cmd" = "4000"
 src/fsw/FCCode/GomspaceController.hpp:11: "default_ppt_mode" = "1"
 src/fsw/FCCode/MainControlLoop.cpp:19: "piksi_serial" = "Serial4"
-src/fsw/FCCode/MainControlLoop.cpp:63: "i2c_mode_sel" = "I2C_MASTER"
-src/fsw/FCCode/MainControlLoop.cpp:64: "i2c_pin_nos" = "I2C_PINS_18_19"
-src/fsw/FCCode/MainControlLoop.cpp:65: "i2c_pullups" = "I2C_PULLUP_EXT"
-src/fsw/FCCode/MainControlLoop.cpp:66: "i2c_rate" = "400000"
-src/fsw/FCCode/MainControlLoop.cpp:67: "i2c_op" = "I2C_OP_MODE_IMM"
-src/fsw/FCCode/MainControlLoop.cpp:127: "piksi_duration" = "6400"
-src/fsw/FCCode/MainControlLoop.cpp:128: "adcs_monitor_duration" = "28000"
-src/fsw/FCCode/MainControlLoop.cpp:129: "debug_duration" = "16400"
-src/fsw/FCCode/MainControlLoop.cpp:130: "gomspace_duration" = "15000"
-src/fsw/FCCode/MainControlLoop.cpp:131: "uplink_duration" = "10000"
-src/fsw/FCCode/MainControlLoop.cpp:132: "attitude_estimator_duration" = "5000"
-src/fsw/FCCode/MainControlLoop.cpp:133: "mission_duration" = "1000"
-src/fsw/FCCode/MainControlLoop.cpp:134: "dcdc_duration" = "1000"
-src/fsw/FCCode/MainControlLoop.cpp:135: "attitude_controller_duration" = "1000"
-src/fsw/FCCode/MainControlLoop.cpp:136: "adcs_commander_duration" = "1000"
-src/fsw/FCCode/MainControlLoop.cpp:137: "adcs_box_controller_duration" = "10000"
-src/fsw/FCCode/MainControlLoop.cpp:138: "orbit_duration" = "5000"
-src/fsw/FCCode/MainControlLoop.cpp:139: "prop_duration" = "28000"
-src/fsw/FCCode/MainControlLoop.cpp:140: "downlink_duration" = "1000"
-src/fsw/FCCode/MainControlLoop.cpp:141: "quake_duration" = "30000"
-src/fsw/FCCode/MainControlLoop.cpp:142: "docking_duration" = "10000"
-src/fsw/FCCode/MainControlLoop.cpp:143: "eeprom_duration" = "16600"
+src/fsw/FCCode/MainControlLoop.cpp:62: "i2c_mode_sel" = "I2C_MASTER"
+src/fsw/FCCode/MainControlLoop.cpp:63: "i2c_pin_nos" = "I2C_PINS_18_19"
+src/fsw/FCCode/MainControlLoop.cpp:64: "i2c_pullups" = "I2C_PULLUP_EXT"
+src/fsw/FCCode/MainControlLoop.cpp:65: "i2c_rate" = "400000"
+src/fsw/FCCode/MainControlLoop.cpp:66: "i2c_op" = "I2C_OP_MODE_IMM"
+src/fsw/FCCode/MainControlLoop.cpp:126: "piksi_duration" = "6400"
+src/fsw/FCCode/MainControlLoop.cpp:127: "adcs_monitor_duration" = "28000"
+src/fsw/FCCode/MainControlLoop.cpp:128: "debug_duration" = "16400"
+src/fsw/FCCode/MainControlLoop.cpp:129: "gomspace_duration" = "15000"
+src/fsw/FCCode/MainControlLoop.cpp:130: "uplink_duration" = "10000"
+src/fsw/FCCode/MainControlLoop.cpp:131: "attitude_estimator_duration" = "5000"
+src/fsw/FCCode/MainControlLoop.cpp:132: "mission_duration" = "1000"
+src/fsw/FCCode/MainControlLoop.cpp:133: "dcdc_duration" = "1000"
+src/fsw/FCCode/MainControlLoop.cpp:134: "attitude_controller_duration" = "1000"
+src/fsw/FCCode/MainControlLoop.cpp:135: "adcs_commander_duration" = "1000"
+src/fsw/FCCode/MainControlLoop.cpp:136: "adcs_box_controller_duration" = "10000"
+src/fsw/FCCode/MainControlLoop.cpp:137: "orbit_duration" = "5000"
+src/fsw/FCCode/MainControlLoop.cpp:138: "prop_duration" = "28000"
+src/fsw/FCCode/MainControlLoop.cpp:139: "downlink_duration" = "1000"
+src/fsw/FCCode/MainControlLoop.cpp:140: "quake_duration" = "30000"
+src/fsw/FCCode/MainControlLoop.cpp:141: "docking_duration" = "10000"
+src/fsw/FCCode/MainControlLoop.cpp:142: "eeprom_duration" = "16600"
 src/fsw/FCCode/MissionManager.hpp:32: "initial_detumble_safety_factor" = "0.025"
 src/fsw/FCCode/MissionManager.hpp:33: "initial_close_approach_trigger_dist" = "2000"
 src/fsw/FCCode/MissionManager.hpp:34: "initial_docking_trigger_dist" = "0.4"

diff --git a/src/flow_data.cpp b/src/flow_data.cpp
@@ -11,7 +11,7 @@ const std::vector<DownlinkProducer::FlowData> PAN::flow_data = {
 {4, false, {"rel_orbit.pos", "rel_orbit.vel"}},
 {5, false, {"rel_orbit.rel_pos", "rel_orbit.rel_vel", "rel_orbit.rel_pos_sigma", "rel_orbit.rel_vel_sigma"}},
 {6, false, {"attitude_estimator.w_bias_body", "attitude_estimator.p_body_eci_sigma_f", "attitude_estimator.w_bias_sigma_body", "attitude_estimator.mag_flag", "attitude_estimator.b_valid", "attitude_estimator.b_body"}},
-{7, true, {"adcs_monitor.functional_fault.base", "piksi_fh.dead.base", "adcs_monitor.wheel1_fault.base", "adcs_monitor.wheel2_fault.base", "adcs_monitor.wheel3_fault.base", "adcs_monitor.wheel_pot_fault.base", "prop.overpressured.base", "prop.pressurize_fail.base", "prop.tank2_temp_high.base", "prop.tank1_temp_high.base", "gomspace.low_batt.base", "gomspace.get_hk.base", "attitude_estimator.fault.base"}},
+{7, true, {"adcs_monitor.functional_fault.base", "piksi_fh.dead.base", "adcs_monitor.wheel2_fault.base", "adcs_monitor.wheel3_fault.base", "adcs_monitor.wheel_pot_fault.base", "prop.overpressured.base", "prop.pressurize_fail.base", "prop.tank2_temp_high.base", "prop.tank1_temp_high.base", "gomspace.low_batt.base", "gomspace.get_hk.base", "attitude_estimator.fault.base"}},
 {8, true, {"gomspace.vbatt", "gomspace.cursun", "gomspace.cursys", "gomspace.temp.output1", "gomspace.temp.output2", "gomspace.temp.output3", "gomspace.temp.output4"}},
 {9, false, {"gomspace.vboost.output1", "gomspace.vboost.output2", "gomspace.vboost.output3", "gomspace.curin.output1", "gomspace.curin.output2", "gomspace.curin.output3"}},
 {10, false, {"gomspace.curout.output1", "gomspace.curout.output2", "gomspace.curout.output3", "gomspace.curout.output4", "gomspace.curout.output5", "gomspace.curout.output6", "gomspace.output.output1", "gomspace.output.output2", "gomspace.output.output3", "gomspace.output.output4", "gomspace.output.output5", "gomspace.output.output6"}},