From 3417d0c915346d060ec264a96a71e860839545bd Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Sun, 20 Dec 2020 14:11:59 +0100
Subject: [PATCH] =?UTF-8?q?1=D0=BC=D0=B1=204=D0=BC=D0=B1=20=D0=BF=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/Consts.h |  8 +++-----
 platformio.ini   |  3 +--
 src/Web.cpp      | 22 ++++------------------
 src/main.cpp     |  1 -
 4 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/include/Consts.h b/include/Consts.h
index 1805957a..f6a7fc80 100644
--- a/include/Consts.h
+++ b/include/Consts.h
@@ -2,9 +2,9 @@
 
 //===========Firmware=============================================================================================================================================
 #define FIRMWARE_VERSION 273
-#define FLASH_SIZE_1MB true
+#define ESP8266_FLASH_SIZE_1MB false
 //===========FileSystem==============================================================================================================================================
-#define USE_LITTLEFS false
+#define USE_LITTLEFS true
 //==================================================================================================================================================================
 #define NUM_BUTTONS 6
 #define LED_PIN LED_BUILTIN
@@ -28,14 +28,12 @@
 #define SensorDhtEnabled
 #define PwmOutEnable
 //=========Features=================================================================================================================================
-#ifndef FLASH_SIZE_1MB
 #define telegramEnable
-#endif
 #define uartEnable
 
 
 #ifdef ESP8266
-#ifdef FLASH_SIZE_1MB
+#ifdef ESP8266_FLASH_SIZE_1MB
 #define FIRMWARE_NAME "esp8266-1mb"
 #else
 #define FIRMWARE_NAME "esp8266"
diff --git a/platformio.ini b/platformio.ini
index 3d8bb9ec..5ce94223 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -45,7 +45,7 @@ extra_scripts = ./tools/littlefsbuilder.py
 [env:esp8266_01_1m]
 framework = arduino
 board = nodemcuv2
-board_build.ldscript = eagle.flash.1m512.ld
+board_build.ldscript = eagle.flash.1m256.ld
 platform = https://github.com/platformio/platform-espressif8266.git
 lib_deps = 
 	${common_env_data.lib_deps_external}
@@ -57,7 +57,6 @@ lib_deps =
 monitor_filters = esp8266_exception_decoder
 upload_speed = 921600
 monitor_speed = 115200
-board_build.filesystem = littlefs
 
 [env:esp8266]
 framework = arduino
diff --git a/src/Web.cpp b/src/Web.cpp
index 0d4c5875..a6cf2b84 100644
--- a/src/Web.cpp
+++ b/src/Web.cpp
@@ -26,11 +26,9 @@ void web_init() {
 
         if (request->hasArg(F("addPreset"))) {
             addPreset2(request->getParam(F("addPreset"))->value().toInt());
-#ifdef FLASH_SIZE_1MB
-            jsonWriteStr(configSetupJson, F("warning1"), F("<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #ffc7c7; padding: 10px;'>Присеты не доступны, модуль на 1mb</p></font></div>"));
-#else
+
             jsonWriteStr(configSetupJson, F("warning1"), F("<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #ffc7c7; padding: 10px;'>Требуется перезагрузка</p></font></div>"));
-#endif
+
             request->redirect(F("/?set.device"));
         }
 
@@ -335,13 +333,11 @@ void web_init() {
         SerialPrint("I", "Update", "firmware version: " + String(lastVersion));
 
         String msg = "";
-#ifdef FLASH_SIZE_1MB
-        if (FLASH_SIZE_1MB) {
+
+        if (ESP8266_FLASH_SIZE_1MB) {
             msg = F("Обновление невозможно, память устройства 1 мб");
         }
         else {
-#endif
-
             if (lastVersion == FIRMWARE_VERSION) {
                 msg = F("Актуальная версия прошивки уже установлена.");
             }
@@ -357,17 +353,7 @@ void web_init() {
             else if (lastVersion < FIRMWARE_VERSION) {
                 msg = F("Ошибка версии. Попробуйте повторить позже...");
             }
-#ifdef FLASH_SIZE_1MB
         }
-#endif
-
-        // else if (lastVersion == "") {
-        //msg = F("Нажмите на кнопку \"обновить прошивку\" повторно...");
-        //} else if (lastVersion == "less") {
-        //msg = F("Обновление \"по воздуху\" не поддерживается!");
-        //} else if (lastVersion == "notsupported") {
-        //   msg = F("Обновление возможно только через usb!");
-        //}
 
         String tmp = "{}";
         jsonWriteStr(tmp, "title", "<button class=\"close\" onclick=\"toggle('my-block')\">×</button>" + msg);
diff --git a/src/main.cpp b/src/main.cpp
index 3bd8fb0a..aeabdbd2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,5 @@
 
 #include <SSDP.h>
-
 #include "BufferExecute.h"
 #include "Bus.h"
 #include "Class/CallBackTest.h"