From e864e5ef24a0ae34c106139580e4a775233a46f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Wed, 15 Jun 2022 13:01:30 +0200 Subject: [PATCH] [boards] Move PCB definitions to subdir, use base IC pinouts --- .../ic-rtl8710bn.json} | 233 ++++++++++-------- boards/_base/pcb/wr3.json | 82 ++++++ boards/_base/pcb/wr3e.json | 82 ++++++ boards/_base/realtek-ambz-tuya3.json | 151 ------------ boards/wr3.json | 9 +- tools/boardgen | 2 +- 6 files changed, 292 insertions(+), 267 deletions(-) rename boards/_base/{realtek-ambz-tuya3-alt.json => pcb/ic-rtl8710bn.json} (51%) create mode 100644 boards/_base/pcb/wr3.json create mode 100644 boards/_base/pcb/wr3e.json delete mode 100644 boards/_base/realtek-ambz-tuya3.json diff --git a/boards/_base/realtek-ambz-tuya3-alt.json b/boards/_base/pcb/ic-rtl8710bn.json similarity index 51% rename from boards/_base/realtek-ambz-tuya3-alt.json rename to boards/_base/pcb/ic-rtl8710bn.json index 7ff6a4d..7a376d4 100644 --- a/boards/_base/realtek-ambz-tuya3-alt.json +++ b/boards/_base/pcb/ic-rtl8710bn.json @@ -1,126 +1,111 @@ { "pcb": { - "templates": [ - "esp12s", - "esp12s-shield", - "tuya-16x24", - "tuya-16x24-rf1" - ], - "vars": { - "MASK_PRESET": "mask_black", - "TRACE_COLOR": "#505050", - "SILK_COLOR": "white", - "PINTYPE_VERT": "pin_vert_2mm_cast_nohole" - }, - "pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD", - "pinout": { + "ic": { "1": { - "NC": null - }, - "2": { - "IC": 27, - "IO": "I", - "ADC": 2, - "ARD": "A1" - }, - "3": { - "IC": 12, - "IO": "I", - "CTRL": "CEN" - }, - "4": { - "IC": 2, - "GPIO": "PA29", - "ARD": "D5", - "UART": "2_RX", - "I2C": "0_SCL", - "PWM": 4 - }, - "5": { - "IC": 13, - "GPIO": "PA14", - "ARD": "D2", - "PWM": 0, - "SWD": "CLK" - }, - "6": { - "IC": 14, - "GPIO": "PA15", - "ARD": "D3", - "PWM": 1, - "SWD": "DIO" - }, - "7": { - "IC": 31, - "GPIO": "PA22", - "ARD": "D0", - "UART": "0_RTS", - "SPI": [ - "0_MISO", - "1_MISO" - ], - "I2C": "0_SCL", - "SD": "D0", - "PWM": 5, - "I2S": "0_WS", - "WAKE": 2 - }, - "8": { - "PWR": 3.3 - }, - "9": { - "GND": null - }, - "10": { - "IC": 16, - "GPIO": "PA00", - "ARD": "D4", - "PWM": 2 - }, - "11": { - "IC": 1, + "C_NAME": "PA_30", "GPIO": "PA30", - "ARD": "D6", + "IRQ": null, "UART": "2_TX", "I2C": "0_SDA", "PWM": 4, "RTC": "OUT" }, + "2": { + "C_NAME": "PA_29", + "GPIO": "PA29", + "IRQ": null, + "UART": "2_RX", + "I2C": "0_SCL", + "PWM": 4 + }, "12": { - "IC": 30, - "GPIO": "PA19", - "ARD": [ - "D1", - "A0" - ], - "ADC": 1, - "UART": "0_CTS", - "SPI": [ - "0_CS", - "1_CS" - ], - "I2C": "0_SDA", - "SD": "D3", - "TMR": "5_TRIG", - "I2S": "0_TX" + "IO": "I", + "CTRL": "CEN" }, "13": { - "IC": 28, + "C_NAME": "PA_14", + "GPIO": "PA14", + "IRQ": null, + "PWM": 0, + "SWD": "CLK" + }, + "14": { + "C_NAME": "PA_15", + "GPIO": "PA15", + "IRQ": null, + "PWM": 1, + "SWD": "DIO" + }, + "16": { + "C_NAME": "PA_0", + "GPIO": "PA00", + "IRQ": null, + "PWM": 2 + }, + "17": { + "C_NAME": "PA_12", + "GPIO": "PA12", + "IRQ": null, + "PWM": 3 + }, + "18": { + "C_NAME": "PA_6", + "GPIO": "PA06", + "IRQ": null, + "SPI": "FCS", + "SD": "D2" + }, + "19": { + "C_NAME": "PA_7", + "GPIO": "PA07", + "IRQ": null, + "SPI": "FD1", + "SD": "D3" + }, + "20": { + "C_NAME": "PA_8", + "GPIO": "PA08", + "IRQ": null, + "SPI": "FD2", + "SD": "CMD" + }, + "21": { + "C_NAME": "PA_9", + "GPIO": "PA09", + "IRQ": null, + "SPI": "FD0", + "SD": "CLK" + }, + "22": { + "C_NAME": "PA_10", + "GPIO": "PA10", + "IRQ": null, + "SPI": "FSCK", + "SD": "D0" + }, + "23": { + "C_NAME": "PA_11", + "GPIO": "PA11", + "IRQ": null, + "SPI": "FD3", + "SD": "D1" + }, + "27": { + "C_NAME": "AD_2", + "IO": "I", + "ADC": 2 + }, + "28": { + "C_NAME": "PA_5", "GPIO": "PA05", - "ARD": "D7", + "IRQ": null, "PWM": 4, "WAKE": 1 }, - "14": { - "IC": 17, - "GPIO": "PA12", - "ARD": "D8", - "PWM": 3 - }, - "15": { - "IC": 29, + "29": { + "C_NAME": "PA_18", "GPIO": "PA18", - "ARD": "D9", + "IRQ": null, "UART": "0_RX", "SPI": [ "0_SCK", @@ -132,10 +117,40 @@ "I2S": "0_MCK", "WAKE": 0 }, - "16": { - "IC": 32, + "30": { + "C_NAME": "PA_19", + "GPIO": "PA19", + "IRQ": null, + "ADC": 1, + "UART": "0_CTS", + "SPI": [ + "0_CS", + "1_CS" + ], + "I2C": "0_SDA", + "SD": "D3", + "TMR": "5_TRIG", + "I2S": "0_TX" + }, + "31": { + "C_NAME": "PA_22", + "GPIO": "PA22", + "IRQ": null, + "UART": "0_RTS", + "SPI": [ + "0_MISO", + "1_MISO" + ], + "I2C": "0_SCL", + "SD": "D0", + "PWM": 5, + "I2S": "0_WS", + "WAKE": 2 + }, + "32": { + "C_NAME": "PA_23", "GPIO": "PA23", - "ARD": "D10", + "IRQ": null, "UART": "0_TX", "SPI": [ "0_MOSI", diff --git a/boards/_base/pcb/wr3.json b/boards/_base/pcb/wr3.json new file mode 100644 index 0000000..9dc7099 --- /dev/null +++ b/boards/_base/pcb/wr3.json @@ -0,0 +1,82 @@ +{ + "pcb": { + "templates": [ + "esp12s", + "esp12s-shield", + "tuya-16x24", + "rf-16mm-type1" + ], + "vars": { + "MASK_PRESET": "mask_black", + "TRACE_COLOR": "#505050", + "SILK_COLOR": "white", + "PINTYPE_VERT": "pin_vert_2mm_cast_nohole" + }, + "pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD", + "pinout": { + "1": { + "NC": null + }, + "2": { + "IC": 31, + "ARD": "D0" + }, + "3": { + "IC": 12 + }, + "4": { + "IC": 30, + "ARD": [ + "D1", + "A0" + ] + }, + "5": { + "IC": 13, + "ARD": "D2" + }, + "6": { + "IC": 14, + "ARD": "D3" + }, + "7": { + "IC": 16, + "ARD": "D4" + }, + "8": { + "PWR": 3.3 + }, + "9": { + "GND": null + }, + "10": { + "IC": 27, + "ARD": "A1" + }, + "11": { + "IC": 2, + "ARD": "D5" + }, + "12": { + "IC": 1, + "ARD": "D6" + }, + "13": { + "IC": 28, + "ARD": "D7" + }, + "14": { + "IC": 17, + "ARD": "D8" + }, + "15": { + "IC": 29, + "ARD": "D9" + }, + "16": { + "IC": 32, + "ARD": "D10" + } + } + } +} diff --git a/boards/_base/pcb/wr3e.json b/boards/_base/pcb/wr3e.json new file mode 100644 index 0000000..644236e --- /dev/null +++ b/boards/_base/pcb/wr3e.json @@ -0,0 +1,82 @@ +{ + "pcb": { + "templates": [ + "esp12s", + "esp12s-shield", + "tuya-16x24", + "rf-16mm-type1" + ], + "vars": { + "MASK_PRESET": "mask_black", + "TRACE_COLOR": "#505050", + "SILK_COLOR": "white", + "PINTYPE_VERT": "pin_vert_2mm_cast_nohole" + }, + "pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD", + "pinout": { + "1": { + "NC": null + }, + "2": { + "IC": 27, + "ARD": "A1" + }, + "3": { + "IC": 12 + }, + "4": { + "IC": 2, + "ARD": "D5" + }, + "5": { + "IC": 13, + "ARD": "D2" + }, + "6": { + "IC": 14, + "ARD": "D3" + }, + "7": { + "IC": 31, + "ARD": "D0" + }, + "8": { + "PWR": 3.3 + }, + "9": { + "GND": null + }, + "10": { + "IC": 16, + "ARD": "D4" + }, + "11": { + "IC": 1, + "ARD": "D6" + }, + "12": { + "IC": 30, + "ARD": [ + "D1", + "A0" + ] + }, + "13": { + "IC": 28, + "ARD": "D7" + }, + "14": { + "IC": 17, + "ARD": "D8" + }, + "15": { + "IC": 29, + "ARD": "D9" + }, + "16": { + "IC": 32, + "ARD": "D10" + } + } + } +} diff --git a/boards/_base/realtek-ambz-tuya3.json b/boards/_base/realtek-ambz-tuya3.json deleted file mode 100644 index b7fe18a..0000000 --- a/boards/_base/realtek-ambz-tuya3.json +++ /dev/null @@ -1,151 +0,0 @@ -{ - "pcb": { - "templates": [ - "esp12s", - "esp12s-shield", - "tuya-16x24", - "tuya-16x24-rf1" - ], - "vars": { - "MASK_PRESET": "mask_black", - "TRACE_COLOR": "#505050", - "SILK_COLOR": "white", - "PINTYPE_VERT": "pin_vert_2mm_cast_nohole" - }, - "pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD", - "pinout": { - "1": { - "NC": null - }, - "2": { - "IC": 31, - "GPIO": "PA22", - "ARD": "D0", - "UART": "0_RTS", - "SPI": [ - "0_MISO", - "1_MISO" - ], - "I2C": "0_SCL", - "SD": "D0", - "PWM": 5, - "I2S": "0_WS", - "WAKE": 2 - }, - "3": { - "IC": 12, - "IO": "I", - "CTRL": "CEN" - }, - "4": { - "IC": 30, - "GPIO": "PA19", - "ARD": [ - "D1", - "A0" - ], - "ADC": 1, - "UART": "0_CTS", - "SPI": [ - "0_CS", - "1_CS" - ], - "I2C": "0_SDA", - "SD": "D3", - "TMR": "5_TRIG", - "I2S": "0_TX" - }, - "5": { - "IC": 13, - "GPIO": "PA14", - "ARD": "D2", - "PWM": 0, - "SWD": "CLK" - }, - "6": { - "IC": 14, - "GPIO": "PA15", - "ARD": "D3", - "PWM": 1, - "SWD": "DIO" - }, - "7": { - "IC": 16, - "GPIO": "PA00", - "ARD": "D4", - "PWM": 2 - }, - "8": { - "PWR": 3.3 - }, - "9": { - "GND": null - }, - "10": { - "IC": 27, - "IO": "I", - "ADC": 2, - "ARD": "A1" - }, - "11": { - "IC": 2, - "GPIO": "PA29", - "ARD": "D5", - "UART": "2_RX", - "I2C": "0_SCL", - "PWM": 4 - }, - "12": { - "IC": 1, - "GPIO": "PA30", - "ARD": "D6", - "UART": "2_TX", - "I2C": "0_SDA", - "PWM": 4, - "RTC": "OUT" - }, - "13": { - "IC": 28, - "GPIO": "PA05", - "ARD": "D7", - "PWM": 4, - "WAKE": 1 - }, - "14": { - "IC": 17, - "GPIO": "PA12", - "ARD": "D8", - "PWM": 3 - }, - "15": { - "IC": 29, - "GPIO": "PA18", - "ARD": "D9", - "UART": "0_RX", - "SPI": [ - "0_SCK", - "1_SCK" - ], - "I2C": "1_SCL", - "SD": "D2", - "TMR": "4_TRIG", - "I2S": "0_MCK", - "WAKE": 0 - }, - "16": { - "IC": 32, - "GPIO": "PA23", - "ARD": "D10", - "UART": "0_TX", - "SPI": [ - "0_MOSI", - "1_MOSI" - ], - "I2C": "1_SDA", - "SD": "D1", - "PWM": 0, - "WAKE": 3 - } - } - } -} diff --git a/boards/wr3.json b/boards/wr3.json index ddde584..256babc 100644 --- a/boards/wr3.json +++ b/boards/wr3.json @@ -2,7 +2,8 @@ "_base": [ "realtek-ambz", "realtek-ambz-2mb", - "realtek-ambz-tuya3" + "pcb/ic-rtl8710bn", + "pcb/wr3" ], "build": { "mcu": "rtl8710bn", @@ -12,10 +13,6 @@ "url": "https://developer.tuya.com/en/docs/iot/wr3-module-datasheet?id=K9g3ainzbj9z1", "vendor": "Tuya Inc.", "pcb": { - "symbol": "WR3", - "vars": { - "MASK_PRESET": "mask_black", - "TRACE_COLOR": "#505050" - } + "symbol": "WR3" } } diff --git a/tools/boardgen b/tools/boardgen index c4dedcf..e92a4d2 160000 --- a/tools/boardgen +++ b/tools/boardgen @@ -1 +1 @@ -Subproject commit c4dedcf6abc773b30a592c8ffa0293bd79e7c7f8 +Subproject commit e92a4d24a069f3cf6fd31e158ece3304eae7e79a