ButtonOut changed (not working version)

src/BufferExecute.cpp

@@ -1,5 +1,8 @@
 #include "BufferExecute.h"
+//
 #include "items/SensorDallas.h"
+#include "items/ButtonOut.h"
+//
 #include "Global.h"
 #include "Module/Terminal.h"
 

src/Class/ScenarioClass3.cpp

@@ -1,18 +1,13 @@
 #include "Class/ScenarioClass3.h"
+#include "MqttClient.h"
 Scenario* myScenario;
 
-//void eventGen(String event_name, String number) {
-//    if (!jsonReadBool(configSetupJson, "scen")) {
-//        return;
-//    }
-//    SerialPrint("", "", event_name);
-//    eventBuf += event_name + number + ",";
-//}
-
 void eventGen2(String eventName, String eventValue) {
     if (!jsonReadBool(configSetupJson, "scen")) {
         return;
     }
     //Serial.println(eventName + " " + eventValue);
     eventBuf += eventName + " " + eventValue + ",";
+
+    //publish(mqttPrefix, eventName + " " + eventValue + ",");
 }

src/Global.cpp

@@ -38,9 +38,13 @@ String itemsFile = "";
 String itemsLine = "";
 
 //key lists and numbers
-String impulsKeyList = "";
-int impulsEnterCounter = -1;
-
+//=========================================
+String impuls_KeyList = "";
+int impuls_EnterCounter = -1;
+//=========================================
+String buttonOut_KeyList = "";
+int buttonOut_EnterCounter = -1;
+//=========================================
 
 // Sensors
 String sensorReadingMap10sec;

src/Init.cpp

@@ -2,8 +2,9 @@
 #include "BufferExecute.h"
 #include "Cmd.h"
 #include "Global.h"
-#include "items/LoggingClass.h"
+#include "items/Logging.h"
 #include "items/ImpulsOutClass.h"
