Merge remote-tracking branch 'origin/master' into feature/realtek-update

.github/workflows/push-master.yml

@@ -17,7 +17,7 @@ jobs:
           python-version: '3.10'
 
       - name: Install docs dependencies
-        run: pip install -U ltchiptool boardgen
+        run: pip install -U ltchiptool "boardgen>=0.11.0"
 
       - name: Generate docs and static JSON files
         run: |

SUMMARY.md

@@ -14,6 +14,7 @@
 * [](SUMMARY.md)
 * 🍪 Chip family docs & info
 	* [Beken BK72xx](docs/platform/beken-72xx/README.md)
+		* [Finding encryption keys](docs/platform/beken-72xx/keys.md)
 	* [Realtek Ameba - info](docs/platform/realtek-amb/README.md)
 	* [Realtek AmebaZ](docs/platform/realtek-ambz/README.md)
 		* [Debugging](docs/platform/realtek-ambz/debugging.md)

boards/_base/pcb/cb1s-test.json

@@ -1,6 +1,6 @@
 {
 	"pcb": {
-		"scale": 10,
+		"scale": 14,
 		"test_pads": {
 			"TSCK": "cb1s.back.sck.anchor",
 			"TCSN": "cb1s.back.csn.anchor",

boards/_base/pcb/cb2l-test.json

@@ -1,6 +1,5 @@
 {
 	"pcb": {
-		"scale": 11,
 		"test_pads": {
 			"TRST": "cb2l.back.rst.anchor",
 			"TRX1": "cb2l.back.u1_rxd.anchor",

boards/_base/pcb/cb2s-test.json

@@ -1,6 +1,5 @@
 {
 	"pcb": {
-		"scale": 11,
 		"test_pads": {
 			"TTX2": "cb2s.back.u2_txd.anchor",
 			"TRX2": "cb2s.back.u2_rxd.anchor",

boards/_base/pcb/t102.json

@@ -6,7 +6,8 @@
 			"rf-type1"
 		],
 		"scale": 10.5,
-		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD,SPI",
+		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD",
+		"drawing_hidden": "SPI",
 		"pinout": {
 			"1": {
 				"PWR": 3.3

boards/_base/pcb/t112.json

@@ -0,0 +1,70 @@
+{
+	"pcb": {
+		"templates": [
+			"esp01m-14",
+			"pcb-blue-light",
+			"rf-type1"
+		],
+		"scale": 10.5,
+		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD",
+		"drawing_hidden": "I2C,SPI",
+		"pinout": {
+			"1": {
+				"PWR": 3.3
+			},
+			"2": {
+				"IC": 2,
+				"ARD": "D0"
+			},
+			"3": {
+				"IC": 30,
+				"ARD": [
+					"D1",
+					"A0"
+				]
+			},
+			"4": {
+				"IC": 14,
+				"ARD": "D2"
+			},
+			"5": {
+				"IC": 13,
+				"ARD": "D3"
+			},
+			"6": {
+				"IC": 16,
+				"ARD": "D4"
+			},
+			"7": {
+				"NC": null
+			},
+			"8": {
+				"IC": 28,
+				"ARD": "D5"
+			},
+			"9": {
+				"IC": 29,
+				"ARD": "D6"
+			},
+			"10": {
+				"IC": 17,
+				"ARD": "D7"
+			},
+			"11": {
+				"IC": 32,
+				"ARD": "D8"
+			},
+			"12": {
+				"IC": 31,
+				"ARD": "D9"
+			},
+			"13": {
+				"IC": 1,
+				"ARD": "D10"
+			},
+			"14": {
+				"GND": null
+			}
+		}
+	}
+}

boards/_base/pcb/wa2.json

@@ -1,6 +1,6 @@
 {
 	"pcb": {
-		"scale": 10.5,
+		"scale": 11,
 		"templates": [
 			"tuya2",
 			"pcb-blue-light",

boards/_base/pcb/wb2l-test.json

@@ -1,6 +1,5 @@
 {
 	"pcb": {
-		"scale": 11,
 		"test_pads": {
 			"TRST": "wb2l.back.rst.anchor",
 			"TRX1": "wb2l.back.u1_rxd.anchor",

boards/_base/pcb/wb2s.json

@@ -1,6 +1,5 @@
 {
 	"pcb": {
-		"scale": 10.5,
 		"templates": [
 			"tuya2",
 			"pcb-blue-light",

boards/_base/pcb/wb3l.json

@@ -9,7 +9,7 @@
 		"vars": {
 			"PINHOLE": 0
 		},
-		"pinout_hidden": "I2S,SD,SPI",
+		"pinout_hidden": "I2S,SD",
 		"pinout": {
 			"1": {
 				"NC": null

boards/_base/pcb/wr2.json

@@ -1,7 +1,7 @@
 {
 	"pcb": {
-		"scale": 10.5,
-		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD,SPI",
+		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD",
+		"drawing_hidden": "SPI",
 		"pinout": {
 			"1": {
 				"PWR": 3.3

boards/_base/pcb/wr2e.json

@@ -1,7 +1,7 @@
 {
 	"pcb": {
-		"scale": 10.5,
-		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD,SPI,SDA0",
+		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD,SDA0",
+		"drawing_hidden": "SPI",
 		"pinout": {
 			"1": {
 				"PWR": 3.3

boards/_base/pcb/wr3n.json

@@ -3,7 +3,7 @@
 		"templates": [
 			"pcb-black"
 		],
-		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD,SPI",
+		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD",
 		"pinout": {
 			"1": {
 				"NC": null

boards/t102-v1.1.json

@@ -13,7 +13,8 @@
 	"url": "https://docs.libretiny.eu/boards/t102-v1.1/",
 	"vendor": "Unknown",
 	"doc": {
-		"fccid": "2AU7O-T102V11"
+		"fccid": "2AU7O-T102V11",
+		"mcu": "w302"
 	},
 	"pcb": {
 		"symbol": "T102_V1.1"

boards/t112-v1.1.json

@@ -0,0 +1,22 @@
+{
+	"_base": [
+		"realtek-ambz",
+		"realtek-ambz-2mb-788k",
+		"ic/rtl8710bn",
+		"pcb/t112"
+	],
+	"build": {
+		"mcu": "rtl8710bn",
+		"variant": "t112-v1.1"
+	},
+	"name": "T112_V1.1",
+	"url": "https://docs.libretiny.eu/boards/t112-v1.1/",
+	"vendor": "Unknown",
+	"doc": {
+		"fccid": "2AU7O-T102V11",
+		"mcu": "w302"
+	},
+	"pcb": {
+		"symbol": "T112_V1.1"
+	}
+}

boards/templates/tuya2.json

@@ -37,7 +37,7 @@
 		},
 		{
 			"type": "text",
-			"pos": "7.0,5.0",
+			"pos": "6.0,5.5",
 			"text": "${SYMBOL}",
 			"font_size": 1.0,
 			"fill": {

boards/templates/tuya2l.json

@@ -39,7 +39,7 @@
 		},
 		{
 			"type": "text",
-			"pos": "4.0,5.5",
+			"pos": "6.0,5.5",
 			"text": "${SYMBOL}",
 			"font_size": 1.0,
 			"fill": {

boards/templates/tuyau.json

@@ -79,7 +79,7 @@
 		},
 		{
 			"type": "text",
-			"pos": "4.0,5.5",
+			"pos": "6.5,5.0",
 			"text": "${SYMBOL}",
 			"font_size": 1.0,
 			"fill": {

boards/variants/t112-v1.1.c

@@ -0,0 +1,48 @@
+/* This file was auto-generated from t112-v1.1.json using boardgen */
+
+#include <Arduino.h>
+
+#ifdef LT_VARIANT_INCLUDE
+#include LT_VARIANT_INCLUDE
+#endif
+
+// clang-format off
+PinInfo lt_arduino_pin_info_list[PINS_COUNT] = {
+	// D0: PA29, UART2_RX, I2C0_SCL, PWM4
+	{PA_29, PIN_GPIO | PIN_IRQ | PIN_PWM | PIN_I2C | PIN_UART,                     PIN_NONE, 0},
+	// D1: PA19, ADC1, UART0_CTS, SPI0_CS, SPI1_CS, I2C0_SDA, SD_D3, TMR5_TRIG, I2S0_TX
+	{PA_19, PIN_GPIO | PIN_IRQ | PIN_ADC | PIN_I2C | PIN_I2S | PIN_SPI | PIN_UART, PIN_NONE, 0},
+	// D2: PA15, PWM1, SWDIO
+	{PA_15, PIN_GPIO | PIN_IRQ | PIN_PWM | PIN_SWD,                                PIN_NONE, 0},
+	// D3: PA14, PWM0, SWCLK
+	{PA_14, PIN_GPIO | PIN_IRQ | PIN_PWM | PIN_SWD,                                PIN_NONE, 0},
+	// D4: PA00, PWM2
+	{PA_0,  PIN_GPIO | PIN_IRQ | PIN_PWM,                                          PIN_NONE, 0},
+	// D5: PA05, PWM4, WAKE1
+	{PA_5,  PIN_GPIO | PIN_IRQ | PIN_PWM,                                          PIN_NONE, 0},
+	// D6: PA18, UART0_RX, SPI0_SCK, SPI1_SCK, I2C1_SCL, SD_D2, TMR4_TRIG, I2S0_MCK, WAKE0
+	{PA_18, PIN_GPIO | PIN_IRQ | PIN_I2C | PIN_I2S | PIN_SPI | PIN_UART,           PIN_NONE, 0},
+	// D7: PA12, PWM3
+	{PA_12, PIN_GPIO | PIN_IRQ | PIN_PWM,                                          PIN_NONE, 0},
+	// D8: PA23, UART0_TX, SPI0_MOSI, SPI1_MOSI, I2C1_SDA, SD_D1, PWM0, WAKE3
+	{PA_23, PIN_GPIO | PIN_IRQ | PIN_PWM | PIN_I2C | PIN_SPI | PIN_UART,           PIN_NONE, 0},
+	// D9: PA22, UART0_RTS, SPI0_MISO, SPI1_MISO, I2C0_SCL, SD_D0, PWM5, I2S0_WS, WAKE2
+	{PA_22, PIN_GPIO | PIN_IRQ | PIN_PWM | PIN_I2C | PIN_I2S | PIN_SPI | PIN_UART, PIN_NONE, 0},
+	// D10: PA30, UART2_TX, I2C0_SDA, PWM4
+	{PA_30, PIN_GPIO | PIN_IRQ | PIN_PWM | PIN_I2C | PIN_UART,                     PIN_NONE, 0},
+};
+
+PinInfo *lt_arduino_pin_gpio_map[] = {
+	[0]  = &(lt_arduino_pin_info_list[4]),  // PA_0 (D4)
+	[5]  = &(lt_arduino_pin_info_list[5]),  // PA_5 (D5)
+	[12] = &(lt_arduino_pin_info_list[7]),  // PA_12 (D7)
+	[14] = &(lt_arduino_pin_info_list[3]),  // PA_14 (D3)
+	[15] = &(lt_arduino_pin_info_list[2]),  // PA_15 (D2)
+	[18] = &(lt_arduino_pin_info_list[6]),  // PA_18 (D6)
+	[19] = &(lt_arduino_pin_info_list[1]),  // PA_19 (D1)
+	[22] = &(lt_arduino_pin_info_list[9]),  // PA_22 (D9)
+	[23] = &(lt_arduino_pin_info_list[8]),  // PA_23 (D8)
+	[29] = &(lt_arduino_pin_info_list[0]),  // PA_29 (D0)
+	[30] = &(lt_arduino_pin_info_list[10]), // PA_30 (D10)
+};
+// clang-format on