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

Merge branch 'ver4dev' of https://github.com/biveraxe/IoTManager into ver4dev

Browse Source
This commit is contained in:
Ilya Belyakov
2023-10-22 20:50:54 +07:00
parent 49cd22a5dd a5636d3461
commit a0806034bb
29 changed files with 467 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/EspFileSystem.cpp
View File

@@ -78,7 +78,8 @@ uint32_t ESP_getChipId(void)
}
// устарела используем новую функцию ниже
#ifndef esp32s2_4mb
#if !defined(esp32s2_4mb) && !defined(esp32c3m_4mb) && !defined(esp32s3_16mb)
//#ifndef esp32s2_4mb
uint32_t ESP_getFlashChipId(void)
{
#ifdef ESP32

4
src/Main.cpp
View File

@@ -3,7 +3,7 @@
#include "classes/IoTDB.h"
#include "utils/Statistic.h"
#include <Wire.h>
#ifdef esp32s2_4mb
#if defined(esp32s2_4mb) || defined(esp32s3_16mb)
#include <USB.h>
#endif
@@ -80,7 +80,7 @@ void stopErrorMarker(int id) {
}
void setup() {
#ifdef esp32s2_4mb
#if defined(esp32s2_4mb) || defined(esp32s3_16mb)
USB.begin();
#endif
#if defined(esp32_4mb) || defined(esp32_16mb) || defined(esp32cam_4mb)

2
src/PeriodicTasks.cpp
View File

@@ -59,7 +59,7 @@ String ESP_getResetReason(void) {
return ESP.getResetReason();
}
#endif
#ifdef esp32s2_4mb
#if defined(esp32s2_4mb) || defined(esp32s3_16mb) || defined(esp32c3m_4mb)
String ESP_getResetReason(void) {
return ESP32GetResetReason(0); // CPU 0
}

71
src/modules/exec/Pcf8591/Pcf8591.cpp Normal file
View File

@@ -0,0 +1,71 @@
#include "Global.h"
#include "classes/IoTItem.h"
#include "Wire.h"
#include <Adafruit_PCF8591.h>
// Make sure that this is set to the value in volts of VCC
#define ADC_REFERENCE_VOLTAGE 3.3
class Pcf8591 : public IoTItem {
int _pin;
bool _isRaw;
bool _isInited = false;
Adafruit_PCF8591 pcf = Adafruit_PCF8591();
public:
Pcf8591(String parameters) : IoTItem(parameters) {
String tmp;
jsonRead(parameters, "pin", tmp);
_pin = tmp.toInt();
jsonRead(parameters, "mode", tmp);
_isRaw = tmp == "raw";
if (!pcf.begin()) {
Serial.println("# Adafruit PCF8591 not found!");
_isInited = false;
} else
_isInited = true;
Serial.println("# Adafruit PCF8591 found");
pcf.enableDAC(true);
Serial.println("AIN0, AIN1, AIN2, AIN3");
}
uint8_t dac_counter = 0;
void doByInterval() {
// Make a triangle wave on the DAC output
pcf.analogWrite(dac_counter++);
if (_isInited) {
if (_isRaw)
value.valD = pcf.analogRead(_pin); // Чтение АЦП нулевого канала (Вольты)
else
value.valD = (int_to_volts(pcf.analogRead(_pin), 8, ADC_REFERENCE_VOLTAGE));
regEvent(value.valD, "PCF8591");
}
}
float int_to_volts(uint16_t dac_value, uint8_t bits, float logic_level) {
return (((float)dac_value / ((1 << bits) - 1)) * logic_level);
}
~Pcf8591(){};
};
void *getAPI_Pcf8591(String subtype, String param) {
if (subtype == F("Pcf8591")) {
return new Pcf8591(param);
} else {
return nullptr;
}
}

75
src/modules/exec/Pcf8591/modinfo.json Normal file
View File

@@ -0,0 +1,75 @@
{
"menuSection": "sensors",
"configItem": [
{
"global": 0,
"name": "Расширитель портов PCF8591",
"type": "Reading",
"subtype": "Pcf8591",
"id": "Pcf85",
"widget": "anydataVlt",
"page": "PCF8591",
"descr": "PCF_0",
"pin": "0",
"mode": "volt",
"map": "1,255,1,100",
"plus": 0,
"multiply": 1,
"round": 2,
"int": 7
}
],
"about": {
"authorName": "Serghei Crasnicov",
"authorContact": "https://t.me/Serghei63",
"authorGit": "https://github.com/Serghei63",
"specialThanks": "",
"moduleName": "Pcf8591",
"moduleVersion": "1.0",
"usedRam": {
"esp32_4mb": 15,
"esp8266_4mb": 15
},
"title": "Расширитель 4-х аналоговых портов PCF8591",
"moduleDesc": "Позволяет получить относительную величину напряжения на понижающем трансформаторе.",
"propInfo": {
"pin": "Номер AN, к которому подключен датчик. Допускается 0, 1, 2, 3",
"mode": "Режим работы. volt - вывод в вольтах , raw - значения от 0 до 255",
"int": "Количество секунд между опросами датчика."
}
},
"defActive": false,
"usedLibs": {
"esp32_4mb": [
"https://github.com/adafruit/Adafruit_PCF8591"
],
"esp32_16mb": [
"https://github.com/adafruit/Adafruit_PCF8591"
],
"esp8266_4mb": [
"https://github.com/adafruit/Adafruit_PCF8591"
],
"esp8266_16mb": [
"https://github.com/adafruit/Adafruit_PCF8591"
],
"esp8266_1mb": [
"https://github.com/adafruit/Adafruit_PCF8591"
],
"esp8266_1mb_ota": [
"https://github.com/adafruit/Adafruit_PCF8591"
],
"esp8285_1mb": [
"https://github.com/adafruit/Adafruit_PCF8591"
],
"esp8285_1mb_ota": [
"https://github.com/adafruit/Adafruit_PCF8591"
],
"esp8266_2mb": [
"https://github.com/adafruit/Adafruit_PCF8591"
],
"esp8266_2mb_ota": [
"https://github.com/adafruit/Adafruit_PCF8591"
]
}
}

2
src/modules/virtual/Cron/modinfo.json
View File

@@ -54,6 +54,8 @@
"esp32cam_4mb": [],
"esp32_16mb": [],
"esp32s2_4mb": [],
"esp32s3_16mb": [],
"esp32c3m_4mb": [],
"esp8266_4mb": [],
"esp8266_16mb": [],
"esp8266_1mb": [],

2
src/modules/virtual/GoogleSheet/modinfo.json
View File

@@ -62,6 +62,8 @@
"esp32_4mb3f": [],
"esp32cam_4mb": [],
"esp32s2_4mb": [],
"esp32s3_16mb": [],
"esp32c3m_4mb": [],
"esp8266_4mb": []
}
}

