Merge branch 'freesanity' of https://github.com/earlephilhower/arduino-pico into freesanity

earlephilhower · earlephilhower · commit 361a36626bf6 · 2025-08-18T10:13:29.000-07:00
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -5,6 +5,7 @@ name: Arduino-Pico CI
 
 on:
   pull_request:
+  workflow_dispatch:
 
 jobs:
 
diff --git a/boards.txt b/boards.txt
diff --git a/cores/rp2040/RP2040Version.h b/cores/rp2040/RP2040Version.h
@@ -1,5 +1,5 @@
 #pragma once
 #define ARDUINO_PICO_MAJOR 4
 #define ARDUINO_PICO_MINOR 7
-#define ARDUINO_PICO_REVISION 0
-#define ARDUINO_PICO_VERSION_STR "4.7.0"
+#define ARDUINO_PICO_REVISION 1
+#define ARDUINO_PICO_VERSION_STR "4.7.1"
diff --git a/cores/rp2040/lwip_wrap.cpp b/cores/rp2040/lwip_wrap.cpp
@@ -250,9 +250,6 @@ extern "C" {
         return __real_tcp_bind_netif(pcb, netif);
     }
 
-
-
-
     extern struct tcp_pcb *__real_tcp_listen_with_backlog(struct tcp_pcb *pcb, u8_t backlog);
     struct tcp_pcb *__wrap_tcp_listen_with_backlog(struct tcp_pcb *pcb, u8_t backlog) {
 #ifdef __FREERTOS
diff --git a/docs/conf.py b/docs/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'4.7.0'
+version = u'4.7.1'
 # The full version, including alpha/beta/rc tags.
-release = u'4.7.0'
+release = u'4.7.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/libraries/AudioBufferManager/src/AudioBufferManager.cpp b/libraries/AudioBufferManager/src/AudioBufferManager.cpp
@@ -170,7 +170,7 @@ bool AudioBufferManager::write(uint32_t v, bool sync) {
     if (!_running || !_isOutput) {
         return false;
     }
-    AudioBuffer ** volatile p = (AudioBuffer ** volatile)&_empty;
+    AudioBuffer ** volatile p = &_empty;
     if (!*p) {
         if (!sync) {
             return false;
@@ -195,7 +195,7 @@ size_t AudioBufferManager::write(const uint32_t *v, size_t words, bool sync) {
         return 0;
     }
     while (words) {
-        AudioBuffer ** volatile p = (AudioBuffer ** volatile)&_empty;
+        AudioBuffer ** volatile p = &_empty;
         if (!*p) {
             if (!sync) {
                 return written;
@@ -225,7 +225,7 @@ bool AudioBufferManager::read(uint32_t *v, bool sync) {
         return false;
     }
 
-    AudioBuffer ** volatile p = (AudioBuffer ** volatile)&_filled;
+    AudioBuffer ** volatile p = &_filled;
     if (!*p) {
         if (!sync) {
             return false;
@@ -251,7 +251,7 @@ size_t AudioBufferManager::read(uint32_t *v, size_t words, bool sync) {
         return 0;
     }
     while (words) {
-        AudioBuffer ** volatile p = (AudioBuffer ** volatile)&_filled;
+        AudioBuffer ** volatile p = &_filled;
         if (!*p) {
             if (!sync) {
                 return read;
@@ -302,10 +302,10 @@ int AudioBufferManager::available() {
 }
 
 void AudioBufferManager::flush() {
-    AudioBuffer ** volatile a = (AudioBuffer ** volatile)&_active[0];
-    AudioBuffer ** volatile b = (AudioBuffer ** volatile)&_active[1];
-    AudioBuffer ** volatile c = (AudioBuffer ** volatile)&_filled;
-    while (*c && (*b != (AudioBuffer * volatile)_silence) && (*a != (AudioBuffer * volatile)_silence)) {
+    AudioBuffer ** volatile a = &_active[0];
+    AudioBuffer ** volatile b = &_active[1];
+    AudioBuffer ** volatile c = &_filled;
+    while (*c && (*b != _silence) && (*a != _silence)) {
         // busy wait until all user written data enroute
     }
 }
diff --git a/libraries/SPISlave/src/SPISlave.cpp b/libraries/SPISlave/src/SPISlave.cpp
@@ -167,14 +167,14 @@ void SPISlaveClass::_handleIRQ() {
         _recvCB(buff, cnt);
     }
     // Attempt to send as many bytes to the TX FIFO as we have/are free
-    while (spi_is_writable(_spi)) {
+    do {
         for (; _dataLeft && spi_is_writable(_spi); _dataLeft--) {
             spi_get_hw(_spi)->dr = *(_dataOut++);
         }
         if (!_dataLeft && _sentCB) {
             _sentCB();
         }
-    }
+    } while (spi_is_writable(_spi) & _dataLeft);
     // Disable the TX FIFO IRQ if there is still no data to send or we'd always be stuck in an IRQ
     // Will be re-enabled once user does a setData
     if (!_dataLeft) {
diff --git a/libraries/SdFat b/libraries/SdFat
@@ -1 +1 @@
-Subproject commit 67e26476f15a3bae5f390d91b6cc01830920c55d
+Subproject commit cda057318bec196183d4cc92b01bc1dd64bbfb02
diff --git a/libraries/WiFi/src/WiFiMulti.cpp b/libraries/WiFi/src/WiFiMulti.cpp
@@ -53,7 +53,7 @@ bool WiFiMulti::addAP(const char *ssid, const char *pass) {
     } else {
         ap.pass = nullptr;
     }
-    DEBUGV("[WIFIMULTI] Adding: '%s' %s' to list\n", ap.ssid, ap.pass);
+    DEBUGV("[WIFIMULTI] Adding: '%s' '%s' to list\n", ap.ssid, ap.pass);
     _list.push_front(ap);
     return true;
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "framework-arduinopico",
-  "version": "1.40700.0",
+  "version": "1.40701.0",
   "description": "Arduino Wiring-based Framework (RPi Pico RP2040, RP2350)",
   "keywords": [
     "framework",
diff --git a/package/package_pico_index.template.json b/package/package_pico_index.template.json
@@ -281,6 +281,9 @@
                   {
                      "name": "Pimoroni Tiny2350"
                   },
+                  {
+                     "name": "Pimoroni Explorer"
+                  },
                   {
                      "name": "Pintronix PinMax"
                   },
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=4.7.0
+version=4.7.1
 
 # Required discoveries and monitors
 # ---------------------------------
diff --git a/tools/json/pimoroni_explorer.json b/tools/json/pimoroni_explorer.json
@@ -0,0 +1,56 @@
+{
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "none.S",
+                "usb_vid": "0x2E8A",
+                "usb_pid": "0x10C0"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m33",
+        "extra_flags": "-DARDUINO_PIMORONI_EXPLORER -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500 ",
+        "f_cpu": "150000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x2E8A",
+                "0x10C0"
+            ]
+        ],
+        "mcu": "rp2350",
+        "variant": "pimoroni_explorer"
+    },
+    "debug": {
+        "jlink_device": "RP2350_M33_0",
+        "openocd_target": "rp2350.cfg",
+        "svd_path": "rp2350.svd"
+    },
+    "frameworks": [
+        "arduino",
+        "picosdk"
+    ],
+    "name": "Explorer",
+    "upload": {
+        "maximum_ram_size": 524288,
+        "maximum_size": 16777216,
+        "require_upload_port": true,
+        "native_usb": true,
+        "use_1200bps_touch": true,
+        "wait_for_upload_port": false,
+        "protocol": "picotool",
+        "protocols": [
+            "blackmagic",
+            "cmsis-dap",
+            "jlink",
+            "raspberrypi-swd",
+            "picotool",
+            "picoprobe"
+        ]
+    },
+    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "Pimoroni"
+}
diff --git a/tools/makeboards.py b/tools/makeboards.py
@@ -654,6 +654,7 @@ def MakeBoardJSON(name, chip, vendor_name, product_name, vid, pid, pwr, boarddef
 MakeBoard("pimoroni_servo2040", "rp2040", "Pimoroni", "Servo2040", "0x2e8a", "0x10a5", 500, "PIMORONI_SERVO2040", 2, 0, "boot2_w25q080_2_padded_checksum")
 MakeBoard("pimoroni_tiny2040", "rp2040", "Pimoroni", "Tiny2040", "0x2e8a", "0x100a", 500, "PIMORONI_TINY2040", 2, 0, "boot2_w25q64jv_4_padded_checksum")
 MakeBoard("pimoroni_tiny2350", "rp2350", "Pimoroni", "Tiny2350", "0x2e8a", "0x100b", 500, "PIMORONI_TINY2350", 4, 0, "none")
+MakeBoard("pimoroni_explorer", "rp2350", "Pimoroni", "Explorer", "0x2e8a", "0x10c0", 500, "PIMORONI_EXPLORER", 16, 0, "none")
 
 # Pintronix
 MakeBoard("pintronix_pinmax", "rp2040", "Pintronix", "PinMax", "0x2e8a", "0x9101", 250, "PINTRONIX_PINMAX", 4, 0, "boot2_w25q080_2_padded_checksum")
diff --git a/variants/pimoroni_explorer/pins_arduino.h b/variants/pimoroni_explorer/pins_arduino.h
@@ -0,0 +1,113 @@
+#pragma once
+
+#include <stdint.h>
+
+// Pin definitions taken from:
+//    https://github.com/pimoroni/explorer/blob/main/explorer/
+//    https://github.com/pimoroni/explorer/blob/main/examples/lib/explorer.py
+//    https://cdn.shopify.com/s/files/1/0174/1800/files/Pimoroni_Explorer_Schematic.pdf?v=1729171995
+
+#define PICO_RP2350A 0
+
+//TODO: Do the buttons count?
+#define NUM_DIGITAL_PINS    (12u)
+#define NUM_ANALOG_INPUTS   (6u)
+#define NUM_ANALOG_OUTPUTS  (0u)
+#define ADC_RESOLUTION      (12u)
+
+#define SERIAL_HOWMANY      (0u)
+#define SPI_HOWMANY         (0u)
+#define WIRE_HOWMANY        (1u)
+
+
+/* IO pin definitions */
+
+static const uint8_t GP0 = (0u);
+static const uint8_t GP1 = (1u);
+static const uint8_t GP2 = (2u);
+static const uint8_t GP3 = (3u);
+static const uint8_t GP4 = (4u);
+static const uint8_t GP5 = (5u);
+
+//Servos
+#define PIN_SERVO1          (6u)
+#define PIN_SERVO2          (7u)
+#define PIN_SERVO3          (8u)
+#define PIN_SERVO4          (9u)
+// Pin 10 is NC
+// Pin 11 is NC
+
+// on-board speaker
+#define PIN_PWM_AUDIO         (12u)
+#define PIN_SPEAKER_AMP_ENABLE (13u)
+
+// on-board buttons
+static const uint8_t SWITCH_C = (14u);
+static const uint8_t SWITCH_B = (15u);
+static const uint8_t SWITCH_A = (16u);
+static const uint8_t SWITCH_X = (17u);
+static const uint8_t SWITCH_Y = (18u);
+static const uint8_t SWITCH_Z = (19u);
+
+// Wire/I2C
+#define PIN_WIRE0_SDA       (20u)
+#define PIN_WIRE0_SCL       (21u)
+
+// Boot button, also referred to as the user switch
+//TODO: Call it SWITCH_BOOT or SWITCH_USER?
+static const uint8_t SWITCH_BOOT = (22u);
+
+// Pin 23 is NC
+// Pin 24 is NC
+// Pin 25 is NC
+#define PIN_LED 25 // The LED will not blink, but sketches will compile
+
+//TODO: LCD
+#define PIN_LCD_BL          (26u)
+#define PIN_LCD_CS          (27u)
+#define PIN_LCD_RS          (28u)
+// Pin 29 is NC
+#define PIN_LCD_WR          (30u)
+#define PIN_LCD_RD          (31u)
+#define PIN_LCD_DB0         (32u)
+#define PIN_LCD_DB1         (33u)
+#define PIN_LCD_DB2         (34u)
+#define PIN_LCD_DB3         (35u)
+#define PIN_LCD_DB4         (36u)
+#define PIN_LCD_DB5         (37u)
+#define PIN_LCD_DB6         (38u)
+#define PIN_LCD_DB7         (39u)
+
+static const uint8_t ADC0 = (40u);
+static const uint8_t ADC1 = (41u);
+static const uint8_t ADC2 = (42u);
+static const uint8_t ADC3 = (43u);
+static const uint8_t ADC4 = (44u);
+static const uint8_t ADC5 = (45u);
+
+#define LED_BUILTIN PIN_LED
+
+// Definitions to make people happy (these don't actually exist)
+// I'm setting them to GPIO10, which is NC.
+
+// Serial
+#define PIN_SERIAL1_TX (10u)
+#define PIN_SERIAL1_RX (10u)
+
+#define PIN_SERIAL2_TX (10u)
+#define PIN_SERIAL2_RX (10u)
+
+// SPI
+#define PIN_SPI0_MISO  (10u)
+#define PIN_SPI0_MOSI  (10u)
+#define PIN_SPI0_SCK   (10u)
+#define PIN_SPI0_SS    (10u)
+
+#define PIN_SPI1_MISO  (10u)
+#define PIN_SPI1_MOSI  (10u)
+#define PIN_SPI1_SCK   (10u)
+#define PIN_SPI1_SS    (10u)
+
+// Wire1
+#define PIN_WIRE1_SDA  (10u)
+#define PIN_WIRE1_SCL  (10u)

Original file line number	Diff line number	Diff line change
`@@ -250,9 +250,6 @@ extern "C" {`
`250`	`250`	`return __real_tcp_bind_netif(pcb, netif);`
`251`	`251`	`}`
`252`	`252`
`253`		`-`
`254`		`-`
`255`		`-`
`256`	`253`	`extern struct tcp_pcb __real_tcp_listen_with_backlog(struct tcp_pcb pcb, u8_t backlog);`
`257`	`254`	`struct tcp_pcb __wrap_tcp_listen_with_backlog(struct tcp_pcb pcb, u8_t backlog) {`
`258`	`255`	`#ifdef __FREERTOS`
Original file line number	Diff line number	Diff line change
`@@ -167,14 +167,14 @@ void SPISlaveClass::_handleIRQ() {`
`167`	`167`	`_recvCB(buff, cnt);`
`168`	`168`	`}`
`169`	`169`	`// Attempt to send as many bytes to the TX FIFO as we have/are free`
`170`		`- while (spi_is_writable(_spi)) {`
	`170`	`+ do {`
`171`	`171`	`for (; _dataLeft && spi_is_writable(_spi); _dataLeft--) {`
`172`	`172`	`spi_get_hw(_spi)->dr = *(_dataOut++);`
`173`	`173`	`}`
`174`	`174`	`if (!_dataLeft && _sentCB) {`
`175`	`175`	`_sentCB();`
`176`	`176`	`}`
`177`		`- }`
	`177`	`+ } while (spi_is_writable(_spi) & _dataLeft);`
`178`	`178`	`// Disable the TX FIFO IRQ if there is still no data to send or we'd always be stuck in an IRQ`
`179`	`179`	`// Will be re-enabled once user does a setData`
`180`	`180`	`if (!_dataLeft) {`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ bool WiFiMulti::addAP(const char ssid, const char pass) {`
`53`	`53`	`} else {`
`54`	`54`	`ap.pass = nullptr;`
`55`	`55`	`}`
`56`		`- DEBUGV("[WIFIMULTI] Adding: '%s' %s' to list\n", ap.ssid, ap.pass);`
	`56`	`+ DEBUGV("[WIFIMULTI] Adding: '%s' '%s' to list\n", ap.ssid, ap.pass);`
`57`	`57`	`_list.push_front(ap);`
`58`	`58`	`return true;`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "framework-arduinopico",`
`3`		`- "version": "1.40700.0",`
	`3`	`+ "version": "1.40701.0",`
`4`	`4`	`"description": "Arduino Wiring-based Framework (RPi Pico RP2040, RP2350)",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"framework",`