fix compilation on esp8266

danielkucera · Aug 19, 2023 · 2cebcf3 · 2cebcf3
1 parent 10cf2d5
commit 2cebcf3
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 28 deletions.
diff --git a/platformio.ini b/platformio.ini
@@ -26,7 +26,7 @@ build_flags =
 lib_deps =
     https://github.com/tzapu/WiFiManager
     https://github.com/marvinroger/ESP8266TrueRandom
-    https://github.com/guido4096/espsoftwareserial.git#add-startbit-timestamp
+    vshymanskyy/Preferences@^2.1.0
 
 [env:esp12e-ota]
 extends = env:esp12e

diff --git a/src/main.cpp b/src/main.cpp
@@ -22,7 +22,9 @@ Preferences preferences;
 #define PWM_FREQ 10000
 #define PWM_RESOLUTION 8
 
+#ifdef ESP32
 TaskHandle_t Task1;
+#endif
 
 WiFiManager wifiManager(Serial1);
 WiFiManagerParameter param_pwm_value("pwm_value", "PWM value", "", 6);
@@ -51,10 +53,12 @@ int random_ch(){
 #endif
 }
 
+#ifdef ESP32
 void on_connected(WiFiEvent_t event, WiFiEventInfo_t info){
   lastConnectTime = millis();
   reconnectCount++;
 }
+#endif
 
 void wdt_start() {
 #ifdef ESP32
@@ -136,45 +140,49 @@ void loop_duration() {
   }
 }
 
-void data_loop(void * pvParameters){
-  while(1){
-    loop_duration();
+void data_process(){
+  loop_duration();
 
-    //check clients for data
-    for (int i = 0; i < MAX_SRV_CLIENTS; i++){
-      handleClient(&serverClients[i]);
-      handleEnhClient(&enhClients[i]);
-    }
+  //check clients for data
+  for (int i = 0; i < MAX_SRV_CLIENTS; i++){
+    handleClient(&serverClients[i]);
+    handleEnhClient(&enhClients[i]);
+  }
 
-    //check queue for data
-    BusType::data d;
-    if (Bus.read(d)) {
-      for (int i = 0; i < MAX_SRV_CLIENTS; i++){
-        if (d._enhanced) {
-          if (d._client == &enhClients[i]) {
-            if (pushEnhClient(&enhClients[i], d._c, d._d, true)) {
-              last_comms = millis();
-            }
-          }
-        }
-        else {
-          if (pushClient(&serverClients[i], d._d)){
+  //check queue for data
+  BusType::data d;
+  if (Bus.read(d)) {
+    for (int i = 0; i < MAX_SRV_CLIENTS; i++){
+      if (d._enhanced) {
+        if (d._client == &enhClients[i]) {
+          if (pushEnhClient(&enhClients[i], d._c, d._d, true)) {
             last_comms = millis();
           }
-          if (pushClient(&serverClientsRO[i], d._d)){
+        }
+      }
+      else {
+        if (pushClient(&serverClients[i], d._d)){
+          last_comms = millis();
+        }
+        if (pushClient(&serverClientsRO[i], d._d)){
+          last_comms = millis();
+        }
+        if (d._client != &enhClients[i]) {
+          if (pushEnhClient(&enhClients[i], d._c, d._d, d._logtoclient == &enhClients[i])){
             last_comms = millis();
           }
-          if (d._client != &enhClients[i]) {
-            if (pushEnhClient(&enhClients[i], d._c, d._d, d._logtoclient == &enhClients[i])){
-              last_comms = millis();
-            }
-          }
         }
       }
     }
   }
 }
 
+void data_loop(void * pvParameters){
+  while(1){
+    data_process();
+  }
+}
+
 void saveParamsCallback () {
   uint8_t new_pwm_value = atoi(param_pwm_value.getValue());
   if (new_pwm_value > 0){
@@ -212,7 +220,9 @@ void setup() {
   WiFi.enableAP(false);
   WiFi.begin();
 
+#ifdef ESP32
   WiFi.onEvent(on_connected, WiFiEvent_t::ARDUINO_EVENT_WIFI_STA_CONNECTED);
+#endif
 
   wifiManager.setSaveParamsCallback(saveParamsCallback);
   wifiManager.addParameter(&param_pwm_value);
@@ -241,7 +251,9 @@ void setup() {
 
   last_comms = millis();
 
+#ifdef ESP32
   xTaskCreate(data_loop, "data_loop", 10000, NULL, 1, &Task1);
+#endif
 }
 
 bool handleStatusServerRequests() {
@@ -284,11 +296,15 @@ void loop() {
 
 #ifdef ESP8266
   MDNS.update();
+
+  data_process();
 #endif
 
   wdt_feed();
 
+#ifdef ESP32
   wifiManager.process();
+#endif
 
   if (WiFi.status() != WL_CONNECTED) {
     reset();