From 7eac8dde3bc08d779f9f812f6ef9bc348d7e2939 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Wed, 30 Dec 2020 16:56:26 +0100 Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=8C=20=D0=B1=D1=8B=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=B3=D0=BE=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BA=D0=BB=D1=8E=D1=87?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D1=80=D0=BE=D1=88=D0=B8=D0=B2?= =?UTF-8?q?=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/config.json | 4 +-- include/Consts.h | 68 ++++++++++++++++++++++++------------- include/Macro.h | 7 ++++ platformio.ini | 87 +++++++++++++++++++++++++++++------------------- src/Tests.cpp | 11 ++++-- 5 files changed, 115 insertions(+), 62 deletions(-) create mode 100644 include/Macro.h diff --git a/data/config.json b/data/config.json index 57cfd757..5e722090 100644 --- a/data/config.json +++ b/data/config.json @@ -3,8 +3,8 @@ "chipID": "", "apssid": "IoTmanager", "appass": "", - "routerssid": "rise", - "routerpass": "hostel3333", + "routerssid": "WLAN1-Y1GYEF", + "routerpass": "2egY69YTA8DDR7En", "timezone": 1, "ntp": "pool.ntp.org", "mqttServer": "91.204.228.124", diff --git a/include/Consts.h b/include/Consts.h index c2ff87dd..6bb81719 100644 --- a/include/Consts.h +++ b/include/Consts.h @@ -1,18 +1,31 @@ #pragma once -//===========Firmware============================================================================================================================================= #define FIRMWARE_VERSION 274 -#define USE_OTA false -//===========FileSystem============================================================================================================================================== + +#ifdef esp8266_4mb +#define FIRMWARE_NAME "esp8266_4mb" #define USE_LITTLEFS true -//================================================================================================================================================================== -#define NUM_BUTTONS 6 +#define USE_OTA true #define LED_PIN 2 -//===========MQTT================================================================================================================================================= +#endif + +#ifdef esp8266_1mb +#define FIRMWARE_NAME "esp8266_1mb" +#define USE_LITTLEFS false +#define USE_OTA false +#define LED_PIN 2 +#endif + +#ifdef esp32_4mb +#define FIRMWARE_NAME "esp32_4mb" +#define USE_LITTLEFS false +#define USE_OTA true +#define LED_PIN 22 +#endif + +#define NUM_BUTTONS 6 #define MQTT_RECONNECT_INTERVAL 20000 -//==========Telemetry============================================================================================================================================= #define TELEMETRY_UPDATE_INTERVAL_MIN 60 -//=========Configuration========================================================================================================================================== #define DEVICE_CONFIG_FILE "s.conf.csv" #define DEVICE_SCENARIO_FILE "s.scen.txt" //=========System parts=========================================================================================================================================== @@ -22,28 +35,16 @@ //#define LAYOUT_IN_RAM //#define UDP_ENABLED //#define SSDP_ENABLED -//=========Sensors enable/disable================================================================================================================================= #define SensorBme280Enabled #define SensorBmp280Enabled #define SensorDhtEnabled #define PwmOutEnable -//=========Features================================================================================================================================= #define telegramEnable #define uartEnable - -#ifdef ESP8266 -#ifdef USE_OTA -#define FIRMWARE_NAME "esp8266-1mb" -#else -#define FIRMWARE_NAME "esp8266" -#endif -#endif - -#ifdef ESP32 -#define FIRMWARE_NAME "esp32" -#endif - //================================================================================================================================================================ + + + enum TimerTask_t { WIFI_SCAN, WIFI_MQTT_CONNECTION_CHECK, TIME, @@ -79,6 +80,27 @@ enum ConfigType_t { CT_CONFIG, CT_SCENARIO }; + + + + + + + + + + + + + + + + + + + + + //history //07.11.2020 (SSDP OFF, UDP OFF) //RAM: [===== ] 46.8% (used 38376 bytes from 81920 bytes) diff --git a/include/Macro.h b/include/Macro.h new file mode 100644 index 00000000..19651b91 --- /dev/null +++ b/include/Macro.h @@ -0,0 +1,7 @@ +//#pragma once +//#define ST(A) #A +//#define STR(A) ST(A) +// +//#ifdef esp32_4mb +//#pragma message STR(esp32_4mb) +//#endif \ No newline at end of file diff --git a/platformio.ini b/platformio.ini index 28d42848..d61bb3a2 100644 --- a/platformio.ini +++ b/platformio.ini @@ -8,8 +8,12 @@ ; Please visit documentation for the other options and examples ; https://docs.platformio.org/page/projectconf.html +;Please use one of definition: +;esp8266_1mb , esp8266_4mb , esp32_4mb [platformio] -default_envs = esp32 +default_envs = esp32_4mb + + [common_env_data] lib_deps_external = @@ -25,42 +29,10 @@ lib_deps_internal = GyverFilters OneWire -[env:esp32] -framework = arduino -board = esp32dev -;board_build.ldscript = eagle.flash.4m2m.ld -platform = https://github.com/platformio/platform-espressif32.git -lib_deps = - ${common_env_data.lib_deps_external} - ${common_env_data.lib_deps_internal} - AsyncTCP - madhephaestus/ESP32Servo - luc-github/ESP32SSDP - CTBot - EspSoftwareSerial -monitor_filters = esp32_exception_decoder -upload_speed = 921600 -monitor_speed = 115200 -;board_build.filesystem = littlefs -;extra_scripts = ./tools/littlefsbuilder.py -[env:esp8266_01_1m] -framework = arduino -board = nodemcuv2 -board_build.ldscript = eagle.flash.1m256.ld -platform = https://github.com/platformio/platform-espressif8266.git -lib_deps = - ${common_env_data.lib_deps_external} - ${common_env_data.lib_deps_internal} - ESPAsyncTCP - ESPAsyncUDP - EspSoftwareSerial - CTBot -monitor_filters = esp8266_exception_decoder -upload_speed = 921600 -monitor_speed = 115200 -[env:esp8266] +[env:esp8266_4mb] +build_flags = -Desp8266_1mb="esp8266_4mb" framework = arduino board = nodemcuv2 board_build.ldscript = eagle.flash.4m1m.ld @@ -76,3 +48,48 @@ monitor_filters = esp8266_exception_decoder upload_speed = 921600 monitor_speed = 115200 board_build.filesystem = littlefs + + + +[env:esp8266_1mb] +build_flags = -Desp8266_1mb="esp8266_1mb" +framework = arduino +board = nodemcuv2 +board_build.ldscript = eagle.flash.1m256.ld +platform = https://github.com/platformio/platform-espressif8266.git +lib_deps = + ${common_env_data.lib_deps_external} + ${common_env_data.lib_deps_internal} + ESPAsyncTCP + ESPAsyncUDP + EspSoftwareSerial + CTBot +monitor_filters = esp8266_exception_decoder +upload_speed = 921600 +monitor_speed = 115200 + + + +[env:esp32_4mb] +build_flags = -Desp32_4mb="esp32_4mb" +framework = arduino +board = esp32dev +platform = https://github.com/platformio/platform-espressif32.git +lib_deps = + ${common_env_data.lib_deps_external} + ${common_env_data.lib_deps_internal} + AsyncTCP + madhephaestus/ESP32Servo + luc-github/ESP32SSDP + CTBot + EspSoftwareSerial +monitor_filters = esp32_exception_decoder +upload_speed = 921600 +monitor_speed = 115200 + + + + + + + diff --git a/src/Tests.cpp b/src/Tests.cpp index f64fe70e..1e6c305e 100644 --- a/src/Tests.cpp +++ b/src/Tests.cpp @@ -1,12 +1,19 @@ #include "Tests.h" - +#include "Macro.h" #include "Global.h" #include "ItemsList.h" void testsPerform() { Serial.println("====some tests section===="); - + #ifdef esp32_4mb + Serial.println("esp32_4mb defined"); + #endif + #ifdef esp8266_1mb + Serial.println("esp32_4mb defined"); + #endif + + //Serial.println(STR(esp32_4mb)); Serial.println("==========end============"); } \ No newline at end of file