From a2d5a6f5e147ef1c4d3a9e5ce558afb4f4e12d39 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Wed, 31 Aug 2022 17:32:40 +0200 Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data_svelte/items.json | 27 ++++++---------------- myProfile.json | 4 ++-- platformio.ini | 3 +-- src/modules/API.cpp | 6 ++--- src/modules/sensors/Bmp280/Bmp280.cpp | 33 +++++++++++++-------------- 5 files changed, 28 insertions(+), 45 deletions(-) diff --git a/data_svelte/items.json b/data_svelte/items.json index fedb8f8e..3468a035 100644 --- a/data_svelte/items.json +++ b/data_svelte/items.json @@ -443,38 +443,25 @@ "num": 33 }, { - "name": "34. PWM ESP32", + "name": "34. PWM ESP8266", "type": "Writing", - "subtype": "Pwm32", + "subtype": "Pwm8266", "id": "pwm", "widget": "range", "page": "Кнопки", "descr": "PWM", "int": 0, - "pin": 2, + "pin": 15, "freq": 5000, - "ledChannel": 2, - "PWM_resolution": 10, "val": 0, "apin": -1, "num": 34 }, - { - "name": "35. Доп. функции системы", - "type": "Reading", - "subtype": "SysExt", - "id": "SysExt", - "widget": "", - "page": "", - "descr": "", - "int": 15, - "num": 35 - }, { "header": "Экраны" }, { - "name": "36. LCD экран 2004", + "name": "35. LCD экран 2004", "type": "Reading", "subtype": "Lcd2004", "id": "Lcd", @@ -486,10 +473,10 @@ "size": "20,4", "coord": "0,0", "id2show": "id датчика", - "num": 36 + "num": 35 }, { - "name": "37. LCD экран 1602", + "name": "36. LCD экран 1602", "type": "Reading", "subtype": "Lcd2004", "id": "Lcd", @@ -501,6 +488,6 @@ "size": "16,2", "coord": "0,0", "id2show": "id датчика", - "num": 37 + "num": 36 } ] \ No newline at end of file diff --git a/myProfile.json b/myProfile.json index b737c76a..4fcac5c5 100644 --- a/myProfile.json +++ b/myProfile.json @@ -21,7 +21,7 @@ }, "projectProp": { "platformio": { - "default_envs": "esp32_4mb", + "default_envs": "esp8266_4mb", "data_dir": "data_svelte" } }, @@ -157,7 +157,7 @@ }, { "path": "src\\modules\\exec\\SysExt", - "active": true + "active": false }, { "path": "src\\modules\\exec\\Telegram", diff --git a/platformio.ini b/platformio.ini index c53521c1..0fca13cd 100644 --- a/platformio.ini +++ b/platformio.ini @@ -39,7 +39,7 @@ build_src_filter = ${env:esp32_4mb_fromitems.build_src_filter} [platformio] -default_envs = esp32_4mb +default_envs = esp8266_4mb data_dir = data_svelte [common_env_data] @@ -89,7 +89,6 @@ build_src_filter = + + + - + + [env:esp32_4mb_fromitems] diff --git a/src/modules/API.cpp b/src/modules/API.cpp index cfb7e431..e570b3b6 100644 --- a/src/modules/API.cpp +++ b/src/modules/API.cpp @@ -22,8 +22,7 @@ void* getAPI_ButtonOut(String subtype, String params); void* getAPI_IoTServo(String subtype, String params); void* getAPI_Mcp23017(String subtype, String params); void* getAPI_Mp3(String subtype, String params); -void* getAPI_Pwm32(String subtype, String params); -void* getAPI_SysExt(String subtype, String params); +void* getAPI_Pwm8266(String subtype, String params); void* getAPI_Lcd2004(String subtype, String params); void* getAPI(String subtype, String params) { @@ -50,8 +49,7 @@ if ((tmpAPI = getAPI_ButtonOut(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_Mp3(subtype, params)) != nullptr) return tmpAPI; -if ((tmpAPI = getAPI_Pwm32(subtype, params)) != nullptr) return tmpAPI; -if ((tmpAPI = getAPI_SysExt(subtype, params)) != nullptr) return tmpAPI; +if ((tmpAPI = getAPI_Pwm8266(subtype, params)) != nullptr) return tmpAPI; if ((tmpAPI = getAPI_Lcd2004(subtype, params)) != nullptr) return tmpAPI; return nullptr; } \ No newline at end of file diff --git a/src/modules/sensors/Bmp280/Bmp280.cpp b/src/modules/sensors/Bmp280/Bmp280.cpp index 07e72b2b..d67a583c 100644 --- a/src/modules/sensors/Bmp280/Bmp280.cpp +++ b/src/modules/sensors/Bmp280/Bmp280.cpp @@ -4,57 +4,56 @@ https://github.com/adafruit/Adafruit_BMP280_Library ******************************************************************/ - #include "Global.h" #include "classes/IoTItem.h" #include #include - std::map bmps; class Bmp280t : public IoTItem { private: - Adafruit_BMP280* _bmp; - + Adafruit_BMP280* _bmp; + public: - Bmp280t(Adafruit_BMP280* bmp, String parameters): IoTItem(parameters) { + Bmp280t(Adafruit_BMP280* bmp, String parameters) : IoTItem(parameters) { _bmp = bmp; } - + void doByInterval() { value.valD = _bmp->readTemperature(); - if (String(value.valD) != "nan") regEvent(value.valD, "Bmp280t"); - else SerialPrint("E", "Sensor DHTt", "Error"); + if (String(value.valD) != "nan") + regEvent(value.valD, "Bmp280t"); + else + SerialPrint("E", "Sensor Bmp280t", "Error"); } - ~Bmp280t() {}; + ~Bmp280t(){}; }; - class Bmp280p : public IoTItem { private: - Adafruit_BMP280* _bmp; + Adafruit_BMP280* _bmp; public: - Bmp280p(Adafruit_BMP280* bmp, String parameters): IoTItem(parameters) { + Bmp280p(Adafruit_BMP280* bmp, String parameters) : IoTItem(parameters) { _bmp = bmp; } - + void doByInterval() { value.valD = _bmp->readPressure(); if (String(value.valD) != "nan") { value.valD = value.valD / 1.333224 / 100; regEvent(value.valD, "Bmp280p"); - } else SerialPrint("E", "Sensor DHTh", "Error"); + } else + SerialPrint("E", "Sensor Bmp280p", "Error"); } - ~Bmp280p() {}; + ~Bmp280p(){}; }; - -void* getAPI_Bmp280(String subtype, String param) { +void* getAPI_Bmp280(String subtype, String param) { if (subtype == F("Bmp280t") || subtype == F("Bmp280p")) { String addr; jsonRead(param, "addr", addr);