Skip to content

Commit b8e4b38

Browse files
committed
Remove duplicate wifiConnect in menuFirmware - otaCheckVersion will call wifiConnect if needed
1 parent 13e56c9 commit b8e4b38

File tree

1 file changed

+15
-20
lines changed

1 file changed

+15
-20
lines changed

Firmware/RTK_Everywhere/menuFirmware.ino

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -103,34 +103,29 @@ void menuFirmware()
103103

104104
bool previouslyConnected = wifiIsConnected();
105105

106-
// Attempt to connect to local WiFi
107-
if (wifiConnect(10000) == true)
106+
// Get firmware version from server
107+
// otaCheckVersion will call wifiConnect if needed
108+
if (otaCheckVersion(reportedVersion, sizeof(reportedVersion)))
108109
{
109-
// Get firmware version from server
110-
if (otaCheckVersion(reportedVersion, sizeof(reportedVersion)))
110+
// We got a version number, now determine if it's newer or not
111+
char currentVersion[21];
112+
getFirmwareVersion(currentVersion, sizeof(currentVersion), enableRCFirmware);
113+
if (isReportedVersionNewer(reportedVersion, &currentVersion[1]) == true ||
114+
FIRMWARE_VERSION_MAJOR == 99 || settings.debugFirmwareUpdate == true)
111115
{
112-
// We got a version number, now determine if it's newer or not
113-
char currentVersion[21];
114-
getFirmwareVersion(currentVersion, sizeof(currentVersion), enableRCFirmware);
115-
if (isReportedVersionNewer(reportedVersion, &currentVersion[1]) == true ||
116-
FIRMWARE_VERSION_MAJOR == 99 || settings.debugFirmwareUpdate == true)
117-
{
118-
systemPrintln("New version detected");
119-
newOTAFirmwareAvailable = true;
120-
}
121-
else
122-
{
123-
systemPrintln("No new firmware available");
124-
}
116+
systemPrintln("New version detected");
117+
newOTAFirmwareAvailable = true;
125118
}
126119
else
127120
{
128-
// Failed to get version number
129-
systemPrintln("Failed to get version number from server.");
121+
systemPrintln("No new firmware available");
130122
}
131123
}
132124
else
133-
systemPrintln("Firmware update failed to connect to WiFi.");
125+
{
126+
// Failed to get version number
127+
systemPrintln("Failed to get version number from server.");
128+
}
134129

135130
if (previouslyConnected == false)
136131
WIFI_STOP();

0 commit comments

Comments
 (0)