2
src/modules/virtual/Loging/modinfo.json
View File

@@ -55,6 +55,8 @@
"esp32cam_4mb": [],
"esp32_16mb": [],
"esp32s2_4mb": [],
"esp32s3_16mb": [],
"esp32c3m_4mb": [],
"esp8266_4mb": [],
"esp8266_16mb": [],
"esp8266_1mb": [],

2
src/modules/virtual/LogingDaily/modinfo.json
View File

@@ -48,6 +48,8 @@
"esp32cam_4mb": [],
"esp32_16mb": [],
"esp32s2_4mb": [],
"esp32s3_16mb": [],
"esp32c3m_4mb": [],
"esp8266_4mb": [],
"esp8266_16mb": [],
"esp8266_1mb": [],

2
src/modules/virtual/Timer/modinfo.json
View File

@@ -78,6 +78,8 @@
"esp32cam_4mb": [],
"esp32_16mb": [],
"esp32s2_4mb": [],
"esp32s3_16mb": [],
"esp32c3m_4mb": [],
"esp8266_4mb": [],
"esp8266_16mb": [],
"esp8266_1mb": [],

2
src/modules/virtual/VButton/modinfo.json
View File

@@ -40,6 +40,8 @@
"esp32cam_4mb": [],
"esp32_16mb": [],
"esp32s2_4mb": [],
"esp32s3_16mb": [],
"esp32c3m_4mb": [],
"esp8266_4mb": [],
"esp8266_16mb": [],
"esp8266_1mb": [],

2
src/modules/virtual/Variable/modinfo.json
View File

@@ -100,6 +100,8 @@
"esp32cam_4mb": [],
"esp32_16mb": [],
"esp32s2_4mb": [],
"esp32s3_16mb": [],
"esp32c3m_4mb": [],
"esp8266_4mb": [],
"esp8266_16mb": [],
"esp8266_1mb": [],

46
src/modules/virtual/VariableColor/VariableColor.cpp
View File

