Skip to content

Commit c53e656

Browse files
nseidlenseidle
authored
Merge pull request #259 from LeeLeahy2/print-states
Enable/disable printing of states and duplicate states
2 parents 19602ed + b2ae0db commit c53e656

File tree

1 file changed

+122
-115
lines changed

1 file changed

+122
-115
lines changed

‎Firmware/RTK_Surveyor/States.ino‎

Lines changed: 122 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -931,125 +931,132 @@ void changeState(SystemState newState)
931931
//Log the heap size at the state change
932932
reportHeapNow();
933933

934+
//Debug print of new state, add leading asterisk for repeated states
935+
if ((!settings.enablePrintDuplicateStates) && (newState == systemState))
936+
return;
937+
938+
if (settings.enablePrintStates && (newState == systemState))
939+
Serial.print("*");
940+
934941
//Set the new state
935942
systemState = newState;
936943

937-
//Debug print of new state, add leading asterisk for repeated states
938-
if (newState == systemState)
939-
Serial.print("*");
940-
switch (systemState)
944+
if (settings.enablePrintStates)
941945
{
942-
case (STATE_ROVER_NOT_STARTED):
943-
Serial.print("State: Rover - Not Started");
944-
break;
945-
case (STATE_ROVER_NO_FIX):
946-
Serial.print("State: Rover - No Fix");
947-
break;
948-
case (STATE_ROVER_FIX):
949-
Serial.print("State: Rover - Fix");
950-
break;
951-
case (STATE_ROVER_RTK_FLOAT):
952-
Serial.print("State: Rover - RTK Float");
953-
break;
954-
case (STATE_ROVER_RTK_FIX):
955-
Serial.print("State: Rover - RTK Fix");
956-
break;
957-
case (STATE_BASE_NOT_STARTED):
958-
Serial.print("State: Base - Not Started");
959-
break;
960-
case (STATE_BASE_TEMP_SETTLE):
961-
Serial.print("State: Base-Temp - Settle");
962-
break;
963-
case (STATE_BASE_TEMP_SURVEY_STARTED):
964-
Serial.print("State: Base-Temp - Survey Started");
965-
break;
966-
case (STATE_BASE_TEMP_TRANSMITTING):
967-
Serial.print("State: Base-Temp - Transmitting");
968-
break;
969-
case (STATE_BASE_FIXED_NOT_STARTED):
970-
Serial.print("State: Base-Fixed - Not Started");
971-
break;
972-
case (STATE_BASE_FIXED_TRANSMITTING):
973-
Serial.print("State: Base-Fixed - Transmitting");
974-
break;
975-
case (STATE_BUBBLE_LEVEL):
976-
Serial.print("State: Bubble level");
977-
break;
978-
case (STATE_MARK_EVENT):
979-
Serial.print("State: Mark Event");
980-
break;
981-
case (STATE_DISPLAY_SETUP):
982-
Serial.print("State: Display Setup");
983-
break;
984-
case (STATE_WIFI_CONFIG_NOT_STARTED):
985-
Serial.print("State: WiFi Config Not Started");
986-
break;
987-
case (STATE_WIFI_CONFIG):
988-
Serial.print("State: WiFi Config");
989-
break;
990-
case (STATE_TEST):
991-
Serial.print("State: System Test Setup");
992-
break;
993-
case (STATE_TESTING):
994-
Serial.print("State: System Testing");
995-
break;
996-
case (STATE_PROFILE):
997-
Serial.print("State: Profile");
998-
break;
999-
case (STATE_KEYS_STARTED):
1000-
Serial.print("State: Keys Started ");
1001-
break;
1002-
case (STATE_KEYS_NEEDED):
1003-
Serial.print("State: Keys Needed");
1004-
break;
1005-
case (STATE_KEYS_WIFI_STARTED):
1006-
Serial.print("State: Keys WiFi Started");
1007-
break;
1008-
case (STATE_KEYS_WIFI_CONNECTED):
1009-
Serial.print("State: Keys WiFi Connected");
1010-
break;
1011-
case (STATE_KEYS_WIFI_TIMEOUT):
1012-
Serial.print("State: Keys WiFi Timeout");
1013-
break;
1014-
case (STATE_KEYS_EXPIRED):
1015-
Serial.print("State: Keys Expired");
1016-
break;
1017-
case (STATE_KEYS_DAYS_REMAINING):
1018-
Serial.print("State: Keys Days Remaining");
1019-
break;
1020-
case (STATE_KEYS_LBAND_CONFIGURE):
1021-
Serial.print("State: Keys L-Band Configure");
1022-
break;
1023-
case (STATE_KEYS_LBAND_ENCRYPTED):
1024-
Serial.print("State: Keys L-Band Encrypted");
1025-
break;
1026-
case (STATE_KEYS_PROVISION_WIFI_STARTED):
1027-
Serial.print("State: Keys Provision - WiFi Started");
1028-
break;
1029-
case (STATE_KEYS_PROVISION_WIFI_CONNECTED):
1030-
Serial.print("State: Keys Provision - WiFi Connected");
1031-
break;
1032-
case (STATE_KEYS_PROVISION_WIFI_TIMEOUT):
1033-
Serial.print("State: Keys Provision - WiFi Timeout");
1034-
break;
1035-
1036-
case (STATE_SHUTDOWN):
1037-
Serial.print("State: Shut Down");
1038-
break;
1039-
default:
1040-
Serial.printf("Change State Unknown: %d", systemState);
1041-
break;
1042-
}
946+
switch (systemState)
947+
{
948+
case (STATE_ROVER_NOT_STARTED):
949+
Serial.print("State: Rover - Not Started");
950+
break;
951+
case (STATE_ROVER_NO_FIX):
952+
Serial.print("State: Rover - No Fix");
953+
break;
954+
case (STATE_ROVER_FIX):
955+
Serial.print("State: Rover - Fix");
956+
break;
957+
case (STATE_ROVER_RTK_FLOAT):
958+
Serial.print("State: Rover - RTK Float");
959+
break;
960+
case (STATE_ROVER_RTK_FIX):
961+
Serial.print("State: Rover - RTK Fix");
962+
break;
963+
case (STATE_BASE_NOT_STARTED):
964+
Serial.print("State: Base - Not Started");
965+
break;
966+
case (STATE_BASE_TEMP_SETTLE):
967+
Serial.print("State: Base-Temp - Settle");
968+
break;
969+
case (STATE_BASE_TEMP_SURVEY_STARTED):
970+
Serial.print("State: Base-Temp - Survey Started");
971+
break;
972+
case (STATE_BASE_TEMP_TRANSMITTING):
973+
Serial.print("State: Base-Temp - Transmitting");
974+
break;
975+
case (STATE_BASE_FIXED_NOT_STARTED):
976+
Serial.print("State: Base-Fixed - Not Started");
977+
break;
978+
case (STATE_BASE_FIXED_TRANSMITTING):
979+
Serial.print("State: Base-Fixed - Transmitting");
980+
break;
981+
case (STATE_BUBBLE_LEVEL):
982+
Serial.print("State: Bubble level");
983+
break;
984+
case (STATE_MARK_EVENT):
985+
Serial.print("State: Mark Event");
986+
break;
987+
case (STATE_DISPLAY_SETUP):
988+
Serial.print("State: Display Setup");
989+
break;
990+
case (STATE_WIFI_CONFIG_NOT_STARTED):
991+
Serial.print("State: WiFi Config Not Started");
992+
break;
993+
case (STATE_WIFI_CONFIG):
994+
Serial.print("State: WiFi Config");
995+
break;
996+
case (STATE_TEST):
997+
Serial.print("State: System Test Setup");
998+
break;
999+
case (STATE_TESTING):
1000+
Serial.print("State: System Testing");
1001+
break;
1002+
case (STATE_PROFILE):
1003+
Serial.print("State: Profile");
1004+
break;
1005+
case (STATE_KEYS_STARTED):
1006+
Serial.print("State: Keys Started ");
1007+
break;
1008+
case (STATE_KEYS_NEEDED):
1009+
Serial.print("State: Keys Needed");
1010+
break;
1011+
case (STATE_KEYS_WIFI_STARTED):
1012+
Serial.print("State: Keys WiFi Started");
1013+
break;
1014+
case (STATE_KEYS_WIFI_CONNECTED):
1015+
Serial.print("State: Keys WiFi Connected");
1016+
break;
1017+
case (STATE_KEYS_WIFI_TIMEOUT):
1018+
Serial.print("State: Keys WiFi Timeout");
1019+
break;
1020+
case (STATE_KEYS_EXPIRED):
1021+
Serial.print("State: Keys Expired");
1022+
break;
1023+
case (STATE_KEYS_DAYS_REMAINING):
1024+
Serial.print("State: Keys Days Remaining");
1025+
break;
1026+
case (STATE_KEYS_LBAND_CONFIGURE):
1027+
Serial.print("State: Keys L-Band Configure");
1028+
break;
1029+
case (STATE_KEYS_LBAND_ENCRYPTED):
1030+
Serial.print("State: Keys L-Band Encrypted");
1031+
break;
1032+
case (STATE_KEYS_PROVISION_WIFI_STARTED):
1033+
Serial.print("State: Keys Provision - WiFi Started");
1034+
break;
1035+
case (STATE_KEYS_PROVISION_WIFI_CONNECTED):
1036+
Serial.print("State: Keys Provision - WiFi Connected");
1037+
break;
1038+
case (STATE_KEYS_PROVISION_WIFI_TIMEOUT):
1039+
Serial.print("State: Keys Provision - WiFi Timeout");
1040+
break;
10431041

1044-
if (online.rtc)
1045-
{
1046-
//Timestamp the state change
1047-
// 1 2
1048-
//12345678901234567890123456
1049-
//YYYY-mm-dd HH:MM:SS.xxxrn0
1050-
struct tm timeinfo = rtc.getTimeStruct();
1051-
char s[30];
1052-
strftime(s, sizeof(s), "%Y-%m-%d %H:%M:%S", &timeinfo);
1053-
Serial.printf(", %s.%03ld\r\n", s, rtc.getMillis());
1042+
case (STATE_SHUTDOWN):
1043+
Serial.print("State: Shut Down");
1044+
break;
1045+
default:
1046+
Serial.printf("Change State Unknown: %d", systemState);
1047+
break;
1048+
}
1049+
1050+
if (online.rtc)
1051+
{
1052+
//Timestamp the state change
1053+
// 1 2
1054+
//12345678901234567890123456
1055+
//YYYY-mm-dd HH:MM:SS.xxxrn0
1056+
struct tm timeinfo = rtc.getTimeStruct();
1057+
char s[30];
1058+
strftime(s, sizeof(s), "%Y-%m-%d %H:%M:%S", &timeinfo);
1059+
Serial.printf(", %s.%03ld\r\n", s, rtc.getMillis());
1060+
}
10541061
}
10551062
}

0 commit comments

Comments
 (0)