telegram bot added (working version)

src/BufferExecute.cpp

@@ -1,5 +1,5 @@
 #include "BufferExecute.h"
-
+#include "items/SensorDallas.h"
 #include "Global.h"
 #include "Module/Terminal.h"
 
@@ -23,9 +23,80 @@ void csvCmdExecute(String& cmdStr) {
     int count = 0;
     while (cmdStr.length()) {
         String buf = selectToMarker(cmdStr, "\n");
+
+
+
         buf = deleteBeforeDelimiter(buf, " ");  //отсечка чекбокса
+
         count++;
-        if (count > 1) sCmd.readStr(buf);
+        if (count > 1) {
+            SerialPrint("I", "Items", buf);
+            String order = selectToMarker(buf, " "); //отсечка самой команды
+
+            if (order == F("button-out")) {
+                sCmd.addCommand(order.c_str(), buttonOut);
+            }
+            else if (order == F("pwm-out")) {
+                sCmd.addCommand(order.c_str(), pwmOut);
+            }
+            else if (order == F("button-in")) {
+                sCmd.addCommand(order.c_str(), buttonIn);
+            }
+            else if (order == F("input-digit")) {
+                sCmd.addCommand(order.c_str(), inputDigit);
+            }
+            else if (order == F("input-time")) {
+                sCmd.addCommand(order.c_str(), inputTime);
+            }
+            else if (order == F("output-text")) {
+                sCmd.addCommand(order.c_str(), textOut);
+            }
+            else if (order == F("analog-adc")) {
+                sCmd.addCommand(order.c_str(), analogAdc);
+            }
+            else if (order == F("ultrasonic-cm")) {
+                sCmd.addCommand(order.c_str(), ultrasonicCm);
+            }
+            else if (order == F("dallas-temp")) {
+                sCmd.addCommand(order.c_str(), dallas);
+            }
+            else if (order == F("dht-temp")) {
+                sCmd.addCommand(order.c_str(), dhtTemp);
+            }
+            else if (order == F("dht-hum")) {
+                sCmd.addCommand(order.c_str(), dhtHum);
+            }
+            else if (order == F("bme280-temp")) {
+                sCmd.addCommand(order.c_str(), bme280Temp);
+            }
+            else if (order == F("bme280-hum")) {
+                sCmd.addCommand(order.c_str(), bme280Hum);
+            }
+            else if (order == F("bme280-press")) {
+                sCmd.addCommand(order.c_str(), bme280Press);
+            }
+            else if (order == F("bmp280-temp")) {
+                sCmd.addCommand(order.c_str(), bmp280Temp);
+            }
+            else if (order == F("bmp280-press")) {
+                sCmd.addCommand(order.c_str(), bmp280Press);
+            }
+            else if (order == F("modbus")) {
+                //sCmd.addCommand(order.c_str(), modbus);
+            }
+            else if (order == F("uptime")) {
+                sCmd.addCommand(order.c_str(), sysUptime);
+            }
+            else if (order == F("logging")) {
+                sCmd.addCommand(order.c_str(), logging);
+            }
+            else if (order == F("impuls-out")) {
+                sCmd.addCommand(order.c_str(), impuls);
+            }
+
+
+            sCmd.readStr(buf);
+        }
         cmdStr = deleteBeforeDelimiter(cmdStr, "\n");
     }
 }