+#include "items/ButtonOut.h"
 #include "items/SensorDallas.h"
 
 void loadConfig() {
@@ -44,9 +45,15 @@ void Device_init() {
     if (myImpulsOut != nullptr) {
         myImpulsOut->clear();
     }
-    impulsKeyList = "";
-    impulsEnterCounter = -1;
-    //================================
+    impuls_KeyList = "";
+    impuls_EnterCounter = -1;
+    //======clear buttonOut params=======
+    if (myButtonOut != nullptr) {
+        myButtonOut->clear();
+    }
+    buttonOut_KeyList = "";
+    buttonOut_EnterCounter = -1;
+    //===================================
 
 
 #ifdef LAYOUT_IN_RAM

src/MqttClient.cpp

@@ -1,7 +1,7 @@
 #include "MqttClient.h"
 
 #include <LittleFS.h>
-#include "items/LoggingClass.h"
+#include "items/Logging.h"
 #include "Class/NotAsync.h"
 #include "Global.h"
 #include "Init.h"
@@ -62,10 +62,9 @@ void mqttSubscribe() {
     SerialPrint("I", "MQTT", "subscribe");
     mqtt.subscribe(mqttPrefix.c_str());
     mqtt.subscribe((mqttRootDevice + "/+/control").c_str());
-    mqtt.subscribe((mqttRootDevice + "/order").c_str());
     mqtt.subscribe((mqttRootDevice + "/update").c_str());
-    mqtt.subscribe((mqttRootDevice + "/devc").c_str());
-    mqtt.subscribe((mqttRootDevice + "/devs").c_str());
+    //mqtt.subscribe((mqttRootDevice + "/order").c_str());
+    //mqtt.subscribe((mqttPrefix + "/event").c_str());
 }
 
 boolean mqttConnect() {
@@ -131,11 +130,16 @@ void mqttCallback(char* topic, uint8_t* payload, size_t length) {
 
     }
     else if (topicStr.indexOf("order")) {
-        payloadStr.replace("_", " ");
-        orderBuf += payloadStr;
-        orderBuf += ",";
+        //payloadStr.replace("_", " ");
+        //orderBuf += payloadStr;
+        //orderBuf += ",";
 
     }
+
+    //else if (topicStr.indexOf("event")) {
+    //    eventBuf += payloadStr;
+    //}
+
     else if (topicStr.indexOf("update")) {
         if (payloadStr == "1") {
             myNotAsyncActions->make(do_UPGRADE);

src/Web.cpp

@@ -3,7 +3,7 @@
 #include "Global.h"
 #include "Init.h"
 #include "ItemsList.h"
-#include "items/LoggingClass.h"
+#include "items/Logging.h"
 #include "Telegram.h"
 
 bool parseRequestForPreset(AsyncWebServerRequest* request, uint8_t& preset) {

src/items/ButtonOut.cpp

@@ -0,0 +1,64 @@
+#include "items/ButtonOut.h"
+
+#include <Arduino.h>
+
+#include "Class/LineParsing.h"
+#include "Global.h"
+#include "BufferExecute.h"
+
+ButtonOut::ButtonOut(unsigned int pin, boolean inv, String key) {
+    _pin = pin;
+    _inv = inv;
+    _key = key;
+}
+ButtonOut::~ButtonOut() {}
+
+void ButtonOut::init() {
+    pinMode(_pin, OUTPUT);
+}
+
+void ButtonOut::execute(String state) {
+    //if (_inv) {
+    //    digitalWrite(_pin, !state.toInt());
+    //}
+    //else {
+        digitalWrite(_pin, state.toInt());
+    //}
+    eventGen2(_key, state);
+    jsonWriteInt(configLiveJson, _key, state.toInt());
+    publishStatus(_key, state);
+}
+
+MyButtonOutVector* myButtonOut = nullptr;
+
+void buttonOut() {
+    myLineParsing.update();
+    String key = myLineParsing.gkey();
+    String pin = myLineParsing.gpin();
+    String inv = myLineParsing.ginv();
+    myLineParsing.clear();
+
+    buttonOut_EnterCounter++;
+    addKey(key, buttonOut_KeyList, buttonOut_EnterCounter);
+
+    static bool firstTime = true;
+    if (firstTime) myButtonOut = new MyButtonOutVector();
+    firstTime = false;
+    myButtonOut->push_back(ButtonOut(pin.toInt(), inv.toInt(), key));
+
+    sCmd.addCommand(key.c_str(), buttonOutExecute);
+}
+
+void buttonOutExecute() {
+    String key = sCmd.order();
+    String state = sCmd.next();
+
+    int number = getKeyNum(key, buttonOut_KeyList);
+
+    if (myButtonOut != nullptr) {
+        if (number != -1) {
+            myButtonOut->at(number).execute(state);
+        }
+    }
+}
+

src/items/ButtonOutClass.cpp

@@ -1,23 +1,23 @@
-#include "items/ButtonOutClass.h"
-
-#include "BufferExecute.h"
-//==========================================Модуль кнопок===================================================
-//button-out light toggle Кнопки Свет 1 pin[12] inv[1] st[1]
-//==========================================================================================================
-ButtonOutClass myButtonOut;
-void buttonOut() {
-    myButtonOut.update();
-    String key = myButtonOut.gkey();
-    String pin = myButtonOut.gpin();
-    String inv = myButtonOut.ginv();
-    sCmd.addCommand(key.c_str(), buttonOutSet);
-    myButtonOut.init();
-    myButtonOut.pinStateSetDefault();
-    myButtonOut.clear();
-}
-
-void buttonOutSet() {
-    String key = sCmd.order();
-    String state = sCmd.next();
-    myButtonOut.pinChange(key, state);
-}
+//#include "items/ButtonOutClass.h"
+//
+//#include "BufferExecute.h"
+////==========================================Модуль кнопок===================================================
+////button-out light toggle Кнопки Свет 1 pin[12] inv[1] st[1]
+////==========================================================================================================
+//ButtonOutClass myButtonOut;
+//void buttonOut() {
+//    myButtonOut.update();
+//    String key = myButtonOut.gkey();
+//    String pin = myButtonOut.gpin();
+//    String inv = myButtonOut.ginv();
+//    sCmd.addCommand(key.c_str(), buttonOutSet);
+//    myButtonOut.init();
+//    myButtonOut.pinStateSetDefault();
+//    myButtonOut.clear();
+//}
+//
+//void buttonOutSet() {
+//    String key = sCmd.order();
+//    String state = sCmd.next();
+//    myButtonOut.pinChange(key, state);
+//}

src/items/ImpulsOutClass.cpp

@@ -44,8 +44,8 @@ void impuls() {
     String pin = myLineParsing.gpin();
     myLineParsing.clear();
 
-    impulsEnterCounter++;
-    addKey(key, impulsKeyList, impulsEnterCounter);
+    impuls_EnterCounter++;
+    addKey(key, impuls_KeyList, impuls_EnterCounter);
 
     static bool firstTime = true;
     if (firstTime) myImpulsOut = new MyImpulsOutVector();
@@ -60,7 +60,7 @@ void impulsExecute() {
     String impulsPeriod = sCmd.next();
     String impulsCount = sCmd.next();
 
-    int number = getKeyNum(key, impulsKeyList);
+    int number = getKeyNum(key, impuls_KeyList);
 
     if (myImpulsOut != nullptr) {
         if (number != -1) {

src/items/Logging.cpp

@@ -1,4 +1,4 @@
-#include "items/LoggingClass.h"
+#include "items/Logging.h"
 
 #include <Arduino.h>
 

src/main.cpp

@@ -15,7 +15,7 @@
 #include "Utils/Timings.h"
 #include "Utils/WebUtils.h"
 #include "items/ButtonInClass.h"
-#include "items/LoggingClass.h"
+#include "items/Logging.h"
 #include "items/ImpulsOutClass.h"
 #include "items/SensorDallas.h"
 #include "Telegram.h"