Merge branch 'master' into fix_issue_3173

earlephilhower · web-flow · commit fc69dc695a23 · 2025-10-03T07:51:59.000-07:00
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -205,7 +205,7 @@ jobs:
     name: Mac
     strategy:
       matrix:
-        os: [macOS-13, macOS-14]
+        os: [macOS-15-intel, macOS-14]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
diff --git a/.github/workflows/release-to-publish.yml b/.github/workflows/release-to-publish.yml
@@ -1,5 +1,10 @@
 name: Arduino-Pico Release Publisher
 
+permissions:
+  actions: read
+  contents: write
+  packages: write
+
 on:
   release:
     types: [published]
diff --git a/.github/workflows/tag-to-draft-release.yml b/.github/workflows/tag-to-draft-release.yml
@@ -4,6 +4,11 @@
 
 name: Arduino-Pico Draft Release
 
+permissions:
+  actions: read
+  contents: write
+  packages: write
+
 on:
   push:
     tags:
diff --git a/cores/rp2040/RP2040Version.h b/cores/rp2040/RP2040Version.h
@@ -1,5 +1,5 @@
 #pragma once
 #define ARDUINO_PICO_MAJOR 5
-#define ARDUINO_PICO_MINOR 2
-#define ARDUINO_PICO_REVISION 1
-#define ARDUINO_PICO_VERSION_STR "5.2.1"
+#define ARDUINO_PICO_MINOR 3
+#define ARDUINO_PICO_REVISION 0
+#define ARDUINO_PICO_VERSION_STR "5.3.0"
diff --git a/cores/rp2040/freertos/freertos-lwip.cpp b/cores/rp2040/freertos/freertos-lwip.cpp
@@ -384,6 +384,7 @@ static void lwipThread(void *params) {
                 *(r->ret) = __real_ethernet_input(r->p, r->netif);
                 break;
             }
