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

libretiny

Browse Source
This commit is contained in:
Mit4el
2024-09-20 12:45:17 +03:00
parent b32abb5a28
commit 596eb9cad4
78 changed files with 8577 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
src/utils/WiFiUtils.cpp
View File

@@ -2,12 +2,32 @@
#include <vector>
#define TRIESONE 25 // количество попыток подключения к одной сети из несколких
#define TRIES 40 // количество попыток подключения сети если она одна
/*
IPAddress stringToIp(String strIp)
{
IPAddress ip;
ip.fromString(strIp);
return ip;
} */
void routerConnect()
{
#if !defined LIBRETINY
WiFi.setAutoConnect(false);
WiFi.persistent(false);
#endif
/* String s_staip = "192.168.2.62";
String s_gateway = "192.168.2.1";
String s_netmask = "255.255.255.0";
String s_dns = "192.168.2.1";
SerialPrint("i", "WIFI", "Use static IP");
WiFi.config(stringToIp(s_staip), stringToIp(s_gateway), stringToIp(s_netmask), stringToIp(s_dns));
// bool config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1 = (uint32_t)0x00000000, IPAddress dns2 = (uint32_t)0x00000000);
SerialPrint("i", "WIFI", "Static IP: " + s_staip);
SerialPrint("i", "WIFI", "Gateway: " + s_gateway);
SerialPrint("i", "WIFI", "Netmask: " + s_netmask);
SerialPrint("i", "WIFI", "DNS: " + s_dns); */
WiFi.mode(WIFI_STA);
byte triesOne = TRIESONE;
@@ -20,14 +40,16 @@ void routerConnect()
if (_passwordList.size() == 0 && _ssidList[0] == "" && _passwordList[0] == "")
{
#ifndef LIBRETINY
WiFi.begin();
#endif
}
else
{
WiFi.begin(_ssidList[0].c_str(), _passwordList[0].c_str());
#ifdef ESP32
#if defined (ESP32)
WiFi.setTxPower(WIFI_POWER_19_5dBm);
#else
#elif defined (ESP8266)
WiFi.setOutputPower(20.5);
#endif
String _ssid;
@@ -79,8 +101,13 @@ void routerConnect()
else
{
Serial.println("");
#ifdef LIBRETINY
SerialPrint("i", "WIFI", "http://" + ipToString(WiFi.localIP()));
jsonWriteStr(settingsFlashJson, "ip", ipToString(WiFi.localIP()));
#else
SerialPrint("i", "WIFI", "http://" + WiFi.localIP().toString());
jsonWriteStr(settingsFlashJson, "ip", WiFi.localIP().toString());
#endif
mqttInit();
}
@@ -96,13 +123,18 @@ bool startAPMode()
String _ssidAP = jsonReadStr(settingsFlashJson, "apssid");
String _passwordAP = jsonReadStr(settingsFlashJson, "appass");
WiFi.softAP(_ssidAP.c_str(), _passwordAP.c_str());
if (_passwordAP == "")
WiFi.softAP(_ssidAP.c_str());
else
WiFi.softAP(_ssidAP.c_str(), _passwordAP.c_str());
IPAddress myIP = WiFi.softAPIP();
#ifdef LIBRETINY
SerialPrint("i", "WIFI", "AP IP: " + ipToString(myIP));
jsonWriteStr(settingsFlashJson, "ip", ipToString(myIP));
#else
SerialPrint("i", "WIFI", "AP IP: " + myIP.toString());
jsonWriteStr(settingsFlashJson, "ip", myIP.toString());
#endif
if (jsonReadInt(errorsHeapJson, "passer") != 1)
{
ts.add(
@@ -126,7 +158,54 @@ bool startAPMode()
}
return true;
}
#if defined (LIBRETINY)
boolean RouterFind(std::vector<String> jArray)
{
bool res = false;
int n = WiFi.scanComplete();
SerialPrint("i", "WIFI", "scan result: " + String(n, DEC));
if (n == -2)
{ // Сканирование не было запущено, запускаем
SerialPrint("i", "WIFI", "start scanning");
n = WiFi.scanNetworks(false, false); // async, show_hidden
SerialPrint("i", "WIFI", "scan result: " + String(n, DEC));
}
else if (n == -1)
{ // Сканирование все еще выполняется
SerialPrint("i", "WIFI", "scanning in progress");
}
else if (n == 0)
{ // ни одна сеть не найдена
SerialPrint("i", "WIFI", "no networks found");
n = WiFi.scanNetworks(false, false);
SerialPrint("i", "WIFI", "scan result: " + String(n, DEC));
}
if (n > 0)
{
for (int8_t i = 0; i < n; i++)
{
for (int8_t k = 0; k < jArray.size(); k++)
{
if (WiFi.SSID(i) == jArray[k])
{
res = true;
}
}
// SerialPrint("i", "WIFI", (res ? "*" : "") + String(i, DEC) + ") " + WiFi.SSID(i));
jsonWriteStr_(ssidListHeapJson, String(i), WiFi.SSID(i));
// String(WiFi.RSSI(i)
}
}
SerialPrint("i", "WIFI", ssidListHeapJson);
WiFi.scanDelete();
return res;
}
#elif defined (ESP8266) || defined (ESP32)
boolean RouterFind(std::vector<String> jArray)
{
bool res = false;
@@ -170,6 +249,7 @@ boolean RouterFind(std::vector<String> jArray)
WiFi.scanDelete();
return res;
}
#endif
boolean isNetworkActive() {
return WiFi.status() == WL_CONNECTED;
@@ -199,3 +279,39 @@ uint8_t RSSIquality() {
}
return res;
}
#ifdef LIBRETINY
String httpGetString(HTTPClient &http)
{
String payload = "";
int len = http.getSize();
uint8_t buff[128] = { 0 };
WiFiClient * stream = http.getStreamPtr();
// read all data from server
while(http.connected() && (len > 0 || len == -1)) {
// get available data size
size_t size = stream->available();
if(size) {
// read up to 128 byte
int c = stream->readBytes(buff, ((size > sizeof(buff)) ? sizeof(buff) : size));
// write it to Serial
// Serial.write(buff,c);
//payload += String((char*)buff);
char charBuff[c + 1]; // Create a character array with space for null terminator
memcpy(charBuff, buff, c); // Copy the data to the character array
charBuff[c] = '\0'; // Null-terminate the character array
payload += String(charBuff); // Append the character array to the payload
if(len > 0) {
len -= c;
}
}
delay(1);
}
return payload;
}
#endif