working remoteControl via espNow

lib/ControllPad/controlPad.cpp

@@ -16,58 +16,65 @@ ControlPad::ControlPad() {
 }
 
 bool ControlPad::loop() {
-    this->receiveData();
-
     if (millis() - this->lastLoopMillis < this->loopDelay)
         return false;
     this->lastLoopMillis = millis();
 
-    // if(!this->connected)
-    //     return false;
+    if(!this->connected)
+        return false;
 
-    // if (millis() - this->lastMessageReceive > this->disconnectTime) {
-    //     this->connected = false;
-    //     return false;
-    // }
+    if (millis() - this->lastMessageReceive > this->disconnectTime) {
+        this->connected = false;
+        this->controlInput.buttons = 0;
+        this->controlInput.x = 127;
+        this->controlInput.y = 127;
+        return false;
+    }
 
-    // if (this->menuControl && this->controlInput.buttons > 0 && this->updated)
-    //     if (!this->firstButtonPress)
-    //         this->menuControl->printMenu();
+    if (this->lastButtons != controlInput.buttons)
+        this->updated = true;
 
-    //     if (ControlPadButton::isControlPadButtonPressed(&this->controlInput, ControlPadButton::PadButton::Left))
-    //         this->menuControl->left();
-    //     else if (ControlPadButton::isControlPadButtonPressed(&this->controlInput, ControlPadButton::PadButton::Right))
-    //         this->menuControl->right();
-    //     else if (ControlPadButton::isControlPadButtonPressed(&this->controlInput, ControlPadButton::PadButton::Up))
-    //         this->menuControl->up();
-    //     else if (ControlPadButton::isControlPadButtonPressed(&this->controlInput, ControlPadButton::PadButton::Down))
-    //         this->menuControl->down();
-    //     else if (ControlPadButton::isControlPadButtonPressed(&this->controlInput, ControlPadButton::PadButton::Yes))
-    //         this->menuControl->yes();
-    //     else if (ControlPadButton::isControlPadButtonPressed(&this->controlInput, ControlPadButton::PadButton::No))
-    //         this->menuControl->no();
+    if (this->menuControl && this->controlInput.buttons > 0 && this->updated) {
+        if (this->firstButtonPress) {
+            this->menuControl->printMenu();
+            this->firstButtonPress = false;
+            std::cout << "ControlPad::loop - First menu print" << std::endl;
+            return true;
+        }
 
-    // this->menuControl->update();
+        if (ControlPadButton::isControlPadButtonPressed(&this->controlInput, ControlPadButton::PadButton::Left))
+            this->menuControl->left();
+        else if (ControlPadButton::isControlPadButtonPressed(&this->controlInput, ControlPadButton::PadButton::Right))
+            this->menuControl->right();
+        else if (ControlPadButton::isControlPadButtonPressed(&this->controlInput, ControlPadButton::PadButton::Up))
+            this->menuControl->up();
+        else if (ControlPadButton::isControlPadButtonPressed(&this->controlInput, ControlPadButton::PadButton::Down))
+            this->menuControl->down();
+        else if (ControlPadButton::isControlPadButtonPressed(&this->controlInput, ControlPadButton::PadButton::Yes))
+            this->menuControl->yes();
+        else if (ControlPadButton::isControlPadButtonPressed(&this->controlInput, ControlPadButton::PadButton::No))
+            this->menuControl->no();
 
+        this->updated = false;
+        this->lastButtons = controlInput.buttons;
+    }
     return true;
 }
 
 void ControlPad::insertData(const uint8_t *data) {
+    this->connected = true;
+    this->lastMessageReceive = millis();
+
     uint8_t lastCount = this->controlInput.counter + 1;
     memcpy(&(this->controlInput), data, sizeof(this->controlInput));
     if (lastCount != this->controlInput.counter)
         std::cout << "ControlPad::insertData counter wrong value" << std::endl;
-    
-    this->lastMessageReceive = millis();
-    std::cout << "data: " << (int) this->controlInput.counter << std::endl;
-}
 
-const ControlPadInput * ControlPad::getControlPadDataPtr(uint16_t maxElapsedTime) const {
-    if (maxElapsedTime && millis() - this->lastMessageReceive > maxElapsedTime)
-        return nullptr;
-    return &this->controlInput;
-}
-
-void ControlPad::receiveData() {
+    if (this->controlInput.x > 127 - this->deadZoneX 
+        && this->controlInput.x < 127 + this->deadZoneX)
+        this->controlInput.x = 127;
 
+    if (this->controlInput.y > 127 - this->deadZoneY 
+        && this->controlInput.y < 127 + this->deadZoneY)
+        this->controlInput.y = 127;
 }

lib/ControllPad/controlPad.h

