diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..4265a1e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,2 @@
+[submodule "tools/boardgen"]
+	url = https://github.com/kuba2k2/boardgen
diff --git a/boards/_base/realtek-ambz-tuya3-alt.json b/boards/_base/realtek-ambz-tuya3-alt.json
new file mode 100644
index 0000000..7ff6a4d
--- /dev/null
+++ b/boards/_base/realtek-ambz-tuya3-alt.json
@@ -0,0 +1,151 @@
+{
+	"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": 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,
+				"GPIO": "PA30",
+				"ARD": "D6",
+				"UART": "2_TX",
+				"I2C": "0_SDA",
+				"PWM": 4,
+				"RTC": "OUT"
+			},
+			"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"
+			},
+			"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/_base/realtek-ambz-tuya3.json b/boards/_base/realtek-ambz-tuya3.json
new file mode 100644
index 0000000..b7fe18a
--- /dev/null
+++ b/boards/_base/realtek-ambz-tuya3.json
@@ -0,0 +1,151 @@
+{
+	"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 1dcb283..96101e6 100644
--- a/boards/wr3.json
+++ b/boards/wr3.json
@@ -1,7 +1,8 @@
 {
 	"_base": [
 		"realtek-ambz",
-		"realtek-ambz-2mb"
+		"realtek-ambz-2mb",
+		"realtek-ambz-tuya3"
 	],
 	"build": {
 		"mcu": "rtl8710bn",
@@ -10,5 +11,12 @@
 	},
 	"name": "WR3 Wi-Fi Module",
 	"url": "https://developer.tuya.com/en/docs/iot/wr3-module-datasheet?id=K9g3ainzbj9z1",
-	"vendor": "Tuya Inc."
+	"vendor": "Tuya Inc.",
+	"pcb": {
+		"symbol": "WR3",
+		"vars": {
+			"MASK_PRESET": "mask_black",
+			"TRACE_COLOR": "#505050"
+		}
+	}
 }
diff --git a/tools/boardgen b/tools/boardgen
new file mode 160000
index 0000000..04bbf0a
--- /dev/null
+++ b/tools/boardgen
@@ -0,0 +1 @@
+Subproject commit 04bbf0a1f593ac1f61b1d433ba6aa4f17af2ea3e