fix(wifi): Fix requirements and guards for hosted Wi-Fi

lucasssvaz · lucasssvaz · commit 1670a4800a22 · 2024-11-06T15:13:10.000-03:00
diff --git a/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Master/ci.json b/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Master/ci.json
@@ -1,6 +1,5 @@
 {
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
   ]
 }
diff --git a/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Slave/ci.json b/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Slave/ci.json
@@ -1,6 +1,5 @@
 {
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
   ]
 }
diff --git a/libraries/ESP_NOW/examples/ESP_NOW_Network/ci.json b/libraries/ESP_NOW/examples/ESP_NOW_Network/ci.json
@@ -1,6 +1,5 @@
 {
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
   ]
 }
diff --git a/libraries/ESP_NOW/examples/ESP_NOW_Serial/ci.json b/libraries/ESP_NOW/examples/ESP_NOW_Serial/ci.json
@@ -1,6 +1,5 @@
 {
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
   ]
 }
diff --git a/libraries/ESP_NOW/src/ESP32_NOW.cpp b/libraries/ESP_NOW/src/ESP32_NOW.cpp
@@ -1,3 +1,8 @@
+#include "sdkconfig.h"
+#if CONFIG_ESP_WIFI_REMOTE_ENABLED
+#warning "ESP-NOW is only supported in SoCs with native Wi-Fi support"
+#else
+
 #include "ESP32_NOW.h"
 #include <string.h>
 #include "esp_system.h"
@@ -406,3 +411,5 @@ size_t ESP_NOW_Peer::send(const uint8_t *data, int len) {
 ESP_NOW_Peer::operator bool() const {
   return added;
 }
+
+#endif
diff --git a/libraries/ESP_NOW/src/ESP32_NOW.h b/libraries/ESP_NOW/src/ESP32_NOW.h
@@ -1,11 +1,18 @@
 #pragma once
 
+#include "sdkconfig.h"
+#if CONFIG_ESP_WIFI_REMOTE_ENABLED
+#warning "ESP-NOW is only supported in SoCs with native Wi-Fi support"
+#else
+
 #include "esp_wifi_types.h"
 #include "Print.h"
 #include "esp_now.h"
 #include "esp32-hal-log.h"
 #include "esp_mac.h"
 
+
+
 class ESP_NOW_Peer;  //forward declaration for friend function
 
 class ESP_NOW_Class : public Print {
@@ -77,3 +84,5 @@ class ESP_NOW_Peer {
 };
 
 extern ESP_NOW_Class ESP_NOW;
+
+#endif
diff --git a/libraries/ESP_NOW/src/ESP32_NOW_Serial.cpp b/libraries/ESP_NOW/src/ESP32_NOW_Serial.cpp
@@ -1,3 +1,8 @@
+#include "sdkconfig.h"
+#if CONFIG_ESP_WIFI_REMOTE_ENABLED
+#warning "ESP-NOW is only supported in SoCs with native Wi-Fi support"
+#else
+
 #include "ESP32_NOW_Serial.h"
 #include <string.h>
 #include "esp_now.h"
@@ -277,3 +282,5 @@ void ESP_NOW_Serial_Class::onSent(bool success) {
     }
   }
 }
+
+#endif
diff --git a/libraries/ESP_NOW/src/ESP32_NOW_Serial.h b/libraries/ESP_NOW/src/ESP32_NOW_Serial.h
@@ -1,5 +1,10 @@
 #pragma once
 
+#include "sdkconfig.h"
+#if CONFIG_ESP_WIFI_REMOTE_ENABLED
+#warning "ESP-NOW is only supported in SoCs with native Wi-Fi support"
+#else
+
 #include "esp_wifi_types.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
@@ -48,3 +53,5 @@ class ESP_NOW_Serial_Class : public Stream, public ESP_NOW_Peer {
   void onReceive(const uint8_t *data, size_t len, bool broadcast);
   void onSent(bool success);
 };
+
+#endif
diff --git a/libraries/HTTPClient/examples/HTTPClientEnterprise/HTTPClientEnterprise.ino b/libraries/HTTPClient/examples/HTTPClientEnterprise/HTTPClientEnterprise.ino
@@ -3,6 +3,12 @@
 /*|TESTED BOARDS: Devkit v1 DOIT, Devkitc v4                 |*/
 /*|CORE: June 2018                                           |*/
 /*|----------------------------------------------------------|*/
