added update for menu

This commit is contained in:
2022-02-01 18:25:23 +01:00
parent d356b28ffb
commit 15fd17e058
6 changed files with 139 additions and 45 deletions
+95 -20
View File
@@ -13,6 +13,23 @@
MenuGPS::MenuGPS(TinyGPSPlus* gps) {
this->gps = gps;
this->last_millis = millis();
}
void MenuGPS::up() {
if (this->currentPage == 0)
this->currentPage = this->countPages - 1;
else
this->currentPage--;
this->printMenu();
}
void MenuGPS::down() {
if (this->currentPage == this->countPages - 1)
this->currentPage = 0;
else
this->currentPage++;
this->printMenu();
}
void MenuGPS::right() {
@@ -33,25 +50,83 @@ void MenuGPS::yes() {
}
void MenuGPS::printMenu() {
if (this->lcd) {
lcd->clear();
lcd->setCursor(0, 0);
if (gps->satellites.isValid() && gps->satellites.value() > 2) {
lcd->printf("Sats: %3.d", gps->satellites.value());
lcd->setCursor(0, 1);
lcd->printf("HDOP: %f", gps->hdop.hdop());
} else {
lcd->clear();
lcd->setCursor(0, 0);
lcd->printf("Data isn't valid");
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;
this->printPage(this->currentPage);
}
void MenuGPS::update() {
if (millis() - this->last_millis < this->delay) {
return;
}
this->printMenu();
this->last_millis = millis();
}
void MenuGPS::printPage(uint8_t page) const {
switch (this->currentPage) {
case 0:
if (this->lcd) {
lcd->clear();
lcd->setCursor(0, 0);
if (gps->satellites.isValid() && gps->satellites.value() > 2) {
lcd->printf("Sats: %3.d", gps->satellites.value());
lcd->setCursor(0, 1);
lcd->printf("HDOP: %f", gps->hdop.hdop());
} else {
lcd->printf("Data isn't valid");
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;
}
break;
case 1:
if (this->lcd) {
lcd->clear();
lcd->setCursor(0, 0);
if (gps->location.isValid() && gps->satellites.value() > 2) {
lcd->printf("Lat: %9.6f", gps->location.lat());
lcd->setCursor(0, 1);
lcd->printf("Lng: %9.6f", gps->location.lng());
} else {
lcd->printf("Data isn't valid");
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;
}
break;
case 2:
if (this->lcd) {
lcd->clear();
lcd->setCursor(0, 0);
lcd->printf("Chars processed");
lcd->setCursor(0, 1);
lcd->printf("-> %u", gps->charsProcessed());
} else {
std::cout << "Chars processed: " << gps->charsProcessed() << std::endl;
}
break;
default:
if (this->lcd) {
lcd->clear();
lcd->setCursor(0, 0);
lcd->printf("Page: %u", page);
} else {
printf("Page: %u", page);
}
break;
}
}
+10 -2
View File
@@ -20,17 +20,25 @@ class MenuGPS : public MenuControl {
public:
MenuGPS(TinyGPSPlus* gps);
void down(){}
void up(){}
void down();
void up();
void right();
void left();
void no();
void yes();
void printMenu();
void update();
private:
const uint8_t countPages = 7;
uint8_t currentPage = 0;
void printPage(const uint8_t page) const;
TinyGPSPlus* gps;
const uint16_t delay = 5000;
uint32_t last_millis = 0;
};
#endif // MENU_GPS_H
+1
View File
@@ -33,6 +33,7 @@ class MenuPidSettings : public MenuControl {
void yes();
void printMenu();
void update(){};
private:
PID* pid;