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

some

Browse Source
This commit is contained in:
Dmitry Borisenko
2021-12-06 01:27:33 +01:00
parent f8307dcb5e
commit 1af7687064
5 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data_svelte/build/bundle.css
View File

File diff suppressed because one or more lines are too long

2
data_svelte/build/bundle.js
View File

File diff suppressed because one or more lines are too long

16
data_svelte/config.json
View File

@@ -7,16 +7,16 @@
"routerpass": "hostel3333", "routerpass": "hostel3333",
"timezone": 1, "timezone": 1,
"ntp": "pool.ntp.org", "ntp": "pool.ntp.org",
"mqttServer": "91.204.228.124", "mqttServer": "M2.WQTT.RU",
"mqttPort": 1883, "mqttPort": 8021,
"mqttPrefix": "/iotTest3", "mqttPrefix": "/iotTest3",
"mqttUser": "rise", "mqttUser": "rise",
"mqttPass": "23ri22se32", "mqttPass": "hostel3333",
"mqttServer2": "M2.WQTT.RU", "mqttServer2": "",
"mqttPort2": 8021, "mqttPort2": 0,
"mqttPrefix2": "/iotTest3", "mqttPrefix2": "",
"mqttUser2": "rise", "mqttUser2": "",
"mqttPass2": "hostel3333", "mqttPass2": "",
"scen": 1, "scen": 1,
"telegramApi": "1416711569:AAEI0j83GmXqwzb_gnK1B0Am0gDwZoJt5xo", "telegramApi": "1416711569:AAEI0j83GmXqwzb_gnK1B0Am0gDwZoJt5xo",
"telegonof": 0, "telegonof": 0,

5
src/Utils/SerialPrint.cpp
View File

@@ -4,9 +4,8 @@
#include "HttpServer.h" #include "HttpServer.h"
void SerialPrint(String errorLevel, String module, String msg) { void SerialPrint(String errorLevel, String module, String msg) {
Serial.println(prettyMillis(millis()) + " [" + errorLevel + "] [" + module + "] " + msg); String tosend = prettyMillis(millis()) + " [" + errorLevel + "] [" + module + "] " + msg;
String tosend = "[" + errorLevel + "] [" + module + "] " + msg;
Serial.println(tosend);
ws.textAll(tosend); ws.textAll(tosend);
} }

3
src/WebServer.cpp
View File

@@ -162,7 +162,6 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
} }
} }
#endif #endif
;
} }
void initMDNS() { void initMDNS() {
@@ -170,7 +169,6 @@ void initMDNS() {
MDNS.addService("http", "tcp", 80); MDNS.addService("http", "tcp", 80);
// TODO Add Adduino OTA // TODO Add Adduino OTA
#endif #endif
;
} }
void initOta() { void initOta() {
@@ -201,7 +199,6 @@ void initOta() {
ArduinoOTA.setHostname(hostName); ArduinoOTA.setHostname(hostName);
ArduinoOTA.begin(); ArduinoOTA.begin();
#endif #endif
;
} }
void initWS() { void initWS() {