+
+#include "sdkconfig.h"
+#if CONFIG_ESP_WIFI_REMOTE_ENABLED
+#error "WPA-Enterprise is only supported in SoCs with native Wi-Fi support"
+#endif
+
 #include <WiFi.h>
 #include <HTTPClient.h>
 #if __has_include("esp_eap_client.h")
diff --git a/libraries/HTTPClient/examples/HTTPClientEnterprise/ci.json b/libraries/HTTPClient/examples/HTTPClientEnterprise/ci.json
@@ -1,6 +1,5 @@
 {
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
   ]
 }
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientSecureEnterprise/WiFiClientSecureEnterprise.ino b/libraries/NetworkClientSecure/examples/WiFiClientSecureEnterprise/WiFiClientSecureEnterprise.ino
@@ -13,6 +13,11 @@
 // Note: this example is outdated and may not work!
 // For more examples see https://github.com/martinius96/ESP32-eduroam
 
+#include "sdkconfig.h"
+#if CONFIG_ESP_WIFI_REMOTE_ENABLED
+#error "WPA-Enterprise is only supported in SoCs with native Wi-Fi support"
+#endif
+
 #include <WiFi.h>
 #include <NetworkClientSecure.h>
 #if __has_include("esp_eap_client.h")
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientSecureEnterprise/ci.json b/libraries/NetworkClientSecure/examples/WiFiClientSecureEnterprise/ci.json
@@ -1,6 +1,5 @@
 {
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
   ]
 }
diff --git a/libraries/WiFi/examples/WPS/WPS.ino b/libraries/WiFi/examples/WPS/WPS.ino
@@ -14,6 +14,11 @@ Author:
 Pranav Cherukupalli <cherukupallip@gmail.com>
 */
 
+#include "sdkconfig.h"
+#if CONFIG_ESP_WIFI_REMOTE_ENABLED
+#error "WPS is only supported in SoCs with native Wi-Fi support"
+#endif
+
 #include "WiFi.h"
 #include "esp_wps.h"
 /*
diff --git a/libraries/WiFi/examples/WPS/ci.json b/libraries/WiFi/examples/WPS/ci.json
@@ -1,6 +1,5 @@
 {
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
   ]
 }
diff --git a/libraries/WiFi/examples/WiFiSmartConfig/WiFiSmartConfig.ino b/libraries/WiFi/examples/WiFiSmartConfig/WiFiSmartConfig.ino
@@ -1,3 +1,8 @@
+#include "sdkconfig.h"
+#if CONFIG_ESP_WIFI_REMOTE_ENABLED
+#error "SmartConfig is only supported in SoCs with native Wi-Fi support"
+#endif
+
 #include "WiFi.h"
 
 void setup() {
diff --git a/libraries/WiFi/examples/WiFiSmartConfig/ci.json b/libraries/WiFi/examples/WiFiSmartConfig/ci.json
@@ -1,6 +1,5 @@
 {
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
   ]
 }
diff --git a/tests/validation/wifi/ci.json b/tests/validation/wifi/ci.json
@@ -21,8 +21,7 @@
     "hardware": false,
     "qemu": false
   },
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`		`- "requires_any": [`
`3`		`- "CONFIG_SOC_WIFI_SUPPORTED=y",`
`4`		`- "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"`
	`2`	`+ "requires": [`
	`3`	`+ "CONFIG_SOC_WIFI_SUPPORTED=y"`
`5`	`4`	`]`
`6`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,8 @@`
	`1`	`+#include "sdkconfig.h"`
	`2`	`+#if CONFIG_ESP_WIFI_REMOTE_ENABLED`
	`3`	`+#warning "ESP-NOW is only supported in SoCs with native Wi-Fi support"`
	`4`	`+#else`
	`5`	`+`
`1`	`6`	`#include "ESP32_NOW_Serial.h"`
`2`	`7`	`#include <string.h>`
`3`	`8`	`#include "esp_now.h"`
`@@ -277,3 +282,5 @@ void ESP_NOW_Serial_Class::onSent(bool success) {`
`277`	`282`	`}`
`278`	`283`	`}`
`279`	`284`	`}`
	`285`	`+`
	`286`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,7 @@`
`21`	`21`	`"hardware": false,`
`22`	`22`	`"qemu": false`
`23`	`23`	`},`
`24`		`- "requires_any": [`
`25`		`- "CONFIG_SOC_WIFI_SUPPORTED=y",`
`26`		`- "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"`
	`24`	`+ "requires": [`
	`25`	`+ "CONFIG_SOC_WIFI_SUPPORTED=y"`
`27`	`26`	`]`
`28`	`27`	`}`