diff --git a/data_esp/set.device.json.gz b/data_esp/set.device.json.gz index 8be82275..87d9244b 100644 Binary files a/data_esp/set.device.json.gz and b/data_esp/set.device.json.gz differ diff --git a/include/Consts.h b/include/Consts.h index e7c9780f..c7593f73 100644 --- a/include/Consts.h +++ b/include/Consts.h @@ -1,6 +1,6 @@ #pragma once -#define FIRMWARE_VERSION 302 +#define FIRMWARE_VERSION 303 //#define svelte diff --git a/src/Global.cpp b/src/Global.cpp index baf83ab2..5a5f7f66 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -5,7 +5,7 @@ AsyncWebSocket ws; //AsyncEventSource events; #endif -TickerScheduler ts(TIMES + 1); +TickerScheduler ts(MYTEST + 1); WiFiClient espClient; PubSubClient mqtt(espClient); StringCommand sCmd; diff --git a/src/Utils/JsonUtils.cpp b/src/Utils/JsonUtils.cpp index 32fc64f4..cb6500bc 100644 --- a/src/Utils/JsonUtils.cpp +++ b/src/Utils/JsonUtils.cpp @@ -5,63 +5,7 @@ #include "Global.h" #include "Utils/FileUtils.h" -//String jsonReadStr(String& json, String name) { -// DynamicJsonBuffer jsonBuffer; -// JsonObject& root = jsonBuffer.parseObject(json); -// return root[name].as(); -//} -// -//boolean jsonReadBool(String& json, String name) { -// DynamicJsonBuffer jsonBuffer; -// JsonObject& root = jsonBuffer.parseObject(json); -// return root[name].as(); -//} -// -//int jsonReadInt(String& json, String name) { -// DynamicJsonBuffer jsonBuffer; -// JsonObject& root = jsonBuffer.parseObject(json); -// return root[name]; -//} -// -//String jsonWriteStr(String& json, String name, String value) { -// DynamicJsonBuffer jsonBuffer; -// JsonObject& root = jsonBuffer.parseObject(json); -// root[name] = value; -// json = ""; -// root.printTo(json); -// return json; -//} -// -//String jsonWriteBool(String& json, String name, boolean value) { -// return jsonWriteStr(json, name, value ? "1" : "0"); -//} -// -//String jsonWriteInt(String& json, String name, int value) { -// DynamicJsonBuffer jsonBuffer; -// JsonObject& root = jsonBuffer.parseObject(json); -// root[name] = value; -// json = ""; -// root.printTo(json); -// return json; -//} -// -//String jsonWriteFloat(String& json, String name, float value) { -// DynamicJsonBuffer jsonBuffer; -// JsonObject& root = jsonBuffer.parseObject(json); -// root[name] = value; -// json = ""; -// root.printTo(json); -// return json; -//} -// -//void saveConfig() { -// writeFile(String("config.json"), configSetupJson); -//} -// -//void saveStore() { -// writeFile(String("store.json"), configStoreJson); -//} - +//================================================================================= String jsonReadStr(String& json, String name) { DynamicJsonDocument doc(JSON_BUFFER_SIZE); DeserializationError error = deserializeJson(doc, json); @@ -124,6 +68,7 @@ String jsonWriteFloat(String& json, String name, float value) { return json; } +//================================================================================= void saveConfig() { writeFile(String("config.json"), configSetupJson); }