+#if defined(PICO_CYW43_SUPPORTED)
             case __cyw43_wifi_join: {
                 __cyw43_wifi_join_req *r = (__cyw43_wifi_join_req *)w.req;
                 *(r->ret) = __real_cyw43_wifi_join(r->self, r->ssid_len, r->ssid, r->key_len, r->key, r->auth_type, r->bssid, r->channel);
@@ -394,6 +395,7 @@ static void lwipThread(void *params) {
                 *(r->ret) = __real_cyw43_wifi_leave(r->self, r->itf);
                 break;
             }
+#endif
             case __callback: {
                 __callback_req *r = (__callback_req *)w.req;
                 r->cb(r->cbData);
diff --git a/cores/rp2040/lwip_wrap.cpp b/cores/rp2040/lwip_wrap.cpp
@@ -832,6 +832,7 @@ extern "C" {
         return __real_ethernet_input(p, netif);
     }
 
+#if defined(PICO_CYW43_SUPPORTED)
     int __real_cyw43_wifi_join(cyw43_t *self, size_t ssid_len, const uint8_t *ssid, size_t key_len, const uint8_t *key, uint32_t auth_type, const uint8_t *bssid, uint32_t channel);
     int __wrap_cyw43_wifi_join(cyw43_t *self, size_t ssid_len, const uint8_t *ssid, size_t key_len, const uint8_t *key, uint32_t auth_type, const uint8_t *bssid, uint32_t channel) {
 #ifdef __FREERTOS
@@ -857,7 +858,7 @@ extern "C" {
 #endif
         return __real_cyw43_wifi_leave(self, itf);
     }
-
+#endif
 
 
     void lwip_callback(void (*cb)(void *), void *cbData, __callback_req *buffer) {
diff --git a/cores/rp2040/lwip_wrap.h b/cores/rp2040/lwip_wrap.h
@@ -48,15 +48,6 @@ extern recursive_mutex_t __lwipMutex;
 class LWIPMutex {
 public:
     LWIPMutex() {
-        //        if (ethernet_arch_lwip_gpio_mask)  {
-        //            ethernet_arch_lwip_gpio_mask();
-        //        }
-        //#if defined(ARDUINO_RASPBERRY_PI_PICO_W)
-        //        if (rp2040.isPicoW()) {
-        //            cyw43_arch_lwip_begin();
-        //            return;
-        //        }
-        //#endif
 #if !defined(__FREERTOS)
         if (ethernet_arch_lwip_begin) {
             ethernet_arch_lwip_begin();
@@ -67,24 +58,11 @@ class LWIPMutex {
     }
 
     ~LWIPMutex() {
-#if !defined(__FREERTOS)
-        //#if defined(ARDUINO_RASPBERRY_PI_PICO_W)
-        //        if (rp2040.isPicoW()) {
-        //            cyw43_arch_lwip_end();
-        //        } else {
-        //#endif
         if (ethernet_arch_lwip_end) {
             ethernet_arch_lwip_end();
         } else {
             recursive_mutex_exit(&__lwipMutex);
         }
-        //#if defined(ARDUINO_RASPBERRY_PI_PICO_W)
-        //        }
-        //#endif
-#endif
-        //        if (ethernet_arch_lwip_gpio_unmask) {
-        //            ethernet_arch_lwip_gpio_unmask();
-        //        }
     }
 };
 
@@ -167,8 +145,10 @@ typedef enum {
 
     __ethernet_input = 9000,
 
+#if defined(PICO_CYW43_SUPPORTED)
     __cyw43_wifi_join = 9500,
     __cyw43_wifi_leave,
+#endif
 
     __callback = 10000,
 } __lwip_op;
@@ -573,6 +553,7 @@ typedef struct {
     err_t *ret;
 } __ethernet_input_req;
 
+#if defined(PICO_CYW43_SUPPORTED)
 typedef struct {
     cyw43_t *self;
     size_t ssid_len;
@@ -590,6 +571,7 @@ typedef struct {
     int itf;
     int *ret;
 } __cyw43_wifi_leave_req;
+#endif
 
 // Run a callback in the LWIP thread (i.e. for Ethernet device polling and packet reception)
 // When in an interrupt, need to pass in a heap-allocated buffer
diff --git a/docs/conf.py b/docs/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'5.2.1'
+version = u'5.3.0'
 # The full version, including alpha/beta/rc tags.
-release = u'5.2.1'
+release = u'5.3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/libraries/FatFSUSB/examples/Listfiles-USB/Listfiles-USB.ino b/libraries/FatFSUSB/examples/Listfiles-USB/Listfiles-USB.ino
@@ -78,7 +78,7 @@ void printDirectory(String dirName, int numTabs) {
       // no more files
       break;
     }
-    for (uint8_t i = 0; i < numTabs; i++) {
+    for (int i = 0; i < numTabs; i++) {
       Serial.print('\t');
     }
     Serial.print(dir.fileName());
diff --git a/libraries/PDM/src/rp2040/OpenPDMFilter.c b/libraries/PDM/src/rp2040/OpenPDMFilter.c
@@ -140,7 +140,7 @@ void convolve(uint32_t Signal[/* SignalLen */], unsigned short SignalLen,
               uint32_t Result[/* SignalLen + KernelLen - 1 */]) {
     uint16_t n;
 
-    for (n = 0; n < SignalLen + KernelLen - 1; n++) {
+    for (n = 0; n < (uint16_t)(SignalLen + KernelLen - 1); n++) {
         unsigned short kmin, kmax, k;
 
         Result[n] = 0;
@@ -222,7 +222,7 @@ void Open_PDM_Filter_64(uint8_t* data, int16_t* dataOut, uint16_t volume, TPDMFi
     uint8_t j = channels - 1;
 #endif
 
-    for (i = 0, data_out_index = 0; i < Param->nSamples; i++, data_out_index += channels) {
+    for (i = 0, data_out_index = 0; i < (uint8_t)Param->nSamples; i++, data_out_index += channels) {
 #ifdef USE_LUT
         Z0 = filter_tables_64[j](data, 0);
         Z1 = filter_tables_64[j](data, 1);
@@ -269,7 +269,7 @@ void Open_PDM_Filter_128(uint8_t* data, int16_t* dataOut, uint16_t volume, TPDMF
     uint8_t j = channels - 1;
 #endif
 
-    for (i = 0, data_out_index = 0; i < Param->nSamples; i++, data_out_index += channels) {
+    for (i = 0, data_out_index = 0; i < (uint8_t)Param->nSamples; i++, data_out_index += channels) {
 #ifdef USE_LUT
         Z0 = filter_tables_128[j](data, 0);
         Z1 = filter_tables_128[j](data, 1);
diff --git a/libraries/SD/examples/CardInfo/CardInfo.ino b/libraries/SD/examples/CardInfo/CardInfo.ino
@@ -167,7 +167,7 @@ void printDirectory(File dir, int numTabs) {
       // no more files
       break;
     }
-    for (uint8_t i = 0; i < numTabs; i++) {
+    for (int i = 0; i < numTabs; i++) {
       Serial.print('\t');
     }
     Serial.print(entry.name());
diff --git a/libraries/SD/examples/listfiles/listfiles.ino b/libraries/SD/examples/listfiles/listfiles.ino
@@ -110,7 +110,7 @@ void printDirectory(File dir, int numTabs) {
       // no more files
       break;
     }
-    for (uint8_t i = 0; i < numTabs; i++) {
+    for (int i = 0; i < numTabs; i++) {
       Serial.print('\t');
     }
     Serial.print(entry.name());
diff --git a/libraries/WebServer/examples/AdvancedWebServer/AdvancedWebServer.ino b/libraries/WebServer/examples/AdvancedWebServer/AdvancedWebServer.ino
@@ -97,7 +97,7 @@ void handleNotFound() {
   message += server.args();
   message += "\n";
 
-  for (uint8_t i = 0; i < server.args(); i++) {
+  for (int i = 0; i < server.args(); i++) {
     message += " " + server.argName(i) + ": " + server.arg(i) + "\n";
   }
 
diff --git a/libraries/WebServer/examples/FSBrowser/FSBrowser.ino b/libraries/WebServer/examples/FSBrowser/FSBrowser.ino
@@ -508,7 +508,7 @@ void handleNotFound() {
   message += F("\nArguments: ");
   message += server.args();
   message += '\n';
-  for (uint8_t i = 0; i < server.args(); i++) {
+  for (int i = 0; i < server.args(); i++) {
     message += F(" NAME:");
     message += server.argName(i);
     message += F("\n VALUE:");
diff --git a/libraries/WebServer/examples/Filters/Filters.ino b/libraries/WebServer/examples/Filters/Filters.ino
@@ -37,7 +37,7 @@ void handleNotFound() {
   message += "\nArguments: ";
   message += server.args();
   message += "\n";
-  for (uint8_t i = 0; i < server.args(); i++) {
+  for (int i = 0; i < server.args(); i++) {
     message += " " + server.argName(i) + ": " + server.arg(i) + "\n";
   }
   server.send(404, "text/plain", message);
diff --git a/libraries/WebServer/examples/HelloServer/HelloServer.ino b/libraries/WebServer/examples/HelloServer/HelloServer.ino
@@ -31,7 +31,7 @@ void handleNotFound() {
   message += "\nArguments: ";
   message += server.args();
   message += "\n";
-  for (uint8_t i = 0; i < server.args(); i++) {
+  for (int i = 0; i < server.args(); i++) {
     message += " " + server.argName(i) + ": " + server.arg(i) + "\n";
   }
   server.send(404, "text/plain", message);
diff --git a/libraries/WebServer/examples/HelloServerBearSSL/HelloServerBearSSL.ino b/libraries/WebServer/examples/HelloServerBearSSL/HelloServerBearSSL.ino
@@ -97,7 +97,7 @@ void handleNotFound() {
   message += "\nArguments: ";
   message += server.args();
   message += "\n";
-  for (uint8_t i = 0; i < server.args(); i++) { message += " " + server.argName(i) + ": " + server.arg(i) + "\n"; }
+  for (int i = 0; i < server.args(); i++) { message += " " + server.argName(i) + ": " + server.arg(i) + "\n"; }
   server.send(404, "text/plain", message);
   digitalWrite(led, 0);
 }
diff --git a/libraries/WebServer/examples/PostServer/PostServer.ino b/libraries/WebServer/examples/PostServer/PostServer.ino
@@ -62,7 +62,7 @@ void handleForm() {
   } else {
     digitalWrite(led, 1);
     String message = "POST form was:\n";
-    for (uint8_t i = 0; i < server.args(); i++) {
+    for (int i = 0; i < server.args(); i++) {
       message += " " + server.argName(i) + ": " + server.arg(i) + "\n";
     }
     server.send(200, "text/plain", message);
@@ -80,7 +80,7 @@ void handleNotFound() {
   message += "\nArguments: ";
   message += server.args();
   message += "\n";
-  for (uint8_t i = 0; i < server.args(); i++) {
+  for (int i = 0; i < server.args(); i++) {
     message += " " + server.argName(i) + ": " + server.arg(i) + "\n";
   }
   server.send(404, "text/plain", message);
diff --git a/libraries/WebServer/examples/SimpleAuthentication/SimpleAuthentication.ino b/libraries/WebServer/examples/SimpleAuthentication/SimpleAuthentication.ino
@@ -92,7 +92,7 @@ void handleNotFound() {
   message += "\nArguments: ";
   message += server.args();
   message += "\n";
-  for (uint8_t i = 0; i < server.args(); i++) {
+  for (int i = 0; i < server.args(); i++) {
     message += " " + server.argName(i) + ": " + server.arg(i) + "\n";
   }
   server.send(404, "text/plain", message);
diff --git a/libraries/WebServer/examples/UploadHugeFile/UploadHugeFile.ino b/libraries/WebServer/examples/UploadHugeFile/UploadHugeFile.ino
@@ -56,7 +56,7 @@ void handleNotFound() {
   message += "\nArguments: ";
   message += server.args();
   message += "\n";
-  for (uint8_t i = 0; i < server.args(); i++) {
+  for (int i = 0; i < server.args(); i++) {
     message += " " + server.argName(i) + ": " + server.arg(i) + "\n";
   }
   server.send(404, "text/plain", message);
diff --git a/libraries/WiFi/src/WiFiClientSecureBearSSL.cpp b/libraries/WiFi/src/WiFiClientSecureBearSSL.cpp
@@ -529,8 +529,7 @@ int WiFiClientSecureCtx::_run_until(unsigned target, bool blocking) {
                     wait for it.
                 */
                 return -1;
-            }
-            if (wlen > 0) {
+            } else {
                 br_ssl_engine_sendrec_ack(_eng, wlen);
             }
             no_work = 0;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "framework-arduinopico",
-  "version": "1.50201.0",
+  "version": "1.50300.0",
   "description": "Arduino Wiring-based Framework (RPi Pico RP2040, RP2350)",
   "keywords": [
     "framework",
diff --git a/platform.txt b/platform.txt
@@ -20,7 +20,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=Raspberry Pi RP2040/RP2350 Boards
-version=5.2.1
+version=5.3.0
 
 # Required discoveries and monitors
 # ---------------------------------

Original file line number	Diff line number	Diff line change
`@@ -832,6 +832,7 @@ extern "C" {`
`832`	`832`	`return __real_ethernet_input(p, netif);`
`833`	`833`	`}`
`834`	`834`
	`835`	`+#if defined(PICO_CYW43_SUPPORTED)`
`835`	`836`	`int __real_cyw43_wifi_join(cyw43_t self, size_t ssid_len, const uint8_t ssid, size_t key_len, const uint8_t key, uint32_t auth_type, const uint8_t bssid, uint32_t channel);`
`836`	`837`	`int __wrap_cyw43_wifi_join(cyw43_t self, size_t ssid_len, const uint8_t ssid, size_t key_len, const uint8_t key, uint32_t auth_type, const uint8_t bssid, uint32_t channel) {`
`837`	`838`	`#ifdef __FREERTOS`
`@@ -857,7 +858,7 @@ extern "C" {`
`857`	`858`	`#endif`
`858`	`859`	`return __real_cyw43_wifi_leave(self, itf);`
`859`	`860`	`}`
`860`		`-`
	`861`	`+#endif`
`861`	`862`
`862`	`863`
`863`	`864`	`void lwip_callback(void (cb)(void ), void cbData, __callback_req buffer) {`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ void printDirectory(String dirName, int numTabs) {`
`78`	`78`	`// no more files`
`79`	`79`	`break;`
`80`	`80`	`}`
`81`		`- for (uint8_t i = 0; i < numTabs; i++) {`
	`81`	`+ for (int i = 0; i < numTabs; i++) {`
`82`	`82`	`Serial.print('\t');`
`83`	`83`	`}`
`84`	`84`	`Serial.print(dir.fileName());`