From faf42327eed34f25068db7cec06509da6147c714 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Sun, 24 Aug 2025 15:50:09 +0200 Subject: [PATCH 1/2] Correct build.variant to match pico-sdk names In pidosdk.py:19 the check for header isfile(join(FRAMEWORK_DIR, "src", "boards", "include", "boards", header)): fails, as pico-sdk names boards using the dot. Otherwise (and without warning) the pico.h header is chosen, leading to false assumptions (e.g. about PICO_DEFAULT_LED_PIN) --- boards/waveshare_rp2040_lcd_0_96.json | 4 ++-- boards/waveshare_rp2040_lcd_1_28.json | 4 ++-- boards/waveshare_rp2350_lcd_0_96.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/boards/waveshare_rp2040_lcd_0_96.json b/boards/waveshare_rp2040_lcd_0_96.json index 10bcac4..73098dd 100644 --- a/boards/waveshare_rp2040_lcd_0_96.json +++ b/boards/waveshare_rp2040_lcd_0_96.json @@ -22,7 +22,7 @@ ] ], "mcu": "rp2040", - "variant": "waveshare_rp2040_lcd_0_96" + "variant": "waveshare_rp2040_lcd_0.96" }, "debug": { "jlink_device": "RP2040_M0_0", @@ -53,4 +53,4 @@ }, "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/", "vendor": "Waveshare" -} \ No newline at end of file +} diff --git a/boards/waveshare_rp2040_lcd_1_28.json b/boards/waveshare_rp2040_lcd_1_28.json index 2025b1b..7fae10c 100644 --- a/boards/waveshare_rp2040_lcd_1_28.json +++ b/boards/waveshare_rp2040_lcd_1_28.json @@ -22,7 +22,7 @@ ] ], "mcu": "rp2040", - "variant": "waveshare_rp2040_lcd_1_28" + "variant": "waveshare_rp2040_lcd_1.28" }, "debug": { "jlink_device": "RP2040_M0_0", @@ -53,4 +53,4 @@ }, "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/", "vendor": "Waveshare" -} \ No newline at end of file +} diff --git a/boards/waveshare_rp2350_lcd_0_96.json b/boards/waveshare_rp2350_lcd_0_96.json index adf8adc..5fd68a4 100644 --- a/boards/waveshare_rp2350_lcd_0_96.json +++ b/boards/waveshare_rp2350_lcd_0_96.json @@ -22,7 +22,7 @@ ] ], "mcu": "rp2350", - "variant": "waveshare_rp2350_lcd_0_96" + "variant": "waveshare_rp2350_lcd_0.96" }, "debug": { "jlink_device": "RP2350_M33_0", @@ -53,4 +53,4 @@ }, "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/", "vendor": "Waveshare" -} \ No newline at end of file +} From 7e9ff84d99db08985f33262f59ee066b11232865 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Sun, 24 Aug 2025 16:25:35 +0200 Subject: [PATCH 2/2] Correct the URLs, even though purely informational. --- boards/waveshare_rp2040_lcd_0_96.json | 2 +- boards/waveshare_rp2040_lcd_1_28.json | 2 +- boards/waveshare_rp2040_matrix.json | 4 ++-- boards/waveshare_rp2040_one.json | 4 ++-- boards/waveshare_rp2040_pizero.json | 4 ++-- boards/waveshare_rp2040_plus.json | 4 ++-- boards/waveshare_rp2040_plus_16mb.json | 4 ++-- boards/waveshare_rp2040_plus_4mb.json | 4 ++-- boards/waveshare_rp2040_zero.json | 4 ++-- boards/waveshare_rp2350_lcd_0_96.json | 2 +- boards/waveshare_rp2350_plus.json | 4 ++-- boards/waveshare_rp2350_zero.json | 4 ++-- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/boards/waveshare_rp2040_lcd_0_96.json b/boards/waveshare_rp2040_lcd_0_96.json index 73098dd..75e6d87 100644 --- a/boards/waveshare_rp2040_lcd_0_96.json +++ b/boards/waveshare_rp2040_lcd_0_96.json @@ -51,6 +51,6 @@ "picoprobe" ] }, - "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/", + "url": "https://www.waveshare.com/rp2040-lcd-0.96.htm", "vendor": "Waveshare" } diff --git a/boards/waveshare_rp2040_lcd_1_28.json b/boards/waveshare_rp2040_lcd_1_28.json index 7fae10c..a35375e 100644 --- a/boards/waveshare_rp2040_lcd_1_28.json +++ b/boards/waveshare_rp2040_lcd_1_28.json @@ -51,6 +51,6 @@ "picoprobe" ] }, - "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/", + "url": "https://www.waveshare.com/rp2040-lcd-1.28.htm", "vendor": "Waveshare" } diff --git a/boards/waveshare_rp2040_matrix.json b/boards/waveshare_rp2040_matrix.json index 1954968..b0feec0 100644 --- a/boards/waveshare_rp2040_matrix.json +++ b/boards/waveshare_rp2040_matrix.json @@ -51,6 +51,6 @@ "picoprobe" ] }, - "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/", + "url": "https://www.waveshare.com/rp2040-matrix.htm", "vendor": "Waveshare" -} \ No newline at end of file +} diff --git a/boards/waveshare_rp2040_one.json b/boards/waveshare_rp2040_one.json index a0a5806..df19f75 100644 --- a/boards/waveshare_rp2040_one.json +++ b/boards/waveshare_rp2040_one.json @@ -51,6 +51,6 @@ "picoprobe" ] }, - "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/", + "url": "https://www.waveshare.com/rp2040-one.htm", "vendor": "Waveshare" -} \ No newline at end of file +} diff --git a/boards/waveshare_rp2040_pizero.json b/boards/waveshare_rp2040_pizero.json index b984dd2..128abe0 100644 --- a/boards/waveshare_rp2040_pizero.json +++ b/boards/waveshare_rp2040_pizero.json @@ -51,6 +51,6 @@ "picoprobe" ] }, - "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/", + "url": "https://www.waveshare.com/rp2040-pizero.htm", "vendor": "Waveshare" -} \ No newline at end of file +} diff --git a/boards/waveshare_rp2040_plus.json b/boards/waveshare_rp2040_plus.json index 3989701..169a0f0 100644 --- a/boards/waveshare_rp2040_plus.json +++ b/boards/waveshare_rp2040_plus.json @@ -51,6 +51,6 @@ "picoprobe" ] }, - "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/", + "url": "https://www.waveshare.com/rp2040-plus.htm", "vendor": "Waveshare" -} \ No newline at end of file +} diff --git a/boards/waveshare_rp2040_plus_16mb.json b/boards/waveshare_rp2040_plus_16mb.json index 037f9bf..7fffed9 100644 --- a/boards/waveshare_rp2040_plus_16mb.json +++ b/boards/waveshare_rp2040_plus_16mb.json @@ -51,6 +51,6 @@ "picoprobe" ] }, - "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/", + "url": "https://www.waveshare.com/rp2040-plus.htm", "vendor": "Waveshare" -} \ No newline at end of file +} diff --git a/boards/waveshare_rp2040_plus_4mb.json b/boards/waveshare_rp2040_plus_4mb.json index 5addd95..837462e 100644 --- a/boards/waveshare_rp2040_plus_4mb.json +++ b/boards/waveshare_rp2040_plus_4mb.json @@ -51,6 +51,6 @@ "picoprobe" ] }, - "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/", + "url": "https://www.waveshare.com/rp2040-plus.htm", "vendor": "Waveshare" -} \ No newline at end of file +} diff --git a/boards/waveshare_rp2040_zero.json b/boards/waveshare_rp2040_zero.json index f211f85..bc94bc5 100644 --- a/boards/waveshare_rp2040_zero.json +++ b/boards/waveshare_rp2040_zero.json @@ -51,6 +51,6 @@ "picoprobe" ] }, - "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/", + "url": "https://www.waveshare.com/rp2040-zero.htm", "vendor": "Waveshare" -} \ No newline at end of file +} diff --git a/boards/waveshare_rp2350_lcd_0_96.json b/boards/waveshare_rp2350_lcd_0_96.json index 5fd68a4..3f2d666 100644 --- a/boards/waveshare_rp2350_lcd_0_96.json +++ b/boards/waveshare_rp2350_lcd_0_96.json @@ -51,6 +51,6 @@ "picoprobe" ] }, - "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/", + "url": "https://www.waveshare.com/rp2350-lcd-0.96.htm", "vendor": "Waveshare" } diff --git a/boards/waveshare_rp2350_plus.json b/boards/waveshare_rp2350_plus.json index 710fe5b..2b6b1e9 100644 --- a/boards/waveshare_rp2350_plus.json +++ b/boards/waveshare_rp2350_plus.json @@ -51,6 +51,6 @@ "picoprobe" ] }, - "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/", + "url": "https://www.waveshare.com/rp2350-plus.htm", "vendor": "Waveshare" -} \ No newline at end of file +} diff --git a/boards/waveshare_rp2350_zero.json b/boards/waveshare_rp2350_zero.json index fd853bd..1e506a6 100644 --- a/boards/waveshare_rp2350_zero.json +++ b/boards/waveshare_rp2350_zero.json @@ -51,6 +51,6 @@ "picoprobe" ] }, - "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/", + "url": "https://www.waveshare.com/rp2350-zero.htm", "vendor": "Waveshare" -} \ No newline at end of file +}