Merge branch 'beta' into beta

This commit is contained in:
Dmitry Borisenko
2020-12-18 20:26:23 +01:00
committed by GitHub
79 changed files with 553 additions and 220 deletions

View File

@@ -1,20 +1,8 @@
#pragma once
//===========Firmware=============================================================================================================================================
#define FIRMWARE_VERSION 272
#define FIRMWARE_VERSION 273
//#define FLASH_SIZE_1MB true
#ifdef ESP8266
#ifdef FLASH_SIZE_1MB
#define FIRMWARE_NAME "esp8266-1mb"
#else
#define FIRMWARE_NAME "esp8266"
#endif
#endif
#ifdef ESP32
#define FIRMWARE_NAME "esp32"
#endif
//===========FileSystem==============================================================================================================================================
#define USE_LITTLEFS true
//==================================================================================================================================================================
@@ -40,11 +28,23 @@
#define SensorDhtEnabled
#define PwmOutEnable
//=========Features=================================================================================================================================
//#define telegramEnable
#ifndef FLASH_SIZE_1MB
#define telegramEnable
#endif
#define uartEnable
#ifdef ESP8266
#ifdef FLASH_SIZE_1MB
#define FIRMWARE_NAME "esp8266-1mb"
#else
#define FIRMWARE_NAME "esp8266"
#endif
#endif
#ifdef ESP32
#define FIRMWARE_NAME "esp32"
#endif
//================================================================================================================================================================
enum TimerTask_t { WIFI_SCAN,