Always something; fix errors: off by one (> instead of >=), merge fail, didn't remove old gps_obj.enable_queue() from MenuFunctions.

This commit is contained in:
Kragg Malak
2023-12-13 19:11:49 -07:00
parent dd2274b018
commit e67c67b990
2 changed files with 2 additions and 3 deletions
+2 -2
View File
@@ -102,7 +102,7 @@ void GpsInterface::enqueue(MicroNMEA& nmea){
int size=text_in->size();
if(size){
#ifdef GPS_TEXT_MAXCOPIES
if(this->text_cycles>GPS_TEXT_MAXCOPIES){
if(this->text_cycles>=GPS_TEXT_MAXCOPIES){
#else
if(this->text_cycles){
#endif
@@ -631,4 +631,4 @@ void GpsInterface::main() {
this->setGPSInfo();
}
}
#endif
#endif
-1
View File
@@ -1679,7 +1679,6 @@ void MenuFunctions::RunSetup()
});
this->addNodes(&deviceMenu, "NMEA Stream", TFT_ORANGE, NULL, GPS_MENU, [this]() {
gps_obj.enable_queue();
wifi_scan_obj.currentScanMode = WIFI_SCAN_GPS_NMEA;
this->changeMenu(&gpsInfoMenu);
wifi_scan_obj.StartScan(WIFI_SCAN_GPS_NMEA, TFT_ORANGE);