mirror of
https://github.com/IoTManagerProject/IoTManager.git
synced 2026-03-26 22:22:16 +03:00
Корректируем настройки прошивки под последние изменения
This commit is contained in:
@@ -125,28 +125,30 @@
|
|||||||
"num": 9
|
"num": 9
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "10. AHT20 Температура",
|
"name": "10. AHTXX Температура",
|
||||||
"type": "Reading",
|
"type": "Reading",
|
||||||
"subtype": "Aht20t",
|
"subtype": "AhtXXt",
|
||||||
"id": "Temp20",
|
"id": "Temp20",
|
||||||
"widget": "anydataTmp",
|
"widget": "anydataTmp",
|
||||||
"page": "Сенсоры",
|
"page": "Сенсоры",
|
||||||
"descr": "AHT20 Температура",
|
"descr": "AHTXX Температура",
|
||||||
"int": 15,
|
"int": 15,
|
||||||
"addr": "0x38",
|
"addr": "0x38",
|
||||||
|
"shtType": 1,
|
||||||
"round": 1,
|
"round": 1,
|
||||||
"num": 10
|
"num": 10
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "11. AHT20 Влажность",
|
"name": "11. AHTXX Влажность",
|
||||||
"type": "Reading",
|
"type": "Reading",
|
||||||
"subtype": "Aht20h",
|
"subtype": "AhtXXh",
|
||||||
"id": "Hum20",
|
"id": "Hum20",
|
||||||
"widget": "anydataHum",
|
"widget": "anydataHum",
|
||||||
"page": "Сенсоры",
|
"page": "Сенсоры",
|
||||||
"descr": "AHT20 Влажность",
|
"descr": "AHTXX Влажность",
|
||||||
"int": 15,
|
"int": 15,
|
||||||
"addr": "0x38",
|
"addr": "0x38",
|
||||||
|
"shtType": 1,
|
||||||
"round": 1,
|
"round": 1,
|
||||||
"num": 11
|
"num": 11
|
||||||
},
|
},
|
||||||
@@ -554,7 +556,20 @@
|
|||||||
"num": 42
|
"num": 42
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "43. PWM ESP8266",
|
"name": "43. Расширитель портов Pcf8574",
|
||||||
|
"type": "Reading",
|
||||||
|
"subtype": "Pcf8574",
|
||||||
|
"id": "Pcf",
|
||||||
|
"widget": "",
|
||||||
|
"page": "",
|
||||||
|
"descr": "",
|
||||||
|
"int": "0",
|
||||||
|
"addr": "0x20",
|
||||||
|
"index": 1,
|
||||||
|
"num": 43
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "44. PWM ESP8266",
|
||||||
"type": "Writing",
|
"type": "Writing",
|
||||||
"subtype": "Pwm8266",
|
"subtype": "Pwm8266",
|
||||||
"id": "pwm",
|
"id": "pwm",
|
||||||
@@ -566,10 +581,10 @@
|
|||||||
"freq": 5000,
|
"freq": 5000,
|
||||||
"val": 0,
|
"val": 0,
|
||||||
"apin": -1,
|
"apin": -1,
|
||||||
"num": 43
|
"num": 44
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "44. Телеграм-Лайт",
|
"name": "45. Телеграм-Лайт",
|
||||||
"type": "Writing",
|
"type": "Writing",
|
||||||
"subtype": "TelegramLT",
|
"subtype": "TelegramLT",
|
||||||
"id": "tg",
|
"id": "tg",
|
||||||
@@ -578,13 +593,13 @@
|
|||||||
"descr": "",
|
"descr": "",
|
||||||
"token": "",
|
"token": "",
|
||||||
"chatID": "",
|
"chatID": "",
|
||||||
"num": 44
|
"num": 45
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"header": "Экраны"
|
"header": "Экраны"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "45. LCD экран 2004",
|
"name": "46. LCD экран 2004",
|
||||||
"type": "Reading",
|
"type": "Reading",
|
||||||
"subtype": "Lcd2004",
|
"subtype": "Lcd2004",
|
||||||
"id": "Lcd",
|
"id": "Lcd",
|
||||||
@@ -596,10 +611,10 @@
|
|||||||
"size": "20,4",
|
"size": "20,4",
|
||||||
"coord": "0,0",
|
"coord": "0,0",
|
||||||
"id2show": "id датчика",
|
"id2show": "id датчика",
|
||||||
"num": 45
|
"num": 46
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "46. LCD экран 1602",
|
"name": "47. LCD экран 1602",
|
||||||
"type": "Reading",
|
"type": "Reading",
|
||||||
"subtype": "Lcd2004",
|
"subtype": "Lcd2004",
|
||||||
"id": "Lcd",
|
"id": "Lcd",
|
||||||
@@ -611,6 +626,6 @@
|
|||||||
"size": "16,2",
|
"size": "16,2",
|
||||||
"coord": "0,0",
|
"coord": "0,0",
|
||||||
"id2show": "id датчика",
|
"id2show": "id датчика",
|
||||||
"num": 46
|
"num": 47
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -9,7 +9,7 @@ board = nodemcuv2
|
|||||||
board_build.ldscript = eagle.flash.4m1m.ld
|
board_build.ldscript = eagle.flash.4m1m.ld
|
||||||
platform = espressif8266 @4.0.1
|
platform = espressif8266 @4.0.1
|
||||||
monitor_filters = esp8266_exception_decoder
|
monitor_filters = esp8266_exception_decoder
|
||||||
upload_speed = 921600
|
upload_speed = 115200
|
||||||
monitor_speed = 115200
|
monitor_speed = 115200
|
||||||
board_build.filesystem = littlefs
|
board_build.filesystem = littlefs
|
||||||
build_src_filter =
|
build_src_filter =
|
||||||
@@ -29,7 +29,7 @@ framework = arduino
|
|||||||
board = esp32dev
|
board = esp32dev
|
||||||
platform = espressif32 @5.1.1
|
platform = espressif32 @5.1.1
|
||||||
monitor_filters = esp32_exception_decoder
|
monitor_filters = esp32_exception_decoder
|
||||||
upload_speed = 921600
|
upload_speed = 115200
|
||||||
monitor_speed = 115200
|
monitor_speed = 115200
|
||||||
debug_tool = esp-prog
|
debug_tool = esp-prog
|
||||||
board_build.filesystem = littlefs
|
board_build.filesystem = littlefs
|
||||||
@@ -53,7 +53,7 @@ lib_deps_external =
|
|||||||
|
|
||||||
[env:esp8266_4mb_fromitems]
|
[env:esp8266_4mb_fromitems]
|
||||||
lib_deps =
|
lib_deps =
|
||||||
Adafruit AHTX0
|
https://github.com/enjoyneering/AHTxx.git
|
||||||
adafruit/Adafruit BME280 Library
|
adafruit/Adafruit BME280 Library
|
||||||
adafruit/Adafruit BMP280 Library
|
adafruit/Adafruit BMP280 Library
|
||||||
beegee-tokyo/DHT sensor library for ESPx
|
beegee-tokyo/DHT sensor library for ESPx
|
||||||
@@ -69,37 +69,39 @@ lib_deps =
|
|||||||
adafruit/Adafruit MCP23017 Arduino Library@^2.1.0
|
adafruit/Adafruit MCP23017 Arduino Library@^2.1.0
|
||||||
adafruit/Adafruit BusIO @ ^1.13.2
|
adafruit/Adafruit BusIO @ ^1.13.2
|
||||||
dfrobot/DFRobotDFPlayerMini @ ^1.0.5
|
dfrobot/DFRobotDFPlayerMini @ ^1.0.5
|
||||||
|
adafruit/Adafruit BusIO @ ^1.13.2
|
||||||
marcoschwartz/LiquidCrystal_I2C@^1.1.4
|
marcoschwartz/LiquidCrystal_I2C@^1.1.4
|
||||||
build_src_filter =
|
build_src_filter =
|
||||||
+<modules\virtual\Loging>
|
+<modules/virtual/Loging>
|
||||||
+<modules\virtual\LogingDaily>
|
+<modules/virtual/LogingDaily>
|
||||||
+<modules\virtual\Timer>
|
+<modules/virtual/Timer>
|
||||||
+<modules\virtual\Variable>
|
+<modules/virtual/Variable>
|
||||||
+<modules\virtual\VButton>
|
+<modules/virtual/VButton>
|
||||||
+<modules\sensors\Acs712>
|
+<modules/sensors/Acs712>
|
||||||
+<modules\sensors\Aht20>
|
+<modules/sensors/AhtXX>
|
||||||
+<modules\sensors\AnalogAdc>
|
+<modules/sensors/AnalogAdc>
|
||||||
+<modules\sensors\Bme280>
|
+<modules/sensors/Bme280>
|
||||||
+<modules\sensors\Bmp280>
|
+<modules/sensors/Bmp280>
|
||||||
+<modules\sensors\Dht1122>
|
+<modules/sensors/Dht1122>
|
||||||
+<modules\sensors\Ds18b20>
|
+<modules/sensors/Ds18b20>
|
||||||
+<modules\sensors\GY21>
|
+<modules/sensors/GY21>
|
||||||
+<modules\sensors\Hdc1080>
|
+<modules/sensors/Hdc1080>
|
||||||
+<modules\sensors\Max6675>
|
+<modules/sensors/Max6675>
|
||||||
+<modules\sensors\Pzem004t>
|
+<modules/sensors/Pzem004t>
|
||||||
+<modules\sensors\RCswitch>
|
+<modules/sensors/RCswitch>
|
||||||
+<modules\sensors\Sht20>
|
+<modules/sensors/Sht20>
|
||||||
+<modules\sensors\Sht30>
|
+<modules/sensors/Sht30>
|
||||||
+<modules\sensors\Sonar>
|
+<modules/sensors/Sonar>
|
||||||
+<modules\sensors\UART>
|
+<modules/sensors/UART>
|
||||||
+<modules\exec\ButtonIn>
|
+<modules/exec/ButtonIn>
|
||||||
+<modules\exec\ButtonOut>
|
+<modules/exec/ButtonOut>
|
||||||
+<modules\exec\IoTServo>
|
+<modules/exec/IoTServo>
|
||||||
+<modules\exec\Mcp23017>
|
+<modules/exec/Mcp23017>
|
||||||
+<modules\exec\Mp3>
|
+<modules/exec/Mp3>
|
||||||
+<modules\exec\Pwm8266>
|
+<modules/exec/Pcf8574>
|
||||||
+<modules\exec\TelegramLT>
|
+<modules/exec/Pwm8266>
|
||||||
+<modules\display\Lcd2004>
|
+<modules/exec/TelegramLT>
|
||||||
|
+<modules/display/Lcd2004>
|
||||||
|
|
||||||
[env:esp32_4mb_fromitems]
|
[env:esp32_4mb_fromitems]
|
||||||
lib_deps =
|
lib_deps =
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ void* getAPI_Timer(String subtype, String params);
|
|||||||
void* getAPI_Variable(String subtype, String params);
|
void* getAPI_Variable(String subtype, String params);
|
||||||
void* getAPI_VButton(String subtype, String params);
|
void* getAPI_VButton(String subtype, String params);
|
||||||
void* getAPI_Acs712(String subtype, String params);
|
void* getAPI_Acs712(String subtype, String params);
|
||||||
void* getAPI_Aht20(String subtype, String params);
|
void* getAPI_AhtXX(String subtype, String params);
|
||||||
void* getAPI_AnalogAdc(String subtype, String params);
|
void* getAPI_AnalogAdc(String subtype, String params);
|
||||||
void* getAPI_Bme280(String subtype, String params);
|
void* getAPI_Bme280(String subtype, String params);
|
||||||
void* getAPI_Bmp280(String subtype, String params);
|
void* getAPI_Bmp280(String subtype, String params);
|
||||||
@@ -26,6 +26,7 @@ void* getAPI_ButtonOut(String subtype, String params);
|
|||||||
void* getAPI_IoTServo(String subtype, String params);
|
void* getAPI_IoTServo(String subtype, String params);
|
||||||
void* getAPI_Mcp23017(String subtype, String params);
|
void* getAPI_Mcp23017(String subtype, String params);
|
||||||
void* getAPI_Mp3(String subtype, String params);
|
void* getAPI_Mp3(String subtype, String params);
|
||||||
|
void* getAPI_Pcf8574(String subtype, String params);
|
||||||
void* getAPI_Pwm8266(String subtype, String params);
|
void* getAPI_Pwm8266(String subtype, String params);
|
||||||
void* getAPI_TelegramLT(String subtype, String params);
|
void* getAPI_TelegramLT(String subtype, String params);
|
||||||
void* getAPI_Lcd2004(String subtype, String params);
|
void* getAPI_Lcd2004(String subtype, String params);
|
||||||
@@ -38,7 +39,7 @@ if ((tmpAPI = getAPI_Timer(subtype, params)) != nullptr) return tmpAPI;
|
|||||||
if ((tmpAPI = getAPI_Variable(subtype, params)) != nullptr) return tmpAPI;
|
if ((tmpAPI = getAPI_Variable(subtype, params)) != nullptr) return tmpAPI;
|
||||||
if ((tmpAPI = getAPI_VButton(subtype, params)) != nullptr) return tmpAPI;
|
if ((tmpAPI = getAPI_VButton(subtype, params)) != nullptr) return tmpAPI;
|
||||||
if ((tmpAPI = getAPI_Acs712(subtype, params)) != nullptr) return tmpAPI;
|
if ((tmpAPI = getAPI_Acs712(subtype, params)) != nullptr) return tmpAPI;
|
||||||
if ((tmpAPI = getAPI_Aht20(subtype, params)) != nullptr) return tmpAPI;
|
if ((tmpAPI = getAPI_AhtXX(subtype, params)) != nullptr) return tmpAPI;
|
||||||
if ((tmpAPI = getAPI_AnalogAdc(subtype, params)) != nullptr) return tmpAPI;
|
if ((tmpAPI = getAPI_AnalogAdc(subtype, params)) != nullptr) return tmpAPI;
|
||||||
if ((tmpAPI = getAPI_Bme280(subtype, params)) != nullptr) return tmpAPI;
|
if ((tmpAPI = getAPI_Bme280(subtype, params)) != nullptr) return tmpAPI;
|
||||||
if ((tmpAPI = getAPI_Bmp280(subtype, params)) != nullptr) return tmpAPI;
|
if ((tmpAPI = getAPI_Bmp280(subtype, params)) != nullptr) return tmpAPI;
|
||||||
@@ -58,6 +59,7 @@ if ((tmpAPI = getAPI_ButtonOut(subtype, params)) != nullptr) return tmpAPI;
|
|||||||
if ((tmpAPI = getAPI_IoTServo(subtype, params)) != nullptr) return tmpAPI;
|
if ((tmpAPI = getAPI_IoTServo(subtype, params)) != nullptr) return tmpAPI;
|
||||||
if ((tmpAPI = getAPI_Mcp23017(subtype, params)) != nullptr) return tmpAPI;
|
if ((tmpAPI = getAPI_Mcp23017(subtype, params)) != nullptr) return tmpAPI;
|
||||||
if ((tmpAPI = getAPI_Mp3(subtype, params)) != nullptr) return tmpAPI;
|
if ((tmpAPI = getAPI_Mp3(subtype, params)) != nullptr) return tmpAPI;
|
||||||
|
if ((tmpAPI = getAPI_Pcf8574(subtype, params)) != nullptr) return tmpAPI;
|
||||||
if ((tmpAPI = getAPI_Pwm8266(subtype, params)) != nullptr) return tmpAPI;
|
if ((tmpAPI = getAPI_Pwm8266(subtype, params)) != nullptr) return tmpAPI;
|
||||||
if ((tmpAPI = getAPI_TelegramLT(subtype, params)) != nullptr) return tmpAPI;
|
if ((tmpAPI = getAPI_TelegramLT(subtype, params)) != nullptr) return tmpAPI;
|
||||||
if ((tmpAPI = getAPI_Lcd2004(subtype, params)) != nullptr) return tmpAPI;
|
if ((tmpAPI = getAPI_Lcd2004(subtype, params)) != nullptr) return tmpAPI;
|
||||||
|
|||||||
Reference in New Issue
Block a user