@@ -80,7 +151,7 @@ void addKey(String& key, String& keyNumberTable, int number) {
 
 int getKeyNum(String& key, String& keyNumberTable) {
     String keyNumberTableBuf = keyNumberTable;
-    //SerialPrint("","",keyNumberTable);
+
     int number = -1;
     while (keyNumberTableBuf.length()) {
         String tmp = selectToMarker(keyNumberTableBuf, ",");

src/Init.cpp

@@ -35,19 +35,18 @@ void Device_init() {
     if (mySensorDallas2 != nullptr) {
         mySensorDallas2->clear();
     }
-
     //======clear logging params======
     if (myLogging != nullptr) {
         myLogging->clear();
     }
     loggingKeyList = "";
-
     //======clear impuls params=======
     if (myImpulsOut != nullptr) {
         myImpulsOut->clear();
     }
     impulsKeyList = "";
     impulsEnterCounter = -1;
+    //================================
 
 
 #ifdef LAYOUT_IN_RAM

src/ItemsCmd.cpp

@@ -1,60 +1,60 @@
-#include "ItemsCmd.h"
+//#include "BufferExecute.h"
+//
+//#include "BufferExecute.h"
+//#include "Class/NotAsync.h"
+//#include "Cmd.h"
+//#include "Global.h"
+//#include "Module/Terminal.h"
+//#include "Servo/Servos.h"
+//
+//#include "items/SensorDallas.h"
+//
+//Terminal *term = nullptr;
+//
+//boolean but[NUM_BUTTONS];
+//Bounce *buttons = new Bounce[NUM_BUTTONS];
+//
+//#ifdef ESP8266
+//SoftwareSerial *mySerial = nullptr;
+//#else
+//HardwareSerial *mySerial = nullptr;
+//#endif
+//
+//void getData();
+//
+//void cmd_init() {
+    //sCmd.addCommand("button-out", buttonOut);
+    //sCmd.addCommand("pwm-out", pwmOut);
+    //sCmd.addCommand("button-in", buttonIn);
 
-#include "BufferExecute.h"
-#include "Class/NotAsync.h"
-#include "Cmd.h"
-#include "Global.h"
-#include "Module/Terminal.h"
-#include "Servo/Servos.h"
+    //sCmd.addCommand("input-digit", inputDigit);
+    //sCmd.addCommand("input-time", inputTime);
+    //sCmd.addCommand("output-text", textOut);
 
-#include "items/SensorDallas.h"
+    //sCmd.addCommand("analog-adc", analogAdc);
+    //sCmd.addCommand("ultrasonic-cm", ultrasonicCm);
+    //sCmd.addCommand("dallas-temp", dallas);
 
-Terminal *term = nullptr;
+    //sCmd.addCommand("dht-temp", dhtTemp);
+    //sCmd.addCommand("dht-hum", dhtHum);
 
-boolean but[NUM_BUTTONS];
-Bounce *buttons = new Bounce[NUM_BUTTONS];
+    //sCmd.addCommand("bme280-temp", bme280Temp);
+    //sCmd.addCommand("bme280-hum", bme280Hum);
+    //sCmd.addCommand("bme280-press", bme280Press);
 
-#ifdef ESP8266
-SoftwareSerial *mySerial = nullptr;
-#else
-HardwareSerial *mySerial = nullptr;
-#endif
-
-void getData();
-
-void cmd_init() {
-    sCmd.addCommand("button-out", buttonOut);
-    sCmd.addCommand("pwm-out", pwmOut);
-    sCmd.addCommand("button-in", buttonIn);
-
-    sCmd.addCommand("input-digit", inputDigit);
-    sCmd.addCommand("input-time", inputTime);
-    sCmd.addCommand("output-text", textOut);
-
-    sCmd.addCommand("analog-adc", analogAdc);
-    sCmd.addCommand("ultrasonic-cm", ultrasonicCm);
-    sCmd.addCommand("dallas-temp", dallas);
-
-    sCmd.addCommand("dht-temp", dhtTemp);
-    sCmd.addCommand("dht-hum", dhtHum);
-
-    sCmd.addCommand("bme280-temp", bme280Temp);
-    sCmd.addCommand("bme280-hum", bme280Hum);
-    sCmd.addCommand("bme280-press", bme280Press);
-
-    sCmd.addCommand("bmp280-temp", bmp280Temp);
-    sCmd.addCommand("bmp280-press", bmp280Press);
+    //sCmd.addCommand("bmp280-temp", bmp280Temp);
+    //sCmd.addCommand("bmp280-press", bmp280Press);
 
     //sCmd.addCommand("modbus", modbus);
 
-    sCmd.addCommand("uptime", sysUptime);
+    //sCmd.addCommand("uptime", sysUptime);
 
-    sCmd.addCommand("logging", logging);
+    //sCmd.addCommand("logging", logging);
 
-    sCmd.addCommand("impuls-out", impuls);
+    //sCmd.addCommand("impuls-out", impuls);
 
-    handle_time_init();
-}
+   
+//}
 
 //    sCmd.addCommand("timerStart", timerStart_);
 //    sCmd.addCommand("timerStop", timerStop_);

src/Telegram.cpp

@@ -0,0 +1,35 @@
+#include "Telegram.h"
+#include "Global.h"
+
+
+CTBot* myBot{ nullptr };
+
+void telegramInit() {
+    String token = jsonReadStr(configSetupJson, "telegramApi");
+    if (!myBot) {
+        myBot = new CTBot();
+    }
+    myBot->setTelegramToken(token);
+    if (myBot->testConnection()) {
+        SerialPrint("I", "Telegram", "Connected");
+    }
+    else {
+        SerialPrint("E", "Telegram", "Not connected");
+    }
+}
+
+void handleTelegram() {
+
+    TBMessage msg;
+
+    static unsigned long prevMillis;
+    unsigned long currentMillis = millis();
+    unsigned long difference = currentMillis - prevMillis;
+    if (difference >= 1000) {
+        prevMillis = millis();
+        if (myBot->getNewMessage(msg)) {
+            Serial.println(msg.text);
+            myBot->sendMessage(msg.sender.id, msg.text);
+        }
+    }
+}

src/Utils/JsonUtils.cpp

@@ -2,8 +2,6 @@
 #include "Utils/FileUtils.h"
 #include "Global.h"
 
-#include <ArduinoJson.h>
-
 String jsonReadStr(String& json, String name) {
     DynamicJsonBuffer jsonBuffer;
     JsonObject& root = jsonBuffer.parseObject(json);

src/Web.cpp

@@ -193,14 +193,13 @@ void web_init() {
             request->send(200, "text/html", payload);
         }
 
-        //        //==============================push settings=============================================
-        //#ifdef PUSH_ENABLED
-        //        if (request->hasArg("pushingboxid")) {
-        //            jsonWriteStr(configSetupJson, "pushingboxid", request->getParam("pushingboxid")->value());
-        //            saveConfig();
-        //            request->send(200);
-        //        }
-        //#endif
+        //==============================push settings=============================================
+        if (request->hasArg("telegramApi")) {
+            jsonWriteStr(configSetupJson, "telegramApi", request->getParam("telegramApi")->value());
+
+            saveConfig();
+            request->send(200);
+        }
 
         //==============================utilities settings=============================================
         if (request->hasArg("i2c")) {
@@ -215,7 +214,7 @@ void web_init() {
             serverIP = jsonReadStr(configSetupJson, "serverip");
             request->send(200);
         }
-    });
+        });
 
     //==============================list of items=====================================================
     //server.on("/del", HTTP_GET, [](AsyncWebServerRequest* request) {
@@ -230,7 +229,7 @@ void web_init() {
     //    request->redirect("/?setn.device");
     //});
 
-    /* 
+    /*
     * Check
     */
     server.on("/check", HTTP_GET, [](AsyncWebServerRequest* request) {
@@ -240,13 +239,17 @@ void web_init() {
         String msg = "";
         if (lastVersion == FIRMWARE_VERSION) {
             msg = F("Актуальная версия прошивки уже установлена.");
-        } else if (lastVersion > FIRMWARE_VERSION) {
+        }
+        else if (lastVersion > FIRMWARE_VERSION) {
             msg = F("Новая версия прошивки<a href=\"#\" class=\"btn btn-block btn-danger\" onclick=\"send_request(this, '/upgrade');setTimeout(function(){ location.href='/?set.device'; }, 90000);html('my-block','<span class=loader></span>Идет обновление прошивки, после обновления страница  перезагрузится автоматически...')\">Установить</a>");
-        } else if (lastVersion == -1) {
+        }
+        else if (lastVersion == -1) {
             msg = F("Cервер не найден. Попробуйте повторить позже...");
-        } else if (lastVersion == -2) {
+        }
+        else if (lastVersion == -2) {
             msg = F("Устройство не подключено к роутеру!");
-        } else if (lastVersion < FIRMWARE_VERSION) {
+        }
+        else if (lastVersion < FIRMWARE_VERSION) {
             msg = F("Ошибка версии. Попробуйте повторить позже...");
         }
 
@@ -262,15 +265,15 @@ void web_init() {
         jsonWriteStr(tmp, "title", "<button class=\"close\" onclick=\"toggle('my-block')\">×</button>" + msg);
         jsonWriteStr(tmp, "class", "pop-up");
         request->send(200, "text/html", tmp);
-    });
+        });
 
-    /* 
+    /*
     * Upgrade
     */
     server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest* request) {
         myNotAsyncActions->make(do_UPGRADE);
         request->send(200, "text/html");
-    });
+        });
 }
 
 void setConfigParam(const char* param, const String& value) {

src/items/ButtonInClass.cpp

@@ -1,8 +1,12 @@
-#include "ItemsCmd.h"
+#include "BufferExecute.h"
 #include "items/ButtonInClass.h"
 //==========================================Модуль физических кнопок========================================
 //button-in switch1 toggle Кнопки Свет 1 pin[2] db[20]
 //==========================================================================================================
+
+boolean but[NUM_BUTTONS];
+Bounce *buttons = new Bounce[NUM_BUTTONS];
+
 ButtonInClass myButtonIn;
 void buttonIn() {
     myButtonIn.update();

src/items/ButtonOutClass.cpp

@@ -1,6 +1,6 @@
 #include "items/ButtonOutClass.h"
 
-#include "ItemsCmd.h"
+#include "BufferExecute.h"
 //==========================================Модуль кнопок===================================================
 //button-out light toggle Кнопки Свет 1 pin[12] inv[1] st[1]
 //==========================================================================================================

src/items/ImpulsOutClass.cpp

@@ -4,7 +4,7 @@
 #include "BufferExecute.h"
 #include "Class/LineParsing.h"
 #include "Global.h"
-#include "ItemsCmd.h"
+#include "BufferExecute.h"
 
 ImpulsOutClass::ImpulsOutClass(unsigned int impulsPin) {
     _impulsPin = impulsPin;

src/items/InputDigitClass.cpp

@@ -1,4 +1,4 @@
-#include "ItemsCmd.h"
+#include "BufferExecute.h"
 #include "items/InputClass.h"
 //==========================================Модуль ввода цифровых значений==================================
 //input-digit digit1 inputDigit Ввод Введите.цифру 4 st[60]

src/items/InputTimeClass.cpp

@@ -1,4 +1,4 @@
-#include "ItemsCmd.h"
+#include "BufferExecute.h"
 #include "items/InputClass.h"
 //==========================================Модуль ввода времени============================================
 //==========================================================================================================

src/items/LoggingClass.cpp

@@ -4,7 +4,7 @@
 
 #include "Class/LineParsing.h"
 #include "Global.h"
-#include "ItemsCmd.h"
+#include "BufferExecute.h"
 
 LoggingClass::LoggingClass(unsigned long period, unsigned int maxPoints, String loggingValueKey, String key) {
     _period = period * 1000;

src/items/OutputTextClass.cpp

@@ -1,4 +1,4 @@
-#include "ItemsCmd.h"
+#include "BufferExecute.h"
 #include "items/OutputTextClass.h"
 //===============================================Модуль вывода текста============================================
 //output-text;id;anydata;Вывод;Сигнализация;order;st[Обнаружено.движение]

src/items/PwmOutClass.cpp

@@ -1,4 +1,4 @@
-#include "ItemsCmd.h"
+#include "BufferExecute.h"
 #include "items/PwmOutClass.h"
 //==========================================Модуль управления ШИМ===================================================
 //pwm-out volume range Кнопки Свет 1 pin[12] st[500]

src/items/SensorAnalogClass.cpp

@@ -1,4 +1,4 @@
-#include "ItemsCmd.h"
+#include "BufferExecute.h"
 #include "items/SensorAnalogClass.h"
 #ifdef ANALOG_ENABLED
 //==============================================Модуль аналогового сенсора===========================================================================================

src/items/SensorBme280Class.cpp

@@ -1,6 +1,6 @@
 #include "items/SensorBme280Class.h"
 
-#include "ItemsCmd.h"
+#include "BufferExecute.h"
 //#ifdef SensorBme280Enabled
 //=========================================Модуль ультрозвукового дальномера==================================================================
 //bme280-temp;id;anydata;Сенсоры;Температура;order;c[1]

src/items/SensorBmp280Class.cpp

@@ -1,6 +1,6 @@
 #include "items/SensorBmp280Class.h"
 
-#include "ItemsCmd.h"
+#include "BufferExecute.h"
 //#ifdef SensorBmp280Enabled
 //=========================================Модуль ультрозвукового дальномера==================================================================
 //bmp280-temp;id;anydata;Сенсоры;Температура;order;c[1]

src/items/SensorDallas.cpp

@@ -1,7 +1,7 @@
 #include "items/SensorDallas.h"
 #include "Class/LineParsing.h"
 #include "Global.h"
-#include "ItemsCmd.h"
+#include "BufferExecute.h"
 #include <Arduino.h>
 
 SensorDallas::SensorDallas(unsigned long interval, unsigned int pin, unsigned int index, String key) {

src/items/SensorDhtClass.cpp

@@ -1,6 +1,6 @@
 #include "items/SensorDhtClass.h"
 
-#include "ItemsCmd.h"
+#include "BufferExecute.h"
 //#ifdef SensorDhtEnabled
 //=========================================DHT Sensor==================================================================
 //dht-temp;id;anydata;Сенсоры;Температура;order;pin;type[dht11];c[1]

src/items/SensorModbusClass.cpp

@@ -1,6 +1,6 @@
 //#include "items/SensorModbusClass.h"
 //
-//#include "ItemsCmd.h"
+//#include "BufferExecute.h"
 ////#ifdef SensorModbusEnabled
 ////=========================================Модуль modbus===================================================================================
 ////modbus;id;anydata;Сенсоры;Температура;order;addr[1];regaddr[0];c[1]

src/items/SensorUltrasonicClass.cpp

@@ -1,4 +1,4 @@
-#include "ItemsCmd.h"
+#include "BufferExecute.h"
 #include "items/SensorUltrasonicClass.h"
 //#ifdef SensorUltrasonicEnabled
 //=========================================Модуль ультрозвукового дальномера==================================================================

src/items/sysUptime.cpp

@@ -1,5 +1,5 @@
 #include "Class/LineParsing.h"
-#include "ItemsCmd.h"
+#include "BufferExecute.h"
 #include "Global.h"
 #include <Arduino.h>
 

src/main.cpp

@@ -18,6 +18,7 @@
 #include "items/LoggingClass.h"
 #include "items/ImpulsOutClass.h"
 #include "items/SensorDallas.h"
+#include "Telegram.h"
 
 void not_async_actions();
 
@@ -38,44 +39,47 @@ void setup() {
     myNotAsyncActions = new NotAsync(do_LAST);
     myScenario = new Scenario();
 
-    SerialPrint("I", "FS", "FS Init");
     fileSystemInit();
+    SerialPrint("I", "FS", "FS Init");
 
-    SerialPrint("I", "Conf", "Config Init");
     loadConfig();
+    SerialPrint("I", "Conf", "Config Init");
 
-    SerialPrint("I", "Time", "Clock Init");
     clock_init();
+    SerialPrint("I", "Time", "Clock Init");
 
-    SerialPrint("I", "CMD", "Commands Init");
-    cmd_init();
+    handle_time_init();
+    SerialPrint("I", "Time", "Handle time init(");
 
-    SerialPrint("I", "Sensors", "Sensors Init");
     sensorsInit();
+    SerialPrint("I", "Sensors", "Sensors Init");
 
-    SerialPrint("I", "Items", "Items Init");
     itemsListInit();
+    SerialPrint("I", "Items", "Items Init");
 
-    SerialPrint("I", "Init", "Init Init");
     all_init();
+    SerialPrint("I", "Init", "Init Init");
 
-    SerialPrint("I", "WIFI", "Network Init");
     routerConnect();
+    SerialPrint("I", "WIFI", "Network Init");
+
+    telegramInit();
+    SerialPrint("I", "Telegram", "Telegram Init");
 
-    SerialPrint("I", "Uptime", "Uptime Init");
     uptime_init();
+    SerialPrint("I", "Uptime", "Uptime Init");
 
-    SerialPrint("I", "Update", "Updater Init");
     upgradeInit();
+    SerialPrint("I", "Update", "Updater Init");
 
-    SerialPrint("I", "HTTP", "HttpServer Init");
     HttpServer::init();
+    SerialPrint("I", "HTTP", "HttpServer Init");
 
-    SerialPrint("I", "Web", "WebAdmin Init");
     web_init();
+    SerialPrint("I", "Web", "WebAdmin Init");
 
-    SerialPrint("I", "Stat", "Stat Init");
     initSt();
+    SerialPrint("I", "Stat", "Stat Init");
 
 #ifdef UDP_ENABLED
     SerialPrint("I", "UDP", "Udp Init");
@@ -90,6 +94,8 @@ void setup() {
     SsdpInit();
 #endif
 
+
+
     //esp_log_level_set("esp_littlefs", ESP_LOG_NONE);
 
     ts.add(
@@ -99,9 +105,7 @@ void setup() {
         nullptr, true);
 
     just_load = false;
-    initialized = true;  //this second POST makes the data to be processed (you don't need to connect as "keep-alive" for that to work)
-
-   
+    initialized = true;  
 }
 
 void loop() {
@@ -124,6 +128,8 @@ void loop() {
     myNotAsyncActions->loop();
     ts.update();
 
+    handleTelegram();
+
     if (myLogging != nullptr) {
         for (unsigned int i = 0; i < myLogging->size(); i++) {
             myLogging->at(i).loop();