@@ -1,46 +0,0 @@
#include "Global.h"
#include "classes/IoTItem.h"
// дочь - родитель
class VariableColor : public IoTItem
{
private:
public:
VariableColor(String parameters) : IoTItem(parameters)
{
}
void doByInterval()
{
}
// событие когда пользователь подключается приложением или веб интерфейсом к усройству
void onMqttWsAppConnectEvent()
{
SerialPrint("i", "Connecting", "Dashbord open ");
regEvent(value.valS, "VariableColor", false, true);
}
IoTValue execute(String command, std::vector<IoTValue> &param)
{
if (command == "widget" && param.size() == 2)
{
String json = "{}";
jsonWriteStr(json, param[0].valS, param[1].valS);
sendSubWidgetsValues(_id, json);
}
return {};
}
};
void *getAPI_VariableColor(String subtype, String param)
{
if (subtype == F("VariableColor"))
{
return new VariableColor(param);
}
else
{
return nullptr;
}
}

51
src/modules/virtual/VariableColor/modinfo.json
View File

@@ -1,51 +0,0 @@
{
"menuSection": "virtual_elments",
"configItem": [
{
"global": 0,
"name": "Цветной текст",
"type": "Reading",
"subtype": "VariableColor",
"id": "color",
"needSave": 0,
"widget": "anydataDef",
"page": "Вывод",
"descr": "Цветной текст",
"val": "...",
"round": 0
}
],
"about": {
"authorName": "AVAKS",
"authorContact": "https://t.me/@avaks_dev",
"authorGit": "https://github.com/avaksru",
"specialThanks": "",
"moduleName": "VariableColor",
"moduleVersion": "1",
"usedRam": {
"esp32_4mb": 15,
"esp8266_4mb": 15
},
"title": "Цветной текст",
"moduleDesc": "Текст с возможностью динамического изменения цвета",
"propInfo": {
"val": "Значение при старте"
}
},
"defActive": true,
"usedLibs": {
"esp32_4mb": [],
"esp32_4mb3f": [],
"esp32cam_4mb": [],
"esp32_16mb": [],
"esp32s2_4mb": [],
"esp8266_4mb": [],
"esp8266_16mb": [],
"esp8266_1mb": [],
"esp8266_1mb_ota": [],
"esp8285_1mb": [],
"esp8285_1mb_ota": [],
"esp8266_2mb": [],
"esp8266_2mb_ota": []
}
}

2
src/modules/virtual/Weather/modinfo.json
View File

@@ -44,6 +44,8 @@
"esp32cam_4mb": [],
"esp32_16mb": [],
"esp32s2_4mb": [],
"esp32s3_16mb": [],
"esp32c3m_4mb": [],
"esp8266_4mb": [],
"esp8266_16mb": [],
"esp8266_1mb": [],

47
src/modules/virtual/owmWeather/modinfo.json
View File

@@ -1,5 +1,6 @@
{
"menuSection": "virtual_elments",
"configItem": [
{
"global": 0,
@@ -13,7 +14,7 @@
"descr": "Температура на улице",
"int": 30,
"API_key": "",
"сity": "Moscow",
"city": "Moscow",
"lon": "37.54",
"lat": "57.74",
"lang": "ru",
@@ -23,13 +24,14 @@
"debug": 0
}
],
"about": {
"authorName": "Serghei Crasnicov, v2.0 Mikhail Bubnov",
"authorContact": "https://t.me/Serghei63",
"authorContact": "https://t.me/Serghei63 https://t.me/Mit4bmw",
"authorGit": "https://github.com/Serghei63",
"specialThanks": "AVAKS",
"moduleName": "owmWeather",
"moduleVersion": "2.0",
"moduleVersion": "2.1",
"usedRam": {
"esp32_4mb": 15,
"esp8266_4mb": 15
@@ -58,14 +60,43 @@
"lon": "Долгота, при использовании координат, будет автоматически выбран ближайший город",
"lat": "Широта, при использовании координат, будет автоматически выбран ближайший город",
"lang": "Язык используемый в ответах OpenWetaherMap",
"debug": "1 - выводить дополнительный лог в сериал"
}
"debug":"1 - выводить дополнительный лог в сериал"
},
"funcInfo": [
{
"name": "sunrise",
"descr": "Функция астрологического таймера, можно задать время до/после рассвета, вернётся количество минут до сработки или после (-). После заката будет возвращать +999 (Значение <=0 будет от сработки и до заката), когда 0 - значит время подошло",
"params": ["количество минут до(-)/после(+) рассвета"]
},
{
"name": "sunset",
"descr": "Функция астрологического таймера, можно задать время до/после заката, вернётся количество минут до сработки или после (-), когда 0 - значит время подошло",
"params": ["количество минут до(-)/после(+) заката"]
},
{
"name": "night",
"descr": "Вернет 1 если ночь (уже закат) и 0 если день (рассвет)",
"params": []
}
]
},
"defActive": false,
"defActive": true,
"usedLibs": {
"esp32_4mb": [],
"esp32_4mb3f": [],
"esp32s2_4mb": [],
"esp32_16mb": []
"esp32_16mb": [],
"esp32s3_16mb": [],
"esp32c3m_4mb": [],
"esp8266_4mb": [],
"esp8266_16mb": [],
"esp8266_1mb": [],
"esp8266_1mb_ota": [],
"esp8285_1mb": [],
"esp8285_1mb_ota": [],
"esp8266_2mb": [],
"esp8266_2mb_ota": []
}
}
}

