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

cleaning

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-09-18 00:02:20 +03:00
parent 0598a20beb
commit b66b4ab947
10 changed files with 52 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Bus/I2CScanner.cpp
View File

@@ -1,26 +0,0 @@
#include "Bus/I2CScanner.h"
#include "Utils/PrintMessage.h"
#include <Wire.h>
I2CScanner::I2CScanner(String& out) : BusScanner(TAG_I2C, out, 2){};
void I2CScanner::init() {
Wire.begin();
}
boolean I2CScanner::syncScan() {
SerialPrint("I","module","scanning...");
size_t cnt = 0;
for (uint8_t i = 8; i < 120; i++) {
Wire.beginTransmission(i);
if (Wire.endTransmission() == 0) {
SerialPrint("I","module","found: " + i);
addResult(i, i < 119);
cnt++;
}
}
return cnt;
}

1
src/Global.cpp
View File

@@ -48,7 +48,6 @@ int enter_to_logging_counter;
// Scenario
int scenario_line_status[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
int lastVersion;
BusScanner_t busToScan;
boolean busScanFlag = false;
boolean fsCheckFlag = false;

81
src/Web.cpp
View File

@@ -85,29 +85,31 @@ void web_init() {
}
#endif
//==============================udp settings=============================================
if (request->hasArg("udponoff")) {
bool value = request->getParam("udponoff")->value().toInt();
jsonWriteBool(configSetupJson, "udponoff", value);
saveConfig();
loadScenario();
request->send(200);
}
//if (request->hasArg("udponoff")) {
// bool value = request->getParam("udponoff")->value().toInt();
// jsonWriteBool(configSetupJson, "udponoff", value);
// saveConfig();
// loadScenario();
// request->send(200);
//}
//
//if (request->hasArg("updatelist")) {
// removeFile("/dev.csv");
// addFileLn("dev.csv", "device id;device name;ip address");
// request->redirect("/?set.udp");
//}
//
//if (request->hasArg("updatepage")) {
// request->redirect("/?set.udp");
//}
//
//if (request->hasArg("devname")) {
// jsonWriteStr(configSetupJson, "name", request->getParam("devname")->value());
// saveConfig();
// request->send(200);
//}
if (request->hasArg("updatelist")) {
removeFile("/dev.csv");
addFileLn("dev.csv", "device id;device name;ip address");
request->redirect("/?set.udp");
}
if (request->hasArg("updatepage")) {
request->redirect("/?set.udp");
}
if (request->hasArg("devname")) {
jsonWriteStr(configSetupJson, "name", request->getParam("devname")->value());
saveConfig();
request->send(200);
}
//==============================wifi settings=============================================
if (request->hasArg("routerssid")) {
jsonWriteStr(configSetupJson, "routerssid", request->getParam("routerssid")->value());
@@ -167,7 +169,9 @@ void web_init() {
saveConfig();
request->send(200);
}
//==============================mqtt settings=============================================
if (request->hasArg("mqttServer")) {
jsonWriteStr(configSetupJson, "mqttServer", request->getParam("mqttServer")->value());
saveConfig();
@@ -215,31 +219,20 @@ void web_init() {
request->send(200, "text/html", payload);
}
//==============================push settings=============================================
#ifdef PUSH_ENABLED
if (request->hasArg("pushingboxid")) {
jsonWriteStr(configSetupJson, "pushingboxid", request->getParam("pushingboxid")->value());
saveConfig();
request->send(200);
}
#endif
// //==============================push settings=============================================
//#ifdef PUSH_ENABLED
// if (request->hasArg("pushingboxid")) {
// jsonWriteStr(configSetupJson, "pushingboxid", request->getParam("pushingboxid")->value());
// saveConfig();
// request->send(200);
// }
//#endif
//==============================utilities settings=============================================
if (request->hasArg(TAG_I2C)) {
busScanFlag = true;
busToScan = BS_I2C;
if (request->hasArg("i2c")) {
request->redirect("/?set.utilities");
} else if (request->hasArg(TAG_ONE_WIRE)) {
busScanFlag = true;
busToScan = BS_ONE_WIRE;
if (request->hasParam(TAG_ONE_WIRE_PIN)) {
setConfigParam(TAG_ONE_WIRE_PIN, request->getParam(TAG_ONE_WIRE_PIN)->value());
}
request->redirect("/?set.utilities");
} else if (request->hasArg(TAG_ONE_WIRE_PIN)) {
setConfigParam(TAG_ONE_WIRE_PIN, request->getParam(TAG_ONE_WIRE_PIN)->value());
request->send(200);
}
}
});
//==============================list of items=====================================================
@@ -272,7 +265,7 @@ void web_init() {
} else if (lastVersion == -2) {
msg = F("Устройство не подключено к роутеру!");
}
// else if (lastVersion == "") {
//msg = F("Нажмите на кнопку \"обновить прошивку\" повторно...");
//} else if (lastVersion == "less") {

18
src/bus.cpp
View File

@@ -1,18 +0,0 @@
#include "Bus/BusScannerFactory.h"
#include "Class/NotAsinc.h"
#include "Global.h"
void busInit() {
myNotAsincActions->add(
do_BUSSCAN, [&](void*) {
doBusScan();
},
nullptr);
}
void doBusScan() {
String res = "";
BusScanner* scanner = BusScannerFactory::get(configSetupJson, busToScan, res);
scanner->scan();
jsonWriteStr(configLiveJson, String(scanner->tag()), res);
}

3
src/main.cpp
View File

@@ -99,9 +99,6 @@ void loop() {
#endif
#ifdef WS_enable
ws.cleanupClients();
#endif
#ifdef UDP_ENABLED
loopUdp();
#endif
timeNow->loop();
MqttClient::loop();