From 1a99f74063569df0927e1ada0256059fcdef128c Mon Sep 17 00:00:00 2001 From: Jim Mussared Date: Tue, 15 Aug 2023 23:25:15 +1000 Subject: [PATCH] ports/*/boards/*/board.json: Remove "id" field. This was used to override the firmware filename generated by the build server (to match the historical name before board definitions existed). Now we're making everything use the board definition name (i.e. the directory name). This work was funded through GitHub Sponsors. Signed-off-by: Jim Mussared --- ports/cc3200/boards/WIPY/board.json | 1 - ports/esp32/boards/GENERIC/board.json | 1 - ports/esp32/boards/GENERIC_C3/board.json | 1 - ports/esp32/boards/SIL_WESP32/board.json | 1 - ports/esp32/boards/UM_FEATHERS2/board.json | 1 - ports/esp32/boards/UM_FEATHERS2NEO/board.json | 1 - ports/esp32/boards/UM_FEATHERS3/board.json | 1 - ports/esp32/boards/UM_PROS3/board.json | 1 - ports/esp32/boards/UM_TINYPICO/board.json | 1 - ports/esp32/boards/UM_TINYS2/board.json | 1 - ports/esp32/boards/UM_TINYS3/board.json | 1 - ports/esp8266/boards/GENERIC/board.json | 1 - ports/esp8266/boards/GENERIC_1M/board.json | 1 - ports/esp8266/boards/GENERIC_512K/board.json | 1 - ports/renesas-ra/boards/EK_RA4M1/board.json | 1 - ports/renesas-ra/boards/EK_RA4W1/board.json | 1 - ports/renesas-ra/boards/EK_RA6M1/board.json | 1 - ports/renesas-ra/boards/EK_RA6M2/board.json | 1 - ports/renesas-ra/boards/RA4M1_CLICKER/board.json | 1 - ports/renesas-ra/boards/VK_RA6M5/board.json | 1 - ports/rp2/boards/PICO/board.json | 1 - ports/rp2/boards/PICO_W/board.json | 1 - ports/stm32/boards/MIKROE_QUAIL/board.json | 1 - ports/stm32/boards/PYBD_SF2/board.json | 1 - ports/stm32/boards/PYBD_SF3/board.json | 1 - ports/stm32/boards/PYBD_SF6/board.json | 1 - ports/stm32/boards/PYBLITEV10/board.json | 1 - ports/stm32/boards/PYBV10/board.json | 1 - ports/stm32/boards/PYBV11/board.json | 1 - 29 files changed, 29 deletions(-) diff --git a/ports/cc3200/boards/WIPY/board.json b/ports/cc3200/boards/WIPY/board.json index 4a5a81f99f..f615953af7 100644 --- a/ports/cc3200/boards/WIPY/board.json +++ b/ports/cc3200/boards/WIPY/board.json @@ -10,7 +10,6 @@ "WiFi", "microSD" ], - "id": "wipy", "images": [ "wipy.jpg" ], diff --git a/ports/esp32/boards/GENERIC/board.json b/ports/esp32/boards/GENERIC/board.json index 8e2f224328..0db38c25d3 100644 --- a/ports/esp32/boards/GENERIC/board.json +++ b/ports/esp32/boards/GENERIC/board.json @@ -8,7 +8,6 @@ "External Flash", "WiFi" ], - "id": "esp32", "images": [ "esp32_devkitc.jpg" ], diff --git a/ports/esp32/boards/GENERIC_C3/board.json b/ports/esp32/boards/GENERIC_C3/board.json index c993c87603..4a81d227a0 100644 --- a/ports/esp32/boards/GENERIC_C3/board.json +++ b/ports/esp32/boards/GENERIC_C3/board.json @@ -8,7 +8,6 @@ "External Flash", "WiFi" ], - "id": "esp32c3", "images": [ "esp32c3_devkitmini.jpg" ], diff --git a/ports/esp32/boards/SIL_WESP32/board.json b/ports/esp32/boards/SIL_WESP32/board.json index 5c77b4887a..50dd2cc660 100644 --- a/ports/esp32/boards/SIL_WESP32/board.json +++ b/ports/esp32/boards/SIL_WESP32/board.json @@ -10,7 +10,6 @@ "PoE", "WiFi" ], - "id": "wesp32", "images": [ "wesp32-iso.jpg", "wesp32-top.jpg" diff --git a/ports/esp32/boards/UM_FEATHERS2/board.json b/ports/esp32/boards/UM_FEATHERS2/board.json index 4b6ea88558..4de9a7d4f7 100644 --- a/ports/esp32/boards/UM_FEATHERS2/board.json +++ b/ports/esp32/boards/UM_FEATHERS2/board.json @@ -16,7 +16,6 @@ "features_non_filterable": [ "Second LDO" ], - "id": "featherS2", "images": [ "unexpectedmaker_feathers2.jpg" ], diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/board.json b/ports/esp32/boards/UM_FEATHERS2NEO/board.json index 51bb02b97b..dfa1f46dc3 100644 --- a/ports/esp32/boards/UM_FEATHERS2NEO/board.json +++ b/ports/esp32/boards/UM_FEATHERS2NEO/board.json @@ -16,7 +16,6 @@ "features_non_filterable": [ "5x5 RGB LED Matrix" ], - "id": "featherS2neo", "images": [ "FeatherS2_Neo_White_Product2.jpg" ], diff --git a/ports/esp32/boards/UM_FEATHERS3/board.json b/ports/esp32/boards/UM_FEATHERS3/board.json index 0ad1ff73be..235d52a12d 100644 --- a/ports/esp32/boards/UM_FEATHERS3/board.json +++ b/ports/esp32/boards/UM_FEATHERS3/board.json @@ -15,7 +15,6 @@ "WiFi" ], "features_non_filterable": [], - "id": "feathers3", "images": [ "unexpectedmaker_feathers3.jpg" ], diff --git a/ports/esp32/boards/UM_PROS3/board.json b/ports/esp32/boards/UM_PROS3/board.json index 3e83a813f4..8efc4e5ab5 100644 --- a/ports/esp32/boards/UM_PROS3/board.json +++ b/ports/esp32/boards/UM_PROS3/board.json @@ -15,7 +15,6 @@ "WiFi" ], "features_non_filterable": [], - "id": "pros3", "images": [ "unexpectedmaker_pros3.jpg" ], diff --git a/ports/esp32/boards/UM_TINYPICO/board.json b/ports/esp32/boards/UM_TINYPICO/board.json index 3e15e99112..bf0b3d2c8c 100644 --- a/ports/esp32/boards/UM_TINYPICO/board.json +++ b/ports/esp32/boards/UM_TINYPICO/board.json @@ -15,7 +15,6 @@ "features_non_filterable": [ "TinyPICO Compatible" ], - "id": "tinypico", "images": [ "tinypico-v2-both.jpg" ], diff --git a/ports/esp32/boards/UM_TINYS2/board.json b/ports/esp32/boards/UM_TINYS2/board.json index b6c94ba9e8..1b4c934dfa 100644 --- a/ports/esp32/boards/UM_TINYS2/board.json +++ b/ports/esp32/boards/UM_TINYS2/board.json @@ -15,7 +15,6 @@ "features_non_filterable": [ "TinyPICO Compatible" ], - "id": "tinys2", "images": [ "TinyS2+Product+Shot.jpg" ], diff --git a/ports/esp32/boards/UM_TINYS3/board.json b/ports/esp32/boards/UM_TINYS3/board.json index 3b7bb13345..27ae46a249 100644 --- a/ports/esp32/boards/UM_TINYS3/board.json +++ b/ports/esp32/boards/UM_TINYS3/board.json @@ -15,7 +15,6 @@ "features_non_filterable": [ "TinyPICO Compatible" ], - "id": "tinys3", "images": [ "unexpectedmaker_tinys3.jpg" ], diff --git a/ports/esp8266/boards/GENERIC/board.json b/ports/esp8266/boards/GENERIC/board.json index ebdd95493b..dffe6d2711 100644 --- a/ports/esp8266/boards/GENERIC/board.json +++ b/ports/esp8266/boards/GENERIC/board.json @@ -7,7 +7,6 @@ "External Flash", "WiFi" ], - "id": "esp8266", "images": [], "mcu": "esp8266", "product": "ESP8266 with 2MiB+ flash", diff --git a/ports/esp8266/boards/GENERIC_1M/board.json b/ports/esp8266/boards/GENERIC_1M/board.json index 5446f29128..4ab5c79df0 100644 --- a/ports/esp8266/boards/GENERIC_1M/board.json +++ b/ports/esp8266/boards/GENERIC_1M/board.json @@ -7,7 +7,6 @@ "External Flash", "WiFi" ], - "id": "esp8266-1m", "images": [], "mcu": "esp8266", "product": "ESP8266 with 1MiB flash", diff --git a/ports/esp8266/boards/GENERIC_512K/board.json b/ports/esp8266/boards/GENERIC_512K/board.json index 1feac4a05c..e035562be7 100644 --- a/ports/esp8266/boards/GENERIC_512K/board.json +++ b/ports/esp8266/boards/GENERIC_512K/board.json @@ -7,7 +7,6 @@ "External Flash", "WiFi" ], - "id": "esp8266-512k", "images": [], "mcu": "esp8266", "product": "ESP8266 with 512kiB flash", diff --git a/ports/renesas-ra/boards/EK_RA4M1/board.json b/ports/renesas-ra/boards/EK_RA4M1/board.json index d21fe0c121..4d8dcd5e6d 100644 --- a/ports/renesas-ra/boards/EK_RA4M1/board.json +++ b/ports/renesas-ra/boards/EK_RA4M1/board.json @@ -4,7 +4,6 @@ ], "docs": "", "features": [], - "id": "EK-RA4M1", "images": [ "ek_ra4m1_board.jpg" ], diff --git a/ports/renesas-ra/boards/EK_RA4W1/board.json b/ports/renesas-ra/boards/EK_RA4W1/board.json index 878d97a8ac..edc4fcbfe0 100644 --- a/ports/renesas-ra/boards/EK_RA4W1/board.json +++ b/ports/renesas-ra/boards/EK_RA4W1/board.json @@ -4,7 +4,6 @@ ], "docs": "", "features": [], - "id": "EK-RA4W1", "images": [ "ek_ra4w1_board.jpg" ], diff --git a/ports/renesas-ra/boards/EK_RA6M1/board.json b/ports/renesas-ra/boards/EK_RA6M1/board.json index d678fa387e..3bdb08b92f 100644 --- a/ports/renesas-ra/boards/EK_RA6M1/board.json +++ b/ports/renesas-ra/boards/EK_RA6M1/board.json @@ -4,7 +4,6 @@ ], "docs": "", "features": [], - "id": "EK-RA6M1", "images": [ "ek_ra6m1_board.jpg" ], diff --git a/ports/renesas-ra/boards/EK_RA6M2/board.json b/ports/renesas-ra/boards/EK_RA6M2/board.json index 3d6b95aacb..5760b19736 100644 --- a/ports/renesas-ra/boards/EK_RA6M2/board.json +++ b/ports/renesas-ra/boards/EK_RA6M2/board.json @@ -4,7 +4,6 @@ ], "docs": "", "features": [], - "id": "EK-RA6M2", "images": [ "ek_ra6m2_board.jpg", "ek_ra6m2_j1_pins.jpg", diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/board.json b/ports/renesas-ra/boards/RA4M1_CLICKER/board.json index 8cb64f6601..be1dd977c3 100644 --- a/ports/renesas-ra/boards/RA4M1_CLICKER/board.json +++ b/ports/renesas-ra/boards/RA4M1_CLICKER/board.json @@ -4,7 +4,6 @@ ], "docs": "", "features": [], - "id": "RA4M1-CLICKER", "images": [ "ra4m1_clicker_board.jpg", "ra4m1_clicker_pins.jpg" diff --git a/ports/renesas-ra/boards/VK_RA6M5/board.json b/ports/renesas-ra/boards/VK_RA6M5/board.json index b2ff6b0e40..48371138b1 100644 --- a/ports/renesas-ra/boards/VK_RA6M5/board.json +++ b/ports/renesas-ra/boards/VK_RA6M5/board.json @@ -6,7 +6,6 @@ "features": [ "DAC" ], - "id": "VK-RA6M5", "images": [ "VK-RA6M5.jpg" ], diff --git a/ports/rp2/boards/PICO/board.json b/ports/rp2/boards/PICO/board.json index 8c0a12ae76..07938978f3 100644 --- a/ports/rp2/boards/PICO/board.json +++ b/ports/rp2/boards/PICO/board.json @@ -8,7 +8,6 @@ "External Flash", "USB" ], - "id": "rp2-pico", "images": [ "rp2-pico.jpg" ], diff --git a/ports/rp2/boards/PICO_W/board.json b/ports/rp2/boards/PICO_W/board.json index 7ee7ef505e..6ea326c6cd 100644 --- a/ports/rp2/boards/PICO_W/board.json +++ b/ports/rp2/boards/PICO_W/board.json @@ -10,7 +10,6 @@ "USB", "WiFi" ], - "id": "rp2-pico-w", "images": [ "rp2-pico-w.jpg" ], diff --git a/ports/stm32/boards/MIKROE_QUAIL/board.json b/ports/stm32/boards/MIKROE_QUAIL/board.json index 15d8b5fc13..689bdb1052 100644 --- a/ports/stm32/boards/MIKROE_QUAIL/board.json +++ b/ports/stm32/boards/MIKROE_QUAIL/board.json @@ -6,7 +6,6 @@ "features": [ "mikroBUS" ], - "id": "MIKROE-QUAIL", "images": [ "quail_top.jpg" ], diff --git a/ports/stm32/boards/PYBD_SF2/board.json b/ports/stm32/boards/PYBD_SF2/board.json index 534a048ff0..06a83e4d89 100644 --- a/ports/stm32/boards/PYBD_SF2/board.json +++ b/ports/stm32/boards/PYBD_SF2/board.json @@ -4,7 +4,6 @@ ], "docs": "", "features": [], - "id": "PYBD-SF2", "images": [ "PYBD_SF2_W4F2.jpg", "PYBD_SF2_W4F2_top.jpg", diff --git a/ports/stm32/boards/PYBD_SF3/board.json b/ports/stm32/boards/PYBD_SF3/board.json index 3e4731b3d2..e89f268cff 100644 --- a/ports/stm32/boards/PYBD_SF3/board.json +++ b/ports/stm32/boards/PYBD_SF3/board.json @@ -4,7 +4,6 @@ ], "docs": "", "features": [], - "id": "PYBD-SF3", "images": [ "PYBD_SF3_W4F2.jpg", "PYBD_SF3_W4F2_top.jpg", diff --git a/ports/stm32/boards/PYBD_SF6/board.json b/ports/stm32/boards/PYBD_SF6/board.json index 3a39763d5b..b6d85d6fd7 100644 --- a/ports/stm32/boards/PYBD_SF6/board.json +++ b/ports/stm32/boards/PYBD_SF6/board.json @@ -7,7 +7,6 @@ "BLE", "WiFi" ], - "id": "PYBD-SF6", "images": [ "PYBD_SF6_W4F2.jpg", "PYBD_SF6_W4F2_top.jpg", diff --git a/ports/stm32/boards/PYBLITEV10/board.json b/ports/stm32/boards/PYBLITEV10/board.json index 38bb7fe1a0..0d2338d3db 100644 --- a/ports/stm32/boards/PYBLITEV10/board.json +++ b/ports/stm32/boards/PYBLITEV10/board.json @@ -4,7 +4,6 @@ ], "docs": "", "features": [], - "id": "pyblitev10", "images": [ "PYBLITEv1_0.jpg", "PYBLITEv1_0-B.jpg", diff --git a/ports/stm32/boards/PYBV10/board.json b/ports/stm32/boards/PYBV10/board.json index 5f8f906172..0c5fea2eb8 100644 --- a/ports/stm32/boards/PYBV10/board.json +++ b/ports/stm32/boards/PYBV10/board.json @@ -4,7 +4,6 @@ ], "docs": "", "features": [], - "id": "pybv10", "images": [ "PYBv1_0-C.jpg" ], diff --git a/ports/stm32/boards/PYBV11/board.json b/ports/stm32/boards/PYBV11/board.json index 1fd04310fd..5d7abbaa83 100644 --- a/ports/stm32/boards/PYBV11/board.json +++ b/ports/stm32/boards/PYBV11/board.json @@ -4,7 +4,6 @@ ], "docs": "", "features": [], - "id": "pybv11", "images": [ "PYBv1_1.jpg", "PYBv1_1-C.jpg",