mirror of
https://github.com/IoTManagerProject/IoTManager.git
synced 2026-03-30 03:49:13 +03:00
Merge branch 'beta' into beta
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user