From d03563e4067e53240fb4330f1369697faddf63e7 Mon Sep 17 00:00:00 2001 From: Nathan Seidle Date: Fri, 13 Dec 2024 14:20:36 -0700 Subject: [PATCH] Update comments --- Firmware/RTK_Everywhere/Network.ino | 3 +-- Firmware/RTK_Everywhere/States.ino | 8 ++++---- Firmware/RTK_Everywhere/menuCommands.ino | 5 +---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Firmware/RTK_Everywhere/Network.ino b/Firmware/RTK_Everywhere/Network.ino index 02fd095d..93f1e587 100644 --- a/Firmware/RTK_Everywhere/Network.ino +++ b/Firmware/RTK_Everywhere/Network.ino @@ -1332,7 +1332,6 @@ void networkUpdate() // If there are no consumers, but the network is online, shut down all networks if (networkConsumers() == 0 && networkIsOnline() == true) { - if (systemState == STATE_WIFI_CONFIG) { // The STATE_WIFI_CONFIG is in control of WiFi. Don't allow the network layer to shut it down @@ -1575,7 +1574,7 @@ uint8_t networkConsumers() if (consumerType & (1 << 7)) systemPrint("OTA Version Check, "); if (consumerType & (1 << 8)) - systemPrint("OTA Scheduled Check, "); + systemPrint("OTA Firmware Update, "); } systemPrintln(); diff --git a/Firmware/RTK_Everywhere/States.ino b/Firmware/RTK_Everywhere/States.ino index 9ad80df2..3f279558 100644 --- a/Firmware/RTK_Everywhere/States.ino +++ b/Firmware/RTK_Everywhere/States.ino @@ -472,14 +472,14 @@ void stateUpdate() // If a firmware version was requested, and obtained, report it back to the web page if (strlen(otaReportedVersion) > 0) { - if(settings.debugWebConfig) - systemPrintln("Webconfig: Reporting firmware version"); - createFirmwareVersionString(settingsCSV); + if (settings.debugWebConfig) + systemPrintf("Webconfig: Firmware version requested. Sending: %s\r\n", settingsCSV); + sendStringToWebsocket(settingsCSV); - otaReportedVersion[0] = '\0'; //Zero out the reported version + otaReportedVersion[0] = '\0'; // Zero out the reported version } } diff --git a/Firmware/RTK_Everywhere/menuCommands.ino b/Firmware/RTK_Everywhere/menuCommands.ino index 290c4f0e..f209ecac 100644 --- a/Firmware/RTK_Everywhere/menuCommands.ino +++ b/Firmware/RTK_Everywhere/menuCommands.ino @@ -1313,12 +1313,9 @@ SettingValueResponse updateSettingWithValue(bool inCommands, const char *setting sendStringToWebsocket((char *)"checkingNewFirmware,1,"); // Tell the config page we received their request - // Indicate to the network that we need access + // Indicate to the OTA state machine that we need to do a version check otaRequestFirmwareVersionCheck = true; - // Erase reported version. Once the reported version comes back, transmit to webpage - otaReportedVersion[0] = '\0'; - // Get firmware version from server // otaCheckVersion will call wifiConnect if needed // if (otaCheckVersion(reportedVersion, sizeof(reportedVersion)))