Merge pull request #3886 from SybexX/test4

test10

Author: SybexX

code/components/jomjol_fileserver_ota/server_ota.cpp

@@ -37,7 +37,7 @@
 #endif // ENABLE_MQTT
 
 #include "ClassControllCamera.h"
-#include "connect_wlan.h"
+#include "connect_wifi_sta.h"
 
 #include "ClassLogFile.h"
 

code/components/jomjol_flowcontroll/ClassFlowControll.cpp

@@ -1,7 +1,7 @@
 #include "ClassFlowControll.h"
 
-#include "connect_wlan.h"
-#include "read_wlanini.h"
+#include "connect_wifi_sta.h"
+#include "read_network_config.h"
 
 #include "freertos/task.h"
 

code/components/jomjol_flowcontroll/ClassFlowInfluxDB.cpp

@@ -2,7 +2,7 @@
 #include <sstream>
 #include "ClassFlowInfluxDB.h"
 #include "Helper.h"
-#include "connect_wlan.h"
+#include "connect_wifi_sta.h"
 
 #include "time_sntp.h"
 #include "interface_influxdb.h"

code/components/jomjol_flowcontroll/ClassFlowInfluxDBv2.cpp

@@ -2,7 +2,7 @@
 #include <sstream>
 #include "ClassFlowInfluxDBv2.h"
 #include "Helper.h"
-#include "connect_wlan.h"
+#include "connect_wifi_sta.h"
 
 #include "time_sntp.h"
 #include "interface_influxdb.h"

code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp

@@ -4,8 +4,8 @@
 #include <iomanip>
 #include "ClassFlowMQTT.h"
 #include "Helper.h"
-#include "connect_wlan.h"
-#include "read_wlanini.h"
+#include "connect_wifi_sta.h"
+#include "read_network_config.h"
 #include "ClassLogFile.h"
 
 #include "time_sntp.h"
@@ -31,7 +31,7 @@ void ClassFlowMQTT::SetInitialParameter(void)
     topicError = "";
     topicRate = "";
     topicTimeStamp = "";
-    maintopic = wlan_config.hostname;
+    maintopic = network_config.hostname;
 
     topicUptime = "";
     topicFreeMem = "";
@@ -40,7 +40,7 @@ void ClassFlowMQTT::SetInitialParameter(void)
     clientCertFilename = "";
     clientKeyFilename = "";
     validateServerCert = true;
-    clientname = wlan_config.hostname;
+    clientname = network_config.hostname;
 
     OldValue = "";
     flowpostprocessing = NULL;

code/components/jomjol_flowcontroll/ClassFlowTakeImage.cpp

@@ -13,7 +13,7 @@
 
 #include "esp_wifi.h"
 #include "esp_log.h"
-#include "../../include/defines.h"
+#include "defines.h"
 #include "psram.h"
 
 #include <time.h>

code/components/jomjol_flowcontroll/ClassFlowWebhook.cpp

@@ -2,7 +2,6 @@
 #include <sstream>
 #include "ClassFlowWebhook.h"
 #include "Helper.h"
-#include "connect_wlan.h"
 
 #include "time_sntp.h"
 #include "interface_webhook.h"

code/components/jomjol_flowcontroll/MainFlowControl.cpp

@@ -13,7 +13,7 @@
 #include "esp_wake_stub.h"
 #include "driver/rtc_io.h"
 
-#include "../../include/defines.h"
+#include "defines.h"
 #include "Helper.h"
 #include "statusled.h"
 
@@ -29,8 +29,8 @@
 
 #include "server_file.h"
 
-#include "read_wlanini.h"
-#include "connect_wlan.h"
+#include "read_network_config.h"
+#include "connect_wifi_sta.h"
 #include "psram.h"
 #include "basic_auth.h"
 
@@ -1833,6 +1833,9 @@ void task_autodoFlow(void *pvParameter)
                 // to minimize current consumption.
                 rtc_gpio_isolate(GPIO_NUM_12);
                 rtc_gpio_isolate(GPIO_NUM_4);
+#endif
+#if (defined(BOARD_ESP32_S3_ETH_V1) || defined(BOARD_ESP32_S3_ETH_V2))
+                gpio_set_level(PER_ENABLE, 0);
 #endif
                 esp_deep_sleep_start();
             }

code/components/jomjol_helper/Helper.cpp

@@ -1360,6 +1360,21 @@ string RundeOutput(double _in, int _anzNachkomma)
 	return stream.str();
 }
 
+void strinttoip4(const char *ip, int &a, int &b, int &c, int &d)
+{
+	std::string zw = std::string(ip);
+	std::stringstream s(zw);
+	char ch; // to temporarily store the '.'
+	s >> a >> ch >> b >> ch >> c >> ch >> d;
+}
+
+std::string BssidToString(const char *c)
+{
+	char cBssid[25];
+	sprintf(cBssid, "%02x:%02x:%02x:%02x:%02x:%02x", c[0], c[1], c[2], c[3], c[4], c[5]);
+	return std::string(cBssid);
+}
+
 string getMac(void)
 {
 	uint8_t macInt[6];

code/components/jomjol_helper/Helper.h

@@ -96,6 +96,8 @@ string getSDCardName();
 string getSDCardCapacity();
 string getSDCardSectorSize();
 
+void strinttoip4(const char *ip, int &a, int &b, int &c, int &d);
+std::string BssidToString(const char *c);
 string getMac(void);
 
 void setSystemStatusFlag(SystemStatusFlag_t flag);