finished speed and sensor menu in modes
This commit is contained in:
@@ -24,6 +24,8 @@ void MenuDriveMode::left() {
|
||||
|
||||
this->firstPrint = true;
|
||||
this->configureOnLeave();
|
||||
if (this->menuSpeed)
|
||||
delete this->menuSpeed;
|
||||
this->driveManager->changeModus();
|
||||
MenuInformationSites::left();
|
||||
}
|
||||
@@ -85,6 +87,20 @@ void MenuDriveMode::init() {
|
||||
this->activeMenu = nullptr;
|
||||
}
|
||||
|
||||
void MenuDriveMode::activateSpeedMenu() {
|
||||
if (!this->driveManager->isActive())
|
||||
return;
|
||||
|
||||
DrivingSpeeds& speeds = this->driveManager->getDriveModiPtr()->getSpeedsRef();
|
||||
MenuIntInput* menu = new MenuIntInput(2, new MenuSpeed(speeds));
|
||||
|
||||
menu->setMinMax(5, UINT8_MAX);
|
||||
menu->setEntry(0, "x m/s e-1", driveManager->getDrivingSpeedsRef().x * 10);
|
||||
menu->setEntry(1, "z rad/s e-1", driveManager->getDrivingSpeedsRef().rot * 10);
|
||||
|
||||
this->addSpeedMenu(menu);
|
||||
}
|
||||
|
||||
void MenuDriveMode::enterSpeedMenu() {
|
||||
this->activeMenu = this->menuSpeed;
|
||||
this->enterMenu();
|
||||
@@ -97,9 +113,8 @@ void MenuDriveMode::enterSensorMenu() {
|
||||
|
||||
void MenuDriveMode::enterMenu() {
|
||||
if (!this->activeMenu)
|
||||
return
|
||||
return;
|
||||
|
||||
this->activeMenu->printMenu();
|
||||
std::cout << "Sensor Menu was theretically printed" << std::endl;
|
||||
this->activeMenu->setParentMenu(this);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user