Merge pull request #8 from Mit4el/ver4dev

esp32s2 и новые модули

src/modules/virtual/Cron/modinfo.json

@@ -50,6 +50,7 @@
     "defActive": true,
     "usedLibs": {
         "esp32_4mb": [],
+        "esp32s2_4mb": [],
         "esp8266_4mb": [],
         "esp8266_1mb": [],
         "esp8266_1mb_ota": [],

src/modules/virtual/GoogleSheet/GoogleSheet.cpp

@@ -0,0 +1,92 @@
+
+#include "Global.h"
+#include "classes/IoTItem.h"
+
+String URL = "https://script.google.com/macros/s/";
+
+
+class GoogleSheet : public IoTItem
+{
+private:
+  String id;
+  String logid;
+  String scid = "";
+  String shname = "";
+  bool init = false;
+  int interval = 1;
+ // long interval;
+public:
+  GoogleSheet(String parameters) : IoTItem(parameters)
+  {
+    jsonRead(parameters, F("id"), id);
+    jsonRead(parameters, F("logid"), logid);
+    jsonRead(parameters, F("scid"), scid);
+    jsonRead(parameters, F("shname"), shname);
+    jsonRead(parameters, F("int"), interval);
+    interval = interval * 1000 * 60; // так как у нас в минутах
+  }
+
+  void doByInterval()
+  {
+    if (WiFi.status() == WL_CONNECTED)
+    {
+      String value = getItemValue(logid);
+      String urlFinal = URL + scid + "/exec?"+"sheet=" + shname + "&id=" + logid + "&value=" + value;
+      if (!init){ init=true; urlFinal = urlFinal + "&init=1";}
+
+      HTTPClient http;
+#if defined ESP8266
+      WiFiClientSecure client;
+      client.setInsecure();
+      if (!http.begin(client, urlFinal))
+      {
+#elif defined ESP32      
+      WiFiClient client;
+      if (!http.begin(urlFinal))
+      {
+#endif
+        SerialPrint("I", F("GoogleSheet"), "connection failed  ");
+      }
+      http.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS); // HTTPC_STRICT_FOLLOW_REDIRECTS HTTPC_FORCE_FOLLOW_REDIRECTS
+      http.addHeader("Content-Type", "application/x-www-form-urlencoded");
+      int httpCode = http.GET();
+//      String payload = http.getString();
+      SerialPrint("<-", F("GoogleSheet"), "URL: " + urlFinal);
+      SerialPrint("->", F("GoogleSheet"), "server: " + (String)httpCode); /*"URL: " + urlFinal + */
+/*      if (httpCode > 0)
+      {
+        SerialPrint("->", F("GoogleSheet"), "msg from server: " + (String)payload.c_str());
+      }
+*/
+      http.end();
+    }
+  }
+
+  void loop()
+  {
+    if (enableDoByInt)
+    {
+      currentMillis = millis();
+      difference = currentMillis - prevMillis;
+      if (difference >= interval)
+      {
+        prevMillis = millis();
+        this->doByInterval();
+      }
+    }
+  }
+  ~GoogleSheet(){};
+};
+
+void *getAPI_GoogleSheet(String subtype, String param)
+{
+
+  if (subtype == F("GoogleSheet"))
+  {
+    return new GoogleSheet(param);
+  }
+  else
+  {
+    return nullptr;
+  }
+}

src/modules/virtual/GoogleSheet/modinfo.json

@@ -0,0 +1,52 @@
+{
+    "menuSection": "Виртуальные элементы",
+    "configItem": [
+        {
+		    "global": 0,
+            "name": "GoogleSheet",
+            "type": "Reading", 
+            "subtype": "GoogleSheet",
+            "id": "sheet",
+            "widget": "nil",
+            "page": "",
+            "descr": "",
+            "int": 5,
+            "logid": "id", 
+			"scid": "AKfycbzAsuM-4Keb-DxZ6yqwmqSeiXRJJAqndijayZQfmx9pfh6wGAejjT6u7gTAIxrbxPBxyw",
+			"shname": "Logger"
+        }
+    ],
+    "about": {
+        "authorName": "Bubnov Mikhail",
+        "authorContact": "https://t.me/Mit4bmw",
+        "authorGit": "https://github.com/Mit4el",
+        "exampleURL": "https://iotmanager.org/wiki",
+        "specialThanks": "",
+        "moduleName": "GoogleSheet",
+        "moduleVersion": "1.0",
+        "usedRam": {
+            "esp32_4mb": 10,
+            "esp8266_4mb": 10
+        },
+        "title": "Логирование в Google таблицы",
+        "moduleDesc": "Расширение позволяющее логировать любую величину в Google таблицы. Инструкция https://drive.google.com/file/d/1VuI06arObNfH3rsOSHKww1tyhfgqXd9F/view?usp=sharing",
+        "propInfo": {
+            "int": "Интервал логирования в минутах",
+            "logid": "ID величины которую будем логировать",
+			"scid": "Идентификатор развертывания Google Apps (script id)",
+			"shname": "Наименование листа в таблице (sheet name)"
+        }
+    },
+    "defActive": false,
+    "usedLibs": {
+        "esp32_4mb": [],
+        "esp32s2_4mb": [],        
+        "esp8266_4mb": [],
+        "esp8266_1mb": [],
+        "esp8266_1mb_ota": [],
+        "esp8285_1mb": [],
+        "esp8285_1mb_ota": [],
+        "esp8266_2mb": [],
+        "esp8266_2mb_ota": []
+    }
+}

src/modules/virtual/Loging/modinfo.json

@@ -51,6 +51,7 @@
     "defActive": true,
     "usedLibs": {
         "esp32_4mb": [],
+        "esp32s2_4mb": [],
         "esp8266_4mb": [],
         "esp8266_1mb": [],
         "esp8266_1mb_ota": [],

src/modules/virtual/LogingDaily/modinfo.json

@@ -44,6 +44,7 @@
     "defActive": true,
     "usedLibs": {
         "esp32_4mb": [],
+        "esp32s2_4mb": [],
         "esp8266_4mb": [],
         "esp8266_1mb": [],
         "esp8266_1mb_ota": [],

src/modules/virtual/Timer/modinfo.json

@@ -70,6 +70,7 @@
     "defActive": true,
     "usedLibs": {
         "esp32_4mb": [],
+        "esp32s2_4mb": [],
         "esp8266_4mb": [],
         "esp8266_1mb": [],
         "esp8266_1mb_ota": [],

src/modules/virtual/VButton/modinfo.json

@@ -36,6 +36,7 @@
     "defActive": true,
     "usedLibs": {
         "esp32_4mb": [],
+        "esp32s2_4mb": [],
         "esp8266_4mb": [],
         "esp8266_1mb": [],
         "esp8266_1mb_ota": [],

src/modules/virtual/Variable/modinfo.json

@@ -96,6 +96,7 @@
     "defActive": true,
     "usedLibs": {
         "esp32_4mb": [],
+        "esp32s2_4mb": [],
         "esp8266_4mb": [],
         "esp8266_1mb": [],
         "esp8266_1mb_ota": [],

src/modules/virtual/VariableColor/modinfo.json

@@ -37,6 +37,7 @@
     
       "usedLibs": {
         "esp32_4mb": [],
+        "esp32s2_4mb": [],
         "esp8266_4mb": [],
         "esp8266_1mb": [],
         "esp8266_1mb_ota": [],

src/modules/virtual/Weather/modinfo.json

@@ -44,6 +44,7 @@
 
   "usedLibs": {
     "esp32_4mb": [],
+    "esp32s2_4mb": [],
     "esp8266_4mb": [],
     "esp8266_1mb": [],
     "esp8266_1mb_ota": [],