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

pre Betta WIFI array

Browse Source
This commit is contained in:
Mit4el
2023-09-24 07:49:48 +00:00
parent 48ccdd7e86
commit e48d13faae
8 changed files with 1069 additions and 1013 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
data_svelte/myProfile.json
View File

@@ -3,8 +3,8 @@
"name": "IoTmanagerVer4",
"apssid": "IoTmanager",
"appass": "",
"routerssid": "iot",
"routerpass": "hostel3333",
"routerssid": ["iot","wifi"],
"routerpass": ["hostel3333","pswd"],
"timezone": 2,
"ntp": "pool.ntp.org",
"weblogin": "admin",
@@ -32,6 +32,11 @@
"firmware": "0x00000",
"littlefs": "0x300000"
},
{
"name": "esp8266_16mb",
"firmware": "0x00000",
"littlefs": "0x200000"
},
{
"name": "esp32_4mb",
"boot_app0": "0xe000",
@@ -40,6 +45,14 @@
"partitions": "0x8000",
"littlefs": "0x290000"
},
{
"name": "esp32_16mb",
"boot_app0": "0xe000",
"bootloader_qio_80m": "0x1000",
"firmware": "0x10000",
"partitions": "0x8000",
"littlefs": "0x910000"
},
{
"name": "esp8266_1mb",
"firmware": "0x00000000",

10
data_svelte/settings.json
View File

@@ -2,8 +2,14 @@
"name": "IoTmanagerVer4",
"apssid": "IoTmanager",
"appass": "",
"routerssid": "iot",
"routerpass": "hostel3333",
"routerssid": [
"iot",
"wifi"
],
"routerpass": [
"hostel3333",
"pswd"
],
"timezone": 2,
"ntp": "pool.ntp.org",
"weblogin": "admin",

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, JsonArray& 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);

2
include/utils/WiFiUtils.h
View File

@@ -7,6 +7,6 @@
inline boolean isNetworkActive() {return WiFi.status() == WL_CONNECTED;};
void routerConnect();
bool startAPMode();
boolean RouterFind(String ssid);
boolean RouterFind(JsonArray jArray);
uint8_t RSSIquality();
extern void wifiSignalInit();

4
myProfile.json
View File

@@ -3,8 +3,8 @@
"name": "IoTmanagerVer4",
"apssid": "IoTmanager",
"appass": "",
"routerssid": "iot",
"routerpass": "hostel3333",
"routerssid": ["iot","wifi"],
"routerpass": ["hostel3333","pswd"],
"timezone": 2,
"ntp": "pool.ntp.org",
"weblogin": "admin",

7
src/WsServer.cpp
View File