@@ -25,7 +25,7 @@ class ControlPad {
 
         void setMenuControl(MenuControl* menuControl) { this->menuControl = menuControl; }
 
-        const ControlPadInput * getControlPadDataPtr(uint16_t maxElapsedTime = 0) const;
+        const ControlPadInput * getControlPadDataPtr() const { return &this->controlInput; }
 
         bool isControlPadConnected() const { return this->connected; }
 
@@ -33,13 +33,13 @@ class ControlPad {
         MenuControl* menuControl = nullptr;
         ControlPadInput controlInput;
 
-        void receiveData();
-
         bool connected = false;
         bool updated = false;
-        bool firstButtonPress = false;
+        bool firstButtonPress = true;
 
-        const uint8_t address[2][6] = { "rover", "ardui" };
+        uint8_t deadZoneX = 10;
+        uint8_t deadZoneY = 10;
+        uint8_t lastButtons = 0;
 
         uint16_t disconnectTime = 50;
         uint16_t loopDelay = 5;
@@ -47,5 +47,4 @@ class ControlPad {
         uint32_t lastMessageReceive = 0;
         uint32_t lastLoopMillis = 0;
 
-
 };

lib/ControllPad/controlPadInput.h

@@ -25,17 +25,49 @@ struct ControlPadInput {
 class ControlPadButton {
     public:
         enum PadButton {
-            Left,
-            Right,
-            Up,
-            Down,
-            Yes,
-            No,
-            Action
+            Left = 4,
+            Right = 8,
+            Up = 2,
+            Down = 1,
+            Yes = 32,
+            No = 16,
+            Action = 64
         };
 
         static bool isControlPadButtonPressed(const ControlPadInput *input, PadButton button) {
-            return false;
+            uint8_t buttonNum = input->buttons;
+            switch (button) {
+                case PadButton::Left :
+                    return buttonNum & (uint8_t) PadButton::Left;
+                    break;
+
+                case PadButton::Right :
+                    return buttonNum & (uint8_t) PadButton::Right;
+                    break;
+
+                case PadButton::Up :
+                    return buttonNum & (uint8_t) PadButton::Up;
+                    break;
+
+                case PadButton::Down :
+                    return buttonNum & (uint8_t) PadButton::Down;
+                    break;
+
+                case PadButton::Yes :
+                    return buttonNum & (uint8_t) PadButton::Yes;
+                    break;
+
+                case PadButton::No :
+                    return buttonNum & (uint8_t) PadButton::No;
+                    break;
+
+                case PadButton::Action :
+                    return buttonNum & (uint8_t) PadButton::Action;
+                    break;
+                
+                default:
+                    return false;;
+            }
         }
 };
 

lib/LcdWrapper/LcdWrapper.cpp

@@ -18,14 +18,19 @@ LcdWrapper::LcdWrapper(LiquidCrystal_I2C* lcd) {
 }
 
 void LcdWrapper::loop() {
-    if (this->changed) {
-        this->lcd->clear();
-        for (uint8_t i = 0; i < DISPLAY_WRAPPER_LINES; i++) {
-            this->lcd->setCursor(0, i);
-            this->lcd->print(this->data[i]);
-        }
-        this->changed = false;
+    if (!this->changed)
+        return;
+
+    this->lcd->clear();
+    for (uint8_t i = 0; i < DISPLAY_WRAPPER_LINES; i++) {
+        this->lcd->setCursor(0, i);
+        this->lcd->print(this->data[i]);
     }
+    
+    if (this->callback)
+        this->callback(this->data, DISPLAY_WRAPPER_LINES, DISPLAY_WRAPPER_ROWS);
+
+    this->changed = false;
 }
 
 void LcdWrapper::clear() {

lib/LcdWrapper/LcdWrapper.h

@@ -19,6 +19,8 @@
 #define DISPLAY_WRAPPER_ROWS 16
 #define DISPLAY_WRAPPER_LINES 2
 
+typedef void (*LcdWrapperCallback) (const char data[][DISPLAY_WRAPPER_ROWS], uint8_t lines, uint8_t rows);
+
 /**
  * @brief A class for the Menu class to print information 
  * 
@@ -54,6 +56,7 @@ class LcdWrapper : public DisplayWrapper {
          * @param line 
          */
         void setCursor(uint8_t row, uint8_t line) override;
+        void setCallback(LcdWrapperCallback callback) { this->callback = callback; }
 
         /**
          * @brief Save the data to be printed
@@ -65,6 +68,7 @@ class LcdWrapper : public DisplayWrapper {
 
     private:
         LiquidCrystal_I2C* lcd;
+        LcdWrapperCallback callback = nullptr;
         char data[DISPLAY_WRAPPER_LINES][DISPLAY_WRAPPER_ROWS];
 
         uint8_t cursorRow = 0;