From 060d44eb74363a9f4cd18c2f9346a3e134ce4a5e Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Sat, 9 Oct 2021 04:33:54 +0800
Subject: [PATCH] 303 arduino json 6

---
 data_esp/set.device.json.gz | Bin 2922 -> 2938 bytes
 include/Consts.h            |   2 +-
 src/Global.cpp              |   2 +-
 src/Utils/JsonUtils.cpp     |  59 ++----------------------------------
 4 files changed, 4 insertions(+), 59 deletions(-)

diff --git a/data_esp/set.device.json.gz b/data_esp/set.device.json.gz
index 8be8227505d0c56ceba73f6a427c44e0b165fe7c..87d9244b22c0ea5645f7641f042f66f233b3b10d 100644
GIT binary patch
literal 2938
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

literal 2922
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
U8jHiD^XHxW4vZ)gr8O`B0CfP68vp<R

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<String>();
-//}
-//
-//boolean jsonReadBool(String& json, String name) {
-//    DynamicJsonBuffer jsonBuffer;
-//    JsonObject& root = jsonBuffer.parseObject(json);
-//    return root[name].as<boolean>();
-//}
-//
-//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);
 }