@@ -154,8 +154,11 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t* payload, size_t length)
}
// запуск асинхронного сканирования wifi сетей при нажатии выпадающего списка
if (headerStr == "/scan|") {
RouterFind(jsonReadStr(settingsFlashJson, F("routerssid")));
if (headerStr == "/scan|")
{
JsonArray jArray;
jsonReadArray(settingsFlashJson, "routerssid", jArray);
RouterFind(jArray);
sendStringToWs("ssidli", ssidListHeapJson, num);
}

20
src/utils/JsonUtils.cpp
View File

@@ -98,6 +98,26 @@ bool jsonRead(const String& json, String key, int& value, bool e) {
return true;
}
bool jsonReadArray(const String& json, String key, JsonArray& jArray, bool e) {
DynamicJsonDocument doc(JSON_BUFFER_SIZE);
DeserializationError error = deserializeJson(doc, json);
if (error) {
if (e) {
SerialPrint("E", F("jsonReadArray"), error.f_str());
jsonErrorDetected();
}
return false;
} else if (!doc.containsKey(key)) {
if (e) {
SerialPrint("E", F("jsonReadArray"), key + " missing in " + json);
jsonErrorDetected();
}
return false;
}
jArray = doc[key];
return true;
}
// new==============================================================================
bool jsonWriteStr_(String& json, const String& key, const String& value, bool e) {
bool ret = true;

151
src/utils/WiFiUtils.cpp
View File

@@ -3,59 +3,56 @@
#define TRIESONE 25 // количество попыток подключения к одной сети из несколких
#define TRIES 40 // количество попыток подключения сети если она одна
void routerConnect() {
void routerConnect()
{
WiFi.setAutoConnect(false);
WiFi.persistent(false);
WiFi.mode(WIFI_STA);
byte triesOne = TRIESONE;
String _ssid = jsonReadStr(settingsFlashJson, "routerssid");
String _password = jsonReadStr(settingsFlashJson, "routerpass");
std::vector<String> _ssidList;
std::vector<String> _passwordList;
for (size_t i = 0; i < 3; i++)
{
String _stmp = selectFromMarkerToMarker(_ssid, ",", i);
String _ptmp = selectFromMarkerToMarker(_password, ",", i);
if (_stmp == "not found" && _ssidList.size() == 0)
{
JsonArray _ssidList;
JsonArray _passwordList;
jsonReadArray(settingsFlashJson, "routerssid", _ssidList);
jsonReadStr(settingsFlashJson, "routerpass", _passwordList);
if (_ssidList.size() > 1)
triesOne = TRIES;
_ssidList.push_back(_ssid);
_passwordList.push_back(_password);
break;
}
if (_stmp != "not found")
{
_ssidList.push_back(_stmp);
_passwordList.push_back(_ptmp);
}
}
if (_ssid == "" && _password == "") {
if (_ssidList.size() == 0 && _ssidList[0] == "" && _passwordList[0] == "")
{
WiFi.begin();
} else {
WiFi.begin(_ssidList[0].c_str(), _passwordList[0].c_str());
}
else
{
WiFi.begin(_ssidList[0].as<const char*>(), _passwordList[0].as<const char*>());
#ifdef ESP32
WiFi.setTxPower(WIFI_POWER_19_5dBm);
#else
WiFi.setOutputPower(20.5);
#endif
if (_ssidList.size() > 1)
String _ssid;
String _password;
for (int8_t i = 0; i < _ssidList.size(); i++)
{
_ssid = _ssid + _ssidList[i].as<String>() + "; ";
}
for (int8_t i = 0; i < _passwordList.size(); i++)
{
_password = _ssid + _passwordList[i].as<String>() + "; ";
}
SerialPrint("i", "WIFI", "ssid list: " + _ssid);
SerialPrint("i", "WIFI", "pass list: " + _password);
}
}
for (size_t i = 0; i < _ssidList.size(); i++) {
for (size_t i = 0; i < _ssidList.size(); i++)
{
triesOne = TRIESONE;
if (WiFi.status() == WL_CONNECTED)
break;
WiFi.begin(_ssidList[i].c_str(), _passwordList[i].c_str());
SerialPrint("i", "WIFI", "ssid connect: " + _ssidList[i]);
SerialPrint("i", "WIFI", "pass connect: " + _passwordList[i]);
while (--triesOne && WiFi.status() != WL_CONNECTED) {
WiFi.begin(_ssidList[i].as<const char*>(), _passwordList[i].as<const char*>());
SerialPrint("i", "WIFI", "ssid connect: " + _ssidList[i].as<String>());
SerialPrint("i", "WIFI", "pass connect: " + _passwordList[i].as<String>());
while (--triesOne && WiFi.status() != WL_CONNECTED)
{
// SerialPrint("i", "WIFI", ": " + String((int)WiFi.status()));
#ifdef ESP8266
if (WiFi.status() == WL_CONNECT_FAILED || WiFi.status() == WL_WRONG_PASSWORD)
@@ -74,10 +71,13 @@ void routerConnect() {
Serial.println("");
}
if (WiFi.status() != WL_CONNECTED) {
if (WiFi.status() != WL_CONNECTED)
{
Serial.println("");
startAPMode();
} else {
}
else
{
Serial.println("");
SerialPrint("i", "WIFI", "http://" + WiFi.localIP().toString());
jsonWriteStr(settingsFlashJson, "ip", WiFi.localIP().toString());
@@ -87,7 +87,8 @@ void routerConnect() {
SerialPrint("i", F("WIFI"), F("Network Init"));
}
bool startAPMode() {
bool startAPMode()
{
SerialPrint("i", "WIFI", "AP Mode");
WiFi.disconnect();
@@ -102,14 +103,20 @@ bool startAPMode() {
SerialPrint("i", "WIFI", "AP IP: " + myIP.toString());
jsonWriteStr(settingsFlashJson, "ip", myIP.toString());
if (jsonReadInt(errorsHeapJson, "passer") != 1) {
if (jsonReadInt(errorsHeapJson, "passer") != 1)
{
ts.add(
WIFI_SCAN, 30 * 1000, [&](void*) {
String sta_ssid = jsonReadStr(settingsFlashJson, "routerssid");
SerialPrint("i", "WIFI", "scanning for " + sta_ssid);
if (RouterFind(sta_ssid)) {
WIFI_SCAN, 30 * 1000,
[&](void *)
{
JsonArray jArray;
jsonReadArray(settingsFlashJson, "routerssid", jArray);
for (JsonVariant value : jArray)
{
SerialPrint("i", "WIFI", "scanning for " + String(value.as<const char*>()));
}
if (RouterFind(jArray))
{
ts.remove(WIFI_SCAN);
WiFi.scanDelete();
routerConnect();
@@ -120,46 +127,39 @@ bool startAPMode() {
return true;
}
boolean RouterFind(String ssid) {
boolean RouterFind(JsonArray jArray)
{
bool res = false;
int n = WiFi.scanComplete();
SerialPrint("i", "WIFI", "scan result: " + String(n, DEC));
if (n == -2) { //Сканирование не было запущено, запускаем
if (n == -2)
{ // Сканирование не было запущено, запускаем
SerialPrint("i", "WIFI", "start scanning");
WiFi.scanNetworks(true, false); // async, show_hidden
}
else if (n == -1) { //Сканирование все еще выполняется
else if (n == -1)
{ // Сканирование все еще выполняется
SerialPrint("i", "WIFI", "scanning in progress");
}
else if (n == 0) { //ни одна сеть не найдена
else if (n == 0)
{ // ни одна сеть не найдена
SerialPrint("i", "WIFI", "no networks found");
WiFi.scanNetworks(true, false);
}
else if (n > 0)
{
std::vector<String> _ssidList;
for (size_t i = 0; i < 3; i++)
{
String _stmp = selectFromMarkerToMarker(ssid, ",", i);
if (_stmp == "not found" && _ssidList.size() == 0)
{
_ssidList.push_back(ssid);
break;
}
if (_stmp != "not found")
_ssidList.push_back(_stmp);
}
for (int8_t i = 0; i < n; i++)
{
if (WiFi.SSID(i) == _ssidList[0] || WiFi.SSID(i) == _ssidList[1] ||
WiFi.SSID(i) == _ssidList[2])
for (int8_t k = 0; k < jArray.size(); k++)
{
if (WiFi.SSID(i) == String(jArray[k]))
{
res = true;
}
}
// SerialPrint("i", "WIFI", (res ? "*" : "") + String(i, DEC) + ") " + WiFi.SSID(i));
jsonWriteStr_(ssidListHeapJson, String(i), WiFi.SSID(i));
@@ -175,21 +175,34 @@ boolean RouterFind(String ssid) {
// return WiFi.status() == WL_CONNECTED;
// }
uint8_t RSSIquality() {
uint8_t RSSIquality()
{
uint8_t res = 0;
if (WiFi.status() == WL_CONNECTED) {
if (WiFi.status() == WL_CONNECTED)
{
int rssi = WiFi.RSSI();
if (rssi >= -50) {
if (rssi >= -50)
{
res = 6; //"Excellent";
} else if (rssi < -50 && rssi >= -60) {
}
else if (rssi < -50 && rssi >= -60)
{
res = 5; //"Very good";
} else if (rssi < -60 && rssi >= -70) {
}
else if (rssi < -60 && rssi >= -70)
{
res = 4; //"Good";
} else if (rssi < -70 && rssi >= -80) {
}
else if (rssi < -70 && rssi >= -80)
{
res = 3; //"Low";
} else if (rssi < -80 && rssi > -100) {
}
else if (rssi < -80 && rssi > -100)
{
res = 2; //"Very low";
} else if (rssi <= -100) {
}
else if (rssi <= -100)
{
res = 1; //"No signal";
}
}