added duplicate console to mqtt

This commit is contained in:
2022-02-14 19:31:24 +01:00
parent 6cacea2df3
commit 3a2e51713b
19 changed files with 262 additions and 166 deletions
+1 -2
View File
@@ -55,9 +55,8 @@ void MenuAkku::printMenu() {
lcd->printf("Controller: %s", buf);
lcd->setCursor(0, 1);
lcd->printf("Main: %u%%", mainBattery);
} else {
std::cout << "Controller: " << buf << "Main: " << mainBattery << "%" << std::endl;
}
std::cout << "Controller: " << buf << " Main: " << (int) mainBattery << "%" << std::endl;
}
void MenuAkku::update() {
+11 -15
View File
@@ -76,13 +76,12 @@ void MenuGPS::printPage(uint8_t page) const {
lcd->setCursor(0, 1);
lcd->printf("or no GPS signal");
}
} else {
}
if (gps->satellites.isValid() && gps->satellites.value() > 2)
std::cout << "Sats: " << gps->satellites.value()
<< "HDOP: " << gps->hdop.hdop() << std::endl;
else
std::cout << "Date isn't valid or no GPS signal" << std::endl;
}
<< "HDOP: " << gps->hdop.hdop() << std::endl;
else
std::cout << "Data isn't valid or no GPS signal" << std::endl;
break;
case 1:
@@ -98,13 +97,12 @@ void MenuGPS::printPage(uint8_t page) const {
lcd->setCursor(0, 1);
lcd->printf("or NO GPS signal");
}
} else {
if (gps->satellites.isValid() && gps->satellites.value() > 2)
std::cout << "Lat: " << gps->location.lat()
<< "Lng: " << gps->location.lng() << std::endl;
else
std::cout << "Date isn't valid or NO GPS signal" << std::endl;
}
if (gps->satellites.isValid() && gps->satellites.value() > 2)
std::cout << "Lat: " << gps->location.lat()
<< "Lng: " << gps->location.lng() << std::endl;
else
std::cout << "Data isn't valid or NO GPS signal" << std::endl;
break;
case 2:
@@ -114,9 +112,8 @@ void MenuGPS::printPage(uint8_t page) const {
lcd->printf("Chars processed");
lcd->setCursor(0, 1);
lcd->printf("-> %u", gps->charsProcessed());
} else {
std::cout << "Chars processed: " << gps->charsProcessed() << std::endl;
}
std::cout << "Chars processed: " << gps->charsProcessed() << std::endl;
break;
default:
@@ -124,9 +121,8 @@ void MenuGPS::printPage(uint8_t page) const {
lcd->clear();
lcd->setCursor(0, 0);
lcd->printf("Page: %u", page);
} else {
printf("Page: %u", page);
}
std::cout << "Page: " << (int) page << std::endl;
break;
}
}
+2 -3
View File
@@ -85,10 +85,9 @@ void MenuPidSettings::printMenu() {
lcd->print(" P I D ");
lcd->setCursor(0, 1);
lcd->print(buf);
} else {
std::cout << " P I D " << std::endl;
std::cout << buf << std::endl;
}
std::cout << " P I D " << std::endl;
std::cout << buf << std::endl;
}
@@ -69,8 +69,8 @@ void MenuAutopilot::printMenu() {
this->lcd->setCursor(0, 1);
this->lcd->print(buf2);
} else
std::cout << buf1 << " " << buf2 << std::endl;
}
std::cout << buf1 << " " << buf2 << std::endl;
}
void MenuAutopilot::update() {
@@ -21,8 +21,8 @@ void MenuCaptureRoute::printMenu() {
this->lcd->setCursor(0, 1);
this->lcd->print("du fahren. :-)");
} else
std::cout << "Capture du\n fahren. :-)" << std::endl;
}
std::cout << "Points: " << this->routeInfo.totalPoints << " du fahren. :-)" << std::endl;
}
void MenuCaptureRoute::update() {
@@ -37,4 +37,4 @@ void MenuCaptureRoute::init() {
this->driveManager->changeModus(Modi::CaptureRoute);
this->captureRoute = (CaptureRoute*) this->driveManager->getDriveModiPtr();
this->routeInfo = this->captureRoute->getRouteInfo();
}
}
@@ -19,6 +19,6 @@ void MenuManualControl::printMenu() {
this->lcd->setCursor(0, 1);
this->lcd->print("du fahren. :-)");
} else
std::cout << "Jetzt kannst du\n fahren. :-)" << std::endl;
}
}
std::cout << "Jetzt kannst du\n fahren. :-)" << std::endl;
}