From f0f2cd0e0e3d2245bd02a20580232ca96bd3a86b Mon Sep 17 00:00:00 2001 From: Mictronics Date: Tue, 4 Mar 2025 21:39:10 +0100 Subject: [PATCH] RAK11310 Fix build with latest Arduino framework (#6227) --- arch/rp2xx0/rp2040.ini | 4 ++-- boards/wiscore_rak11300.json | 40 -------------------------------- variants/rak11310/platformio.ini | 5 +--- 3 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 boards/wiscore_rak11300.json diff --git a/arch/rp2xx0/rp2040.ini b/arch/rp2xx0/rp2040.ini index 74644800d..1542dbee7 100644 --- a/arch/rp2xx0/rp2040.ini +++ b/arch/rp2xx0/rp2040.ini @@ -1,8 +1,8 @@ ; Common settings for rp2040 Processor based targets [rp2040_base] -platform = https://github.com/maxgerhardt/platform-raspberrypi.git#19e30129fb1428b823be585c787dcb4ac0d9014c ; For arduino-pico >=4.2.1 +platform = https://github.com/maxgerhardt/platform-raspberrypi.git#76ecf3c7e9dd4503af0331154c4ca1cddc4b03e5 ; For arduino-pico >= 4.4.3 extends = arduino_base -platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#6024e9a7e82a72e38dd90f42029ba3748835eb2e ; 4.3.0 with fix MDNS +platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#4.4.3 board_build.core = earlephilhower board_build.filesystem_size = 0.5m diff --git a/boards/wiscore_rak11300.json b/boards/wiscore_rak11300.json deleted file mode 100644 index 19beee74d..000000000 --- a/boards/wiscore_rak11300.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "build": { - "arduino": { - "earlephilhower": { - "boot2_source": "boot2_w25q080_2_padded_checksum.S", - "usb_vid": "0x2E8A", - "usb_pid": "0x000A" - } - }, - "core": "earlephilhower", - "cpu": "cortex-m0plus", - "extra_flags": "-DARDUINO_GENERIC_RP2040 -DRASPBERRY_PI_PICO -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250", - "f_cpu": "133000000L", - "hwids": [ - ["0x2E8A", "0x00C0"], - ["0x2E8A", "0x000A"] - ], - "mcu": "rp2040", - "variant": "WisBlock_RAK11300_Board" - }, - "debug": { - "jlink_device": "RP2040_M0_0", - "openocd_target": "rp2040.cfg", - "svd_path": "rp2040.svd" - }, - "frameworks": ["arduino"], - "name": "WisBlock RAK11300", - "upload": { - "maximum_ram_size": 270336, - "maximum_size": 2097152, - "require_upload_port": true, - "native_usb": true, - "use_1200bps_touch": true, - "wait_for_upload_port": false, - "protocol": "picotool", - "protocols": ["cmsis-dap", "raspberrypi-swd", "picotool", "picoprobe"] - }, - "url": "https://docs.rakwireless.com/", - "vendor": "RAKwireless" -} diff --git a/variants/rak11310/platformio.ini b/variants/rak11310/platformio.ini index 10bbe1620..6e718a651 100644 --- a/variants/rak11310/platformio.ini +++ b/variants/rak11310/platformio.ini @@ -1,10 +1,7 @@ [env:rak11310] extends = rp2040_base -board = wiscore_rak11300 +board = rakwireless_rak11300 upload_protocol = picotool -# keep an old SDK to use less memory. -platform = https://github.com/maxgerhardt/platform-raspberrypi.git#v1.2.0-gcc12 -platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#4.0.1 # add our variants files to the include and src paths build_flags = ${rp2040_base.build_flags}