added pid settings to menu

This commit is contained in:
2022-01-19 14:55:26 +01:00
parent 241123e6c9
commit 1265cfda5c
20 changed files with 608 additions and 87 deletions
+37 -21
View File
@@ -14,11 +14,7 @@ Menu::Menu() {
this->it = this->entrys.begin();
}
void Menu::setParentMenu(Menu* menu) {
this->parentMenu = menu;
}
void Menu::addEntry(MenuEntry* entry) {
void Menu::addEntry(MenuAction* entry) {
this->entrys.push_back(entry);
// TODO: Same shit here. Why I get the first element after an increment.
@@ -31,8 +27,8 @@ void Menu::addEntry(MenuEntry* entry) {
void Menu::printMenu() {
Serial.println("\n\n");
for (std::list<MenuEntry*>::iterator iter = this->entrys.begin(); iter != this->entrys.end(); iter++) {
MenuEntry* selectedEntry = *(iter);
for (std::list<MenuAction*>::iterator iter = this->entrys.begin(); iter != this->entrys.end(); iter++) {
MenuAction* selectedEntry = *(iter);
if (this->it == iter)
Serial.print(" ");
Serial.println(selectedEntry->getName());
@@ -40,15 +36,15 @@ void Menu::printMenu() {
this->inSubmenu = false;
}
void Menu::nextEntry() {
void Menu::down() {
if (this->inSubmenu) {
MenuEntry* selectedEntry = *(this->it);
selectedEntry->getMenu()->nextEntry();
MenuAction* selectedEntry = *(this->it);
selectedEntry->getMenu()->down();
return;
}
// TODO: Why I need the fucking next two lines? here and in the next function
std::list<MenuEntry*>::iterator iter = this->it;
std::list<MenuAction*>::iterator iter = this->it;
iter++;
if (iter != this->entrys.end())
this->it++;
@@ -57,13 +53,13 @@ void Menu::nextEntry() {
this->printMenu();
}
void Menu::prevEntry() {
void Menu::up() {
if (this->inSubmenu) {
MenuEntry* selectedEntry = *(this->it);
selectedEntry->getMenu()->prevEntry();
MenuAction* selectedEntry = *(this->it);
selectedEntry->getMenu()->up();
return;
}
std::list<MenuEntry*>::iterator iter = this->entrys.end();
std::list<MenuAction*>::iterator iter = this->entrys.end();
iter--;
if (this->it != this->entrys.begin()) {
Serial.println("--");
@@ -76,12 +72,12 @@ void Menu::prevEntry() {
this->printMenu();
}
void Menu::enterEntry() {
void Menu::right() {
// TODO: find out why i cannot call runAction() directly from the iterator
MenuEntry* selectedEntry = *(this->it);
MenuAction* selectedEntry = *(this->it);
if (this->inSubmenu) {
selectedEntry->getMenu()->enterEntry();
selectedEntry->getMenu()->right();
return;
}
@@ -92,13 +88,33 @@ void Menu::enterEntry() {
selectedEntry->runAction();
}
void Menu::enterParentMenu() {
void Menu::left() {
if (this->inSubmenu) {
MenuEntry* selectedEntry = *(this->it);
selectedEntry->getMenu()->enterParentMenu();
MenuAction* selectedEntry = *(this->it);
selectedEntry->getMenu()->left();
return;
}
if (parentMenu)
this->parentMenu->printMenu();
}
void Menu::yes() {
if (this->inSubmenu) {
MenuAction* selectedEntry = *(this->it);
selectedEntry->getMenu()->yes();
return;
}
this->right();
}
void Menu::no() {
if (this->inSubmenu) {
MenuAction* selectedEntry = *(this->it);
selectedEntry->getMenu()->no();
return;
}
this->left();
}