From 1b67e53bbeef7af023706594d2ee83b3eb3d0645 Mon Sep 17 00:00:00 2001 From: pennam Date: Thu, 13 Feb 2025 11:12:16 +0100 Subject: [PATCH 1/4] WiFiS3: add missing WL*_LENGTH definitions --- libraries/WiFiS3/src/WiFi.h | 2 -- libraries/WiFiS3/src/WiFiTypes.h | 46 +++++++++++++++++++------------- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/libraries/WiFiS3/src/WiFi.h b/libraries/WiFiS3/src/WiFi.h index 2b733cfab..2643c2254 100644 --- a/libraries/WiFiS3/src/WiFi.h +++ b/libraries/WiFiS3/src/WiFi.h @@ -17,9 +17,7 @@ #define DEFAULT_GW_AP_ADDRESS IPAddress(192,168,1,1) #define DEFAULT_NM_AP_ADDRESS IPAddress(255,255,255,0) - #define WIFI_FIRMWARE_LATEST_VERSION "0.4.1" -#define WL_MAC_ADDR_LENGTH 6 class CAccessPoint { public: diff --git a/libraries/WiFiS3/src/WiFiTypes.h b/libraries/WiFiS3/src/WiFiTypes.h index d72acd95a..8848e4c26 100644 --- a/libraries/WiFiS3/src/WiFiTypes.h +++ b/libraries/WiFiS3/src/WiFiTypes.h @@ -1,19 +1,30 @@ #ifndef WIFI_S3_TYPES_H #define WIFI_S3_TYPES_H +// Maximum size of a SSID +#define WL_SSID_MAX_LENGTH 32 +// Length of passphrase. Valid lengths are 8-63. +#define WL_WPA_KEY_MAX_LENGTH 63 +// Length of key in bytes. Valid values are 5 and 13. +#define WL_WEP_KEY_MAX_LENGTH 13 +// Size of a MAC-address or BSSID +#define WL_MAC_ADDR_LENGTH 6 +// Size of a MAC-address or BSSID +#define WL_IPV4_LENGTH 4 + typedef enum { - WL_NO_SHIELD = 255, - WL_NO_MODULE = WL_NO_SHIELD, - WL_IDLE_STATUS = 0, - WL_NO_SSID_AVAIL, - WL_SCAN_COMPLETED, - WL_CONNECTED, - WL_CONNECT_FAILED, - WL_CONNECTION_LOST, - WL_DISCONNECTED, - WL_AP_LISTENING, - WL_AP_CONNECTED, - WL_AP_FAILED + WL_NO_SHIELD = 255, + WL_NO_MODULE = WL_NO_SHIELD, + WL_IDLE_STATUS = 0, + WL_NO_SSID_AVAIL, + WL_SCAN_COMPLETED, + WL_CONNECTED, + WL_CONNECT_FAILED, + WL_CONNECTION_LOST, + WL_DISCONNECTED, + WL_AP_LISTENING, + WL_AP_CONNECTED, + WL_AP_FAILED } wl_status_t; /* Encryption modes */ @@ -27,15 +38,14 @@ enum wl_enc_type { ENC_TYPE_WPA3, ENC_TYPE_NONE, ENC_TYPE_AUTO, - ENC_TYPE_UNKNOWN = 255 }; typedef enum { - WL_PING_DEST_UNREACHABLE = -1, - WL_PING_TIMEOUT = -2, - WL_PING_UNKNOWN_HOST = -3, - WL_PING_ERROR = -4 -} wl_ping_result_t; + WL_PING_DEST_UNREACHABLE = -1, + WL_PING_TIMEOUT = -2, + WL_PING_UNKNOWN_HOST = -3, + WL_PING_ERROR = -4 +}wl_ping_result_t; #endif \ No newline at end of file From 3581fc2471091e2f928caebbcd784be8bacb8b23 Mon Sep 17 00:00:00 2001 From: pennam Date: Thu, 13 Feb 2025 11:13:14 +0100 Subject: [PATCH 2/4] WiFiC3: add missing WL*_LENGTH definitions --- libraries/lwIpWrapper/src/CNetIf.cpp | 6 +++--- libraries/lwIpWrapper/src/CNetIf.h | 11 +++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/libraries/lwIpWrapper/src/CNetIf.cpp b/libraries/lwIpWrapper/src/CNetIf.cpp index 680b1f992..86b02edce 100644 --- a/libraries/lwIpWrapper/src/CNetIf.cpp +++ b/libraries/lwIpWrapper/src/CNetIf.cpp @@ -537,17 +537,17 @@ int CLwipIf::getMacAddress(NetIfType_t type, uint8_t* mac) MAC.mode = WIFI_MODE_STA; if (CEspControl::getInstance().getWifiMacAddress(MAC) == ESP_CONTROL_OK) { CNetUtilities::macStr2macArray(mac, MAC.mac); - rv = MAC_ADDRESS_DIM; + rv = WL_MAC_ADDR_LENGTH; } } else if (type == NI_WIFI_SOFTAP) { MAC.mode = WIFI_MODE_AP; if (CEspControl::getInstance().getWifiMacAddress(MAC) == ESP_CONTROL_OK) { CNetUtilities::macStr2macArray(mac, MAC.mac); - rv = MAC_ADDRESS_DIM; + rv = WL_MAC_ADDR_LENGTH; } } else { eth_get_mac_address(mac); - rv = MAC_ADDRESS_DIM; + rv = WL_MAC_ADDR_LENGTH; } CLwipIf::getInstance().restartAsyncRequest(); diff --git a/libraries/lwIpWrapper/src/CNetIf.h b/libraries/lwIpWrapper/src/CNetIf.h index 2fa090bba..0616b724b 100644 --- a/libraries/lwIpWrapper/src/CNetIf.h +++ b/libraries/lwIpWrapper/src/CNetIf.h @@ -34,14 +34,21 @@ #endif #define MAX_SOFAT_CONNECTION_DEF 5 - -#define MAC_ADDRESS_DIM 6 #define NETWORK_INTERFACES_MAX_NUM 3 #define MAX_HOSTNAME_DIM 253 #define WIFI_INIT_TIMEOUT_MS 10000 +// Maximum size of a SSID +#define WL_SSID_MAX_LENGTH 32 +// Length of passphrase. Valid lengths are 8-63. +#define WL_WPA_KEY_MAX_LENGTH 63 +// Length of key in bytes. Valid values are 5 and 13. +#define WL_WEP_KEY_MAX_LENGTH 13 +// Size of a MAC-address or BSSID #define WL_MAC_ADDR_LENGTH 6 +// Size of a MAC-address or BSSID +#define WL_IPV4_LENGTH 4 /* DEFAULT ADDRESS FOR ETHERNET CONFIGURATION */ From f65e3ef881930b482e04841ef51a34d4dfd591ff Mon Sep 17 00:00:00 2001 From: Mattia Pennasilico Date: Wed, 19 Feb 2025 17:37:53 +0100 Subject: [PATCH 3/4] WiFiS3: fix comment about IP4 address length Co-authored-by: Daniele <34984733+maidnl@users.noreply.github.com> --- libraries/WiFiS3/src/WiFiTypes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/WiFiS3/src/WiFiTypes.h b/libraries/WiFiS3/src/WiFiTypes.h index 8848e4c26..8bd0b8d08 100644 --- a/libraries/WiFiS3/src/WiFiTypes.h +++ b/libraries/WiFiS3/src/WiFiTypes.h @@ -9,7 +9,7 @@ #define WL_WEP_KEY_MAX_LENGTH 13 // Size of a MAC-address or BSSID #define WL_MAC_ADDR_LENGTH 6 -// Size of a MAC-address or BSSID +// Size of a IP4 address #define WL_IPV4_LENGTH 4 typedef enum { From b5bb105cb66dea94f9e8971c303a8e8d83ac97b6 Mon Sep 17 00:00:00 2001 From: Mattia Pennasilico Date: Wed, 19 Feb 2025 17:38:22 +0100 Subject: [PATCH 4/4] lwIpWrapper: fix comment about IP4 address length Co-authored-by: Daniele <34984733+maidnl@users.noreply.github.com> --- libraries/lwIpWrapper/src/CNetIf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/lwIpWrapper/src/CNetIf.h b/libraries/lwIpWrapper/src/CNetIf.h index 0616b724b..9f8bd404a 100644 --- a/libraries/lwIpWrapper/src/CNetIf.h +++ b/libraries/lwIpWrapper/src/CNetIf.h @@ -47,7 +47,7 @@ #define WL_WEP_KEY_MAX_LENGTH 13 // Size of a MAC-address or BSSID #define WL_MAC_ADDR_LENGTH 6 -// Size of a MAC-address or BSSID +// Size of a IP4 address #define WL_IPV4_LENGTH 4 /* DEFAULT ADDRESS FOR ETHERNET CONFIGURATION */