begin with gps, can drive now

This commit is contained in:
2022-01-29 20:50:30 +01:00
parent 9c4c82f8b3
commit ab4ceb8b09
12 changed files with 222 additions and 43 deletions
+55
View File
@@ -0,0 +1,55 @@
/**
* @file menuGPS.cpp
* @author Alexander Klein (alex@kleiax.de)
* @brief
* @version 0.1
* @date 2022-01-29
*
* @copyright Copyright (c) 2022
*
*/
#include "menuGPS.h"
MenuGPS::MenuGPS(TinyGPSPlus* gps) {
this->gps = gps;
}
void MenuGPS::right() {
this->printMenu();
}
void MenuGPS::left() {
if (this->parentMenu)
this->parentMenu->printMenu();
}
void MenuGPS::no() {
this->left();
}
void MenuGPS::yes() {
this->printMenu();
}
void MenuGPS::printMenu() {
if (this->lcd) {
lcd->clear();
lcd->setCursor(0, 0);
if (gps->satellites.isValid()) {
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");
}
} else {
if (gps->satellites.isValid())
std::cout << "Sats: " << gps->satellites.value()
<< "HDOP: " << gps->hdop.hdop() << std::endl;
else
std::cout << "Date isn't valid" << std::endl;
}
}
+36
View File
@@ -0,0 +1,36 @@
/**
* @file menuGPS.h
* @author Alexander Klein (alex@kleiax.de)
* @brief
* @version 0.1
* @date 2022-01-29
*
* @copyright Copyright (c) 2022
*
*/
#ifndef MENU_GPS_H
#define MENU_GPS_H
#include <TinyGPS++.h>
#include "menuControl.h"
class MenuGPS : public MenuControl {
public:
MenuGPS(TinyGPSPlus* gps);
void down(){}
void up(){}
void right();
void left();
void no();
void yes();
void printMenu();
private:
TinyGPSPlus* gps;
};
#endif // MENU_GPS_H
+9 -1
View File
@@ -16,5 +16,13 @@ void MenuManualControl::no() {
void MenuManualControl::printMenu() {
this->driveManager->changeModus(Modi::ManualControl);
std::cout << "Jetzt kannst du\n fahren. :-)" << std::endl;
if (this->lcd) {
this->lcd->clear();
this->lcd->setCursor(0, 0);
this->lcd->print("Jetzt kannst");
this->lcd->setCursor(0, 1);
this->lcd->print("du fahren. :-)");
} else
std::cout << "Jetzt kannst du\n fahren. :-)" << std::endl;
}
-4
View File
@@ -18,8 +18,6 @@
// TODO: delete after installtion of display
#include <Arduino.h>
class MenuManualControl : public MenuControl {
public:
MenuManualControl(DriveManager* driveManager);
@@ -35,8 +33,6 @@ class MenuManualControl : public MenuControl {
private:
DriveManager* driveManager;
};
#endif // MENU_MANUAL_DRIVE_H
+14 -4
View File
@@ -62,23 +62,33 @@ void MenuPidSettings::yes() {
}
void MenuPidSettings::printMenu() {
std::cout << " P I D " << std::endl;
char buf[17];
switch (this->curPos) {
case 0:
printf("_%3.d_ %3.d %3.d \n", this->values[0], this->values[1], this->values[2]);
sprintf(buf, "_%3.d_ %3.d %3.d ", this->values[0], this->values[1], this->values[2]);
break;
case 1:
printf(" %3.d _%3.d_ %3.d \n", this->values[0], this->values[1], this->values[2]);
sprintf(buf, " %3.d _%3.d_ %3.d ", this->values[0], this->values[1], this->values[2]);
break;
case 2:
printf(" %3.d %3.d _%3.d_\n", this->values[0], this->values[1], this->values[2]);
sprintf(buf, " %3.d %3.d _%3.d_", this->values[0], this->values[1], this->values[2]);
break;
default:
break;
}
if (this->lcd) {
lcd->clear();
lcd->setCursor(0, 0);
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;
}
}