Структурируем модули как надо

2026-03-27 22:52:19 +03:00 · 2022-08-11 17:40:42 +03:00
parent 1ddc3aab9c
commit 799aff3383
70 changed files with 281 additions and 281 deletions
--- a/src/modules/exec/ButtonIn/ButtonIn.cpp
+++ b/src/modules/exec/ButtonIn/ButtonIn.cpp
@@ -1,77 +0,0 @@
-#include "Global.h"
-#include "classes/IoTItem.h"
-
-extern IoTGpio IoTgpio;
-
-
-class ButtonIn : public IoTItem {
-   private:
-    int _pin;
-    bool _execLevel;
-    int _fixState;
-    String _pinMode;
-    int _lastButtonState = LOW;
-    unsigned long _lastDebounceTime = 0;
-    unsigned long _debounceDelay = 50;
-    int _buttonState;
-    int _reading;
-
-   public:
-    ButtonIn(String parameters): IoTItem(parameters) {
-        jsonRead(parameters, "pin", _pin);
-        jsonRead(parameters, "execLevel", _execLevel);
-        jsonRead(parameters, "pinMode", _pinMode);
-        jsonRead(parameters, "debounceDelay", _debounceDelay);
-        jsonRead(parameters, "fixState", _fixState);
-        //Serial.printf("vvvvvvvvvvvvvvvv =%d \n", _fixState);
-        
-        IoTgpio.pinMode(_pin, INPUT);
-        if (_pinMode == "INPUT_PULLUP") IoTgpio.digitalWrite(_pin, HIGH);
-        else if (_pinMode == "INPUT_PULLDOWN") IoTgpio.digitalWrite(_pin, LOW);
-
-    
-        // TODO: загрузить значение из памяти иначе пока просто считываем значение текущего состояния PIN
-        _lastButtonState = _buttonState = IoTgpio.digitalRead(_pin);
-    }
-
-    void loop() {
-        _reading = IoTgpio.digitalRead(_pin);
-        if (_reading != _lastButtonState) {
-            // reset the debouncing timer
-            _lastDebounceTime = millis();
-        }
-
-        if ((millis() - _lastDebounceTime) > _debounceDelay) {
-            if (_reading != _buttonState) {
-               _buttonState = _reading;
-
-                if (_fixState == 1 && _buttonState == _execLevel) {
-                    value.valD = !value.valD;
-                    regEvent(value.valD, "ButtonIn"); 
-                }
-
-                if (_fixState == 2) {
-                    value.valD = !value.valD;
-                    regEvent(value.valD, "ButtonIn"); 
-                }
-                
-                if (_fixState == 0) {
-                    value.valD = _buttonState;
-                    regEvent(value.valD, "ButtonIn");
-                }
-            }
-        }
-
-        _lastButtonState = _reading;
-    }
-
-    ~ButtonIn() {};
-};
-
-void* getAPI_ButtonIn(String subtype, String param) {
-    if (subtype == F("ButtonIn")) {
-        return new ButtonIn(param);
-    } else {
-        return nullptr;
-    }
-}