@@ -62,6 +62,7 @@ SensorDataHandler zMagData(MAGNETOMETER_Z, &dataSaver);
6262
6363SensorDataHandler superLoopRate (AVERAGE_CYCLE_RATE, &dataSaver);
6464SensorDataHandler stateChange (STATE_CHANGE, &dataSaver);
65+ SensorDataHandler currentState (CURRENT_STATE, &dataSaver);
6566SensorDataHandler flightIDSaver (FLIGHT_ID, &dataSaver);
6667float flightID;
6768
@@ -86,13 +87,13 @@ SendableSensorData* ssds[] {
8687 new SendableSensorData (nullptr , (SensorDataHandler*[]) {&xMagData, &yMagData, &zMagData}, 3 , 111 , 1 ),
8788 new SendableSensorData (&superLoopRate, nullptr , 0 , 1 , 1 ),
8889 new SendableSensorData (&stateChange, nullptr , 0 , 1 , 1 ),
90+ new SendableSensorData (¤tState, nullptr , 0 , 1 , 1 ),
8991 new SendableSensorData (&flightIDSaver, nullptr , 0 , 1 , 1 ),
9092};
91- // HardwareSerial rfdSerialConnection(0, 1); //TODO: change txPin and rxPin to real values
92- Telemetry telemetry (ssds, 10 , Serial );
93+ HardwareSerial SUART1 (PB7, PB6);
94+ Telemetry telemetry (ssds, 10 , SUART1 );
9395
9496CommandLine cmdLine (&Serial);
95- HardwareSerial SUART1 (PB7, PB6);
9697
9798void testCommand (std::queue<std::string> arguments, std::string& response);
9899void ping (std::queue<std::string> arguments, std::string& response);
@@ -106,6 +107,7 @@ void setup() {
106107
107108
108109 Serial.begin (115200 );
110+ SUART1.begin (57600 );
109111 // while (!Serial) delay(10); // Wait for Serial Monitor (Comment out if not using)
110112
111113
@@ -184,7 +186,7 @@ void setup() {
184186 cmdLine.addCommand (" clear_plm" , " cplm" , clearPostLaunchMode);
185187 cmdLine.addCommand (" status" , " s" , printStatus);
186188 cmdLine.addCommand (" dump" , " d" , dumpFlash);
187- // cmdLine.begin();
189+ cmdLine.begin ();
188190
189191
190192 // Set save speeds
@@ -197,6 +199,7 @@ void setup() {
197199 altitudeData.restrictSaveSpeed (10 ); // Save altitude every 10 ms (100hz)
198200 flightIDSaver.restrictSaveSpeed (10000 );
199201 apogeeEstData.restrictSaveSpeed (10 );
202+ currentState.restrictSaveSpeed (2000 );
200203
201204
202205 // Loop start time
@@ -243,7 +246,7 @@ void loop() {
243246 #ifdef SIM
244247 SerialSim::getInstance ().update ();
245248 #else
246- // cmdLine.readInput();
249+ cmdLine.readInput ();
247250 #endif
248251
249252 sox.getEvent (&accel, &gyro, &temp);
@@ -317,6 +320,7 @@ void loop() {
317320 zGyroData.addData (DataPoint (current_time, gyro.gyro .z ));
318321
319322 superLoopRate.addData (DataPoint (current_time, loop_count / (millis () / 1000 - start_time_s)));
323+ currentState.addData (DataPoint (current_time, stateMachine.getState ()));
320324
321325 telemetry.tick (current_time);
322326
0 commit comments