Removed mutex

Author: mathieucarbou

examples/NonBlockingCaptivePortal/NonBlockingCaptivePortal.ino

@@ -59,8 +59,8 @@ void setup() {
     }
   });
 
-  espConnect.setConnectTimeout(20);       // 20 seconds
-  espConnect.setCaptivePortalTimeout(40); // 30 seconds
+  espConnect.setConnectTimeout(20);
+  espConnect.setCaptivePortalTimeout(40);
   espConnect.setAutoRestart(true);
   espConnect.setBlocking(false);
 

platformio.ini

@@ -22,7 +22,6 @@ build_flags =
   ; -D ESPCONNECT_NO_STD_STRING
   ; -D ESPCONNECT_NO_LOGGING
   ; -D ESPCONNECT_ETH_SUPPORT
-  ; -D ESPCONNECT_NO_MUTEX
 lib_compat_mode = strict
 lib_ldf_mode = chain
 lib_deps = 

src/MycilaESPConnect.cpp

@@ -365,10 +365,6 @@ void Mycila::ESPConnect::loop() {
   if (_dnsServer != nullptr)
     _dnsServer->processNextRequest();
 
-#ifndef ESPCONNECT_NO_MUTEX
-  std::lock_guard<std::mutex> lock(_mutex);
-#endif
-
   // first check if we have to enter AP mode
   if (_state == Mycila::ESPConnect::State::NETWORK_ENABLED && _config.apMode) {
     _startAP();
@@ -849,10 +845,6 @@ void Mycila::ESPConnect::_onWiFiEvent(WiFiEvent_t event) {
   if (_state == Mycila::ESPConnect::State::NETWORK_DISABLED)
     return;
 
-#ifndef ESPCONNECT_NO_MUTEX
-  std::lock_guard<std::mutex> lock(_mutex);
-#endif
-
   switch (event) {
 #ifdef ESPCONNECT_ETH_SUPPORT
     case ARDUINO_EVENT_ETH_START:

src/MycilaESPConnect.h

@@ -7,7 +7,6 @@
 #include <DNSServer.h>
 
 #ifdef ESP8266
-  #define ESPCONNECT_NO_MUTEX 1
   #include <ESP8266WiFi.h>
 #else
   #include <WiFi.h>
@@ -27,10 +26,6 @@
   #define ESPCONNECT_STRING std::string
 #endif
 
-#ifndef ESPCONNECT_NO_MUTEX
-  #include <mutex>
-#endif
-
 #define ESPCONNECT_VERSION          "10.2.1"
 #define ESPCONNECT_VERSION_MAJOR    10
 #define ESPCONNECT_VERSION_MINOR    2
@@ -218,6 +213,11 @@ namespace Mycila {
       // Whether ESPConnect will restart the ESP if the captive portal times out or once it has completed (old behaviour)
       void setAutoRestart(bool autoRestart) { _autoRestart = autoRestart; }
 
+      // Get the delay before a restart occurs
+      uint32_t getRestartDelay() const { return _restartDelay; }
+      // Set the delay before a restart occurs in ms
+      void setRestartDelay(uint32_t delay) { _restartDelay = delay; }
+
       // load configuration from NVS
       void loadConfiguration() { loadConfiguration(_config); }
       // load configuration from NVS
@@ -231,11 +231,6 @@ namespace Mycila {
       // when using auto-load and save of configuration, this method can clear saved states.
       void clearConfiguration();
 
-      // Get the delay before a restart occurs
-      uint32_t getRestartDelay() const { return _restartDelay; }
-      // Set the delay before a restart occurs in ms
-      void setRestartDelay(uint32_t delay) { _restartDelay = delay; }
-
 #ifndef ESPCONNECT_NO_CAPTIVE_PORTAL
       void toJson(const JsonObject& root) const;
 #endif
@@ -259,6 +254,8 @@ namespace Mycila {
       bool _blocking = true;
       bool _autoRestart = true;
       bool _autoSave = false;
+      uint32_t _restartRequestTime = 0;
+      uint32_t _restartDelay = 1000;
 #ifdef ESP8266
       WiFiEventHandler onStationModeGotIP;
       WiFiEventHandler onStationModeDHCPTimeout;
@@ -283,10 +280,5 @@ namespace Mycila {
 
     private:
       static int8_t _wifiSignalQuality(int32_t rssi);
-      uint32_t _restartRequestTime = 0;
-      uint32_t _restartDelay = 1000;
-#ifndef ESPCONNECT_NO_MUTEX
-      std::mutex _mutex;
-#endif
   };
 } // namespace Mycila