Merge branch 'master' into riscv

earlephilhower · web-flow · commit a2f642e1580e · 2024-09-24T08:14:21.000-07:00
diff --git a/README.md b/README.md
@@ -40,7 +40,8 @@ Read the [Contributing Guide](https://github.com/earlephilhower/arduino-pico/blo
 * Cytron Maker Nano RP2040
 * Cytron Maker Uno RP2040
 * Cytron Motion 2350 Pro
-* DatanoiseTV PicoADK+
+* Datanoise PicoADK v1
+* Datanoise PicoADK v2 (RP2350)
 * Degz Suibo RP2040
 * DeRuiLab FlyBoard2040 Core
 * DFRobot Beetle RP2040
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 0
-#define ARDUINO_PICO_REVISION 2
-#define ARDUINO_PICO_VERSION_STR "4.0.2"
+#define ARDUINO_PICO_REVISION 3
+#define ARDUINO_PICO_VERSION_STR "4.0.3"
diff --git a/docs/conf.py b/docs/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'4.0.2'
+version = u'4.0.3'
 # The full version, including alpha/beta/rc tags.
-release = u'4.0.2'
+release = u'4.0.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/libraries/Wire/src/Wire.cpp b/libraries/Wire/src/Wire.cpp
@@ -291,7 +291,7 @@ size_t TwoWire::requestFrom(uint8_t address, size_t quantity) {
 }
 
 static bool _clockStretch(pin_size_t pin) {
-    auto end = time_us_64() + 100;
+    auto end = time_us_64() + 500;
     while ((time_us_64() < end) && (!digitalRead(pin))) { /* noop */ }
     return digitalRead(pin);
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "framework-arduinopico",
-  "version": "1.40002.0",
+  "version": "1.40003.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
@@ -125,6 +125,9 @@
                   {
                      "name": "DatanoiseTV PicoADK"
                   },
+                  {
+                     "name": "DatanoiseTV PicoADK v2"
+                  },
                   {
                      "name": "Degz Robotics Suibo RP2040"
                   },
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.0.2
+version=4.0.3
 
 # Required discoveries and monitors
 # ---------------------------------
diff --git a/tools/json/datanoisetv_picoadk_v2.json b/tools/json/datanoisetv_picoadk_v2.json
@@ -0,0 +1,55 @@
+{
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+                "usb_vid": "0x2E8A",
+                "usb_pid": "0x10AE"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m33",
+        "extra_flags": "-DARDUINO_DATANOISETV_PICOADK_V2 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "150000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x2E8A",
+                "0x10AE"
+            ]
+        ],
+        "mcu": "rp2350",
+        "variant": "datanoisetv_picoadk_v2"
+    },
+    "debug": {
+        "jlink_device": "RP2350_0",
+        "openocd_target": "rp2350.cfg",
+        "svd_path": "rp2350.svd"
+    },
+    "frameworks": [
+        "arduino"
+    ],
+    "name": "PicoADK v2",
+    "upload": {
+        "maximum_ram_size": 524288,
+        "maximum_size": 4194304,
+        "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": "DatanoiseTV"
+}
diff --git a/tools/makeboards.py b/tools/makeboards.py
@@ -520,6 +520,7 @@ def MakeBoardJSON(name, chip, vendor_name, product_name, vid, pid, pwr, boarddef
 
 # DatanoiseTV
 MakeBoard("datanoisetv_picoadk", "rp2040", "DatanoiseTV", "PicoADK", "0x2e8a", "0x000a", 250, "DATANOISETV_PICOADK", 2, 0, "boot2_w25q080_2_padded_checksum")
+MakeBoard("datanoisetv_picoadk_v2", "rp2350", "DatanoiseTV", "PicoADK v2", "0x2e8a", "0x10ae", 250, "DATANOISETV_PICOADK_V2", 4, 0, "boot2_w25q080_2_padded_checksum")
 
 # Degz Robotics
 MakeBoard("degz_suibo", "rp2040", "Degz Robotics", "Suibo RP2040", "0x2e8a", "0xf00a", 250, "DEGZ_SUIBO_RP2040", 16, 0, "boot2_generic_03h_4_padded_checksum", board_url="https://www.degzrobotics.com/suibo")
diff --git a/variants/datanoisetv_picoadk_v2/pins_arduino.h b/variants/datanoisetv_picoadk_v2/pins_arduino.h
@@ -0,0 +1,63 @@
+#pragma once
+
+// DatanoiseTV PicoADK v2 - Audio Development Kit with RP2350A
+// https://github.com/DatanoiseTV/PicoDSP-Hardware
+
+// LEDs
+#define PIN_LED        (2u)
+#define LED_BUILTIN    PIN_LED
+
+// Serial - relocated
+#define PIN_SERIAL1_TX (12u)
+#define PIN_SERIAL1_RX (13u)
+
+// Serial 2 - relocated
+#define PIN_SERIAL2_TX (27u)
+#define PIN_SERIAL2_RX (28u)
+
+// SPI0
+#define PIN_SPI0_MISO  (8u)
+#define PIN_SPI0_MOSI  (7u)
+#define PIN_SPI0_SCK   (6u)
+#define PIN_SPI0_SS    (5u)
+
+// SPI1
+#define PIN_SPI1_MISO  (12u)
+#define PIN_SPI1_MOSI  (11u)
+#define PIN_SPI1_SCK   (10u)
+#define PIN_SPI1_SS    (13u)
+
+// Wire
+#define PIN_WIRE0_SDA  (8u)
+#define PIN_WIRE0_SCL  (9u)
+
+#define PIN_WIRE1_SDA  (6u)
+#define PIN_WIRE1_SCL  (7u)
+
+// I2S
+#define PIN_I2S_BCLK   (17u)
+#define PIN_I2S_LRCLK  (18u)
+#define PIN_I2S_DOUT   (16u)
+#define PIN_I2S_DIN    (15u)
+
+#define SERIAL_HOWMANY (3u)
+#define SPI_HOWMANY    (2u)
+#define WIRE_HOWMANY   (2u)
+
+// PSRAM
+#define RP2350_PSRAM_CS         (0u)
+#define RP2350_PSRAM_MAX_SCK_HZ (109*1000*1000)
+#define PIN_PSRAM_CS            RP2350_PSRAM_CS
+
+// SDIO for SD Card
+#define PIN_SDIO_CLK    (20u)
+#define PIN_SDIO_CMD    (21u)
+#define PIN_SDIO_D0     (22u)
+#define PIN_SDIO_D1     (23u)
+#define PIN_SDIO_D2     (24u)
+#define PIN_SDIO_D3     (25u)
+
+// MIDI
+#define PIN_MIDI_RX    (1u)
+
+#include "../generic/common.h"

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ size_t TwoWire::requestFrom(uint8_t address, size_t quantity) {`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`static bool _clockStretch(pin_size_t pin) {`
`294`		`- auto end = time_us_64() + 100;`
	`294`	`+ auto end = time_us_64() + 500;`
`295`	`295`	`while ((time_us_64() < end) && (!digitalRead(pin))) { /* noop */ }`
`296`	`296`	`return digitalRead(pin);`
`297`	`297`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "framework-arduinopico",`
`3`		`- "version": "1.40002.0",`
	`3`	`+ "version": "1.40003.0",`
`4`	`4`	`"description": "Arduino Wiring-based Framework (RPi Pico RP2040, RP2350)",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"framework",`
Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,9 @@`
`125`	`125`	`{`
`126`	`126`	`"name": "DatanoiseTV PicoADK"`
`127`	`127`	`},`
	`128`	`+ {`
	`129`	`+ "name": "DatanoiseTV PicoADK v2"`
	`130`	`+ },`
`128`	`131`	`{`
`129`	`132`	`"name": "Degz Robotics Suibo RP2040"`
`130`	`133`	`},`