mirror of
https://github.com/IoTManagerProject/IoTManager.git
synced 2026-03-27 06:32:19 +03:00
some
This commit is contained in:
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -7,16 +7,16 @@
|
||||
"routerpass": "hostel3333",
|
||||
"timezone": 1,
|
||||
"ntp": "pool.ntp.org",
|
||||
"mqttServer": "91.204.228.124",
|
||||
"mqttPort": 1883,
|
||||
"mqttServer": "M2.WQTT.RU",
|
||||
"mqttPort": 8021,
|
||||
"mqttPrefix": "/iotTest3",
|
||||
"mqttUser": "rise",
|
||||
"mqttPass": "23ri22se32",
|
||||
"mqttServer2": "M2.WQTT.RU",
|
||||
"mqttPort2": 8021,
|
||||
"mqttPrefix2": "/iotTest3",
|
||||
"mqttUser2": "rise",
|
||||
"mqttPass2": "hostel3333",
|
||||
"mqttPass": "hostel3333",
|
||||
"mqttServer2": "",
|
||||
"mqttPort2": 0,
|
||||
"mqttPrefix2": "",
|
||||
"mqttUser2": "",
|
||||
"mqttPass2": "",
|
||||
"scen": 1,
|
||||
"telegramApi": "1416711569:AAEI0j83GmXqwzb_gnK1B0Am0gDwZoJt5xo",
|
||||
"telegonof": 0,
|
||||
|
||||
@@ -4,9 +4,8 @@
|
||||
#include "HttpServer.h"
|
||||
|
||||
void SerialPrint(String errorLevel, String module, String msg) {
|
||||
Serial.println(prettyMillis(millis()) + " [" + errorLevel + "] [" + module + "] " + msg);
|
||||
|
||||
String tosend = "[" + errorLevel + "] [" + module + "] " + msg;
|
||||
String tosend = prettyMillis(millis()) + " [" + errorLevel + "] [" + module + "] " + msg;
|
||||
|
||||
Serial.println(tosend);
|
||||
ws.textAll(tosend);
|
||||
}
|
||||
@@ -162,7 +162,6 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
|
||||
}
|
||||
}
|
||||
#endif
|
||||
;
|
||||
}
|
||||
|
||||
void initMDNS() {
|
||||
@@ -170,7 +169,6 @@ void initMDNS() {
|
||||
MDNS.addService("http", "tcp", 80);
|
||||
// TODO Add Adduino OTA
|
||||
#endif
|
||||
;
|
||||
}
|
||||
|
||||
void initOta() {
|
||||
@@ -201,7 +199,6 @@ void initOta() {
|
||||
ArduinoOTA.setHostname(hostName);
|
||||
ArduinoOTA.begin();
|
||||
#endif
|
||||
;
|
||||
}
|
||||
|
||||
void initWS() {
|
||||
|
||||
Reference in New Issue
Block a user