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' into v4dev

Browse Source
This commit is contained in:
Ilya Belyakov
2023-10-03 22:04:54 +03:00
committed by GitHub
parent 2def3f2825 d391bbbd63
commit 6db1ef5bfd
113 changed files with 5761 additions and 2275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/Const.h
View File

@@ -24,10 +24,18 @@
#define FIRMWARE_NAME "esp8266_4mb"
#endif
#ifdef esp8266_16mb
#define FIRMWARE_NAME "esp8266_16mb"
#endif
#ifdef esp32_4mb
#define FIRMWARE_NAME "esp32_4mb"
#endif
#ifdef esp32_16mb
#define FIRMWARE_NAME "esp32_16mb"
#endif
#ifdef esp32s2_4mb
#define FIRMWARE_NAME "esp32s2_4mb"
#endif

2
include/MqttClient.h
View File

@@ -14,6 +14,7 @@ boolean mqttConnect();
void mqttReconnect();
void mqttLoop();
void mqttSubscribe();
bool mqttIsConnect();
boolean publish(const String& topic, const String& data);
boolean publishData(const String& topic, const String& data);
@@ -21,6 +22,7 @@ boolean publishChartMqtt(const String& topic, const String& data);
boolean publishJsonMqtt(const String& topic, const String& json);
boolean publishStatusMqtt(const String& topic, const String& data);
boolean publishEvent(const String& topic, const String& data);
void mqttSubscribeExternal(String topic, bool usePrefix);
bool publishChartFileToMqtt(String path, String id, int maxCount);

1
include/utils/JsonUtils.h
View File

@@ -15,6 +15,7 @@ extern bool jsonRead(const String& json, String key, float& value, bool e = true
extern bool jsonRead(const String& json, String key, String& value, bool e = true);
extern bool jsonRead(const String& json, String key, bool& value, bool e = true);
extern bool jsonRead(const String& json, String key, int& value, bool e = true);
extern bool jsonReadArray(const String& json, String key, std::vector<String>& jArray, bool e = true);
extern String jsonReadStr(const String& json, String name, bool e = true);
extern int jsonReadInt(const String& json, String name, bool e = true);

4
include/utils/WiFiUtils.h
View File

@@ -2,11 +2,11 @@
#include "Global.h"
#include "MqttClient.h"
#include <vector>
// boolean isNetworkActive();
inline boolean isNetworkActive() {return WiFi.status() == WL_CONNECTED;};
void routerConnect();
bool startAPMode();
boolean RouterFind(String ssid);
boolean RouterFind(std::vector<String> jArray);
uint8_t RSSIquality();
extern void wifiSignalInit();