134
src/modules/virtual/owmWeather/owmWeather.cpp
View File

@@ -22,9 +22,12 @@ private:
String _lang = "";
bool _debug = false;
DynamicJsonDocument Weatherdoc1;
unsigned long _sunsetTime = 0;
unsigned long _sunriseTime = 0;
uint32_t _tzone = 0;
public:
owmWeather(String parameters) : Weatherdoc1(1024), IoTItem(parameters)
owmWeather(String parameters) : Weatherdoc1(1024), IoTItem(parameters)
{
_API_key = jsonReadStr(parameters, "API_key");
// _ID_sity = jsonReadStr(parameters, "ID_sity");
@@ -82,7 +85,8 @@ public:
deserializeJson(Weatherdoc1, payload);
// ret += payload;
SerialPrint("i", "Weatherdoc1", "memoryUsage: " + String(Weatherdoc1.memoryUsage()));
if (_debug)
SerialPrint("i", "Weatherdoc1", "memoryUsage: " + String(Weatherdoc1.memoryUsage()));
}
}
else
@@ -104,6 +108,11 @@ public:
getWeather();
if (jsonReadStr(Weatherdoc1["main"], "temp", true) != "null")
{
_tzone = Weatherdoc1["timezone"].as<int>();
_sunriseTime = std::atoll(jsonReadStr(Weatherdoc1["sys"], "sunrise", true).c_str());
_sunriseTime = _sunriseTime + _tzone;
_sunsetTime = std::atoll(jsonReadStr(Weatherdoc1["sys"], "sunset", true).c_str());
_sunsetTime = _sunsetTime + _tzone;
publishNew("main", "temp");
publishNew("main", "pressure");
@@ -121,66 +130,152 @@ public:
if (_param == "temp")
{
value.valS = jsonReadStr(Weatherdoc1["main"], "temp", true);
regEvent(value.valS, "owmWeather");
}
else if (_param == "pressure")
{
value.valS = jsonReadStr(Weatherdoc1["main"], "pressure", true);
// value.valS = jsonReadStr(Weatherdoc1["main"], "pressure", true);
int tval;
jsonRead(Weatherdoc1["main"], "pressure", tval, true);
regEvent(tval / 1.333, "owmWeather");
}
else if (_param == "humidity")
{
value.valS = jsonReadStr(Weatherdoc1["main"], "humidity", true);
regEvent(value.valS, "owmWeather");
}
else if (_param == "speed")
{
value.valS = jsonReadStr(Weatherdoc1["wind"], "speed", true);
regEvent(value.valS, "owmWeather");
}
else if (_param == "deg")
{
value.valS = jsonReadStr(Weatherdoc1["wind"], "deg", true);
regEvent(value.valS, "owmWeather");
}
else if (_param == "all")
{
value.valS = jsonReadStr(Weatherdoc1["clouds"], "all", true);
regEvent(value.valS, "owmWeather");
}
else if (_param == "main")
{
value.valS = jsonReadStr(Weatherdoc1["weather"][0], "main", true);
regEvent(value.valS, "owmWeather");
}
else if (_param == "description")
{
value.valS = jsonReadStr(Weatherdoc1["weather"][0], "description", true);
regEvent(value.valS, "owmWeather");
}
else if (_param == "icon")
{
value.valS = jsonReadStr(Weatherdoc1["weather"][0], "icon", true);
regEvent(value.valS, "owmWeather");
}
else if (_param == "sunrise")
{
value.valS = getTimeDotFormatedFromUnix(std::atoll(jsonReadStr(Weatherdoc1["sys"], "sunrise", true).c_str()));
value.valS = getTimeDotFormatedFromUnix(_sunriseTime);
regEvent(value.valS, "owmWeather");
}
else if (_param == "sunset")
{
value.valS = getTimeDotFormatedFromUnix(std::atoll(jsonReadStr(Weatherdoc1["sys"], "sunset", true).c_str()));
value.valS = getTimeDotFormatedFromUnix(_sunsetTime);
regEvent(value.valS, "owmWeather");
}
else if (_param == "sunset")
else if (_param == "name")
{
value.valS = Weatherdoc1["name"].as<String>();
regEvent(value.valS, "owmWeather");
}
// value.isDecimal = false;
regEvent(value.valS, "owmWeather");
// regEvent(value.valS, "owmWeather");
}
}
IoTValue execute(String command, std::vector<IoTValue> &param)
{
IoTValue value = {};
if (command == "get")
{
// getWeather();
doByInterval();
}
else if (command == "night")
{
if (_sunsetTime == 0 || !isTimeSynch)
{
SerialPrint("i", ("AstroTimer"), "Not TimeSynch or Weather data server");
value.valD = 0;
return value;
}
long dt_cur = getSystemTime() + _tzone;
// Если светло
if (dt_cur >= _sunriseTime && dt_cur < _sunsetTime)
value.valD = 0;
else // если темно
value.valD = 1;
if (_debug)
{
SerialPrint("i", ("AstroTimer"), "night: " + String(value.valD));
}
}
return {};
else if (command == "sunset")
{
if (_sunsetTime == 0 || !isTimeSynch)
{
SerialPrint("i", ("AstroTimer"), "Not TimeSynch or Weather data server");
value.valD = 999;
return value;
}
long dt_cur = getSystemTime() + _tzone;
if (param.size())
{
if (param[0].isDecimal)
{
long dt_set = (_sunsetTime + (int)(param[0].valD * 60));
long dt = dt_set - dt_cur;
value.valD = dt / 60;
if (_debug)
{
SerialPrint("i", ("AstroTimer"), "set: " + getTimeDotFormatedFromUnix(dt_set) + " time: " + getTimeDotFormatedFromUnix(dt_cur) + " sunset: " + getTimeDotFormatedFromUnix(_sunsetTime) + " Dt: " + String(param[0].valD) + " diff: " + String(value.valD));
}
}
}
}
else if (command == "sunrise")
{
if (_sunriseTime == 0 || !isTimeSynch)
{
SerialPrint("i", ("AstroTimer"), "Not TimeSynch or Weather data server");
value.valD = 999;
return value;
}
long dt_cur = getSystemTime() + _tzone;
if (dt_cur >= _sunsetTime)
{
SerialPrint("i", ("AstroTimer"), "УЖЕ Закат, таймер не считаем time: " + getTimeDotFormatedFromUnix(dt_cur) + " diff: " + String(value.valD));
value.valD = 999;
return value;
}
if (param.size())
{
if (param[0].isDecimal)
{
long dt_set = (_sunriseTime + (int)(param[0].valD * 60));
long dt = dt_set - dt_cur;
value.valD = dt / 60;
if (_debug)
{
SerialPrint("i", ("AstroTimer"), "set: " + getTimeDotFormatedFromUnix(dt_set) + " time: " + getTimeDotFormatedFromUnix(dt_cur) + " sunrise: " + getTimeDotFormatedFromUnix(_sunriseTime) + " Dt: " + String(param[0].valD) + " diff: " + String(value.valD));
}
}
}
}
return value;
}
// проверяем если пришедшее значение отличается от предыдущего регистрируем событие
@@ -230,14 +325,33 @@ public:
{
if (Weatherdoc1[root][param].as<String>() != tmp->value.valS)
{
tmp->setValue(getTimeDotFormatedFromUnix(std::atoll(jsonReadStr(Weatherdoc1[root], param, true).c_str())), true);
if (param == "sunrise")
{
tmp->setValue(getTimeDotFormatedFromUnix(_sunriseTime), true);
}
else if (param == "sunset")
{
tmp->setValue(getTimeDotFormatedFromUnix(_sunsetTime), true);
}
else
{
tmp->setValue(Weatherdoc1[root][param].as<String>(), true);
}
}
}
else
{
if (Weatherdoc1[root][param].as<String>() != tmp->value.valS)
{
tmp->setValue(Weatherdoc1[root][param].as<String>(), true);
if (param == "pressure")
{
int tval = Weatherdoc1[root][param].as<int>();
tmp->setValue(String(tval / 1.333), true);
}
else
{
tmp->setValue(Weatherdoc1[root][param].as<String>(), true);
}
}
}
}