File tree Expand file tree Collapse file tree 3 files changed +19
-18
lines changed Expand file tree Collapse file tree 3 files changed +19
-18
lines changed Original file line number Diff line number Diff line change @@ -1429,8 +1429,21 @@ void paintSystemTest()
1429
1429
oled.setCursor (xOffset, yOffset + (5 * charHeight) ); // x, y
1430
1430
oled.print (macAddress);
1431
1431
oled.print (" :" );
1432
+
1433
+ // Verify the ESP UART2 can communicate TX/RX to ZED UART1
1432
1434
if (zedUartPassed == false )
1433
- oled.print (F (" FAIL" ));
1435
+ {
1436
+ SFE_UBLOX_GNSS myGNSS;
1437
+
1438
+ // begin() attempts 3 connections
1439
+ if (myGNSS.begin (serialGNSS) == true )
1440
+ {
1441
+ zedUartPassed = true ;
1442
+ oled.print (F (" OK" ));
1443
+ }
1444
+ else
1445
+ oled.print (F (" FAIL" ));
1446
+ }
1434
1447
else
1435
1448
oled.print (F (" OK" ));
1436
1449
}
Original file line number Diff line number Diff line change @@ -641,24 +641,12 @@ void updateSystemState()
641
641
// Debounce entry into test menu
642
642
if (millis () - lastTestMenuChange > 500 )
643
643
{
644
+ zedUartPassed = false ;
645
+
644
646
// Enable RTCM 1230. This is the GLONASS bias sentence and is transmitted
645
647
// even if there is no GPS fix. We use it to test serial output.
646
648
i2cGNSS.enableRTCMmessage (UBX_RTCM_1230, COM_PORT_UART2, 1 ); // Enable message every second
647
649
648
- // Verify the ESP UART2 can communicate TX/RX to ZED UART1
649
- SFE_UBLOX_GNSS myGNSS;
650
-
651
- // Attempt 3 connections
652
- for (int x = 0 ; x < 3 ; x++)
653
- {
654
- if (myGNSS.begin (serialGNSS) == true )
655
- {
656
- zedUartPassed = true ;
657
- break ;
658
- }
659
- delay (250 );
660
- }
661
-
662
650
changeState (STATE_TESTING);
663
651
}
664
652
}
Original file line number Diff line number Diff line change @@ -226,12 +226,12 @@ bool configureUbloxModule()
226
226
if (getSerialRate (COM_PORT_UART1) != settings.dataPortBaud )
227
227
{
228
228
Serial.println (F (" Updating UART1 rate" ));
229
- i2cGNSS.setSerialRate (settings.dataPortBaud , COM_PORT_UART1); // Set UART1 to 115200
229
+ i2cGNSS.setSerialRate (settings.dataPortBaud , COM_PORT_UART1);
230
230
}
231
- if (getSerialRate (COM_PORT_UART2) != settings.radioPortBaud )
231
+ if (getSerialRate (COM_PORT_UART2) != settings.radioPortBaud ) // Defaults to 460800 to maximize message output support
232
232
{
233
233
Serial.println (F (" Updating UART2 rate" ));
234
- i2cGNSS.setSerialRate (settings.radioPortBaud , COM_PORT_UART2); // Set UART2 to 57600 to match SiK telemetry radio firmware default
234
+ i2cGNSS.setSerialRate (settings.radioPortBaud , COM_PORT_UART2); // Defaults to 57600 to match SiK telemetry radio firmware default
235
235
}
236
236
237
237
if (response == false )
You can’t perform that action at this time.
0 commit comments