moved pid settings to menuIntInput

2023-01-04 02:29:22 +01:00
parent facfd1d045
commit bc7379ae7e
3 changed files with 22 additions and 122 deletions
@@ -13,81 +13,10 @@

 MenuPidSettings::MenuPidSettings(PID* pid) {
    this->pid = pid;
-    this->values[0] = (uint8_t) pid->GetKp();
-    this->values[1] = (uint8_t) pid->GetKi();
-    this->values[2] = (uint8_t) pid->GetKd();
 }

-void MenuPidSettings::down() {
-    if (values[curPos] > 0)
-        values[curPos]--;
-
-    this->printMenu();
+void MenuPidSettings::action(int16_t* values, uint8_t length) {
+    if (length != 3) 
+        return;
+    this->pid->SetTunings(values[0], values[1], values[2]);
 }
-
-void MenuPidSettings::up() {
-    if (values[curPos] < UINT8_MAX)
-        values[curPos]++;
-
-    this->printMenu();
-}
-
-void MenuPidSettings::right() {
-    if (curPos < NUM_VAL - 1)
-        curPos++;
-    else
-        curPos = 0;
-
-    this->printMenu();
-}
-
-void MenuPidSettings::left() {
-    if (curPos > 0)
-        curPos--;
-    else
-        curPos = NUM_VAL - 1;
-
-    this->printMenu();
-}
-
-void MenuPidSettings::no() {
-    if (parentMenu)
-        this->parentMenu->printMenu();
-}
-
-void MenuPidSettings::yes() {
-    this->pid->SetTunings(this->values[0], this->values[1], this->values[2]);
-    if (parentMenu)
-        this->parentMenu->printMenu();
-}
-
-void MenuPidSettings::printMenu() {
-    char buf[17];
-    switch (this->curPos) {
-        case 0:
-            sprintf(buf, "_%3.d_ %3.d  %3.d ", this->values[0], this->values[1], this->values[2]);
-            break;
-
-        case 1:
-            sprintf(buf, " %3.d _%3.d_ %3.d ", this->values[0], this->values[1], this->values[2]);
-            break;
-
-        case 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);
-    }
-    std::cout << "  P    I    D  " << std::endl;
-    std::cout << buf << std::endl;
-}
-
-