From 9934690d0a2d48f8fd0fc4906a99dff293e04eb5 Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Tue, 15 Dec 2020 22:10:40 +0100
Subject: [PATCH] some

---
 data/config.json           | 6 +++---
 include/Consts.h           | 5 ++++-
 include/FSEditor.h         | 2 +-
 include/Utils/FileHelper.h | 2 +-
 include/Utils/FileUtils.h  | 2 +-
 platformio.ini             | 4 +++-
 src/Clock.cpp              | 2 +-
 src/Telegram.cpp           | 4 +++-
 src/Utils/TimeUtils.cpp    | 3 ++-
 9 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/data/config.json b/data/config.json
index 710b94ac..84768aa7 100644
--- a/data/config.json
+++ b/data/config.json
@@ -7,11 +7,11 @@
     "routerpass": "hostel3333",
     "timezone": 1,
     "ntp": "pool.ntp.org",
-    "mqttServer": "wqtt.ru",
-    "mqttPort": 8021,
+    "mqttServer": "91.204.228.124",
+    "mqttPort": 1883,
     "mqttPrefix": "/iotTest",
     "mqttUser": "rise",
-    "mqttPass": "hostel3333",
+    "mqttPass": "23ri22se32",
     "scen": "1",
     "telegramApi": "1416711569:AAEI0j83GmXqwzb_gnK1B0Am0gDwZoJt5xo",
     "telegonof": "0",
diff --git a/include/Consts.h b/include/Consts.h
index 941df935..698d0d00 100644
--- a/include/Consts.h
+++ b/include/Consts.h
@@ -15,7 +15,10 @@
 #define FIRMWARE_NAME "esp32"
 #endif
 
-//===========FSystem==============================================================================================================================================
+//===========FileSystem==============================================================================================================================================
+#define littlefs_on
+
+//==================================================================================================================================================================
 #define NUM_BUTTONS 6
 #define LED_PIN 2
 
diff --git a/include/FSEditor.h b/include/FSEditor.h
index 69282648..16efe998 100644
--- a/include/FSEditor.h
+++ b/include/FSEditor.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
-#include <FS.h>
+//#include <FS.h>
 
 #ifdef ESP8266
 #include <LittleFS.h>
diff --git a/include/Utils/FileHelper.h b/include/Utils/FileHelper.h
index daa9186c..542ed423 100644
--- a/include/Utils/FileHelper.h
+++ b/include/Utils/FileHelper.h
@@ -2,7 +2,7 @@
 
 #include <Arduino.h>
 
-#include "FS.h"
+//#include "FS.h"
 
 #ifdef ESP32
 #include "LITTLEFS.h"
diff --git a/include/Utils/FileUtils.h b/include/Utils/FileUtils.h
index da2688ac..d630fc39 100644
--- a/include/Utils/FileUtils.h
+++ b/include/Utils/FileUtils.h
@@ -4,7 +4,7 @@
 
 #include "Consts.h"
 
-#include "FS.h"
+//#include "FS.h"
 
 #ifdef ESP32
 #include "LITTLEFS.h"
diff --git a/platformio.ini b/platformio.ini
index b2e3463e..5cb44ff7 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -47,10 +47,12 @@ lib_deps =
 	ESPAsyncUDP
 	EspSoftwareSerial
 	CTBot
+	SPIFFS
 monitor_filters = esp8266_exception_decoder
 upload_speed = 921600
 monitor_speed = 115200
-board_build.filesystem = littlefs
+;board_build.filesystem = littlefs
+board_build.filesystem = SPIFFS
 ;=============================================================================================================================================
 [env:esp8266]
 framework = arduino
diff --git a/src/Clock.cpp b/src/Clock.cpp
index 2ae4132a..0cb26942 100644
--- a/src/Clock.cpp
+++ b/src/Clock.cpp
@@ -12,5 +12,5 @@ void clockInit() {
             timeNow->hasSync();
         },
         nullptr, true);
-    SerialPrint("I", F("Time"), F("Clock Init"));
+    SerialPrint("I", F("NTP"), F("Clock Init"));
 }
diff --git a/src/Telegram.cpp b/src/Telegram.cpp
index 6a5237ca..679ba5c7 100644
--- a/src/Telegram.cpp
+++ b/src/Telegram.cpp
@@ -76,7 +76,9 @@ void sendTelegramMsg() {
         static String prevMsg;
         if (prevMsg != msg) {
             prevMsg = msg;
-            myBot->sendMessage(jsonReadInt(configSetupJson, "chatId"), msg);
+            if (msg != "na") {
+                myBot->sendMessage(jsonReadInt(configSetupJson, "chatId"), msg);
+            }
             SerialPrint("<-", "Telegram", "chat ID: " + String(jsonReadInt(configSetupJson, "chatId")) + ", msg: " + msg);
         }
     }
diff --git a/src/Utils/TimeUtils.cpp b/src/Utils/TimeUtils.cpp
index b377965a..6d2dcdee 100644
--- a/src/Utils/TimeUtils.cpp
+++ b/src/Utils/TimeUtils.cpp
@@ -228,8 +228,9 @@ void timeInit() {
                 prevTime = timenow;
                 jsonWriteStr(configLiveJson, "timenow", timenow);
                 eventGen2("timenow", timenow);
+                SerialPrint("I", F("NTP"), timenow);
             }
         },
         nullptr, true);
-    SerialPrint("I", F("Time"), F("Handle time init"));
+    SerialPrint("I", F("NTP"), F("Handle time init"));  
 }