Merge pull request #12 from ayushsharma82/dev

fix: enum clashes

Author: ayushsharma82

library.json

@@ -25,7 +25,7 @@
     {
       "owner": "mathieucarbou",
       "name": "ESPAsyncWebServer",
-      "version": "^3.1.1",
+      "version": "^3.1.2",
       "platforms": ["espressif8266", "espressif32", "raspberrypi"]
     },
     {
@@ -35,7 +35,7 @@
       "platforms": ["espressif8266", "raspberrypi"]
     }
   ],
-  "version": "1.0.9",
+  "version": "1.1.0",
   "frameworks": "arduino",
   "platforms": ["espressif32", "raspberrypi"],
   "build": {

library.properties

@@ -1,5 +1,5 @@
 name=NetWizard
-version=1.0.9
+version=1.1.0
 author=Ayush Sharma
 category=Communication
 maintainer=Ayush Sharma <[email protected]>

platformio.ini

@@ -7,8 +7,8 @@ build_flags =
   -D NETWIZARD_USE_ASYNC_WEBSERVER=1
 lib_deps = 
   bblanchon/[email protected]
-  mathieucarbou/AsyncTCP@^3.2.3
-  mathieucarbou/[email protected].1
+  mathieucarbou/AsyncTCP@^3.2.4
+  mathieucarbou/[email protected].2
 upload_protocol = esptool
 monitor_speed = 115200
 monitor_filters = esp32_exception_decoder, log2file
@@ -30,7 +30,7 @@ platform = espressif8266
 board = huzzah
 lib_deps = 
   bblanchon/[email protected]
-  mathieucarbou/[email protected].1
+  mathieucarbou/[email protected].2
   esphome/[email protected]
 
 [env:pico]

src/NetWizard.cpp

@@ -480,11 +480,11 @@ void NetWizard::_generateStatusJson(String& str) {
   #else
     DynamicJsonDocument json(NETWIZARD_STATUS_JSON_SIZE);
   #endif
-  json["conn"]["status"] = _nw.status;
+  json["conn"]["status"] = (uint8_t)_nw.status;
   json["conn"]["ssid"] = _nw.sta.ssid.c_str();
   json["conn"]["mac"] = WiFi.macAddress();
   json["conn"]["ip"] = WiFi.localIP().toString();
-  json["portal"]["state"] = _nw.portal.state;
+  json["portal"]["state"] = (uint8_t)_nw.portal.state;
 
   // Serialize JSON to string
   serializeJson(json, str);
@@ -574,76 +574,78 @@ void NetWizard::_generateScanJson(String& str) {
     //   MAX,
     // }
 
+    NetWizardEncryptionType enc = NetWizardEncryptionType::OPEN;
     #if defined(ESP8266) || defined(ESP32)
       switch (WiFi.encryptionType(i)) {
         case WIFI_AUTH_OPEN:
-          obj["e"] = NetWizardEncryptionType::OPEN;
+          enc = NetWizardEncryptionType::OPEN;
           break;
         case WIFI_AUTH_WEP:
-          obj["e"] = NetWizardEncryptionType::WEP;
+          enc = NetWizardEncryptionType::WEP;
           break;
         case WIFI_AUTH_WPA_PSK:
-          obj["e"] = NetWizardEncryptionType::WPA_PSK;
+          enc = NetWizardEncryptionType::WPA_PSK;
           break;
         case WIFI_AUTH_WPA2_PSK:
-          obj["e"] = NetWizardEncryptionType::WPA2_PSK;
+          enc = NetWizardEncryptionType::WPA2_PSK;
           break;
         case WIFI_AUTH_WPA_WPA2_PSK:
-          obj["e"] = NetWizardEncryptionType::WPA_WPA2_PSK;
+          enc = NetWizardEncryptionType::WPA_WPA2_PSK;
           break;
         // case WIFI_AUTH_ENTERPRISE:
-        //   obj["e"] = NetWizardEncryptionType::ENTERPRISE;
+        //   enc = NetWizardEncryptionType::ENTERPRISE;
         //   break;
         case WIFI_AUTH_WPA2_ENTERPRISE:
-          obj["e"] = NetWizardEncryptionType::WPA2_ENTERPRISE;
+          enc = NetWizardEncryptionType::WPA2_ENTERPRISE;
           break;
         case WIFI_AUTH_WPA3_PSK:
-          obj["e"] = NetWizardEncryptionType::WPA3_PSK;
+          enc = NetWizardEncryptionType::WPA3_PSK;
           break;
         case WIFI_AUTH_WPA2_WPA3_PSK:
-          obj["e"] = NetWizardEncryptionType::WPA2_WPA3_PSK;
+          enc = NetWizardEncryptionType::WPA2_WPA3_PSK;
           break;
         case WIFI_AUTH_WAPI_PSK:
-          obj["e"] = NetWizardEncryptionType::WAPI_PSK;
+          enc = NetWizardEncryptionType::WAPI_PSK;
           break;
         case WIFI_AUTH_OWE:
-          obj["e"] = NetWizardEncryptionType::OWE;
+          enc = NetWizardEncryptionType::OWE;
           break;
         case WIFI_AUTH_WPA3_ENT_192:
-          obj["e"] = NetWizardEncryptionType::WPA3_ENT_192;
+          enc = NetWizardEncryptionType::WPA3_ENT_192;
           break;
         // case WIFI_AUTH_WPA3_EXT_PSK:
-        //   obj["e"] = NetWizardEncryptionType::WPA3_EXT_PSK;
+        //   enc = NetWizardEncryptionType::WPA3_EXT_PSK;
         //   break;
         // case WIFI_AUTH_WPA3_EXT_PSK_MIXED_MODE:
-        //   obj["e"] = NetWizardEncryptionType::WPA3_EXT_PSK_MIXED_MODE;
+        //   enc = NetWizardEncryptionType::WPA3_EXT_PSK_MIXED_MODE;
         //   break;
         case WIFI_AUTH_MAX:
-          obj["e"] = NetWizardEncryptionType::MAX;
+          enc = NetWizardEncryptionType::MAX;
           break;
         default:
-          obj["e"] = NetWizardEncryptionType::UNKNOWN;
+          enc = NetWizardEncryptionType::UNKNOWN;
           break;
       }
     #elif defined(TARGET_RP2040)
       switch (WiFi.encryptionType(i)) {
         case ENC_TYPE_NONE:
-          obj["e"] = NetWizardEncryptionType::OPEN;
+          enc = NetWizardEncryptionType::OPEN;
           break;
         case ENC_TYPE_TKIP:
-          obj["e"] = NetWizardEncryptionType::WPA_PSK;
+          enc = NetWizardEncryptionType::WPA_PSK;
           break;
         case ENC_TYPE_CCMP:
-          obj["e"] = NetWizardEncryptionType::WPA2_PSK;
+          enc = NetWizardEncryptionType::WPA2_PSK;
           break;
         case ENC_TYPE_AUTO:
-          obj["e"] = NetWizardEncryptionType::WPA_WPA2_PSK;
+          enc = NetWizardEncryptionType::WPA_WPA2_PSK;
           break;
         default:
-          obj["e"] = NetWizardEncryptionType::UNKNOWN;
+          enc = NetWizardEncryptionType::UNKNOWN;
           break;
       }
     #endif
+    obj["e"] = (uint8_t)enc;
   }
   serializeJson(json, str);
   json.clear();

src/NetWizard.h

@@ -93,25 +93,25 @@ typedef enum {
   BLOCKING,
 } NetWizardStrategy;
 
-typedef enum {
+enum class NetWizardConnectionStatus {
   DISCONNECTED = 0,
   CONNECTING,
   CONNECTED,
   CONNECTION_FAILED,
   CONNECTION_LOST,
   NOT_FOUND,
-} NetWizardConnectionStatus;
+};
 
-typedef enum {
+enum class NetWizardPortalState {
   IDLE = 0,
   CONNECTING_WIFI,
   WAITING_FOR_CONNECTION,
   SUCCESS,
   FAILED,
   TIMEOUT
-} NetWizardPortalState;
+};
 
-typedef enum {
+enum class NetWizardEncryptionType {
   OPEN = 0,
   WEP,
   WPA_PSK,
@@ -128,7 +128,7 @@ typedef enum {
   WPA3_EXT_PSK_MIXED_MODE,
   MAX,
   UNKNOWN
-} NetWizardEncryptionType;
+};
 
 class NetWizardParameter;