iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-26 22:22:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta' into beta

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-12-18 20:26:23 +01:00
committed by GitHub
parent eddb2eb289 9ac72f14e0
commit 916116bbc4
79 changed files with 553 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/Consts.h
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,

1
include/Global.h
View File

@@ -54,6 +54,7 @@ extern String configSetupJson; //все настройки
extern String configLiveJson; //все данные с датчиков (связан с mqtt)
extern String configStoreJson; //все данные которые должны сохраняться
extern String configOptionJson; //для трансфера
extern String telegramMsgJson;
extern String getValue(String& key);
// Mqtt

2
include/ItemsList.h
View File

@@ -4,8 +4,10 @@
#include "Global.h"
extern void itemsListInit();
extern void addItem2(String param);
extern void addItem(String name);
extern void addPreset(String name);
extern void addPreset2(int num);
extern void delChoosingItems();
extern void delAllItems();
extern uint8_t getNewElementNumber(String file);