From cb0cc86aa6c93c804757d74f487964fe9636be3b Mon Sep 17 00:00:00 2001 From: tyeth Date: Mon, 2 Dec 2024 18:50:29 +0000 Subject: [PATCH 1/5] Update bootDiskName for Picos + Schema --- boards/rpi-pico-2w/definition.json | 1 + boards/rpi-pico-w/definition.json | 1 + boards/schema.json | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/boards/rpi-pico-2w/definition.json b/boards/rpi-pico-2w/definition.json index f7a5e54..720bb79 100644 --- a/boards/rpi-pico-2w/definition.json +++ b/boards/rpi-pico-2w/definition.json @@ -1,5 +1,6 @@ { "boardName":"rpi-pico-2w", + "bootDiskName":"RP2350", "mcuName":"rp2350", "mcuRefVoltage":3.3, "displayName":"Raspberry Pi Pico 2W", diff --git a/boards/rpi-pico-w/definition.json b/boards/rpi-pico-w/definition.json index f97e9a0..a702a84 100644 --- a/boards/rpi-pico-w/definition.json +++ b/boards/rpi-pico-w/definition.json @@ -1,5 +1,6 @@ { "boardName":"rpi-pico-w", + "bootDiskName":"RP2", "mcuName":"rp2040", "mcuRefVoltage":3.3, "displayName":"Raspberry Pi Pico W", diff --git a/boards/schema.json b/boards/schema.json index 44dc500..b56716f 100644 --- a/boards/schema.json +++ b/boards/schema.json @@ -11,6 +11,12 @@ "minLength": 3, "maxLength": 40 }, + "bootDiskName": { + "description": "The name of the disk that the board will appear as when connected in bootloader mode to a computer. e.g. RP2", + "type": "string", + "minLength": 1, + "maxLength": 40 + }, "mcuName": { "description": "Microcontroller name.", "type": "string", From 093dedc66a6cc4b987f37d73076259c2d7d0e855 Mon Sep 17 00:00:00 2001 From: tyeth Date: Mon, 2 Dec 2024 19:01:14 +0000 Subject: [PATCH 2/5] Add Reverse TFT S3 boot disk name --- .../definition.json | 293 +++++++++--------- 1 file changed, 147 insertions(+), 146 deletions(-) diff --git a/boards/feather-esp32s3-reverse-tft/definition.json b/boards/feather-esp32s3-reverse-tft/definition.json index 898aa9d..1d94f92 100644 --- a/boards/feather-esp32s3-reverse-tft/definition.json +++ b/boards/feather-esp32s3-reverse-tft/definition.json @@ -1,146 +1,147 @@ -{ - "boardName":"feather-esp32s3-reverse-tft", - "mcuName":"esp32s3", - "mcuRefVoltage":2.6, - "displayName":"ESP32-S3 Reverse TFT Feather", - "vendor":"Adafruit", - "productURL":"https://www.adafruit.com/product/5691", - "documentationURL": "https://learn.adafruit.com/esp32-s3-reverse-tft-feather", - "installMethod":"uf2", - "components":{ - "digitalPins":[ - { - "name":"D0", - "displayName":"D0 (Boot Push Button)", - "dataType":"bool", - "direction":"INPUT" - }, - { - "name":"D1", - "displayName":"D1 Push Button", - "dataType":"bool" - }, - { - "name":"D2", - "displayName":"D2 Push Button", - "dataType":"bool" - }, - { - "name":"D5", - "displayName":"D5", - "dataType":"bool", - "hasPWM":true, - "hasServo":true - }, - { - "name":"D6", - "displayName":"D6", - "dataType":"bool", - "hasPWM":true, - "hasServo":true - }, - { - "name":"D9", - "displayName":"D9", - "dataType":"bool", - "hasPWM":true, - "hasServo":true - }, - { - "name":"D10", - "displayName":"D10", - "dataType":"bool", - "hasPWM":true, - "hasServo":true - }, - { - "name":"D11", - "displayName":"D11", - "dataType":"bool", - "hasPWM":true, - "hasServo":true - }, - { - "name":"D12", - "displayName":"D12", - "dataType":"bool", - "hasPWM":true, - "hasServo":true - }, - { - "name":"D13", - "displayName":"D13 (LED)", - "dataType":"bool", - "hasPWM":true - }, - { - "name":"D33", - "displayName":"D33 (NeoPixel)", - "dataType":"bool" - }, - { - "name": "D38", - "displayName": "D38 (UART RX)", - "dataType": "bool", - "uartRx": true - }, - { - "name": "D39", - "displayName": "D39 (UART TX)", - "dataType": "bool", - "uartTx": true - } - ], - "analogPins":[ - { - "name":"A18", - "displayName":"A0", - "dataType":"int16", - "hasPWM":true, - "hasServo":true - }, - { - "name":"A17", - "displayName":"A1", - "dataType":"int16", - "hasPWM":true, - "hasServo":true - }, - { - "name":"A16", - "displayName":"A2", - "dataType":"int16", - "hasPWM":true, - "hasServo":true - }, - { - "name":"A15", - "displayName":"A3", - "dataType":"int16", - "hasPWM":true, - "hasServo":true - }, - { - "name":"A14", - "displayName":"A4", - "dataType":"int16", - "hasPWM":true, - "hasServo":true - }, - { - "name":"A8", - "displayName":"A5", - "dataType":"int16", - "hasPWM":true, - "hasServo":true - } - ], - "i2cPorts":[ - { - "i2cPortId":0, - "SDA":3, - "SCL":4 - } - ] - } - } +{ + "boardName":"feather-esp32s3-reverse-tft", + "bootDiskName":"FTHRS3BOOT", + "mcuName":"esp32s3", + "mcuRefVoltage":2.6, + "displayName":"ESP32-S3 Reverse TFT Feather", + "vendor":"Adafruit", + "productURL":"https://www.adafruit.com/product/5691", + "documentationURL": "https://learn.adafruit.com/esp32-s3-reverse-tft-feather", + "installMethod":"uf2", + "components":{ + "digitalPins":[ + { + "name":"D0", + "displayName":"D0 (Boot Push Button)", + "dataType":"bool", + "direction":"INPUT" + }, + { + "name":"D1", + "displayName":"D1 Push Button", + "dataType":"bool" + }, + { + "name":"D2", + "displayName":"D2 Push Button", + "dataType":"bool" + }, + { + "name":"D5", + "displayName":"D5", + "dataType":"bool", + "hasPWM":true, + "hasServo":true + }, + { + "name":"D6", + "displayName":"D6", + "dataType":"bool", + "hasPWM":true, + "hasServo":true + }, + { + "name":"D9", + "displayName":"D9", + "dataType":"bool", + "hasPWM":true, + "hasServo":true + }, + { + "name":"D10", + "displayName":"D10", + "dataType":"bool", + "hasPWM":true, + "hasServo":true + }, + { + "name":"D11", + "displayName":"D11", + "dataType":"bool", + "hasPWM":true, + "hasServo":true + }, + { + "name":"D12", + "displayName":"D12", + "dataType":"bool", + "hasPWM":true, + "hasServo":true + }, + { + "name":"D13", + "displayName":"D13 (LED)", + "dataType":"bool", + "hasPWM":true + }, + { + "name":"D33", + "displayName":"D33 (NeoPixel)", + "dataType":"bool" + }, + { + "name": "D38", + "displayName": "D38 (UART RX)", + "dataType": "bool", + "uartRx": true + }, + { + "name": "D39", + "displayName": "D39 (UART TX)", + "dataType": "bool", + "uartTx": true + } + ], + "analogPins":[ + { + "name":"A18", + "displayName":"A0", + "dataType":"int16", + "hasPWM":true, + "hasServo":true + }, + { + "name":"A17", + "displayName":"A1", + "dataType":"int16", + "hasPWM":true, + "hasServo":true + }, + { + "name":"A16", + "displayName":"A2", + "dataType":"int16", + "hasPWM":true, + "hasServo":true + }, + { + "name":"A15", + "displayName":"A3", + "dataType":"int16", + "hasPWM":true, + "hasServo":true + }, + { + "name":"A14", + "displayName":"A4", + "dataType":"int16", + "hasPWM":true, + "hasServo":true + }, + { + "name":"A8", + "displayName":"A5", + "dataType":"int16", + "hasPWM":true, + "hasServo":true + } + ], + "i2cPorts":[ + { + "i2cPortId":0, + "SDA":3, + "SCL":4 + } + ] + } + } From cfa4c55527699054c721a8b609a497ef4e920bba Mon Sep 17 00:00:00 2001 From: tyeth Date: Mon, 2 Dec 2024 20:00:49 +0000 Subject: [PATCH 3/5] Migrate PicoW/2W LED pin from 32 to 64 --- boards/rpi-pico-2w/definition.json | 2 +- boards/rpi-pico-2w/magic.json | 2 +- boards/rpi-pico-w/definition.json | 2 +- boards/rpi-pico-w/magic.json | 38 +++++++++++++++--------------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/boards/rpi-pico-2w/definition.json b/boards/rpi-pico-2w/definition.json index 720bb79..d6e5759 100644 --- a/boards/rpi-pico-2w/definition.json +++ b/boards/rpi-pico-2w/definition.json @@ -225,7 +225,7 @@ "hasServo":true }, { - "name":"D32", + "name":"D64", "displayName":"LED (BUILT-IN)", "dataType":"bool" } diff --git a/boards/rpi-pico-2w/magic.json b/boards/rpi-pico-2w/magic.json index ae53ba9..acdb56b 100644 --- a/boards/rpi-pico-2w/magic.json +++ b/boards/rpi-pico-2w/magic.json @@ -9,7 +9,7 @@ "components": [ { "name": "LED", - "pinName": "D32", + "pinName": "D64", "type": "led", "mode": "DIGITAL", "direction": "OUTPUT", diff --git a/boards/rpi-pico-w/definition.json b/boards/rpi-pico-w/definition.json index a702a84..9164892 100644 --- a/boards/rpi-pico-w/definition.json +++ b/boards/rpi-pico-w/definition.json @@ -224,7 +224,7 @@ "hasServo":true }, { - "name":"D32", + "name":"D64", "displayName":"LED (BUILT-IN)", "dataType":"bool" } diff --git a/boards/rpi-pico-w/magic.json b/boards/rpi-pico-w/magic.json index 084b04e..90ae472 100644 --- a/boards/rpi-pico-w/magic.json +++ b/boards/rpi-pico-w/magic.json @@ -1,19 +1,19 @@ -{ - "exportVersion": "1.0.0", - "exportedBy": "Adafruit", - "exportedAt": "2023-11-13T19:26:40.834Z", - "exportedFromDevice": { - "board": "rpi-pico-w", - "firmwareVersion": "1.0.0-beta.73" - }, - "components": [ - { - "name": "LED", - "pinName": "D32", - "type": "led", - "mode": "DIGITAL", - "direction": "OUTPUT", - "isPin": true - } - ] -} +{ + "exportVersion": "1.0.0", + "exportedBy": "Adafruit", + "exportedAt": "2023-11-13T19:26:40.834Z", + "exportedFromDevice": { + "board": "rpi-pico-w", + "firmwareVersion": "1.0.0-beta.73" + }, + "components": [ + { + "name": "LED", + "pinName": "D64", + "type": "led", + "mode": "DIGITAL", + "direction": "OUTPUT", + "isPin": true + } + ] +} From 19968384bf9fb4bb4cb3be721a5211bc52e7b3e4 Mon Sep 17 00:00:00 2001 From: tyeth Date: Wed, 4 Dec 2024 00:09:36 +0000 Subject: [PATCH 4/5] Swap S3revTFT back to LF --- .../definition.json | 294 +++++++++--------- 1 file changed, 147 insertions(+), 147 deletions(-) diff --git a/boards/feather-esp32s3-reverse-tft/definition.json b/boards/feather-esp32s3-reverse-tft/definition.json index 1d94f92..accc043 100644 --- a/boards/feather-esp32s3-reverse-tft/definition.json +++ b/boards/feather-esp32s3-reverse-tft/definition.json @@ -1,147 +1,147 @@ -{ - "boardName":"feather-esp32s3-reverse-tft", - "bootDiskName":"FTHRS3BOOT", - "mcuName":"esp32s3", - "mcuRefVoltage":2.6, - "displayName":"ESP32-S3 Reverse TFT Feather", - "vendor":"Adafruit", - "productURL":"https://www.adafruit.com/product/5691", - "documentationURL": "https://learn.adafruit.com/esp32-s3-reverse-tft-feather", - "installMethod":"uf2", - "components":{ - "digitalPins":[ - { - "name":"D0", - "displayName":"D0 (Boot Push Button)", - "dataType":"bool", - "direction":"INPUT" - }, - { - "name":"D1", - "displayName":"D1 Push Button", - "dataType":"bool" - }, - { - "name":"D2", - "displayName":"D2 Push Button", - "dataType":"bool" - }, - { - "name":"D5", - "displayName":"D5", - "dataType":"bool", - "hasPWM":true, - "hasServo":true - }, - { - "name":"D6", - "displayName":"D6", - "dataType":"bool", - "hasPWM":true, - "hasServo":true - }, - { - "name":"D9", - "displayName":"D9", - "dataType":"bool", - "hasPWM":true, - "hasServo":true - }, - { - "name":"D10", - "displayName":"D10", - "dataType":"bool", - "hasPWM":true, - "hasServo":true - }, - { - "name":"D11", - "displayName":"D11", - "dataType":"bool", - "hasPWM":true, - "hasServo":true - }, - { - "name":"D12", - "displayName":"D12", - "dataType":"bool", - "hasPWM":true, - "hasServo":true - }, - { - "name":"D13", - "displayName":"D13 (LED)", - "dataType":"bool", - "hasPWM":true - }, - { - "name":"D33", - "displayName":"D33 (NeoPixel)", - "dataType":"bool" - }, - { - "name": "D38", - "displayName": "D38 (UART RX)", - "dataType": "bool", - "uartRx": true - }, - { - "name": "D39", - "displayName": "D39 (UART TX)", - "dataType": "bool", - "uartTx": true - } - ], - "analogPins":[ - { - "name":"A18", - "displayName":"A0", - "dataType":"int16", - "hasPWM":true, - "hasServo":true - }, - { - "name":"A17", - "displayName":"A1", - "dataType":"int16", - "hasPWM":true, - "hasServo":true - }, - { - "name":"A16", - "displayName":"A2", - "dataType":"int16", - "hasPWM":true, - "hasServo":true - }, - { - "name":"A15", - "displayName":"A3", - "dataType":"int16", - "hasPWM":true, - "hasServo":true - }, - { - "name":"A14", - "displayName":"A4", - "dataType":"int16", - "hasPWM":true, - "hasServo":true - }, - { - "name":"A8", - "displayName":"A5", - "dataType":"int16", - "hasPWM":true, - "hasServo":true - } - ], - "i2cPorts":[ - { - "i2cPortId":0, - "SDA":3, - "SCL":4 - } - ] - } - } +{ + "boardName":"feather-esp32s3-reverse-tft", + "bootDiskName":"FTHRS3BOOT", + "mcuName":"esp32s3", + "mcuRefVoltage":2.6, + "displayName":"ESP32-S3 Reverse TFT Feather", + "vendor":"Adafruit", + "productURL":"https://www.adafruit.com/product/5691", + "documentationURL": "https://learn.adafruit.com/esp32-s3-reverse-tft-feather", + "installMethod":"uf2", + "components":{ + "digitalPins":[ + { + "name":"D0", + "displayName":"D0 (Boot Push Button)", + "dataType":"bool", + "direction":"INPUT" + }, + { + "name":"D1", + "displayName":"D1 Push Button", + "dataType":"bool" + }, + { + "name":"D2", + "displayName":"D2 Push Button", + "dataType":"bool" + }, + { + "name":"D5", + "displayName":"D5", + "dataType":"bool", + "hasPWM":true, + "hasServo":true + }, + { + "name":"D6", + "displayName":"D6", + "dataType":"bool", + "hasPWM":true, + "hasServo":true + }, + { + "name":"D9", + "displayName":"D9", + "dataType":"bool", + "hasPWM":true, + "hasServo":true + }, + { + "name":"D10", + "displayName":"D10", + "dataType":"bool", + "hasPWM":true, + "hasServo":true + }, + { + "name":"D11", + "displayName":"D11", + "dataType":"bool", + "hasPWM":true, + "hasServo":true + }, + { + "name":"D12", + "displayName":"D12", + "dataType":"bool", + "hasPWM":true, + "hasServo":true + }, + { + "name":"D13", + "displayName":"D13 (LED)", + "dataType":"bool", + "hasPWM":true + }, + { + "name":"D33", + "displayName":"D33 (NeoPixel)", + "dataType":"bool" + }, + { + "name": "D38", + "displayName": "D38 (UART RX)", + "dataType": "bool", + "uartRx": true + }, + { + "name": "D39", + "displayName": "D39 (UART TX)", + "dataType": "bool", + "uartTx": true + } + ], + "analogPins":[ + { + "name":"A18", + "displayName":"A0", + "dataType":"int16", + "hasPWM":true, + "hasServo":true + }, + { + "name":"A17", + "displayName":"A1", + "dataType":"int16", + "hasPWM":true, + "hasServo":true + }, + { + "name":"A16", + "displayName":"A2", + "dataType":"int16", + "hasPWM":true, + "hasServo":true + }, + { + "name":"A15", + "displayName":"A3", + "dataType":"int16", + "hasPWM":true, + "hasServo":true + }, + { + "name":"A14", + "displayName":"A4", + "dataType":"int16", + "hasPWM":true, + "hasServo":true + }, + { + "name":"A8", + "displayName":"A5", + "dataType":"int16", + "hasPWM":true, + "hasServo":true + } + ], + "i2cPorts":[ + { + "i2cPortId":0, + "SDA":3, + "SCL":4 + } + ] + } + } From 54c3900e3572e95e469628f7248bd343fce7498a Mon Sep 17 00:00:00 2001 From: tyeth Date: Wed, 4 Dec 2024 00:10:45 +0000 Subject: [PATCH 5/5] Swap picow magic config back to LF --- boards/rpi-pico-w/magic.json | 38 ++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/boards/rpi-pico-w/magic.json b/boards/rpi-pico-w/magic.json index 90ae472..2008d77 100644 --- a/boards/rpi-pico-w/magic.json +++ b/boards/rpi-pico-w/magic.json @@ -1,19 +1,19 @@ -{ - "exportVersion": "1.0.0", - "exportedBy": "Adafruit", - "exportedAt": "2023-11-13T19:26:40.834Z", - "exportedFromDevice": { - "board": "rpi-pico-w", - "firmwareVersion": "1.0.0-beta.73" - }, - "components": [ - { - "name": "LED", - "pinName": "D64", - "type": "led", - "mode": "DIGITAL", - "direction": "OUTPUT", - "isPin": true - } - ] -} +{ + "exportVersion": "1.0.0", + "exportedBy": "Adafruit", + "exportedAt": "2023-11-13T19:26:40.834Z", + "exportedFromDevice": { + "board": "rpi-pico-w", + "firmwareVersion": "1.0.0-beta.73" + }, + "components": [ + { + "name": "LED", + "pinName": "D64", + "type": "led", + "mode": "DIGITAL", + "direction": "OUTPUT", + "isPin": true + } + ] +}