Update I2S

While I don't see it in RFC 7230, some web services seem to deliver an
explicit t-e header even with the default identity mapping.  If seen,
let it pass.

Found & fixed by M. Guenther

cores/rp2040/RP2040Version.h

@@ -1,5 +1,5 @@
 #pragma once
 #define ARDUINO_PICO_MAJOR 4
 #define ARDUINO_PICO_MINOR 6
-#define ARDUINO_PICO_REVISION 0
-#define ARDUINO_PICO_VERSION_STR "4.6.0"
+#define ARDUINO_PICO_REVISION 1
+#define ARDUINO_PICO_VERSION_STR "4.6.1"

docs/bluetooth.rst

@@ -42,7 +42,7 @@ For many BTStack examples, you simply need call the included
 called afterwards to start processing (in the background).
 
 You will also need to acquire the BT ``async_context`` system lock before
-calling any BTStack APIs.  ``__lockBluetooth`` and ``unlockBluetooth`` are
+calling any BTStack APIs.  ``__lockBluetooth`` and ``__unlockBluetooth`` are
 provided in the PicoW variant code.
 
 Note that if you need to modify the system ``btstack_config.h`` file, do so

docs/conf.py

@@ -54,9 +54,9 @@ author = u'Earle F. Philhower, III'
 # built documents.
 #
 # The short X.Y version.
-version = u'4.6.0'
+version = u'4.6.1'
 # The full version, including alpha/beta/rc tags.
-release = u'4.6.0'
+release = u'4.6.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/platformio.rst

@@ -63,12 +63,10 @@ Step 3: Reboot the computer
 Once the two prior stages are complete, please do a full reboot or power cycle so that the new settings will take effect.
 
 
-Current state of development
-----------------------------
+Updating platformio.ini to use the proper platform
+--------------------------------------------------
 
-At the time of writing, PlatformIO integration for this core is a work-in-progress and not yet merged into mainline PlatformIO. This is subject to change once `this pull request <https://github.com/platformio/platform-raspberrypi/pull/36>`_ is merged.
-
-If you want to use the PlatformIO integration right now, make sure you first create a standard Raspberry Pi Pico + Arduino project within PlatformIO.
+First create a standard Raspberry Pi Pico + Arduino project within PlatformIO.
 This will give you a project with the ``platformio.ini``
 
 .. code:: ini

docs/spi.rst

@@ -16,7 +16,7 @@ SPI pinouts can be set **before SPI.begin()** using the following calls:
 Note that the ``CS`` pin can be hardware or software controlled by the sketch.
 When software controlled, the ``setCS()`` call is ignored.
 
-The Arduino `SPI documentation <https://www.arduino.cc/en/reference/SPI>`_ gives
+The Arduino `SPI documentation <https://docs.arduino.cc/language-reference/en/functions/communication/SPI/>`_ gives
 a detailed overview of the library, except for the following RP2040-specific
 changes:
 

libraries/Adafruit_TinyUSB_Arduino

@@ -1 +1 @@
-Subproject commit 7b30ff9e144c1364fcf5db0a491d5dbd3a3660ce
+Subproject commit 737dfb21154754485d5e45567315364bc382e1be

libraries/HTTPClient/src/HTTPClient.cpp

@@ -1154,6 +1154,9 @@ int HTTPClient::handleHeaderResponse() {
                     DEBUG_HTTPCLIENT("[HTTP-Client][handleHeaderResponse] Transfer-Encoding: %s\n", transferEncoding.c_str());
                     if (transferEncoding.equalsIgnoreCase(F("chunked"))) {
                         _transferEncoding = HTTPC_TE_CHUNKED;
+                    } else if (transferEncoding.equalsIgnoreCase(F("identity"))) {
+                        // Not in the RFC but seen in the wild
+                        _transferEncoding = HTTPC_TE_IDENTITY;
                     } else {
                         _returnCode = HTTPC_ERROR_ENCODING;
                         return _returnCode;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "framework-arduinopico",
-  "version": "1.40600.0",
+  "version": "1.40601.0",
   "description": "Arduino Wiring-based Framework (RPi Pico RP2040, RP2350)",
   "keywords": [
     "framework",

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.6.0
+version=4.6.1
 
 # Required discoveries and monitors
 # ---------------------------------

variants/adafruit_fruitjam/pins_arduino.h

@@ -8,9 +8,9 @@
 #define NUM_NEOPIXEL   (5u)
 
 // 'Boot0' button also on GPIO #0
-#define PIN_BUTTON      (0u)
-#define PIN_BUTTON1     (4u)
-#define PIN_BUTTON2     (5u)
+#define PIN_BUTTON1     (0u)
+#define PIN_BUTTON2     (4u)
+#define PIN_BUTTON3     (5u)
 
 // USB host connector
 #define PIN_USB_HOST_DP (1u)
@@ -29,12 +29,22 @@
 
 // I2S
 #define PIN_I2S_DATAOUT  (24u)
-#define PIN_I2S_WORDSEL  (25u)
+#define PIN_I2S_WORDSEL  (27u)
 #define PIN_I2S_BITCLK   (26u)
-#define PIN_I2S_MCLK     (27u)
+#define PIN_I2S_MCLK     (25u)
+#define PIN_I2S_IRQ      (23u)
+
 
 #define PIN_PERIPHERAL_RESET (22u)
 
+
+#define SerialESP32     Serial1
+#define SPIWIFI         SPI1
+#define SPIWIFI_SS      46      // Chip select pin
+#define SPIWIFI_ACK     3       // a.k.a BUSY or READY pin
+#define ESP32_RESETN    PIN_PERIPHERAL_RESET  // Reset pin
+#define ESP32_GPIO0     PIN_I2S_IRQ
+
 #define __PIN_A0        (40u)
 #define __PIN_A1        (41u)
 #define __PIN_A2        (42u)
@@ -43,24 +53,25 @@
 #define __PIN_A5        (45u)
 
 // UARTs
+#define __SERIAL1_DEVICE uart1
 #define PIN_SERIAL1_TX (8u)
 #define PIN_SERIAL1_RX (9u)
-#define PIN_SERIAL2_TX (99u) // not pinned out
+#define PIN_SERIAL2_TX (99u)
 #define PIN_SERIAL2_RX (99u)
 
 // SPI
-#define __SPI1_DEVICE   spi1
-#define PIN_SPI1_MISO  (28u)
-#define PIN_SPI1_MOSI  (31u)
-#define PIN_SPI1_SCK   (30u)
-#define PIN_SPI1_SS    (46u)
-
 #define __SPI0_DEVICE   spi0
 #define PIN_SPI0_MISO  (36u)
 #define PIN_SPI0_MOSI  (35u)
 #define PIN_SPI0_SCK   (34u)
 #define PIN_SPI0_SS    (39u)
 
+#define __SPI1_DEVICE   spi1
+#define PIN_SPI1_MISO  (28u)
+#define PIN_SPI1_MOSI  (31u)
+#define PIN_SPI1_SCK   (30u)
+#define PIN_SPI1_SS    (46u)
+
 // Wire
 #define __WIRE0_DEVICE i2c0
 #define PIN_WIRE0_SDA  (20u)