@@ -103,34 +103,29 @@ void menuFirmware()
103
103
104
104
bool previouslyConnected = wifiIsConnected ();
105
105
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)))
108
109
{
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, ¤tVersion[1 ]) == true ||
114
+ FIRMWARE_VERSION_MAJOR == 99 || settings.debugFirmwareUpdate == true )
111
115
{
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, ¤tVersion[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 ;
125
118
}
126
119
else
127
120
{
128
- // Failed to get version number
129
- systemPrintln (" Failed to get version number from server." );
121
+ systemPrintln (" No new firmware available" );
130
122
}
131
123
}
132
124
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
+ }
134
129
135
130
if (previouslyConnected == false )
136
131
WIFI_STOP ();
0 commit comments