mirror of
https://github.com/IoTManagerProject/IoTManager.git
synced 2026-03-26 22:22:16 +03:00
Bus scanner added
This commit is contained in:
4
include/Bus.h
Normal file
4
include/Bus.h
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
#pragma once
|
||||||
|
#include <Arduino.h>
|
||||||
|
void busInit();
|
||||||
|
String i2c_scan();
|
||||||
38
src/Bus.cpp
Normal file
38
src/Bus.cpp
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
#include "Bus.h"
|
||||||
|
#include "Class/NotAsinc.h"
|
||||||
|
#include "Global.h"
|
||||||
|
|
||||||
|
void busInit() {
|
||||||
|
myNotAsincActions->add(
|
||||||
|
do_BUSSCAN, [&](void*) {
|
||||||
|
String tmp = i2c_scan();
|
||||||
|
if (tmp == "error") {
|
||||||
|
tmp = i2c_scan();
|
||||||
|
Serial.println(tmp);
|
||||||
|
jsonWriteStr(configLiveJson, "i2c", tmp);
|
||||||
|
} else {
|
||||||
|
Serial.println(tmp);
|
||||||
|
jsonWriteStr(configLiveJson, "i2c", tmp);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
nullptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
String i2c_scan() {
|
||||||
|
String out;
|
||||||
|
byte count = 0;
|
||||||
|
Wire.begin();
|
||||||
|
for (byte i = 8; i < 120; i++) {
|
||||||
|
Wire.beginTransmission(i);
|
||||||
|
if (Wire.endTransmission() == 0) {
|
||||||
|
count++;
|
||||||
|
out += String(count) + ". 0x" + String(i, HEX) + "; ";
|
||||||
|
delay(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (count == 0) {
|
||||||
|
return "error";
|
||||||
|
} else {
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
}
|
||||||
22
src/Web.cpp
22
src/Web.cpp
@@ -109,7 +109,6 @@ void web_init() {
|
|||||||
// request->send(200);
|
// request->send(200);
|
||||||
//}
|
//}
|
||||||
|
|
||||||
|
|
||||||
//==============================wifi settings=============================================
|
//==============================wifi settings=============================================
|
||||||
if (request->hasArg("routerssid")) {
|
if (request->hasArg("routerssid")) {
|
||||||
jsonWriteStr(configSetupJson, "routerssid", request->getParam("routerssid")->value());
|
jsonWriteStr(configSetupJson, "routerssid", request->getParam("routerssid")->value());
|
||||||
@@ -219,20 +218,20 @@ void web_init() {
|
|||||||
request->send(200, "text/html", payload);
|
request->send(200, "text/html", payload);
|
||||||
}
|
}
|
||||||
|
|
||||||
// //==============================push settings=============================================
|
// //==============================push settings=============================================
|
||||||
//#ifdef PUSH_ENABLED
|
//#ifdef PUSH_ENABLED
|
||||||
// if (request->hasArg("pushingboxid")) {
|
// if (request->hasArg("pushingboxid")) {
|
||||||
// jsonWriteStr(configSetupJson, "pushingboxid", request->getParam("pushingboxid")->value());
|
// jsonWriteStr(configSetupJson, "pushingboxid", request->getParam("pushingboxid")->value());
|
||||||
// saveConfig();
|
// saveConfig();
|
||||||
// request->send(200);
|
// request->send(200);
|
||||||
// }
|
// }
|
||||||
//#endif
|
//#endif
|
||||||
|
|
||||||
//==============================utilities settings=============================================
|
//==============================utilities settings=============================================
|
||||||
if (request->hasArg("i2c")) {
|
if (request->hasArg("i2c")) {
|
||||||
|
myNotAsincActions->make(do_BUSSCAN);
|
||||||
request->redirect("/?set.utilities");
|
request->redirect("/?set.utilities");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
//==============================list of items=====================================================
|
//==============================list of items=====================================================
|
||||||
@@ -285,7 +284,6 @@ void web_init() {
|
|||||||
*/
|
*/
|
||||||
server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest* request) {
|
server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest* request) {
|
||||||
myNotAsincActions->make(do_UPGRADE);
|
myNotAsincActions->make(do_UPGRADE);
|
||||||
;
|
|
||||||
request->send(200, "text/html");
|
request->send(200, "text/html");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,6 +14,7 @@
|
|||||||
#include "Utils\WebUtils.h"
|
#include "Utils\WebUtils.h"
|
||||||
#include "items/ButtonInClass.h"
|
#include "items/ButtonInClass.h"
|
||||||
#include "RemoteOrdersUdp.h"
|
#include "RemoteOrdersUdp.h"
|
||||||
|
#include "Bus.h"
|
||||||
|
|
||||||
void not_async_actions();
|
void not_async_actions();
|
||||||
|
|
||||||
@@ -73,6 +74,9 @@ void setup() {
|
|||||||
|
|
||||||
SerialPrint("I","UDP","Udp Init");
|
SerialPrint("I","UDP","Udp Init");
|
||||||
asyncUdpInit();
|
asyncUdpInit();
|
||||||
|
|
||||||
|
SerialPrint("I","Bus","Bus Init");
|
||||||
|
busInit();
|
||||||
|
|
||||||
#ifdef SSDP_EN
|
#ifdef SSDP_EN
|
||||||
SerialPrint("I","SSDP","Ssdp Init");
|
SerialPrint("I","SSDP","Ssdp Init");
|
||||||
|
|||||||
Reference in New Issue
Block a user