Skip to content

Commit 2c5d9aa

Browse files
committed
Merge branch 'release_candidate' into AddFlexLoRa
2 parents ffb62f4 + ce62276 commit 2c5d9aa

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

Firmware/RTK_Everywhere/Developer.ino

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ void nmeaExtractStdDeviations(char *nmeaSentence, int arraySize) {}
267267
void processNonSBFData(SEMP_PARSE_STATE *parse) {}
268268
void processUart1SBF(SEMP_PARSE_STATE *parse, uint16_t type) {}
269269
void processUart1SPARTN(SEMP_PARSE_STATE *parse, uint16_t type) {}
270+
void menuLogMosaic() {}
270271

271272
#endif // COMPILE_MOSAICX5
272273

Firmware/RTK_Everywhere/Tilt.ino

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,10 @@ void tiltDetect()
10191019

10201020
// Start test if not previously detected
10211021
if (settings.detectedTilt == true)
1022+
{
1023+
present.imu_im19 = true; // Allow tiltUpdate() to run
10221024
return;
1025+
}
10231026

10241027
// Test for tilt only once
10251028
if (settings.testedTilt == true)
@@ -1048,9 +1051,6 @@ void tiltDetect()
10481051
{
10491052
if (tiltSensor->begin(SerialTiltTest) == true)
10501053
{
1051-
if (settings.enableImuDebug == true)
1052-
systemPrintln("Tilt sensor detected");
1053-
10541054
present.imu_im19 = true; // Allow tiltUpdate() to run
10551055
settings.detectedTilt = true;
10561056
break;
@@ -1061,8 +1061,8 @@ void tiltDetect()
10611061

10621062
#endif // COMPILE_IM19_IMU
10631063

1064-
// if (settings.enableImuDebug == true)
1065-
systemPrintf("Tilt sensor %sdetected\r\n", settings.detectedTilt ? "" : "not ");
1064+
if (settings.enableImuDebug == true)
1065+
systemPrintf("Tilt sensor %sdetected\r\n", settings.detectedTilt ? "" : "not ");
10661066

10671067
settings.testedTilt = true;
10681068
recordSystemSettings();

Firmware/RTK_Everywhere/WiFi.ino

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1327,10 +1327,7 @@ bool RTK_WIFI::connect(unsigned long timeout, bool startAP)
13271327

13281328
// Enable WiFi station if necessary
13291329
if (wifiStationRunning == false)
1330-
{
1331-
displayWiFiConnect();
13321330
started = enable(wifiEspNowRunning, wifiSoftApRunning, true, __FILE__, __LINE__);
1333-
}
13341331
else if (startAP && !wifiSoftApRunning)
13351332
started = enable(wifiEspNowRunning, true, wifiStationRunning, __FILE__, __LINE__);
13361333

@@ -2827,6 +2824,7 @@ bool RTK_WIFI::stopStart(WIFI_ACTION_t stopping, WIFI_ACTION_t starting)
28272824
systemPrintf("channel: %d\r\n", channel);
28282825
_started = _started | WIFI_STA_START_SCAN;
28292826

2827+
systemPrintln("Scanning for WiFi...");
28302828
displayWiFiConnect();
28312829

28322830
// Determine if WiFi scan failed, stop WiFi station startup
@@ -3181,7 +3179,7 @@ bool RTK_WIFI::stopStart(WIFI_ACTION_t stopping, WIFI_ACTION_t starting)
31813179

31823180
// Return the enable status
31833181
bool enabled = ((_started & allOnline) == expected);
3184-
if (!enabled)
3182+
if (settings.debugWifiState && !enabled)
31853183
systemPrintf("ERROR: RTK_WIFI::stopStart failed!\r\n");
31863184
if (settings.debugWifiState && _verbose)
31873185
{

Firmware/RTK_Everywhere/menuMain.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ void factoryReset(bool alreadyHasSemaphore)
547547
gnss->factoryReset();
548548
}
549549
else
550-
systemPrintln("GNSS not online. Unable to factoryReset...");
550+
systemPrintln("GNSS not online: Unable to factory reset.");
551551

552552
systemPrintln("Settings erased successfully. Rebooting. Goodbye!");
553553
delay(2000);

0 commit comments

Comments
 (0)