diff --git a/docker/test_configs/ln882x-arduino.yaml b/docker/test_configs/ln882x-arduino.yaml
index 4cff3a48837..38e96630bae 100644
--- a/docker/test_configs/ln882x-arduino.yaml
+++ b/docker/test_configs/ln882x-arduino.yaml
@@ -2,6 +2,6 @@ esphome:
   name: docker-test-ln882x-arduino
 
 ln882x:
-  board: generic-ln882hki
+  board: generic-ln882h
 
 logger:
diff --git a/esphome/components/bk72xx/boards.py b/esphome/components/bk72xx/boards.py
index f8bedce329b..6054b03f78a 100644
--- a/esphome/components/bk72xx/boards.py
+++ b/esphome/components/bk72xx/boards.py
@@ -21,38 +21,6 @@ from esphome.components.libretiny.const import (
 )
 
 BK72XX_BOARDS = {
-    "wb2l-m1": {
-        "name": "WB2L_M1 Wi-Fi Module",
-        "family": FAMILY_BK7231N,
-    },
-    "xh-wb3s": {
-        "name": "NiceMCU XH-WB3S",
-        "family": FAMILY_BK7238,
-    },
-    "cbu": {
-        "name": "CBU Wi-Fi Module",
-        "family": FAMILY_BK7231N,
-    },
-    "t1-u": {
-        "name": "T1-U Wi-Fi Module",
-        "family": FAMILY_BK7238,
-    },
-    "generic-bk7238-tuya": {
-        "name": "Generic - BK7238 (Tuya T1)",
-        "family": FAMILY_BK7238,
-    },
-    "t1-m": {
-        "name": "T1-M Wi-Fi Module",
-        "family": FAMILY_BK7238,
-    },
-    "generic-bk7231t-qfn32-tuya": {
-        "name": "Generic - BK7231T (Tuya)",
-        "family": FAMILY_BK7231T,
-    },
-    "generic-bk7231n-qfn32-tuya": {
-        "name": "Generic - BK7231N (Tuya)",
-        "family": FAMILY_BK7231N,
-    },
     "cb1s": {
         "name": "CB1S Wi-Fi Module",
         "family": FAMILY_BK7231N,
@@ -61,623 +29,117 @@ BK72XX_BOARDS = {
         "name": "CB2L Wi-Fi Module",
         "family": FAMILY_BK7231N,
     },
-    "cblc5": {
-        "name": "CBLC5 Wi-Fi Module",
+    "cb2s": {
+        "name": "CB2S Wi-Fi Module",
+        "family": FAMILY_BK7231N,
+    },
+    "cb3l": {
+        "name": "CB3L Wi-Fi Module",
         "family": FAMILY_BK7231N,
     },
     "cb3s": {
         "name": "CB3S Wi-Fi Module",
         "family": FAMILY_BK7231N,
     },
-    "wb3s": {
-        "name": "WB3S Wi-Fi Module",
-        "family": FAMILY_BK7231T,
-    },
-    "lsc-lma35": {
-        "name": "LSC LMA35 BK7231N",
+    "cb3se": {
+        "name": "CB3SE Wi-Fi Module",
         "family": FAMILY_BK7231N,
     },
-    "generic-bk7252": {
-        "name": "Generic - BK7252",
-        "family": FAMILY_BK7251,
-    },
-    "t1-3s": {
-        "name": "T1-3S Wi-Fi Module",
-        "family": FAMILY_BK7238,
-    },
-    "wb2l": {
-        "name": "WB2L Wi-Fi Module",
-        "family": FAMILY_BK7231T,
-    },
-    "wb1s": {
-        "name": "WB1S Wi-Fi Module",
-        "family": FAMILY_BK7231T,
-    },
-    "wblc5": {
-        "name": "WBLC5 Wi-Fi Module",
-        "family": FAMILY_BK7231T,
-    },
-    "cb2s": {
-        "name": "CB2S Wi-Fi Module",
+    "cblc5": {
+        "name": "CBLC5 Wi-Fi Module",
         "family": FAMILY_BK7231N,
     },
+    "cbu": {
+        "name": "CBU Wi-Fi Module",
+        "family": FAMILY_BK7231N,
+    },
+    "generic-bk7231n-qfn32": {
+        "name": "Generic - BK7231N",
+        "family": FAMILY_BK7231N,
+    },
+    "generic-bk7231n-qfn32-tuya": {
+        "name": "Generic - BK7231N (Tuya)",
+        "family": FAMILY_BK7231N,
+    },
+    "generic-bk7231t-qfn32-tuya": {
+        "name": "Generic - BK7231T (Tuya)",
+        "family": FAMILY_BK7231T,
+    },
     "generic-bk7238": {
         "name": "Generic - BK7238",
         "family": FAMILY_BK7238,
     },
-    "wa2": {
-        "name": "WA2 Wi-Fi Module",
-        "family": FAMILY_BK7231Q,
+    "generic-bk7238-tuya": {
+        "name": "Generic - BK7238 (Tuya T1)",
+        "family": FAMILY_BK7238,
     },
-    "cb3l": {
-        "name": "CB3L Wi-Fi Module",
+    "generic-bk7252": {
+        "name": "Generic - BK7252",
+        "family": FAMILY_BK7251,
+    },
+    "lsc-lma35": {
+        "name": "LSC LMA35 BK7231N",
         "family": FAMILY_BK7231N,
     },
     "lsc-lma35-t": {
         "name": "LSC LMA35 BK7231T",
         "family": FAMILY_BK7231T,
     },
-    "cb3se": {
-        "name": "CB3SE Wi-Fi Module",
-        "family": FAMILY_BK7231N,
-    },
-    "wb3l": {
-        "name": "WB3L Wi-Fi Module",
-        "family": FAMILY_BK7231T,
-    },
     "t1-2s": {
         "name": "T1-2S Wi-Fi Module",
         "family": FAMILY_BK7238,
     },
+    "t1-3s": {
+        "name": "T1-3S Wi-Fi Module",
+        "family": FAMILY_BK7238,
+    },
+    "t1-m": {
+        "name": "T1-M Wi-Fi Module",
+        "family": FAMILY_BK7238,
+    },
+    "t1-u": {
+        "name": "T1-U Wi-Fi Module",
+        "family": FAMILY_BK7238,
+    },
+    "wa2": {
+        "name": "WA2 Wi-Fi Module",
+        "family": FAMILY_BK7231Q,
+    },
+    "wb1s": {
+        "name": "WB1S Wi-Fi Module",
+        "family": FAMILY_BK7231T,
+    },
+    "wb2l": {
+        "name": "WB2L Wi-Fi Module",
+        "family": FAMILY_BK7231T,
+    },
+    "wb2l-m1": {
+        "name": "WB2L_M1 Wi-Fi Module",
+        "family": FAMILY_BK7231N,
+    },
     "wb2s": {
         "name": "WB2S Wi-Fi Module",
         "family": FAMILY_BK7231T,
     },
+    "wb3l": {
+        "name": "WB3L Wi-Fi Module",
+        "family": FAMILY_BK7231T,
+    },
+    "wb3s": {
+        "name": "WB3S Wi-Fi Module",
+        "family": FAMILY_BK7231T,
+    },
+    "wblc5": {
+        "name": "WBLC5 Wi-Fi Module",
+        "family": FAMILY_BK7231T,
+    },
+    "xh-wb3s": {
+        "name": "NiceMCU XH-WB3S",
+        "family": FAMILY_BK7238,
+    },
 }
 
 BK72XX_BOARD_PINS = {
-    "wb2l-m1": {
-        "WIRE1_SCL": 20,
-        "WIRE1_SDA": 21,
-        "WIRE2_SCL": 0,
-        "WIRE2_SDA": 1,
-        "SERIAL1_RX": 10,
-        "SERIAL1_TX": 11,
-        "SERIAL2_RX": 1,
-        "SERIAL2_TX": 0,
-        "ADC3": 23,
-        "P0": 0,
-        "P1": 1,
-        "P6": 6,
-        "P7": 7,
-        "P8": 8,
-        "P10": 10,
-        "P11": 11,
-        "P20": 20,
-        "P21": 21,
-        "P22": 22,
-        "P23": 23,
-        "P24": 24,
-        "P26": 26,
-        "PWM0": 6,
-        "PWM1": 7,
-        "PWM2": 8,
-        "PWM4": 24,
-        "PWM5": 26,
-        "RX1": 10,
-        "RX2": 1,
-        "SCL1": 20,
-        "SCL2": 0,
-        "SDA1": 21,
-        "SDA2": 1,
-        "TX1": 11,
-        "TX2": 0,
-        "D0": 8,
-        "D1": 7,
-        "D2": 6,
-        "D3": 26,
-        "D4": 24,
-        "D5": 10,
-        "D6": 11,
-        "D7": 1,
-        "D8": 0,
-        "D9": 20,
-        "D10": 21,
-        "D11": 23,
-        "D12": 22,
-        "A0": 23,
-    },
-    "xh-wb3s": {
-        "SPI0_CS": 15,
-        "SPI0_MISO": 17,
-        "SPI0_MOSI": 16,
-        "SPI0_SCK": 14,
-        "WIRE2_SCL_0": 15,
-        "WIRE2_SCL_1": 24,
-        "WIRE2_SDA_0": 17,
-        "WIRE2_SDA_1": 26,
-        "SERIAL1_RX": 10,
-        "SERIAL1_TX": 11,
-        "SERIAL2_RX": 1,
-        "SERIAL2_TX": 0,
-        "ADC1": 26,
-        "ADC2": 24,
-        "ADC3": 20,
-        "ADC4": 28,
-        "ADC5": 1,
-        "ADC6": 10,
-        "CS": 15,
-        "MISO": 17,
-        "MOSI": 16,
-        "P0": 0,
-        "P1": 1,
-        "P6": 6,
-        "P7": 7,
-        "P8": 8,
-        "P9": 9,
-        "P10": 10,
-        "P11": 11,
-        "P14": 14,
-        "P15": 15,
-        "P16": 16,
-        "P17": 17,
-        "P20": 20,
-        "P21": 21,
-        "P22": 22,
-        "P23": 23,
-        "P24": 24,
-        "P26": 26,
-        "P28": 28,
-        "PWM0": 6,
-        "PWM1": 7,
-        "PWM2": 8,
-        "PWM3": 9,
-        "PWM4": 24,
-        "PWM5": 26,
-        "RX1": 10,
-        "RX2": 1,
-        "SCK": 14,
-        "TX1": 11,
-        "TX2": 0,
-        "D0": 7,
-        "D1": 23,
-        "D2": 14,
-        "D3": 26,
-        "D4": 24,
-        "D5": 6,
-        "D6": 9,
-        "D7": 0,
-        "D8": 1,
-        "D9": 8,
-        "D10": 10,
-        "D11": 11,
-        "D12": 16,
-        "D13": 20,
-        "D14": 21,
-        "D15": 22,
-        "D16": 15,
-        "D17": 17,
-        "A0": 28,
-        "A1": 26,
-        "A2": 24,
-        "A3": 1,
-        "A4": 10,
-        "A5": 20,
-    },
-    "cbu": {
-        "SPI0_CS": 15,
-        "SPI0_MISO": 17,
-        "SPI0_MOSI": 16,
-        "SPI0_SCK": 14,
-        "WIRE1_SCL": 20,
-        "WIRE1_SDA": 21,
-        "WIRE2_SCL": 0,
-        "WIRE2_SDA": 1,
-        "SERIAL1_RX": 10,
-        "SERIAL1_TX": 11,
-        "SERIAL2_RX": 1,
-        "SERIAL2_TX": 0,
-        "ADC3": 23,
-        "CS": 15,
-        "MISO": 17,
-        "MOSI": 16,
-        "P0": 0,
-        "P1": 1,
-        "P6": 6,
-        "P7": 7,
-        "P8": 8,
-        "P9": 9,
-        "P10": 10,
-        "P11": 11,
-        "P14": 14,
-        "P15": 15,
-        "P16": 16,
-        "P17": 17,
-        "P20": 20,
-        "P21": 21,
-        "P22": 22,
-        "P23": 23,
-        "P24": 24,
-        "P26": 26,
-        "P28": 28,
-        "PWM0": 6,
-        "PWM1": 7,
-        "PWM2": 8,
-        "PWM3": 9,
-        "PWM4": 24,
-        "PWM5": 26,
-        "RX1": 10,
-        "RX2": 1,
-        "SCK": 14,
-        "SCL1": 20,
-        "SCL2": 0,
-        "SDA1": 21,
-        "SDA2": 1,
-        "TX1": 11,
-        "TX2": 0,
-        "D0": 14,
-        "D1": 16,
-        "D2": 20,
-        "D3": 22,
-        "D4": 23,
-        "D5": 1,
-        "D6": 0,
-        "D7": 8,
-        "D8": 7,
-        "D9": 6,
-        "D10": 26,
-        "D11": 24,
-        "D12": 11,
-        "D13": 10,
-        "D14": 28,
-        "D15": 9,
-        "D16": 17,
-        "D17": 15,
-        "D18": 21,
-        "A0": 23,
-    },
-    "t1-u": {
-        "SPI0_CS": 15,
-        "SPI0_MISO": 17,
-        "SPI0_MOSI": 16,
-        "SPI0_SCK": 14,
-        "WIRE2_SCL_0": 15,
-        "WIRE2_SCL_1": 24,
-        "WIRE2_SDA_0": 17,
-        "WIRE2_SDA_1": 26,
-        "SERIAL1_RX": 10,
-        "SERIAL1_TX": 11,
-        "SERIAL2_RX": 1,
-        "SERIAL2_TX": 0,
-        "ADC1": 26,
-        "ADC2": 24,
-        "ADC3": 20,
-        "ADC4": 28,
-        "ADC5": 1,
-        "ADC6": 10,
-        "CS": 15,
-        "MISO": 17,
-        "MOSI": 16,
-        "P0": 0,
-        "P1": 1,
-        "P6": 6,
-        "P8": 8,
-        "P9": 9,
-        "P10": 10,
-        "P11": 11,
-        "P14": 14,
-        "P15": 15,
-        "P16": 16,
-        "P17": 17,
-        "P20": 20,
-        "P21": 21,
-        "P22": 22,
-        "P23": 23,
-        "P24": 24,
-        "P26": 26,
-        "P28": 28,
-        "PWM0": 6,
-        "PWM2": 8,
-        "PWM3": 9,
-        "PWM4": 24,
-        "PWM5": 26,
-        "RX1": 10,
-        "RX2": 1,
-        "SCK": 14,
-        "TX1": 11,
-        "TX2": 0,
-        "D0": 14,
-        "D1": 16,
-        "D2": 23,
-        "D3": 22,
-        "D4": 20,
-        "D5": 1,
-        "D6": 0,
-        "D7": 24,
-        "D8": 9,
-        "D9": 26,
-        "D10": 6,
-        "D11": 8,
-        "D12": 11,
-        "D13": 10,
-        "D14": 28,
-        "D15": 21,
-        "D16": 17,
-        "D17": 15,
-        "A0": 20,
-        "A1": 1,
-        "A2": 24,
-        "A3": 26,
-        "A4": 10,
-        "A5": 28,
-    },
-    "generic-bk7238-tuya": {
-        "SPI0_CS": 15,
-        "SPI0_MISO": 17,
-        "SPI0_MOSI": 16,
-        "SPI0_SCK": 14,
-        "WIRE2_SCL_0": 15,
-        "WIRE2_SCL_1": 24,
-        "WIRE2_SDA_0": 17,
-        "WIRE2_SDA_1": 26,
-        "SERIAL1_RX": 10,
-        "SERIAL1_TX": 11,
-        "SERIAL2_RX": 1,
-        "SERIAL2_TX": 0,
-        "ADC1": 26,
-        "ADC2": 24,
-        "ADC3": 20,
-        "ADC4": 28,
-        "ADC5": 1,
-        "ADC6": 10,
-        "CS": 15,
-        "MISO": 17,
-        "MOSI": 16,
-        "P0": 0,
-        "P1": 1,
-        "P6": 6,
-        "P7": 7,
-        "P8": 8,
-        "P9": 9,
-        "P10": 10,
-        "P11": 11,
-        "P14": 14,
-        "P15": 15,
-        "P16": 16,
-        "P17": 17,
-        "P20": 20,
-        "P21": 21,
-        "P22": 22,
-        "P23": 23,
-        "P24": 24,
-        "P26": 26,
-        "P28": 28,
-        "PWM0": 6,
-        "PWM1": 7,
-        "PWM2": 8,
-        "PWM3": 9,
-        "PWM4": 24,
-        "PWM5": 26,
-        "RX1": 10,
-        "RX2": 1,
-        "SCK": 14,
-        "TX1": 11,
-        "TX2": 0,
-        "D0": 0,
-        "D1": 1,
-        "D2": 6,
-        "D3": 7,
-        "D4": 8,
-        "D5": 9,
-        "D6": 10,
-        "D7": 11,
-        "D8": 14,
-        "D9": 15,
-        "D10": 16,
-        "D11": 17,
-        "D12": 20,
-        "D13": 21,
-        "D14": 22,
-        "D15": 23,
-        "D16": 24,
-        "D17": 26,
-        "D18": 28,
-        "A0": 1,
-        "A1": 10,
-        "A2": 20,
-        "A3": 24,
-        "A4": 26,
-        "A5": 28,
-    },
-    "t1-m": {
-        "WIRE2_SCL": 24,
-        "WIRE2_SDA": 26,
-        "SERIAL1_RX": 10,
-        "SERIAL1_TX": 11,
-        "SERIAL2_RX": 1,
-        "SERIAL2_TX": 0,
-        "ADC1": 26,
-        "ADC2": 24,
-        "ADC5": 1,
-        "ADC6": 10,
-        "P0": 0,
-        "P1": 1,
-        "P6": 6,
-        "P8": 8,
-        "P9": 9,
-        "P10": 10,
-        "P11": 11,
-        "P24": 24,
-        "P26": 26,
-        "PWM0": 6,
-        "PWM2": 8,
-        "PWM3": 9,
-        "PWM4": 24,
-        "PWM5": 26,
-        "RX1": 10,
-        "RX2": 1,
-        "SCL2": 24,
-        "SDA2": 26,
-        "TX1": 11,
-        "TX2": 0,
-        "D0": 26,
-        "D1": 6,
-        "D2": 8,
-        "D3": 1,
-        "D4": 10,
-        "D5": 11,
-        "D6": 9,
-        "D7": 24,
-        "D11": 0,
-        "A0": 26,
-        "A1": 10,
-        "A2": 1,
-        "A3": 24,
-    },
-    "generic-bk7231t-qfn32-tuya": {
-        "SPI0_CS": 15,
-        "SPI0_MISO": 17,
-        "SPI0_MOSI": 16,
-        "SPI0_SCK": 14,
-        "WIRE1_SCL": 20,
-        "WIRE1_SDA": 21,
-        "WIRE2_SCL": 0,
-        "WIRE2_SDA": 1,
-        "SERIAL1_RX": 10,
-        "SERIAL1_TX": 11,
-        "SERIAL2_RX": 1,
-        "SERIAL2_TX": 0,
-        "ADC3": 23,
-        "CS": 15,
-        "MISO": 17,
-        "MOSI": 16,
-        "P0": 0,
-        "P1": 1,
-        "P6": 6,
-        "P7": 7,
-        "P8": 8,
-        "P9": 9,
-        "P10": 10,
-        "P11": 11,
-        "P14": 14,
-        "P15": 15,
-        "P16": 16,
-        "P17": 17,
-        "P20": 20,
-        "P21": 21,
-        "P22": 22,
-        "P23": 23,
-        "P24": 24,
-        "P26": 26,
-        "P28": 28,
-        "PWM0": 6,
-        "PWM1": 7,
-        "PWM2": 8,
-        "PWM3": 9,
-        "PWM4": 24,
-        "PWM5": 26,
-        "RX1": 10,
-        "RX2": 1,
-        "SCK": 14,
-        "SCL1": 20,
-        "SCL2": 0,
-        "SDA1": 21,
-        "SDA2": 1,
-        "TX1": 11,
-        "TX2": 0,
-        "D0": 0,
-        "D1": 1,
-        "D2": 6,
-        "D3": 7,
-        "D4": 8,
-        "D5": 9,
-        "D6": 10,
-        "D7": 11,
-        "D8": 14,
-        "D9": 15,
-        "D10": 16,
-        "D11": 17,
-        "D12": 20,
-        "D13": 21,
-        "D14": 22,
-        "D15": 23,
-        "D16": 24,
-        "D17": 26,
-        "D18": 28,
-        "A0": 23,
-    },
-    "generic-bk7231n-qfn32-tuya": {
-        "SPI0_CS": 15,
-        "SPI0_MISO": 17,
-        "SPI0_MOSI": 16,
-        "SPI0_SCK": 14,
-        "WIRE1_SCL": 20,
-        "WIRE1_SDA": 21,
-        "WIRE2_SCL": 0,
-        "WIRE2_SDA": 1,
-        "SERIAL1_RX": 10,
-        "SERIAL1_TX": 11,
-        "SERIAL2_RX": 1,
-        "SERIAL2_TX": 0,
-        "ADC3": 23,
-        "CS": 15,
-        "MISO": 17,
-        "MOSI": 16,
-        "P0": 0,
-        "P1": 1,
-        "P6": 6,
-        "P7": 7,
-        "P8": 8,
-        "P9": 9,
-        "P10": 10,
-        "P11": 11,
-        "P14": 14,
-        "P15": 15,
-        "P16": 16,
-        "P17": 17,
-        "P20": 20,
-        "P21": 21,
-        "P22": 22,
-        "P23": 23,
-        "P24": 24,
-        "P26": 26,
-        "P28": 28,
-        "PWM0": 6,
-        "PWM1": 7,
-        "PWM2": 8,
-        "PWM3": 9,
-        "PWM4": 24,
-        "PWM5": 26,
-        "RX1": 10,
-        "RX2": 1,
-        "SCK": 14,
-        "SCL1": 20,
-        "SCL2": 0,
-        "SDA1": 21,
-        "SDA2": 1,
-        "TX1": 11,
-        "TX2": 0,
-        "D0": 0,
-        "D1": 1,
-        "D2": 6,
-        "D3": 7,
-        "D4": 8,
-        "D5": 9,
-        "D6": 10,
-        "D7": 11,
-        "D8": 14,
-        "D9": 15,
-        "D10": 16,
-        "D11": 17,
-        "D12": 20,
-        "D13": 21,
-        "D14": 22,
-        "D15": 23,
-        "D16": 24,
-        "D17": 26,
-        "D18": 28,
-        "A0": 23,
-    },
     "cb1s": {
         "WIRE1_SCL": 20,
         "WIRE1_SDA": 21,
@@ -765,22 +227,28 @@ BK72XX_BOARD_PINS = {
         "D7": 11,
         "D8": 21,
     },
-    "cblc5": {
+    "cb2s": {
         "WIRE2_SCL": 0,
         "WIRE2_SDA": 1,
         "SERIAL1_RX": 10,
         "SERIAL1_TX": 11,
         "SERIAL2_RX": 1,
         "SERIAL2_TX": 0,
+        "ADC3": 23,
         "P0": 0,
         "P1": 1,
         "P6": 6,
+        "P7": 7,
+        "P8": 8,
         "P10": 10,
         "P11": 11,
         "P21": 21,
+        "P23": 23,
         "P24": 24,
         "P26": 26,
         "PWM0": 6,
+        "PWM1": 7,
+        "PWM2": 8,
         "PWM4": 24,
         "PWM5": 26,
         "RX1": 10,
@@ -790,14 +258,61 @@ BK72XX_BOARD_PINS = {
         "SDA2": 1,
         "TX1": 11,
         "TX2": 0,
-        "D0": 24,
-        "D1": 6,
-        "D2": 26,
-        "D3": 11,
+        "D0": 6,
+        "D1": 7,
+        "D2": 8,
+        "D3": 23,
         "D4": 10,
-        "D5": 1,
+        "D5": 11,
+        "D6": 24,
+        "D7": 26,
+        "D8": 0,
+        "D9": 1,
+        "D10": 21,
+        "A0": 23,
+    },
+    "cb3l": {
+        "SERIAL1_RX": 10,
+        "SERIAL1_TX": 11,
+        "SERIAL2_TX": 0,
+        "ADC3": 23,
+        "P0": 0,
+        "P6": 6,
+        "P7": 7,
+        "P8": 8,
+        "P9": 9,
+        "P10": 10,
+        "P11": 11,
+        "P14": 14,
+        "P21": 21,
+        "P23": 23,
+        "P24": 24,
+        "P26": 26,
+        "PWM0": 6,
+        "PWM1": 7,
+        "PWM2": 8,
+        "PWM3": 9,
+        "PWM4": 24,
+        "PWM5": 26,
+        "RX1": 10,
+        "SCK": 14,
+        "SCL2": 0,
+        "SDA1": 21,
+        "TX1": 11,
+        "TX2": 0,
+        "D0": 23,
+        "D1": 14,
+        "D2": 26,
+        "D3": 24,
+        "D4": 6,
+        "D5": 9,
         "D6": 0,
         "D7": 21,
+        "D8": 8,
+        "D9": 7,
+        "D10": 10,
+        "D11": 11,
+        "A0": 23,
     },
     "cb3s": {
         "WIRE1_SCL": 20,
@@ -849,9 +364,11 @@ BK72XX_BOARD_PINS = {
         "D13": 20,
         "A0": 23,
     },
-    "wb3s": {
-        "WIRE1_SCL": 20,
-        "WIRE1_SDA": 21,
+    "cb3se": {
+        "SPI0_CS": 15,
+        "SPI0_MISO": 17,
+        "SPI0_MOSI": 16,
+        "SPI0_SCK": 14,
         "WIRE2_SCL": 0,
         "WIRE2_SDA": 1,
         "SERIAL1_RX": 10,
@@ -859,6 +376,9 @@ BK72XX_BOARD_PINS = {
         "SERIAL2_RX": 1,
         "SERIAL2_TX": 0,
         "ADC3": 23,
+        "CS": 15,
+        "MISO": 17,
+        "MOSI": 16,
         "P0": 0,
         "P1": 1,
         "P6": 6,
@@ -868,8 +388,10 @@ BK72XX_BOARD_PINS = {
         "P10": 10,
         "P11": 11,
         "P14": 14,
+        "P15": 15,
+        "P16": 16,
+        "P17": 17,
         "P20": 20,
-        "P21": 21,
         "P22": 22,
         "P23": 23,
         "P24": 24,
@@ -885,7 +407,6 @@ BK72XX_BOARD_PINS = {
         "SCK": 14,
         "SCL1": 20,
         "SCL2": 0,
-        "SDA1": 21,
         "SDA2": 1,
         "TX1": 11,
         "TX2": 0,
@@ -894,19 +415,61 @@ BK72XX_BOARD_PINS = {
         "D2": 26,
         "D3": 24,
         "D4": 6,
-        "D5": 7,
+        "D5": 9,
         "D6": 0,
         "D7": 1,
-        "D8": 9,
-        "D9": 8,
+        "D8": 8,
+        "D9": 7,
         "D10": 10,
         "D11": 11,
-        "D12": 22,
-        "D13": 21,
+        "D12": 15,
+        "D13": 22,
         "D14": 20,
+        "D15": 17,
+        "D16": 16,
         "A0": 23,
     },
-    "lsc-lma35": {
+    "cblc5": {
+        "WIRE2_SCL": 0,
+        "WIRE2_SDA": 1,
+        "SERIAL1_RX": 10,
+        "SERIAL1_TX": 11,
+        "SERIAL2_RX": 1,
+        "SERIAL2_TX": 0,
+        "P0": 0,
+        "P1": 1,
+        "P6": 6,
+        "P10": 10,
+        "P11": 11,
+        "P21": 21,
+        "P24": 24,
+        "P26": 26,
+        "PWM0": 6,
+        "PWM4": 24,
+        "PWM5": 26,
+        "RX1": 10,
+        "RX2": 1,
+        "SCL2": 0,
+        "SDA1": 21,
+        "SDA2": 1,
+        "TX1": 11,
+        "TX2": 0,
+        "D0": 24,
+        "D1": 6,
+        "D2": 26,
+        "D3": 11,
+        "D4": 10,
+        "D5": 1,
+        "D6": 0,
+        "D7": 21,
+    },
+    "cbu": {
+        "SPI0_CS": 15,
+        "SPI0_MISO": 17,
+        "SPI0_MOSI": 16,
+        "SPI0_SCK": 14,
+        "WIRE1_SCL": 20,
+        "WIRE1_SDA": 21,
         "WIRE2_SCL": 0,
         "WIRE2_SDA": 1,
         "SERIAL1_RX": 10,
@@ -914,6 +477,8 @@ BK72XX_BOARD_PINS = {
         "SERIAL2_RX": 1,
         "SERIAL2_TX": 0,
         "ADC3": 23,
+        "CS": 15,
+        "MISO": 17,
         "MOSI": 16,
         "P0": 0,
         "P1": 1,
@@ -924,12 +489,16 @@ BK72XX_BOARD_PINS = {
         "P10": 10,
         "P11": 11,
         "P14": 14,
+        "P15": 15,
         "P16": 16,
+        "P17": 17,
+        "P20": 20,
         "P21": 21,
         "P22": 22,
         "P23": 23,
         "P24": 24,
         "P26": 26,
+        "P28": 28,
         "PWM0": 6,
         "PWM1": 7,
         "PWM2": 8,
@@ -939,28 +508,405 @@ BK72XX_BOARD_PINS = {
         "RX1": 10,
         "RX2": 1,
         "SCK": 14,
+        "SCL1": 20,
         "SCL2": 0,
         "SDA1": 21,
         "SDA2": 1,
         "TX1": 11,
         "TX2": 0,
-        "D0": 26,
-        "D1": 14,
-        "D2": 16,
-        "D3": 24,
-        "D4": 22,
-        "D5": 0,
-        "D6": 23,
+        "D0": 14,
+        "D1": 16,
+        "D2": 20,
+        "D3": 22,
+        "D4": 23,
+        "D5": 1,
+        "D6": 0,
         "D7": 8,
-        "D8": 9,
-        "D9": 21,
-        "D10": 6,
-        "D11": 7,
-        "D12": 10,
-        "D13": 11,
-        "D14": 1,
+        "D8": 7,
+        "D9": 6,
+        "D10": 26,
+        "D11": 24,
+        "D12": 11,
+        "D13": 10,
+        "D14": 28,
+        "D15": 9,
+        "D16": 17,
+        "D17": 15,
+        "D18": 21,
         "A0": 23,
     },
+    "generic-bk7231n-qfn32": {
+        "SPI0_CS": 15,
+        "SPI0_MISO": 17,
+        "SPI0_MOSI": 16,
+        "SPI0_SCK": 14,
+        "WIRE1_SCL": 20,
+        "WIRE1_SDA": 21,
+        "WIRE2_SCL": 0,
+        "WIRE2_SDA": 1,
+        "SERIAL1_RX": 10,
+        "SERIAL1_TX": 11,
+        "SERIAL2_RX": 1,
+        "SERIAL2_TX": 0,
+        "ADC3": 23,
+        "CS": 15,
+        "MISO": 17,
+        "MOSI": 16,
+        "P0": 0,
+        "P1": 1,
+        "P6": 6,
+        "P7": 7,
+        "P8": 8,
+        "P9": 9,
+        "P10": 10,
+        "P11": 11,
+        "P14": 14,
+        "P15": 15,
+        "P16": 16,
+        "P17": 17,
+        "P20": 20,
+        "P21": 21,
+        "P22": 22,
+        "P23": 23,
+        "P24": 24,
+        "P26": 26,
+        "P28": 28,
+        "PWM0": 6,
+        "PWM1": 7,
+        "PWM2": 8,
+        "PWM3": 9,
+        "PWM4": 24,
+        "PWM5": 26,
+        "RX1": 10,
+        "RX2": 1,
+        "SCK": 14,
+        "SCL1": 20,
+        "SCL2": 0,
+        "SDA1": 21,
+        "SDA2": 1,
+        "TX1": 11,
+        "TX2": 0,
+        "D0": 0,
+        "D1": 1,
+        "D2": 6,
+        "D3": 7,
+        "D4": 8,
+        "D5": 9,
+        "D6": 10,
+        "D7": 11,
+        "D8": 14,
+        "D9": 15,
+        "D10": 16,
+        "D11": 17,
+        "D12": 20,
+        "D13": 21,
+        "D14": 22,
+        "D15": 23,
+        "D16": 24,
+        "D17": 26,
+        "D18": 28,
+        "A0": 23,
+    },
+    "generic-bk7231n-qfn32-tuya": {
+        "SPI0_CS": 15,
+        "SPI0_MISO": 17,
+        "SPI0_MOSI": 16,
+        "SPI0_SCK": 14,
+        "WIRE1_SCL": 20,
+        "WIRE1_SDA": 21,
+        "WIRE2_SCL": 0,
+        "WIRE2_SDA": 1,
+        "SERIAL1_RX": 10,
+        "SERIAL1_TX": 11,
+        "SERIAL2_RX": 1,
+        "SERIAL2_TX": 0,
+        "ADC3": 23,
+        "CS": 15,
+        "MISO": 17,
+        "MOSI": 16,
+        "P0": 0,
+        "P1": 1,
+        "P6": 6,
+        "P7": 7,
+        "P8": 8,
+        "P9": 9,
+        "P10": 10,
+        "P11": 11,
+        "P14": 14,
+        "P15": 15,
+        "P16": 16,
+        "P17": 17,
+        "P20": 20,
+        "P21": 21,
+        "P22": 22,
+        "P23": 23,
+        "P24": 24,
+        "P26": 26,
+        "P28": 28,
+        "PWM0": 6,
+        "PWM1": 7,
+        "PWM2": 8,
+        "PWM3": 9,
+        "PWM4": 24,
+        "PWM5": 26,
+        "RX1": 10,
+        "RX2": 1,
+        "SCK": 14,
+        "SCL1": 20,
+        "SCL2": 0,
+        "SDA1": 21,
+        "SDA2": 1,
+        "TX1": 11,
+        "TX2": 0,
+        "D0": 0,
+        "D1": 1,
+        "D2": 6,
+        "D3": 7,
+        "D4": 8,
+        "D5": 9,
+        "D6": 10,
+        "D7": 11,
+        "D8": 14,
+        "D9": 15,
+        "D10": 16,
+        "D11": 17,
+        "D12": 20,
+        "D13": 21,
+        "D14": 22,
+        "D15": 23,
+        "D16": 24,
+        "D17": 26,
+        "D18": 28,
+        "A0": 23,
+    },
+    "generic-bk7231t-qfn32-tuya": {
+        "SPI0_CS": 15,
+        "SPI0_MISO": 17,
+        "SPI0_MOSI": 16,
+        "SPI0_SCK": 14,
+        "WIRE1_SCL": 20,
+        "WIRE1_SDA": 21,
+        "WIRE2_SCL": 0,
+        "WIRE2_SDA": 1,
+        "SERIAL1_RX": 10,
+        "SERIAL1_TX": 11,
+        "SERIAL2_RX": 1,
+        "SERIAL2_TX": 0,
+        "ADC3": 23,
+        "CS": 15,
+        "MISO": 17,
+        "MOSI": 16,
+        "P0": 0,
+        "P1": 1,
+        "P6": 6,
+        "P7": 7,
+        "P8": 8,
+        "P9": 9,
+        "P10": 10,
+        "P11": 11,
+        "P14": 14,
+        "P15": 15,
+        "P16": 16,
+        "P17": 17,
+        "P20": 20,
+        "P21": 21,
+        "P22": 22,
+        "P23": 23,
+        "P24": 24,
+        "P26": 26,
+        "P28": 28,
+        "PWM0": 6,
+        "PWM1": 7,
+        "PWM2": 8,
+        "PWM3": 9,
+        "PWM4": 24,
+        "PWM5": 26,
+        "RX1": 10,
+        "RX2": 1,
+        "SCK": 14,
+        "SCL1": 20,
+        "SCL2": 0,
+        "SDA1": 21,
+        "SDA2": 1,
+        "TX1": 11,
+        "TX2": 0,
+        "D0": 0,
+        "D1": 1,
+        "D2": 6,
+        "D3": 7,
+        "D4": 8,
+        "D5": 9,
+        "D6": 10,
+        "D7": 11,
+        "D8": 14,
+        "D9": 15,
+        "D10": 16,
+        "D11": 17,
+        "D12": 20,
+        "D13": 21,
+        "D14": 22,
+        "D15": 23,
+        "D16": 24,
+        "D17": 26,
+        "D18": 28,
+        "A0": 23,
+    },
+    "generic-bk7238": {
+        "SPI0_CS": 15,
+        "SPI0_MISO": 17,
+        "SPI0_MOSI": 16,
+        "SPI0_SCK": 14,
+        "WIRE2_SCL_0": 15,
+        "WIRE2_SCL_1": 24,
+        "WIRE2_SDA_0": 17,
+        "WIRE2_SDA_1": 26,
+        "SERIAL1_RX": 10,
+        "SERIAL1_TX": 11,
+        "SERIAL2_RX": 1,
+        "SERIAL2_TX": 0,
+        "ADC1": 26,
+        "ADC2": 24,
+        "ADC3": 20,
+        "ADC4": 28,
+        "ADC5": 1,
+        "ADC6": 10,
+        "CS": 15,
+        "MISO": 17,
+        "MOSI": 16,
+        "P0": 0,
+        "P1": 1,
+        "P6": 6,
+        "P7": 7,
+        "P8": 8,
+        "P9": 9,
+        "P10": 10,
+        "P11": 11,
+        "P14": 14,
+        "P15": 15,
+        "P16": 16,
+        "P17": 17,
+        "P20": 20,
+        "P21": 21,
+        "P22": 22,
+        "P23": 23,
+        "P24": 24,
+        "P26": 26,
+        "P28": 28,
+        "PWM0": 6,
+        "PWM1": 7,
+        "PWM2": 8,
+        "PWM3": 9,
+        "PWM4": 24,
+        "PWM5": 26,
+        "RX1": 10,
+        "RX2": 1,
+        "SCK": 14,
+        "TX1": 11,
+        "TX2": 0,
+        "D0": 0,
+        "D1": 1,
+        "D2": 6,
+        "D3": 7,
+        "D4": 8,
+        "D5": 9,
+        "D6": 10,
+        "D7": 11,
+        "D8": 14,
+        "D9": 15,
+        "D10": 16,
+        "D11": 17,
+        "D12": 20,
+        "D13": 21,
+        "D14": 22,
+        "D15": 23,
+        "D16": 24,
+        "D17": 26,
+        "D18": 28,
+        "A0": 1,
+        "A1": 10,
+        "A2": 20,
+        "A3": 24,
+        "A4": 26,
+        "A5": 28,
+    },
+    "generic-bk7238-tuya": {
+        "SPI0_CS": 15,
+        "SPI0_MISO": 17,
+        "SPI0_MOSI": 16,
+        "SPI0_SCK": 14,
+        "WIRE2_SCL_0": 15,
+        "WIRE2_SCL_1": 24,
+        "WIRE2_SDA_0": 17,
+        "WIRE2_SDA_1": 26,
+        "SERIAL1_RX": 10,
+        "SERIAL1_TX": 11,
+        "SERIAL2_RX": 1,
+        "SERIAL2_TX": 0,
+        "ADC1": 26,
+        "ADC2": 24,
+        "ADC3": 20,
+        "ADC4": 28,
+        "ADC5": 1,
+        "ADC6": 10,
+        "CS": 15,
+        "MISO": 17,
+        "MOSI": 16,
+        "P0": 0,
+        "P1": 1,
+        "P6": 6,
+        "P7": 7,
+        "P8": 8,
+        "P9": 9,
+        "P10": 10,
+        "P11": 11,
+        "P14": 14,
+        "P15": 15,
+        "P16": 16,
+        "P17": 17,
+        "P20": 20,
+        "P21": 21,
+        "P22": 22,
+        "P23": 23,
+        "P24": 24,
+        "P26": 26,
+        "P28": 28,
+        "PWM0": 6,
+        "PWM1": 7,
+        "PWM2": 8,
+        "PWM3": 9,
+        "PWM4": 24,
+        "PWM5": 26,
+        "RX1": 10,
+        "RX2": 1,
+        "SCK": 14,
+        "TX1": 11,
+        "TX2": 0,
+        "D0": 0,
+        "D1": 1,
+        "D2": 6,
+        "D3": 7,
+        "D4": 8,
+        "D5": 9,
+        "D6": 10,
+        "D7": 11,
+        "D8": 14,
+        "D9": 15,
+        "D10": 16,
+        "D11": 17,
+        "D12": 20,
+        "D13": 21,
+        "D14": 22,
+        "D15": 23,
+        "D16": 24,
+        "D17": 26,
+        "D18": 28,
+        "A0": 1,
+        "A1": 10,
+        "A2": 20,
+        "A3": 24,
+        "A4": 26,
+        "A5": 28,
+    },
     "generic-bk7252": {
         "SPI0_CS": 15,
         "SPI0_MISO": 17,
@@ -1085,6 +1031,161 @@ BK72XX_BOARD_PINS = {
         "A6": 12,
         "A7": 13,
     },
+    "lsc-lma35": {
+        "WIRE2_SCL": 0,
+        "WIRE2_SDA": 1,
+        "SERIAL1_RX": 10,
+        "SERIAL1_TX": 11,
+        "SERIAL2_RX": 1,
+        "SERIAL2_TX": 0,
+        "ADC3": 23,
+        "MOSI": 16,
+        "P0": 0,
+        "P1": 1,
+        "P6": 6,
+        "P7": 7,
+        "P8": 8,
+        "P9": 9,
+        "P10": 10,
+        "P11": 11,
+        "P14": 14,
+        "P16": 16,
+        "P21": 21,
+        "P22": 22,
+        "P23": 23,
+        "P24": 24,
+        "P26": 26,
+        "PWM0": 6,
+        "PWM1": 7,
+        "PWM2": 8,
+        "PWM3": 9,
+        "PWM4": 24,
+        "PWM5": 26,
+        "RX1": 10,
+        "RX2": 1,
+        "SCK": 14,
+        "SCL2": 0,
+        "SDA1": 21,
+        "SDA2": 1,
+        "TX1": 11,
+        "TX2": 0,
+        "D0": 26,
+        "D1": 14,
+        "D2": 16,
+        "D3": 24,
+        "D4": 22,
+        "D5": 0,
+        "D6": 23,
+        "D7": 8,
+        "D8": 9,
+        "D9": 21,
+        "D10": 6,
+        "D11": 7,
+        "D12": 10,
+        "D13": 11,
+        "D14": 1,
+        "A0": 23,
+    },
+    "lsc-lma35-t": {
+        "WIRE2_SCL": 0,
+        "WIRE2_SDA": 1,
+        "SERIAL1_RX": 10,
+        "SERIAL1_TX": 11,
+        "SERIAL2_RX": 1,
+        "SERIAL2_TX": 0,
+        "ADC3": 23,
+        "MOSI": 16,
+        "P0": 0,
+        "P1": 1,
+        "P6": 6,
+        "P7": 7,
+        "P8": 8,
+        "P9": 9,
+        "P10": 10,
+        "P11": 11,
+        "P14": 14,
+        "P16": 16,
+        "P21": 21,
+        "P22": 22,
+        "P23": 23,
+        "P24": 24,
+        "P26": 26,
+        "PWM0": 6,
+        "PWM1": 7,
+        "PWM2": 8,
+        "PWM3": 9,
+        "PWM4": 24,
+        "PWM5": 26,
+        "RX1": 10,
+        "RX2": 1,
+        "SCK": 14,
+        "SCL2": 0,
+        "SDA1": 21,
+        "SDA2": 1,
+        "TX1": 11,
+        "TX2": 0,
+        "D0": 26,
+        "D1": 14,
+        "D2": 16,
+        "D3": 24,
+        "D4": 22,
+        "D5": 0,
+        "D6": 23,
+        "D7": 8,
+        "D8": 9,
+        "D9": 21,
+        "D10": 6,
+        "D11": 7,
+        "D12": 10,
+        "D13": 11,
+        "D14": 1,
+        "A0": 23,
+    },
+    "t1-2s": {
+        "WIRE2_SCL": 24,
+        "WIRE2_SDA": 26,
+        "SERIAL1_RX": 10,
+        "SERIAL1_TX": 11,
+        "SERIAL2_RX": 1,
+        "SERIAL2_TX": 0,
+        "ADC1": 26,
+        "ADC2": 24,
+        "ADC5": 1,
+        "ADC6": 10,
+        "P0": 0,
+        "P1": 1,
+        "P6": 6,
+        "P8": 8,
+        "P9": 9,
+        "P10": 10,
+        "P11": 11,
+        "P24": 24,
+        "P26": 26,
+        "PWM0": 6,
+        "PWM2": 8,
+        "PWM3": 9,
+        "PWM4": 24,
+        "PWM5": 26,
+        "RX1": 10,
+        "RX2": 1,
+        "SCL2": 24,
+        "SDA2": 26,
+        "TX1": 11,
+        "TX2": 0,
+        "D0": 26,
+        "D1": 6,
+        "D2": 8,
+        "D3": 1,
+        "D4": 10,
+        "D5": 11,
+        "D6": 9,
+        "D7": 24,
+        "D11": 0,
+        "A0": 26,
+        "A1": 10,
+        "A2": 1,
+        "A3": 24,
+    },
     "t1-3s": {
         "SPI0_CS": 15,
         "SPI0_MISO": 17,
@@ -1154,6 +1255,217 @@ BK72XX_BOARD_PINS = {
         "A3": 26,
         "A4": 10,
     },
+    "t1-m": {
+        "WIRE2_SCL": 24,
+        "WIRE2_SDA": 26,
+        "SERIAL1_RX": 10,
+        "SERIAL1_TX": 11,
+        "SERIAL2_RX": 1,
+        "SERIAL2_TX": 0,
+        "ADC1": 26,
+        "ADC2": 24,
+        "ADC5": 1,
+        "ADC6": 10,
+        "P0": 0,
+        "P1": 1,
+        "P6": 6,
+        "P8": 8,
+        "P9": 9,
+        "P10": 10,
+        "P11": 11,
+        "P24": 24,
+        "P26": 26,
+        "PWM0": 6,
+        "PWM2": 8,
+        "PWM3": 9,
+        "PWM4": 24,
+        "PWM5": 26,
+        "RX1": 10,
+        "RX2": 1,
+        "SCL2": 24,
+        "SDA2": 26,
+        "TX1": 11,
+        "TX2": 0,
+        "D0": 26,
+        "D1": 6,
+        "D2": 8,
+        "D3": 1,
+        "D4": 10,
+        "D5": 11,
+        "D6": 9,
+        "D7": 24,
+        "D11": 0,
+        "A0": 26,
+        "A1": 10,
+        "A2": 1,
+        "A3": 24,
+    },
+    "t1-u": {
+        "SPI0_CS": 15,
+        "SPI0_MISO": 17,
+        "SPI0_MOSI": 16,
+        "SPI0_SCK": 14,
+        "WIRE2_SCL_0": 15,
+        "WIRE2_SCL_1": 24,
+        "WIRE2_SDA_0": 17,
+        "WIRE2_SDA_1": 26,
+        "SERIAL1_RX": 10,
+        "SERIAL1_TX": 11,
+        "SERIAL2_RX": 1,
+        "SERIAL2_TX": 0,
+        "ADC1": 26,
+        "ADC2": 24,
+        "ADC3": 20,
+        "ADC4": 28,
+        "ADC5": 1,
+        "ADC6": 10,
+        "CS": 15,
+        "MISO": 17,
+        "MOSI": 16,
+        "P0": 0,
+        "P1": 1,
+        "P6": 6,
+        "P8": 8,
+        "P9": 9,
+        "P10": 10,
+        "P11": 11,
+        "P14": 14,
+        "P15": 15,
+        "P16": 16,
+        "P17": 17,
+        "P20": 20,
+        "P21": 21,
+        "P22": 22,
+        "P23": 23,
+        "P24": 24,
+        "P26": 26,
+        "P28": 28,
+        "PWM0": 6,
+        "PWM2": 8,
+        "PWM3": 9,
+        "PWM4": 24,
+        "PWM5": 26,
+        "RX1": 10,
+        "RX2": 1,
+        "SCK": 14,
+        "TX1": 11,
+        "TX2": 0,
+        "D0": 14,
+        "D1": 16,
+        "D2": 23,
+        "D3": 22,
+        "D4": 20,
+        "D5": 1,
+        "D6": 0,
+        "D7": 24,
+        "D8": 9,
+        "D9": 26,
+        "D10": 6,
+        "D11": 8,
+        "D12": 11,
+        "D13": 10,
+        "D14": 28,
+        "D15": 21,
+        "D16": 17,
+        "D17": 15,
+        "A0": 20,
+        "A1": 1,
+        "A2": 24,
+        "A3": 26,
+        "A4": 10,
+        "A5": 28,
+    },
+    "wa2": {
+        "WIRE1_SCL": 20,
+        "WIRE1_SDA": 21,
+        "SERIAL1_RX": 10,
+        "SERIAL1_TX": 11,
+        "SERIAL2_TX": 0,
+        "ADC1": 4,
+        "ADC3": 23,
+        "P0": 0,
+        "P4": 4,
+        "P6": 6,
+        "P7": 7,
+        "P8": 8,
+        "P10": 10,
+        "P11": 11,
+        "P18": 18,
+        "P19": 19,
+        "P20": 20,
+        "P21": 21,
+        "P22": 22,
+        "P23": 23,
+        "PWM0": 6,
+        "PWM1": 7,
+        "PWM2": 8,
+        "PWM4": 18,
+        "PWM5": 19,
+        "RX1": 10,
+        "SCL1": 20,
+        "SCL2": 0,
+        "SDA1": 21,
+        "TX1": 11,
+        "TX2": 0,
+        "D0": 8,
+        "D1": 7,
+        "D2": 6,
+        "D3": 23,
+        "D4": 10,
+        "D5": 11,
+        "D6": 18,
+        "D7": 19,
+        "D8": 20,
+        "D9": 4,
+        "D10": 0,
+        "D11": 21,
+        "D12": 22,
+        "A0": 23,
+    },
+    "wb1s": {
+        "WIRE2_SCL": 0,
+        "WIRE2_SDA": 1,
+        "SERIAL1_RX": 10,
+        "SERIAL1_TX": 11,
+        "SERIAL2_RX": 1,
+        "SERIAL2_TX": 0,
+        "ADC3": 23,
+        "P0": 0,
+        "P1": 1,
+        "P6": 6,
+        "P7": 7,
+        "P8": 8,
+        "P9": 9,
+        "P10": 10,
+        "P11": 11,
+        "P23": 23,
+        "P24": 24,
+        "P26": 26,
+        "PWM0": 6,
+        "PWM1": 7,
+        "PWM2": 8,
+        "PWM3": 9,
+        "PWM4": 24,
+        "PWM5": 26,
+        "RX1": 10,
+        "RX2": 1,
+        "SCL2": 0,
+        "SDA2": 1,
+        "TX1": 11,
+        "TX2": 0,
+        "D0": 11,
+        "D1": 10,
+        "D2": 26,
+        "D3": 24,
+        "D4": 0,
+        "D5": 8,
+        "D6": 7,
+        "D7": 1,
+        "D8": 9,
+        "D9": 6,
+        "D10": 23,
+        "A0": 23,
+    },
     "wb2l": {
         "WIRE1_SCL": 20,
         "WIRE1_SDA": 21,
@@ -1205,51 +1517,7 @@ BK72XX_BOARD_PINS = {
         "D12": 22,
         "A0": 23,
     },
-    "wb1s": {
-        "WIRE2_SCL": 0,
-        "WIRE2_SDA": 1,
-        "SERIAL1_RX": 10,
-        "SERIAL1_TX": 11,
-        "SERIAL2_RX": 1,
-        "SERIAL2_TX": 0,
-        "ADC3": 23,
-        "P0": 0,
-        "P1": 1,
-        "P6": 6,
-        "P7": 7,
-        "P8": 8,
-        "P9": 9,
-        "P10": 10,
-        "P11": 11,
-        "P23": 23,
-        "P24": 24,
-        "P26": 26,
-        "PWM0": 6,
-        "PWM1": 7,
-        "PWM2": 8,
-        "PWM3": 9,
-        "PWM4": 24,
-        "PWM5": 26,
-        "RX1": 10,
-        "RX2": 1,
-        "SCL2": 0,
-        "SDA2": 1,
-        "TX1": 11,
-        "TX2": 0,
-        "D0": 11,
-        "D1": 10,
-        "D2": 26,
-        "D3": 24,
-        "D4": 0,
-        "D5": 8,
-        "D6": 7,
-        "D7": 1,
-        "D8": 9,
-        "D9": 6,
-        "D10": 23,
-        "A0": 23,
-    },
-    "wblc5": {
+    "wb2l-m1": {
         "WIRE1_SCL": 20,
         "WIRE1_SDA": 21,
         "WIRE2_SCL": 0,
@@ -1262,6 +1530,8 @@ BK72XX_BOARD_PINS = {
         "P0": 0,
         "P1": 1,
         "P6": 6,
+        "P7": 7,
+        "P8": 8,
         "P10": 10,
         "P11": 11,
         "P20": 20,
@@ -1271,95 +1541,43 @@ BK72XX_BOARD_PINS = {
         "P24": 24,
         "P26": 26,
         "PWM0": 6,
-        "PWM4": 24,
-        "PWM5": 26,
-        "RX1": 10,
-        "RX2": 1,
-        "SCL1": 20,
-        "SCL2": 0,
-        "SDA1": 21,
-        "SDA2": 1,
-        "TX1": 11,
-        "TX2": 0,
-        "D0": 24,
-        "D1": 6,
-        "D2": 26,
-        "D3": 10,
-        "D4": 11,
-        "D5": 1,
-        "D6": 0,
-        "D7": 20,
-        "D8": 21,
-        "D9": 22,
-        "D10": 23,
-        "A0": 23,
-    },
-    "cb2s": {
-        "WIRE2_SCL": 0,
-        "WIRE2_SDA": 1,
-        "SERIAL1_RX": 10,
-        "SERIAL1_TX": 11,
-        "SERIAL2_RX": 1,
-        "SERIAL2_TX": 0,
-        "ADC3": 23,
-        "P0": 0,
-        "P1": 1,
-        "P6": 6,
-        "P7": 7,
-        "P8": 8,
-        "P10": 10,
-        "P11": 11,
-        "P21": 21,
-        "P23": 23,
-        "P24": 24,
-        "P26": 26,
-        "PWM0": 6,
         "PWM1": 7,
         "PWM2": 8,
         "PWM4": 24,
         "PWM5": 26,
         "RX1": 10,
         "RX2": 1,
+        "SCL1": 20,
         "SCL2": 0,
         "SDA1": 21,
         "SDA2": 1,
         "TX1": 11,
         "TX2": 0,
-        "D0": 6,
+        "D0": 8,
         "D1": 7,
-        "D2": 8,
-        "D3": 23,
-        "D4": 10,
-        "D5": 11,
-        "D6": 24,
-        "D7": 26,
+        "D2": 6,
+        "D3": 26,
+        "D4": 24,
+        "D5": 10,
+        "D6": 11,
+        "D7": 1,
         "D8": 0,
-        "D9": 1,
+        "D9": 20,
         "D10": 21,
+        "D11": 23,
+        "D12": 22,
         "A0": 23,
     },
-    "generic-bk7238": {
-        "SPI0_CS": 15,
-        "SPI0_MISO": 17,
-        "SPI0_MOSI": 16,
-        "SPI0_SCK": 14,
-        "WIRE2_SCL_0": 15,
-        "WIRE2_SCL_1": 24,
-        "WIRE2_SDA_0": 17,
-        "WIRE2_SDA_1": 26,
+    "wb2s": {
+        "WIRE1_SCL": 20,
+        "WIRE1_SDA": 21,
+        "WIRE2_SCL": 0,
+        "WIRE2_SDA": 1,
         "SERIAL1_RX": 10,
         "SERIAL1_TX": 11,
         "SERIAL2_RX": 1,
         "SERIAL2_TX": 0,
-        "ADC1": 26,
-        "ADC2": 24,
-        "ADC3": 20,
-        "ADC4": 28,
-        "ADC5": 1,
-        "ADC6": 10,
-        "CS": 15,
-        "MISO": 17,
-        "MOSI": 16,
+        "ADC3": 23,
         "P0": 0,
         "P1": 1,
         "P6": 6,
@@ -1368,17 +1586,12 @@ BK72XX_BOARD_PINS = {
         "P9": 9,
         "P10": 10,
         "P11": 11,
-        "P14": 14,
-        "P15": 15,
-        "P16": 16,
-        "P17": 17,
         "P20": 20,
         "P21": 21,
         "P22": 22,
         "P23": 23,
         "P24": 24,
         "P26": 26,
-        "P28": 28,
         "PWM0": 6,
         "PWM1": 7,
         "PWM2": 8,
@@ -1387,65 +1600,10 @@ BK72XX_BOARD_PINS = {
         "PWM5": 26,
         "RX1": 10,
         "RX2": 1,
-        "SCK": 14,
-        "TX1": 11,
-        "TX2": 0,
-        "D0": 0,
-        "D1": 1,
-        "D2": 6,
-        "D3": 7,
-        "D4": 8,
-        "D5": 9,
-        "D6": 10,
-        "D7": 11,
-        "D8": 14,
-        "D9": 15,
-        "D10": 16,
-        "D11": 17,
-        "D12": 20,
-        "D13": 21,
-        "D14": 22,
-        "D15": 23,
-        "D16": 24,
-        "D17": 26,
-        "D18": 28,
-        "A0": 1,
-        "A1": 10,
-        "A2": 20,
-        "A3": 24,
-        "A4": 26,
-        "A5": 28,
-    },
-    "wa2": {
-        "WIRE1_SCL": 20,
-        "WIRE1_SDA": 21,
-        "SERIAL1_RX": 10,
-        "SERIAL1_TX": 11,
-        "SERIAL2_TX": 0,
-        "ADC1": 4,
-        "ADC3": 23,
-        "P0": 0,
-        "P4": 4,
-        "P6": 6,
-        "P7": 7,
-        "P8": 8,
-        "P10": 10,
-        "P11": 11,
-        "P18": 18,
-        "P19": 19,
-        "P20": 20,
-        "P21": 21,
-        "P22": 22,
-        "P23": 23,
-        "PWM0": 6,
-        "PWM1": 7,
-        "PWM2": 8,
-        "PWM4": 18,
-        "PWM5": 19,
-        "RX1": 10,
         "SCL1": 20,
         "SCL2": 0,
         "SDA1": 21,
+        "SDA2": 1,
         "TX1": 11,
         "TX2": 0,
         "D0": 8,
@@ -1454,176 +1612,14 @@ BK72XX_BOARD_PINS = {
         "D3": 23,
         "D4": 10,
         "D5": 11,
-        "D6": 18,
-        "D7": 19,
+        "D6": 24,
+        "D7": 26,
         "D8": 20,
-        "D9": 4,
-        "D10": 0,
-        "D11": 21,
-        "D12": 22,
-        "A0": 23,
-    },
-    "cb3l": {
-        "SERIAL1_RX": 10,
-        "SERIAL1_TX": 11,
-        "SERIAL2_TX": 0,
-        "ADC3": 23,
-        "P0": 0,
-        "P6": 6,
-        "P7": 7,
-        "P8": 8,
-        "P9": 9,
-        "P10": 10,
-        "P11": 11,
-        "P14": 14,
-        "P21": 21,
-        "P23": 23,
-        "P24": 24,
-        "P26": 26,
-        "PWM0": 6,
-        "PWM1": 7,
-        "PWM2": 8,
-        "PWM3": 9,
-        "PWM4": 24,
-        "PWM5": 26,
-        "RX1": 10,
-        "SCK": 14,
-        "SCL2": 0,
-        "SDA1": 21,
-        "TX1": 11,
-        "TX2": 0,
-        "D0": 23,
-        "D1": 14,
-        "D2": 26,
-        "D3": 24,
-        "D4": 6,
-        "D5": 9,
-        "D6": 0,
-        "D7": 21,
-        "D8": 8,
-        "D9": 7,
-        "D10": 10,
-        "D11": 11,
-        "A0": 23,
-    },
-    "lsc-lma35-t": {
-        "WIRE2_SCL": 0,
-        "WIRE2_SDA": 1,
-        "SERIAL1_RX": 10,
-        "SERIAL1_TX": 11,
-        "SERIAL2_RX": 1,
-        "SERIAL2_TX": 0,
-        "ADC3": 23,
-        "MOSI": 16,
-        "P0": 0,
-        "P1": 1,
-        "P6": 6,
-        "P7": 7,
-        "P8": 8,
-        "P9": 9,
-        "P10": 10,
-        "P11": 11,
-        "P14": 14,
-        "P16": 16,
-        "P21": 21,
-        "P22": 22,
-        "P23": 23,
-        "P24": 24,
-        "P26": 26,
-        "PWM0": 6,
-        "PWM1": 7,
-        "PWM2": 8,
-        "PWM3": 9,
-        "PWM4": 24,
-        "PWM5": 26,
-        "RX1": 10,
-        "RX2": 1,
-        "SCK": 14,
-        "SCL2": 0,
-        "SDA1": 21,
-        "SDA2": 1,
-        "TX1": 11,
-        "TX2": 0,
-        "D0": 26,
-        "D1": 14,
-        "D2": 16,
-        "D3": 24,
-        "D4": 22,
-        "D5": 0,
-        "D6": 23,
-        "D7": 8,
-        "D8": 9,
-        "D9": 21,
-        "D10": 6,
-        "D11": 7,
-        "D12": 10,
-        "D13": 11,
-        "D14": 1,
-        "A0": 23,
-    },
-    "cb3se": {
-        "SPI0_CS": 15,
-        "SPI0_MISO": 17,
-        "SPI0_MOSI": 16,
-        "SPI0_SCK": 14,
-        "WIRE2_SCL": 0,
-        "WIRE2_SDA": 1,
-        "SERIAL1_RX": 10,
-        "SERIAL1_TX": 11,
-        "SERIAL2_RX": 1,
-        "SERIAL2_TX": 0,
-        "ADC3": 23,
-        "CS": 15,
-        "MISO": 17,
-        "MOSI": 16,
-        "P0": 0,
-        "P1": 1,
-        "P6": 6,
-        "P7": 7,
-        "P8": 8,
-        "P9": 9,
-        "P10": 10,
-        "P11": 11,
-        "P14": 14,
-        "P15": 15,
-        "P16": 16,
-        "P17": 17,
-        "P20": 20,
-        "P22": 22,
-        "P23": 23,
-        "P24": 24,
-        "P26": 26,
-        "PWM0": 6,
-        "PWM1": 7,
-        "PWM2": 8,
-        "PWM3": 9,
-        "PWM4": 24,
-        "PWM5": 26,
-        "RX1": 10,
-        "RX2": 1,
-        "SCK": 14,
-        "SCL1": 20,
-        "SCL2": 0,
-        "SDA2": 1,
-        "TX1": 11,
-        "TX2": 0,
-        "D0": 23,
-        "D1": 14,
-        "D2": 26,
-        "D3": 24,
-        "D4": 6,
-        "D5": 9,
-        "D6": 0,
-        "D7": 1,
-        "D8": 8,
-        "D9": 7,
-        "D10": 10,
-        "D11": 11,
-        "D12": 15,
+        "D9": 9,
+        "D10": 1,
+        "D11": 0,
+        "D12": 21,
         "D13": 22,
-        "D14": 20,
-        "D15": 17,
-        "D16": 16,
         "A0": 23,
     },
     "wb3l": {
@@ -1686,52 +1682,7 @@ BK72XX_BOARD_PINS = {
         "D15": 1,
         "A0": 23,
     },
-    "t1-2s": {
-        "WIRE2_SCL": 24,
-        "WIRE2_SDA": 26,
-        "SERIAL1_RX": 10,
-        "SERIAL1_TX": 11,
-        "SERIAL2_RX": 1,
-        "SERIAL2_TX": 0,
-        "ADC1": 26,
-        "ADC2": 24,
-        "ADC5": 1,
-        "ADC6": 10,
-        "P0": 0,
-        "P1": 1,
-        "P6": 6,
-        "P8": 8,
-        "P9": 9,
-        "P10": 10,
-        "P11": 11,
-        "P24": 24,
-        "P26": 26,
-        "PWM0": 6,
-        "PWM2": 8,
-        "PWM3": 9,
-        "PWM4": 24,
-        "PWM5": 26,
-        "RX1": 10,
-        "RX2": 1,
-        "SCL2": 24,
-        "SDA2": 26,
-        "TX1": 11,
-        "TX2": 0,
-        "D0": 26,
-        "D1": 6,
-        "D2": 8,
-        "D3": 1,
-        "D4": 10,
-        "D5": 11,
-        "D6": 9,
-        "D7": 24,
-        "D11": 0,
-        "A0": 26,
-        "A1": 10,
-        "A2": 1,
-        "A3": 24,
-    },
-    "wb2s": {
+    "wb3s": {
         "WIRE1_SCL": 20,
         "WIRE1_SDA": 21,
         "WIRE2_SCL": 0,
@@ -1749,6 +1700,7 @@ BK72XX_BOARD_PINS = {
         "P9": 9,
         "P10": 10,
         "P11": 11,
+        "P14": 14,
         "P20": 20,
         "P21": 21,
         "P22": 22,
@@ -1763,28 +1715,152 @@ BK72XX_BOARD_PINS = {
         "PWM5": 26,
         "RX1": 10,
         "RX2": 1,
+        "SCK": 14,
         "SCL1": 20,
         "SCL2": 0,
         "SDA1": 21,
         "SDA2": 1,
         "TX1": 11,
         "TX2": 0,
-        "D0": 8,
-        "D1": 7,
-        "D2": 6,
-        "D3": 23,
-        "D4": 10,
-        "D5": 11,
-        "D6": 24,
-        "D7": 26,
-        "D8": 20,
-        "D9": 9,
-        "D10": 1,
-        "D11": 0,
-        "D12": 21,
-        "D13": 22,
+        "D0": 23,
+        "D1": 14,
+        "D2": 26,
+        "D3": 24,
+        "D4": 6,
+        "D5": 7,
+        "D6": 0,
+        "D7": 1,
+        "D8": 9,
+        "D9": 8,
+        "D10": 10,
+        "D11": 11,
+        "D12": 22,
+        "D13": 21,
+        "D14": 20,
         "A0": 23,
     },
+    "wblc5": {
+        "WIRE1_SCL": 20,
+        "WIRE1_SDA": 21,
+        "WIRE2_SCL": 0,
+        "WIRE2_SDA": 1,
+        "SERIAL1_RX": 10,
+        "SERIAL1_TX": 11,
+        "SERIAL2_RX": 1,
+        "SERIAL2_TX": 0,
+        "ADC3": 23,
+        "P0": 0,
+        "P1": 1,
+        "P6": 6,
+        "P10": 10,
+        "P11": 11,
+        "P20": 20,
+        "P21": 21,
+        "P22": 22,
+        "P23": 23,
+        "P24": 24,
+        "P26": 26,
+        "PWM0": 6,
+        "PWM4": 24,
+        "PWM5": 26,
+        "RX1": 10,
+        "RX2": 1,
+        "SCL1": 20,
+        "SCL2": 0,
+        "SDA1": 21,
+        "SDA2": 1,
+        "TX1": 11,
+        "TX2": 0,
+        "D0": 24,
+        "D1": 6,
+        "D2": 26,
+        "D3": 10,
+        "D4": 11,
+        "D5": 1,
+        "D6": 0,
+        "D7": 20,
+        "D8": 21,
+        "D9": 22,
+        "D10": 23,
+        "A0": 23,
+    },
+    "xh-wb3s": {
+        "SPI0_CS": 15,
+        "SPI0_MISO": 17,
+        "SPI0_MOSI": 16,
+        "SPI0_SCK": 14,
+        "WIRE2_SCL_0": 15,
+        "WIRE2_SCL_1": 24,
+        "WIRE2_SDA_0": 17,
+        "WIRE2_SDA_1": 26,
+        "SERIAL1_RX": 10,
+        "SERIAL1_TX": 11,
+        "SERIAL2_RX": 1,
+        "SERIAL2_TX": 0,
+        "ADC1": 26,
+        "ADC2": 24,
+        "ADC3": 20,
+        "ADC4": 28,
+        "ADC5": 1,
+        "ADC6": 10,
+        "CS": 15,
+        "MISO": 17,
+        "MOSI": 16,
+        "P0": 0,
+        "P1": 1,
+        "P6": 6,
+        "P7": 7,
+        "P8": 8,
+        "P9": 9,
+        "P10": 10,
+        "P11": 11,
+        "P14": 14,
+        "P15": 15,
+        "P16": 16,
+        "P17": 17,
+        "P20": 20,
+        "P21": 21,
+        "P22": 22,
+        "P23": 23,
+        "P24": 24,
+        "P26": 26,
+        "P28": 28,
+        "PWM0": 6,
+        "PWM1": 7,
+        "PWM2": 8,
+        "PWM3": 9,
+        "PWM4": 24,
+        "PWM5": 26,
+        "RX1": 10,
+        "RX2": 1,
+        "SCK": 14,
+        "TX1": 11,
+        "TX2": 0,
+        "D0": 7,
+        "D1": 23,
+        "D2": 14,
+        "D3": 26,
+        "D4": 24,
+        "D5": 6,
+        "D6": 9,
+        "D7": 0,
+        "D8": 1,
+        "D9": 8,
+        "D10": 10,
+        "D11": 11,
+        "D12": 16,
+        "D13": 20,
+        "D14": 21,
+        "D15": 22,
+        "D16": 15,
+        "D17": 17,
+        "A0": 28,
+        "A1": 26,
+        "A2": 24,
+        "A3": 1,
+        "A4": 10,
+        "A5": 20,
+    },
 }
 
 BOARDS = BK72XX_BOARDS
diff --git a/esphome/components/libretiny/__init__.py b/esphome/components/libretiny/__init__.py
index bcc393f3fd0..079bb32aabb 100644
--- a/esphome/components/libretiny/__init__.py
+++ b/esphome/components/libretiny/__init__.py
@@ -211,14 +211,14 @@ def _notify_old_style(config):
 # The dev and latest branches will be at *least* this version, which is what matters.
 # Use GitHub releases directly to avoid PlatformIO moderation delays.
 ARDUINO_VERSIONS = {
-    "dev": (cv.Version(1, 12, 1), "https://github.com/libretiny-eu/libretiny.git"),
+    "dev": (cv.Version(1, 13, 0), "https://github.com/libretiny-eu/libretiny.git"),
     "latest": (
-        cv.Version(1, 12, 1),
-        "https://github.com/libretiny-eu/libretiny.git#v1.12.1",
+        cv.Version(1, 13, 0),
+        "https://github.com/libretiny-eu/libretiny.git#v1.13.0",
     ),
     "recommended": (
-        cv.Version(1, 12, 1),
-        "https://github.com/libretiny-eu/libretiny.git#v1.12.1",
+        cv.Version(1, 13, 0),
+        "https://github.com/libretiny-eu/libretiny.git#v1.13.0",
     ),
 }
 
diff --git a/esphome/components/libretiny/generate_components.py b/esphome/components/libretiny/generate_components.py
index 6ca16f277f4..791a2659a94 100644
--- a/esphome/components/libretiny/generate_components.py
+++ b/esphome/components/libretiny/generate_components.py
@@ -359,7 +359,9 @@ if __name__ == "__main__":
     check_base_code(BASE_CODE_INIT)
     # list all boards from ltchiptool
     components_dir = Path(__file__).parent.parent
-    boards = [Board(b) for b in Board.get_list()]
+    # Board.get_list() returns glob (filesystem) order, which is non-deterministic
+    # and produces noisy diffs on regeneration; sort by board id for stable output.
+    boards = sorted((Board(b) for b in Board.get_list()), key=lambda b: b.name)
     # keep track of all supported root- and chip-families
     components = set()
     families = {}
diff --git a/esphome/components/ln882x/boards.py b/esphome/components/ln882x/boards.py
index df44419ed21..bcd3ffbd9ee 100644
--- a/esphome/components/ln882x/boards.py
+++ b/esphome/components/ln882x/boards.py
@@ -15,26 +15,38 @@ Any manual changes WILL BE LOST on regeneration.
 from esphome.components.libretiny.const import FAMILY_LN882H
 
 LN882X_BOARDS = {
-    "generic-ln882hki": {
-        "name": "Generic - LN882HKI",
+    "generic-ln882h": {
+        "name": "Generic - LN882H",
         "family": FAMILY_LN882H,
     },
-    "wb02a": {
-        "name": "WB02A Wi-Fi/BLE Module",
-        "family": FAMILY_LN882H,
-    },
-    "wl2s": {
-        "name": "WL2S Wi-Fi/BLE Module",
+    "generic-ln882h-tuya": {
+        "name": "Generic - LN882H (Tuya)",
         "family": FAMILY_LN882H,
     },
     "ln-02": {
         "name": "LN-02 Wi-Fi/BLE Module",
         "family": FAMILY_LN882H,
     },
+    "ln-cb3s-v1.0": {
+        "name": "LN-CB3S V1.0",
+        "family": FAMILY_LN882H,
+    },
+    "wb02a": {
+        "name": "WB02A Wi-Fi/BLE Module",
+        "family": FAMILY_LN882H,
+    },
+    "wl2h-u": {
+        "name": "WL2H-U Wi-Fi/BLE Module",
+        "family": FAMILY_LN882H,
+    },
+    "wl2s": {
+        "name": "WL2S Wi-Fi/BLE Module",
+        "family": FAMILY_LN882H,
+    },
 }
 
 LN882X_BOARD_PINS = {
-    "generic-ln882hki": {
+    "generic-ln882h": {
         "WIRE0_SCL_0": 0,
         "WIRE0_SCL_1": 1,
         "WIRE0_SCL_2": 2,
@@ -153,27 +165,292 @@ LN882X_BOARD_PINS = {
         "A6": 20,
         "A7": 21,
     },
+    "generic-ln882h-tuya": {
+        "WIRE0_SCL_0": 0,
+        "WIRE0_SCL_1": 1,
+        "WIRE0_SCL_2": 2,
+        "WIRE0_SCL_3": 3,
+        "WIRE0_SCL_4": 4,
+        "WIRE0_SCL_5": 5,
+        "WIRE0_SCL_6": 6,
+        "WIRE0_SCL_7": 7,
+        "WIRE0_SCL_8": 8,
+        "WIRE0_SCL_9": 9,
+        "WIRE0_SCL_10": 10,
+        "WIRE0_SCL_11": 11,
+        "WIRE0_SCL_12": 12,
+        "WIRE0_SCL_13": 19,
+        "WIRE0_SCL_14": 20,
+        "WIRE0_SCL_15": 21,
+        "WIRE0_SCL_16": 22,
+        "WIRE0_SCL_17": 23,
+        "WIRE0_SCL_18": 24,
+        "WIRE0_SCL_19": 25,
+        "WIRE0_SDA_0": 0,
+        "WIRE0_SDA_1": 1,
+        "WIRE0_SDA_2": 2,
+        "WIRE0_SDA_3": 3,
+        "WIRE0_SDA_4": 4,
+        "WIRE0_SDA_5": 5,
+        "WIRE0_SDA_6": 6,
+        "WIRE0_SDA_7": 7,
+        "WIRE0_SDA_8": 8,
+        "WIRE0_SDA_9": 9,
+        "WIRE0_SDA_10": 10,
+        "WIRE0_SDA_11": 11,
+        "WIRE0_SDA_12": 12,
+        "WIRE0_SDA_13": 19,
+        "WIRE0_SDA_14": 20,
+        "WIRE0_SDA_15": 21,
+        "WIRE0_SDA_16": 22,
+        "WIRE0_SDA_17": 23,
+        "WIRE0_SDA_18": 24,
+        "WIRE0_SDA_19": 25,
+        "SERIAL0_RX": 3,
+        "SERIAL0_TX": 2,
+        "SERIAL1_RX": 24,
+        "SERIAL1_TX": 25,
+        "ADC2": 0,
+        "ADC3": 1,
+        "ADC4": 4,
+        "ADC5": 19,
+        "ADC6": 20,
+        "ADC7": 21,
+        "PA00": 0,
+        "PA0": 0,
+        "PA01": 1,
+        "PA1": 1,
+        "PA02": 2,
+        "PA2": 2,
+        "PA03": 3,
+        "PA3": 3,
+        "PA04": 4,
+        "PA4": 4,
+        "PA05": 5,
+        "PA5": 5,
+        "PA06": 6,
+        "PA6": 6,
+        "PA07": 7,
+        "PA7": 7,
+        "PA08": 8,
+        "PA8": 8,
+        "PA09": 9,
+        "PA9": 9,
+        "PA10": 10,
+        "PA11": 11,
+        "PA12": 12,
+        "PB03": 19,
+        "PB3": 19,
+        "PB04": 20,
+        "PB4": 20,
+        "PB05": 21,
+        "PB5": 21,
+        "PB06": 22,
+        "PB6": 22,
+        "PB07": 23,
+        "PB7": 23,
+        "PB08": 24,
+        "PB8": 24,
+        "PB09": 25,
+        "PB9": 25,
+        "RX0": 3,
+        "RX1": 24,
+        "TX0": 2,
+        "TX1": 25,
+        "D0": 0,
+        "D1": 1,
+        "D2": 2,
+        "D3": 3,
+        "D4": 4,
+        "D5": 5,
+        "D6": 6,
+        "D7": 7,
+        "D8": 8,
+        "D9": 9,
+        "D10": 10,
+        "D11": 11,
+        "D12": 12,
+        "D13": 19,
+        "D14": 20,
+        "D15": 21,
+        "D16": 22,
+        "D17": 23,
+        "D18": 24,
+        "D19": 25,
+        "A2": 0,
+        "A3": 1,
+        "A4": 4,
+        "A5": 19,
+        "A6": 20,
+        "A7": 21,
+    },
+    "ln-02": {
+        "WIRE0_SCL_0": 0,
+        "WIRE0_SCL_1": 1,
+        "WIRE0_SCL_2": 2,
+        "WIRE0_SCL_3": 3,
+        "WIRE0_SCL_4": 9,
+        "WIRE0_SCL_5": 11,
+        "WIRE0_SCL_6": 19,
+        "WIRE0_SCL_7": 24,
+        "WIRE0_SCL_8": 25,
+        "WIRE0_SDA_0": 0,
+        "WIRE0_SDA_1": 1,
+        "WIRE0_SDA_2": 2,
+        "WIRE0_SDA_3": 3,
+        "WIRE0_SDA_4": 9,
+        "WIRE0_SDA_5": 11,
+        "WIRE0_SDA_6": 19,
+        "WIRE0_SDA_7": 24,
+        "WIRE0_SDA_8": 25,
+        "SERIAL0_RX": 3,
+        "SERIAL0_TX": 2,
+        "SERIAL1_RX": 24,
+        "SERIAL1_TX": 25,
+        "ADC2": 0,
+        "ADC3": 1,
+        "ADC5": 19,
+        "PA00": 0,
+        "PA0": 0,
+        "PA01": 1,
+        "PA1": 1,
+        "PA02": 2,
+        "PA2": 2,
+        "PA03": 3,
+        "PA3": 3,
+        "PA09": 9,
+        "PA9": 9,
+        "PA11": 11,
+        "PB03": 19,
+        "PB3": 19,
+        "PB08": 24,
+        "PB8": 24,
+        "PB09": 25,
+        "PB9": 25,
+        "RX0": 3,
+        "RX1": 24,
+        "SCL0": 9,
+        "SDA0": 9,
+        "TX0": 2,
+        "TX1": 25,
+        "D0": 11,
+        "D1": 19,
+        "D2": 3,
+        "D3": 24,
+        "D4": 2,
+        "D5": 25,
+        "D6": 1,
+        "D7": 0,
+        "D8": 9,
+        "A0": 19,
+        "A1": 1,
+        "A2": 0,
+    },
+    "ln-cb3s-v1.0": {
+        "WIRE0_SCL_0": 0,
+        "WIRE0_SCL_1": 1,
+        "WIRE0_SCL_2": 2,
+        "WIRE0_SCL_3": 3,
+        "WIRE0_SCL_4": 4,
+        "WIRE0_SCL_5": 5,
+        "WIRE0_SCL_6": 6,
+        "WIRE0_SCL_7": 9,
+        "WIRE0_SCL_8": 11,
+        "WIRE0_SCL_9": 20,
+        "WIRE0_SCL_10": 21,
+        "WIRE0_SCL_11": 22,
+        "WIRE0_SCL_12": 25,
+        "WIRE0_SDA_0": 0,
+        "WIRE0_SDA_1": 1,
+        "WIRE0_SDA_2": 2,
+        "WIRE0_SDA_3": 3,
+        "WIRE0_SDA_4": 4,
+        "WIRE0_SDA_5": 5,
+        "WIRE0_SDA_6": 6,
+        "WIRE0_SDA_7": 9,
+        "WIRE0_SDA_8": 11,
+        "WIRE0_SDA_9": 20,
+        "WIRE0_SDA_10": 21,
+        "WIRE0_SDA_11": 22,
+        "WIRE0_SDA_12": 25,
+        "SERIAL0_RX": 3,
+        "SERIAL0_TX": 2,
+        "SERIAL1_TX": 25,
+        "ADC2": 0,
+        "ADC3": 1,
+        "ADC4": 4,
+        "ADC6": 20,
+        "ADC7": 21,
+        "PA00": 0,
+        "PA0": 0,
+        "PA01": 1,
+        "PA1": 1,
+        "PA02": 2,
+        "PA2": 2,
+        "PA03": 3,
+        "PA3": 3,
+        "PA04": 4,
+        "PA4": 4,
+        "PA05": 5,
+        "PA5": 5,
+        "PA06": 6,
+        "PA6": 6,
+        "PA09": 9,
+        "PA9": 9,
+        "PA11": 11,
+        "PB04": 20,
+        "PB4": 20,
+        "PB05": 21,
+        "PB5": 21,
+        "PB06": 22,
+        "PB6": 22,
+        "PB09": 25,
+        "PB9": 25,
+        "RX0": 3,
+        "TX0": 2,
+        "TX1": 25,
+        "D0": 0,
+        "D1": 1,
+        "D2": 4,
+        "D3": 5,
+        "D4": 6,
+        "D5": 20,
+        "D6": 25,
+        "D7": 9,
+        "D8": 21,
+        "D9": 22,
+        "D10": 3,
+        "D11": 2,
+        "D12": 11,
+        "A0": 0,
+        "A1": 1,
+        "A2": 4,
+        "A3": 20,
+        "A4": 21,
+    },
     "wb02a": {
         "WIRE0_SCL_0": 1,
         "WIRE0_SCL_1": 2,
         "WIRE0_SCL_2": 3,
         "WIRE0_SCL_3": 4,
         "WIRE0_SCL_4": 5,
-        "WIRE0_SCL_5": 7,
-        "WIRE0_SCL_6": 9,
-        "WIRE0_SCL_7": 10,
-        "WIRE0_SCL_8": 24,
-        "WIRE0_SCL_9": 25,
+        "WIRE0_SCL_5": 6,
+        "WIRE0_SCL_6": 7,
+        "WIRE0_SCL_7": 9,
+        "WIRE0_SCL_8": 10,
+        "WIRE0_SCL_9": 24,
+        "WIRE0_SCL_10": 25,
         "WIRE0_SDA_0": 1,
         "WIRE0_SDA_1": 2,
         "WIRE0_SDA_2": 3,
         "WIRE0_SDA_3": 4,
         "WIRE0_SDA_4": 5,
-        "WIRE0_SDA_5": 7,
-        "WIRE0_SDA_6": 9,
-        "WIRE0_SDA_7": 10,
-        "WIRE0_SDA_8": 24,
-        "WIRE0_SDA_9": 25,
+        "WIRE0_SDA_5": 6,
+        "WIRE0_SDA_6": 7,
+        "WIRE0_SDA_7": 9,
+        "WIRE0_SDA_8": 10,
+        "WIRE0_SDA_9": 24,
+        "WIRE0_SDA_10": 25,
         "SERIAL0_RX": 3,
         "SERIAL0_TX": 2,
         "SERIAL1_RX": 24,
@@ -190,6 +467,8 @@ LN882X_BOARD_PINS = {
         "PA4": 4,
         "PA05": 5,
         "PA5": 5,
+        "PA06": 6,
+        "PA6": 6,
         "PA07": 7,
         "PA7": 7,
         "PA09": 9,
@@ -206,18 +485,128 @@ LN882X_BOARD_PINS = {
         "TX0": 2,
         "TX1": 25,
         "D0": 7,
-        "D1": 5,
+        "D1": 6,
         "D2": 3,
         "D3": 10,
         "D4": 2,
         "D5": 1,
         "D6": 4,
-        "D7": 9,
-        "D8": 24,
-        "D9": 25,
+        "D7": 5,
+        "D8": 9,
+        "D9": 24,
+        "D10": 25,
         "A0": 1,
         "A1": 4,
     },
+    "wl2h-u": {
+        "WIRE0_SCL_0": 0,
+        "WIRE0_SCL_1": 1,
+        "WIRE0_SCL_2": 2,
+        "WIRE0_SCL_3": 3,
+        "WIRE0_SCL_4": 4,
+        "WIRE0_SCL_5": 5,
+        "WIRE0_SCL_6": 6,
+        "WIRE0_SCL_7": 7,
+        "WIRE0_SCL_8": 10,
+        "WIRE0_SCL_9": 11,
+        "WIRE0_SCL_10": 12,
+        "WIRE0_SCL_11": 19,
+        "WIRE0_SCL_12": 20,
+        "WIRE0_SCL_13": 21,
+        "WIRE0_SCL_14": 22,
+        "WIRE0_SCL_15": 23,
+        "WIRE0_SCL_16": 24,
+        "WIRE0_SCL_17": 25,
+        "WIRE0_SDA_0": 0,
+        "WIRE0_SDA_1": 1,
+        "WIRE0_SDA_2": 2,
+        "WIRE0_SDA_3": 3,
+        "WIRE0_SDA_4": 4,
+        "WIRE0_SDA_5": 5,
+        "WIRE0_SDA_6": 6,
+        "WIRE0_SDA_7": 7,
+        "WIRE0_SDA_8": 10,
+        "WIRE0_SDA_9": 11,
+        "WIRE0_SDA_10": 12,
+        "WIRE0_SDA_11": 19,
+        "WIRE0_SDA_12": 20,
+        "WIRE0_SDA_13": 21,
+        "WIRE0_SDA_14": 22,
+        "WIRE0_SDA_15": 23,
+        "WIRE0_SDA_16": 24,
+        "WIRE0_SDA_17": 25,
+        "SERIAL0_RX": 3,
+        "SERIAL0_TX": 2,
+        "SERIAL1_RX": 24,
+        "SERIAL1_TX": 25,
+        "ADC2": 0,
+        "ADC3": 1,
+        "ADC4": 4,
+        "ADC5": 19,
+        "ADC6": 20,
+        "ADC7": 21,
+        "PA00": 0,
+        "PA0": 0,
+        "PA01": 1,
+        "PA1": 1,
+        "PA02": 2,
+        "PA2": 2,
+        "PA03": 3,
+        "PA3": 3,
+        "PA04": 4,
+        "PA4": 4,
+        "PA05": 5,
+        "PA5": 5,
+        "PA06": 6,
+        "PA6": 6,
+        "PA07": 7,
+        "PA7": 7,
+        "PA10": 10,
+        "PA11": 11,
+        "PA12": 12,
+        "PB03": 19,
+        "PB3": 19,
+        "PB04": 20,
+        "PB4": 20,
+        "PB05": 21,
+        "PB5": 21,
+        "PB06": 22,
+        "PB6": 22,
+        "PB07": 23,
+        "PB7": 23,
+        "PB08": 24,
+        "PB8": 24,
+        "PB09": 25,
+        "PB9": 25,
+        "RX0": 3,
+        "RX1": 24,
+        "TX0": 2,
+        "TX1": 25,
+        "D0": 5,
+        "D1": 6,
+        "D2": 4,
+        "D3": 1,
+        "D4": 0,
+        "D5": 24,
+        "D6": 25,
+        "D7": 7,
+        "D8": 10,
+        "D9": 11,
+        "D10": 12,
+        "D11": 19,
+        "D12": 2,
+        "D13": 3,
+        "D14": 20,
+        "D15": 21,
+        "D16": 22,
+        "D17": 23,
+        "A0": 4,
+        "A1": 1,
+        "A2": 0,
+        "A3": 19,
+        "A4": 20,
+        "A5": 21,
+    },
     "wl2s": {
         "WIRE0_SCL_0": 0,
         "WIRE0_SCL_1": 1,
@@ -298,68 +687,6 @@ LN882X_BOARD_PINS = {
         "A1": 19,
         "A2": 1,
     },
-    "ln-02": {
-        "WIRE0_SCL_0": 0,
-        "WIRE0_SCL_1": 1,
-        "WIRE0_SCL_2": 2,
-        "WIRE0_SCL_3": 3,
-        "WIRE0_SCL_4": 9,
-        "WIRE0_SCL_5": 11,
-        "WIRE0_SCL_6": 19,
-        "WIRE0_SCL_7": 24,
-        "WIRE0_SCL_8": 25,
-        "WIRE0_SDA_0": 0,
-        "WIRE0_SDA_1": 1,
-        "WIRE0_SDA_2": 2,
-        "WIRE0_SDA_3": 3,
-        "WIRE0_SDA_4": 9,
-        "WIRE0_SDA_5": 11,
-        "WIRE0_SDA_6": 19,
-        "WIRE0_SDA_7": 24,
-        "WIRE0_SDA_8": 25,
-        "SERIAL0_RX": 3,
-        "SERIAL0_TX": 2,
-        "SERIAL1_RX": 24,
-        "SERIAL1_TX": 25,
-        "ADC2": 0,
-        "ADC3": 1,
-        "ADC5": 19,
-        "PA00": 0,
-        "PA0": 0,
-        "PA01": 1,
-        "PA1": 1,
-        "PA02": 2,
-        "PA2": 2,
-        "PA03": 3,
-        "PA3": 3,
-        "PA09": 9,
-        "PA9": 9,
-        "PA11": 11,
-        "PB03": 19,
-        "PB3": 19,
-        "PB08": 24,
-        "PB8": 24,
-        "PB09": 25,
-        "PB9": 25,
-        "RX0": 3,
-        "RX1": 24,
-        "SCL0": 9,
-        "SDA0": 9,
-        "TX0": 2,
-        "TX1": 25,
-        "D0": 11,
-        "D1": 19,
-        "D2": 3,
-        "D3": 24,
-        "D4": 2,
-        "D5": 25,
-        "D6": 1,
-        "D7": 0,
-        "D8": 9,
-        "A0": 19,
-        "A1": 1,
-        "A2": 0,
-    },
 }
 
 BOARDS = LN882X_BOARDS
diff --git a/esphome/components/rtl87xx/boards.py b/esphome/components/rtl87xx/boards.py
index 3a5ee853f28..23d220a91ee 100644
--- a/esphome/components/rtl87xx/boards.py
+++ b/esphome/components/rtl87xx/boards.py
@@ -15,40 +15,24 @@ Any manual changes WILL BE LOST on regeneration.
 from esphome.components.libretiny.const import FAMILY_RTL8710B, FAMILY_RTL8720C
 
 RTL87XX_BOARDS = {
-    "wr3le": {
-        "name": "WR3LE Wi-Fi Module",
-        "family": FAMILY_RTL8710B,
-    },
-    "wr2": {
-        "name": "WR2 Wi-Fi Module",
-        "family": FAMILY_RTL8710B,
-    },
-    "wbr3": {
-        "name": "WBR3 Wi-Fi Module",
-        "family": FAMILY_RTL8720C,
-    },
-    "generic-rtl8710bn-2mb-468k": {
-        "name": "Generic - RTL8710BN (2M/468k)",
-        "family": FAMILY_RTL8710B,
-    },
-    "wr1e": {
-        "name": "WR1E Wi-Fi Module",
-        "family": FAMILY_RTL8710B,
-    },
-    "wr3e": {
-        "name": "WR3E Wi-Fi Module",
-        "family": FAMILY_RTL8710B,
-    },
-    "wr3": {
-        "name": "WR3 Wi-Fi Module",
-        "family": FAMILY_RTL8710B,
-    },
     "afw121t": {
         "name": "AFW121T",
         "family": FAMILY_RTL8710B,
     },
-    "wr3n": {
-        "name": "WR3N Wi-Fi Module",
+    "bw12": {
+        "name": "BW12",
+        "family": FAMILY_RTL8710B,
+    },
+    "bw15": {
+        "name": "BW15",
+        "family": FAMILY_RTL8720C,
+    },
+    "cr3l": {
+        "name": "CR3L Wi-Fi Module",
+        "family": FAMILY_RTL8720C,
+    },
+    "generic-rtl8710bn-2mb-468k": {
+        "name": "Generic - RTL8710BN (2M/468k)",
         "family": FAMILY_RTL8710B,
     },
     "generic-rtl8710bn-2mb-788k": {
@@ -59,42 +43,6 @@ RTL87XX_BOARDS = {
         "name": "Generic - RTL8710BX (4M/980k)",
         "family": FAMILY_RTL8710B,
     },
-    "wr2e": {
-        "name": "WR2E Wi-Fi Module",
-        "family": FAMILY_RTL8710B,
-    },
-    "t112-v1.1": {
-        "name": "T112_V1.1",
-        "family": FAMILY_RTL8710B,
-    },
-    "wr3l": {
-        "name": "WR3L Wi-Fi Module",
-        "family": FAMILY_RTL8710B,
-    },
-    "wbru": {
-        "name": "WBRU Wi-Fi Module",
-        "family": FAMILY_RTL8720C,
-    },
-    "wr2le": {
-        "name": "WR2LE Wi-Fi Module",
-        "family": FAMILY_RTL8710B,
-    },
-    "bw15": {
-        "name": "BW15",
-        "family": FAMILY_RTL8720C,
-    },
-    "t103-v1.0": {
-        "name": "T103_V1.0",
-        "family": FAMILY_RTL8710B,
-    },
-    "cr3l": {
-        "name": "CR3L Wi-Fi Module",
-        "family": FAMILY_RTL8720C,
-    },
-    "generic-rtl8720cm-4mb-1712k": {
-        "name": "Generic - RTL8720CM (4M/1712k)",
-        "family": FAMILY_RTL8720C,
-    },
     "generic-rtl8720cf-2mb-896k": {
         "name": "Generic - RTL8720CF (2M/896k)",
         "family": FAMILY_RTL8720C,
@@ -103,521 +51,81 @@ RTL87XX_BOARDS = {
         "name": "Generic - RTL8720CF (2M/992k)",
         "family": FAMILY_RTL8720C,
     },
-    "bw12": {
-        "name": "BW12",
-        "family": FAMILY_RTL8710B,
+    "generic-rtl8720cm-4mb-1712k": {
+        "name": "Generic - RTL8720CM (4M/1712k)",
+        "family": FAMILY_RTL8720C,
     },
     "t102-v1.1": {
         "name": "T102_V1.1",
         "family": FAMILY_RTL8710B,
     },
-    "wr2l": {
-        "name": "WR2L Wi-Fi Module",
+    "t103-v1.0": {
+        "name": "T103_V1.0",
+        "family": FAMILY_RTL8710B,
+    },
+    "t112-v1.1": {
+        "name": "T112_V1.1",
         "family": FAMILY_RTL8710B,
     },
     "wbr1": {
         "name": "WBR1 Wi-Fi Module",
         "family": FAMILY_RTL8720C,
     },
+    "wbr3": {
+        "name": "WBR3 Wi-Fi Module",
+        "family": FAMILY_RTL8720C,
+    },
+    "wbru": {
+        "name": "WBRU Wi-Fi Module",
+        "family": FAMILY_RTL8720C,
+    },
     "wr1": {
         "name": "WR1 Wi-Fi Module",
         "family": FAMILY_RTL8710B,
     },
+    "wr1e": {
+        "name": "WR1E Wi-Fi Module",
+        "family": FAMILY_RTL8710B,
+    },
+    "wr2": {
+        "name": "WR2 Wi-Fi Module",
+        "family": FAMILY_RTL8710B,
+    },
+    "wr2e": {
+        "name": "WR2E Wi-Fi Module",
+        "family": FAMILY_RTL8710B,
+    },
+    "wr2l": {
+        "name": "WR2L Wi-Fi Module",
+        "family": FAMILY_RTL8710B,
+    },
+    "wr2le": {
+        "name": "WR2LE Wi-Fi Module",
+        "family": FAMILY_RTL8710B,
+    },
+    "wr3": {
+        "name": "WR3 Wi-Fi Module",
+        "family": FAMILY_RTL8710B,
+    },
+    "wr3e": {
+        "name": "WR3E Wi-Fi Module",
+        "family": FAMILY_RTL8710B,
+    },
+    "wr3l": {
+        "name": "WR3L Wi-Fi Module",
+        "family": FAMILY_RTL8710B,
+    },
+    "wr3le": {
+        "name": "WR3LE Wi-Fi Module",
+        "family": FAMILY_RTL8710B,
+    },
+    "wr3n": {
+        "name": "WR3N Wi-Fi Module",
+        "family": FAMILY_RTL8710B,
+    },
 }
 
 RTL87XX_BOARD_PINS = {
-    "wr3le": {
-        "SPI0_CS": 19,
-        "SPI0_MISO": 22,
-        "SPI0_MOSI": 23,
-        "SPI0_SCK": 18,
-        "SPI1_CS": 19,
-        "SPI1_MISO": 22,
-        "SPI1_MOSI": 23,
-        "SPI1_SCK": 18,
-        "WIRE0_SCL_0": 22,
-        "WIRE0_SCL_1": 29,
-        "WIRE0_SDA_0": 19,
-        "WIRE0_SDA_1": 30,
-        "WIRE1_SCL": 18,
-        "WIRE1_SDA": 23,
-        "SERIAL0_CTS": 19,
-        "SERIAL0_RTS": 22,
-        "SERIAL0_RX": 18,
-        "SERIAL0_TX": 23,
-        "SERIAL2_RX": 29,
-        "SERIAL2_TX": 30,
-        "ADC1": 19,
-        "ADC2": 41,
-        "CS0": 19,
-        "CS1": 19,
-        "CTS0": 19,
-        "MISO0": 22,
-        "MISO1": 22,
-        "MOSI0": 23,
-        "MOSI1": 23,
-        "PA00": 0,
-        "PA0": 0,
-        "PA05": 5,
-        "PA5": 5,
-        "PA12": 12,
-        "PA14": 14,
-        "PA15": 15,
-        "PA18": 18,
-        "PA19": 19,
-        "PA22": 22,
-        "PA23": 23,
-        "PA29": 29,
-        "PA30": 30,
-        "PWM1": 15,
-        "PWM2": 0,
-        "PWM3": 12,
-        "PWM4": 5,
-        "PWM5": 22,
-        "RTS0": 22,
-        "RX0": 18,
-        "RX2": 29,
-        "SCK0": 18,
-        "SCK1": 18,
-        "SCL1": 18,
-        "SDA1": 23,
-        "TX0": 23,
-        "TX2": 30,
-        "D0": 29,
-        "D1": 14,
-        "D2": 15,
-        "D3": 22,
-        "D4": 0,
-        "D5": 30,
-        "D6": 19,
-        "D7": 5,
-        "D8": 12,
-        "D9": 18,
-        "D10": 23,
-        "A0": 19,
-        "A1": 41,
-    },
-    "wr2": {
-        "WIRE0_SCL": 29,
-        "WIRE0_SDA": 30,
-        "WIRE1_SCL": 18,
-        "WIRE1_SDA": 23,
-        "SERIAL0_RX": 18,
-        "SERIAL0_TX": 23,
-        "SERIAL2_RX": 29,
-        "SERIAL2_TX": 30,
-        "ADC2": 41,
-        "MOSI0": 23,
-        "MOSI1": 23,
-        "PA00": 0,
-        "PA0": 0,
-        "PA05": 5,
-        "PA5": 5,
-        "PA12": 12,
-        "PA14": 14,
-        "PA15": 15,
-        "PA18": 18,
-        "PA23": 23,
-        "PA29": 29,
-        "PA30": 30,
-        "PWM1": 15,
-        "PWM2": 0,
-        "PWM3": 12,
-        "PWM4": 29,
-        "RX0": 18,
-        "RX2": 29,
-        "SCK0": 18,
-        "SCK1": 18,
-        "SCL0": 29,
-        "SCL1": 18,
-        "SDA0": 30,
-        "SDA1": 23,
-        "TX0": 23,
-        "TX2": 30,
-        "D0": 12,
-        "D1": 0,
-        "D2": 5,
-        "D4": 18,
-        "D5": 23,
-        "D6": 14,
-        "D7": 15,
-        "D8": 30,
-        "D9": 29,
-        "A1": 41,
-    },
-    "wbr3": {
-        "WIRE0_SCL_0": 2,
-        "WIRE0_SCL_1": 11,
-        "WIRE0_SCL_2": 15,
-        "WIRE0_SCL_3": 19,
-        "WIRE0_SDA_0": 3,
-        "WIRE0_SDA_1": 12,
-        "WIRE0_SDA_2": 16,
-        "SERIAL0_RX_0": 12,
-        "SERIAL0_RX_1": 13,
-        "SERIAL0_TX_0": 11,
-        "SERIAL0_TX_1": 14,
-        "SERIAL1_CTS": 4,
-        "SERIAL1_RX_0": 0,
-        "SERIAL1_RX_1": 2,
-        "SERIAL1_TX_0": 1,
-        "SERIAL1_TX_1": 3,
-        "SERIAL2_CTS": 19,
-        "SERIAL2_RX": 15,
-        "SERIAL2_TX": 16,
-        "CS0": 15,
-        "CTS1": 4,
-        "CTS2": 19,
-        "PA00": 0,
-        "PA0": 0,
-        "PA01": 1,
-        "PA1": 1,
-        "PA02": 2,
-        "PA2": 2,
-        "PA03": 3,
-        "PA3": 3,
-        "PA04": 4,
-        "PA4": 4,
-        "PA07": 7,
-        "PA7": 7,
-        "PA11": 11,
-        "PA12": 12,
-        "PA13": 13,
-        "PA14": 14,
-        "PA15": 15,
-        "PA16": 16,
-        "PA17": 17,
-        "PA18": 18,
-        "PA19": 19,
-        "PWM5": 17,
-        "PWM6": 18,
-        "RX2": 15,
-        "SDA0": 16,
-        "TX2": 16,
-        "D0": 7,
-        "D1": 11,
-        "D2": 2,
-        "D3": 3,
-        "D4": 4,
-        "D5": 12,
-        "D6": 16,
-        "D7": 17,
-        "D8": 18,
-        "D9": 19,
-        "D10": 13,
-        "D11": 14,
-        "D12": 15,
-        "D13": 0,
-        "D14": 1,
-    },
-    "generic-rtl8710bn-2mb-468k": {
-        "SPI0_CS": 19,
-        "SPI0_FCS": 6,
-        "SPI0_FD0": 9,
-        "SPI0_FD1": 7,
-        "SPI0_FD2": 8,
-        "SPI0_FD3": 11,
-        "SPI0_FSCK": 10,
-        "SPI0_MISO": 22,
-        "SPI0_MOSI": 23,
-        "SPI0_SCK": 18,
-        "SPI1_CS": 19,
-        "SPI1_MISO": 22,
-        "SPI1_MOSI": 23,
-        "SPI1_SCK": 18,
-        "WIRE0_SCL_0": 22,
-        "WIRE0_SCL_1": 29,
-        "WIRE0_SDA_0": 19,
-        "WIRE0_SDA_1": 30,
-        "WIRE1_SCL": 18,
-        "WIRE1_SDA": 23,
-        "SERIAL0_CTS": 19,
-        "SERIAL0_RTS": 22,
-        "SERIAL0_RX": 18,
-        "SERIAL0_TX": 23,
-        "SERIAL2_RX": 29,
-        "SERIAL2_TX": 30,
-        "ADC1": 19,
-        "ADC2": 41,
-        "CS0": 19,
-        "CS1": 19,
-        "CTS0": 19,
-        "FCS": 6,
-        "FD0": 9,
-        "FD1": 7,
-        "FD2": 8,
-        "FD3": 11,
-        "FSCK": 10,
-        "MISO0": 22,
-        "MISO1": 22,
-        "MOSI0": 23,
-        "MOSI1": 23,
-        "PA00": 0,
-        "PA0": 0,
-        "PA05": 5,
-        "PA5": 5,
-        "PA06": 6,
-        "PA6": 6,
-        "PA07": 7,
-        "PA7": 7,
-        "PA08": 8,
-        "PA8": 8,
-        "PA09": 9,
-        "PA9": 9,
-        "PA10": 10,
-        "PA11": 11,
-        "PA12": 12,
-        "PA14": 14,
-        "PA15": 15,
-        "PA18": 18,
-        "PA19": 19,
-        "PA22": 22,
-        "PA23": 23,
-        "PA29": 29,
-        "PA30": 30,
-        "PWM1": 15,
-        "PWM2": 0,
-        "PWM3": 12,
-        "PWM4": 30,
-        "PWM5": 22,
-        "RTS0": 22,
-        "RX0": 18,
-        "RX2": 29,
-        "SCK0": 18,
-        "SCK1": 18,
-        "SCL1": 18,
-        "SDA1": 23,
-        "TX0": 23,
-        "TX2": 30,
-        "D0": 0,
-        "D1": 5,
-        "D2": 6,
-        "D3": 7,
-        "D4": 8,
-        "D5": 9,
-        "D6": 10,
-        "D7": 11,
-        "D8": 12,
-        "D9": 14,
-        "D10": 15,
-        "D11": 18,
-        "D12": 19,
-        "D13": 22,
-        "D14": 23,
-        "D15": 29,
-        "D16": 30,
-        "A0": 19,
-        "A1": 41,
-    },
-    "wr1e": {
-        "SPI0_CS": 19,
-        "SPI0_MISO": 22,
-        "SPI0_MOSI": 23,
-        "SPI0_SCK": 18,
-        "SPI1_CS": 19,
-        "SPI1_MISO": 22,
-        "SPI1_MOSI": 23,
-        "SPI1_SCK": 18,
-        "WIRE0_SCL_0": 22,
-        "WIRE0_SCL_1": 29,
-        "WIRE0_SDA_0": 19,
-        "WIRE0_SDA_1": 30,
-        "WIRE1_SCL": 18,
-        "WIRE1_SDA": 23,
-        "SERIAL0_CTS": 19,
-        "SERIAL0_RTS": 22,
-        "SERIAL0_RX": 18,
-        "SERIAL0_TX": 23,
-        "SERIAL2_RX": 29,
-        "SERIAL2_TX": 30,
-        "ADC1": 19,
-        "ADC2": 41,
-        "CS0": 19,
-        "CS1": 19,
-        "CTS0": 19,
-        "MISO0": 22,
-        "MISO1": 22,
-        "MOSI0": 23,
-        "MOSI1": 23,
-        "PA05": 5,
-        "PA5": 5,
-        "PA12": 12,
-        "PA14": 14,
-        "PA15": 15,
-        "PA18": 18,
-        "PA19": 19,
-        "PA22": 22,
-        "PA23": 23,
-        "PA29": 29,
-        "PA30": 30,
-        "PWM1": 15,
-        "PWM3": 12,
-        "PWM4": 29,
-        "PWM5": 22,
-        "RTS0": 22,
-        "RX0": 18,
-        "RX2": 29,
-        "SCK0": 18,
-        "SCK1": 18,
-        "SCL1": 18,
-        "SDA1": 23,
-        "TX0": 23,
-        "TX2": 30,
-        "D0": 23,
-        "D1": 18,
-        "D2": 14,
-        "D3": 15,
-        "D4": 30,
-        "D5": 12,
-        "D6": 5,
-        "D7": 29,
-        "D8": 19,
-        "D9": 22,
-        "A0": 19,
-        "A1": 41,
-    },
-    "wr3e": {
-        "SPI0_CS": 19,
-        "SPI0_MISO": 22,
-        "SPI0_MOSI": 23,
-        "SPI0_SCK": 18,
-        "SPI1_CS": 19,
-        "SPI1_MISO": 22,
-        "SPI1_MOSI": 23,
-        "SPI1_SCK": 18,
-        "WIRE0_SCL_0": 22,
-        "WIRE0_SCL_1": 29,
-        "WIRE0_SDA_0": 19,
-        "WIRE0_SDA_1": 30,
-        "WIRE1_SCL": 18,
-        "WIRE1_SDA": 23,
-        "SERIAL0_CTS": 19,
-        "SERIAL0_RTS": 22,
-        "SERIAL0_RX": 18,
-        "SERIAL0_TX": 23,
-        "SERIAL2_RX": 29,
-        "SERIAL2_TX": 30,
-        "ADC1": 19,
-        "ADC2": 41,
-        "CS0": 19,
-        "CS1": 19,
-        "CTS0": 19,
-        "MISO0": 22,
-        "MISO1": 22,
-        "MOSI0": 23,
-        "MOSI1": 23,
-        "PA00": 0,
-        "PA0": 0,
-        "PA05": 5,
-        "PA5": 5,
-        "PA12": 12,
-        "PA14": 14,
-        "PA15": 15,
-        "PA18": 18,
-        "PA19": 19,
-        "PA22": 22,
-        "PA23": 23,
-        "PA29": 29,
-        "PA30": 30,
-        "PWM1": 15,
-        "PWM2": 0,
-        "PWM3": 12,
-        "PWM4": 5,
-        "PWM5": 22,
-        "RTS0": 22,
-        "RX0": 18,
-        "RX2": 29,
-        "SCK0": 18,
-        "SCK1": 18,
-        "SCL1": 18,
-        "SDA1": 23,
-        "TX0": 23,
-        "TX2": 30,
-        "D0": 29,
-        "D1": 14,
-        "D2": 15,
-        "D3": 22,
-        "D4": 0,
-        "D5": 30,
-        "D6": 19,
-        "D7": 5,
-        "D8": 12,
-        "D9": 18,
-        "D10": 23,
-        "A0": 19,
-        "A1": 41,
-    },
-    "wr3": {
-        "SPI0_CS": 19,
-        "SPI0_MISO": 22,
-        "SPI0_MOSI": 23,
-        "SPI0_SCK": 18,
-        "SPI1_CS": 19,
-        "SPI1_MISO": 22,
-        "SPI1_MOSI": 23,
-        "SPI1_SCK": 18,
-        "WIRE0_SCL_0": 22,
-        "WIRE0_SCL_1": 29,
-        "WIRE0_SDA_0": 19,
-        "WIRE0_SDA_1": 30,
-        "WIRE1_SCL": 18,
-        "WIRE1_SDA": 23,
-        "SERIAL0_CTS": 19,
-        "SERIAL0_RTS": 22,
-        "SERIAL0_RX": 18,
-        "SERIAL0_TX": 23,
-        "SERIAL2_RX": 29,
-        "SERIAL2_TX": 30,
-        "ADC1": 19,
-        "ADC2": 41,
-        "CS0": 19,
-        "CS1": 19,
-        "CTS0": 19,
-        "MISO0": 22,
-        "MISO1": 22,
-        "MOSI0": 23,
-        "MOSI1": 23,
-        "PA00": 0,
-        "PA0": 0,
-        "PA05": 5,
-        "PA5": 5,
-        "PA12": 12,
-        "PA14": 14,
-        "PA15": 15,
-        "PA18": 18,
-        "PA19": 19,
-        "PA22": 22,
-        "PA23": 23,
-        "PA29": 29,
-        "PA30": 30,
-        "PWM1": 15,
-        "PWM2": 0,
-        "PWM3": 12,
-        "PWM4": 5,
-        "PWM5": 22,
-        "RTS0": 22,
-        "RX0": 18,
-        "RX2": 29,
-        "SCK0": 18,
-        "SCK1": 18,
-        "SCL1": 18,
-        "SDA1": 23,
-        "TX0": 23,
-        "TX2": 30,
-        "D0": 22,
-        "D1": 19,
-        "D2": 14,
-        "D3": 15,
-        "D4": 0,
-        "D5": 29,
-        "D6": 30,
-        "D7": 5,
-        "D8": 12,
-        "D9": 18,
-        "D10": 23,
-        "A0": 19,
-        "A1": 41,
-    },
     "afw121t": {
         "SPI0_CS": 19,
         "SPI0_MISO": 22,
@@ -686,16 +194,33 @@ RTL87XX_BOARD_PINS = {
         "D9": 23,
         "D10": 30,
     },
-    "wr3n": {
-        "WIRE0_SCL": 29,
-        "WIRE0_SDA": 30,
+    "bw12": {
+        "SPI0_CS": 19,
+        "SPI0_MISO": 22,
+        "SPI0_MOSI": 23,
+        "SPI0_SCK": 18,
+        "SPI1_CS": 19,
+        "SPI1_MISO": 22,
+        "SPI1_MOSI": 23,
+        "SPI1_SCK": 18,
+        "WIRE0_SCL_0": 22,
+        "WIRE0_SCL_1": 29,
+        "WIRE0_SDA_0": 19,
+        "WIRE0_SDA_1": 30,
         "WIRE1_SCL": 18,
         "WIRE1_SDA": 23,
+        "SERIAL0_CTS": 19,
+        "SERIAL0_RTS": 22,
         "SERIAL0_RX": 18,
         "SERIAL0_TX": 23,
         "SERIAL2_RX": 29,
         "SERIAL2_TX": 30,
-        "ADC2": 41,
+        "ADC1": 19,
+        "CS0": 19,
+        "CS1": 19,
+        "CTS0": 19,
+        "MISO0": 22,
+        "MISO1": 22,
         "MOSI0": 23,
         "MOSI1": 23,
         "PA00": 0,
@@ -706,32 +231,269 @@ RTL87XX_BOARD_PINS = {
         "PA14": 14,
         "PA15": 15,
         "PA18": 18,
+        "PA19": 19,
+        "PA22": 22,
         "PA23": 23,
         "PA29": 29,
         "PA30": 30,
         "PWM1": 15,
         "PWM2": 0,
         "PWM3": 12,
-        "PWM4": 5,
+        "PWM4": 30,
+        "PWM5": 22,
+        "RTS0": 22,
         "RX0": 18,
         "RX2": 29,
         "SCK0": 18,
         "SCK1": 18,
-        "SCL0": 29,
         "SCL1": 18,
-        "SDA0": 30,
         "SDA1": 23,
         "TX0": 23,
         "TX2": 30,
-        "D0": 29,
-        "D1": 14,
-        "D2": 15,
-        "D3": 0,
-        "D4": 30,
-        "D5": 5,
-        "D6": 12,
+        "D0": 5,
+        "D1": 29,
+        "D2": 0,
+        "D3": 19,
+        "D4": 22,
+        "D5": 30,
+        "D6": 14,
+        "D7": 12,
+        "D8": 15,
+        "D9": 18,
+        "D10": 23,
+        "A0": 19,
+    },
+    "bw15": {
+        "SPI0_CS_0": 2,
+        "SPI0_CS_1": 15,
+        "SPI0_MISO": 20,
+        "SPI0_MOSI_0": 4,
+        "SPI0_MOSI_1": 19,
+        "SPI0_SCK_0": 3,
+        "SPI0_SCK_1": 16,
+        "WIRE0_SCL_0": 2,
+        "WIRE0_SCL_1": 15,
+        "WIRE0_SCL_2": 19,
+        "WIRE0_SDA_0": 3,
+        "WIRE0_SDA_1": 16,
+        "WIRE0_SDA_2": 20,
+        "SERIAL0_RX": 13,
+        "SERIAL0_TX": 14,
+        "SERIAL1_CTS": 4,
+        "SERIAL1_RX_0": 0,
+        "SERIAL1_RX_1": 2,
+        "SERIAL1_TX_0": 1,
+        "SERIAL1_TX_1": 3,
+        "SERIAL2_CTS": 19,
+        "SERIAL2_RTS": 20,
+        "SERIAL2_RX": 15,
+        "SERIAL2_TX": 16,
+        "CTS1": 4,
+        "CTS2": 19,
+        "MISO0": 20,
+        "PA00": 0,
+        "PA0": 0,
+        "PA01": 1,
+        "PA1": 1,
+        "PA02": 2,
+        "PA2": 2,
+        "PA03": 3,
+        "PA3": 3,
+        "PA04": 4,
+        "PA4": 4,
+        "PA13": 13,
+        "PA14": 14,
+        "PA15": 15,
+        "PA16": 16,
+        "PA17": 17,
+        "PA18": 18,
+        "PA19": 19,
+        "PA20": 20,
+        "PWM1": 1,
+        "PWM5": 17,
+        "PWM6": 18,
+        "RTS2": 20,
+        "RX0": 13,
+        "RX2": 15,
+        "SCL0": 19,
+        "SDA0": 3,
+        "TX0": 14,
+        "TX2": 16,
+        "D0": 17,
+        "D1": 18,
+        "D2": 2,
+        "D3": 15,
+        "D4": 4,
+        "D5": 19,
+        "D6": 20,
+        "D7": 16,
+        "D8": 0,
+        "D9": 3,
+        "D10": 1,
+        "D11": 13,
+        "D12": 14,
+    },
+    "cr3l": {
+        "SPI0_CS_0": 2,
+        "SPI0_CS_1": 15,
+        "SPI0_MISO": 20,
+        "SPI0_MOSI_0": 4,
+        "SPI0_MOSI_1": 19,
+        "SPI0_SCK_0": 3,
+        "SPI0_SCK_1": 16,
+        "WIRE0_SCL_0": 2,
+        "WIRE0_SCL_1": 15,
+        "WIRE0_SCL_2": 19,
+        "WIRE0_SDA_0": 3,
+        "WIRE0_SDA_1": 16,
+        "WIRE0_SDA_2": 20,
+        "SERIAL0_RX": 13,
+        "SERIAL0_TX": 14,
+        "SERIAL1_CTS": 4,
+        "SERIAL1_RX": 2,
+        "SERIAL1_TX": 3,
+        "SERIAL2_CTS": 19,
+        "SERIAL2_RTS": 20,
+        "SERIAL2_RX": 15,
+        "SERIAL2_TX": 16,
+        "CTS1": 4,
+        "CTS2": 19,
+        "MISO0": 20,
+        "PA02": 2,
+        "PA2": 2,
+        "PA03": 3,
+        "PA3": 3,
+        "PA04": 4,
+        "PA4": 4,
+        "PA13": 13,
+        "PA14": 14,
+        "PA15": 15,
+        "PA16": 16,
+        "PA17": 17,
+        "PA18": 18,
+        "PA19": 19,
+        "PA20": 20,
+        "PWM0": 20,
+        "PWM5": 17,
+        "PWM6": 18,
+        "RTS2": 20,
+        "RX0": 13,
+        "RX1": 2,
+        "RX2": 15,
+        "SCL0": 19,
+        "SDA0": 16,
+        "TX0": 14,
+        "TX1": 3,
+        "TX2": 16,
+        "D0": 20,
+        "D1": 2,
+        "D2": 3,
+        "D3": 4,
+        "D4": 15,
+        "D5": 16,
+        "D6": 17,
         "D7": 18,
-        "D8": 23,
+        "D8": 19,
+        "D9": 13,
+        "D10": 14,
+    },
+    "generic-rtl8710bn-2mb-468k": {
+        "SPI0_CS": 19,
+        "SPI0_FCS": 6,
+        "SPI0_FD0": 9,
+        "SPI0_FD1": 7,
+        "SPI0_FD2": 8,
+        "SPI0_FD3": 11,
+        "SPI0_FSCK": 10,
+        "SPI0_MISO": 22,
+        "SPI0_MOSI": 23,
+        "SPI0_SCK": 18,
+        "SPI1_CS": 19,
+        "SPI1_MISO": 22,
+        "SPI1_MOSI": 23,
+        "SPI1_SCK": 18,
+        "WIRE0_SCL_0": 22,
+        "WIRE0_SCL_1": 29,
+        "WIRE0_SDA_0": 19,
+        "WIRE0_SDA_1": 30,
+        "WIRE1_SCL": 18,
+        "WIRE1_SDA": 23,
+        "SERIAL0_CTS": 19,
+        "SERIAL0_RTS": 22,
+        "SERIAL0_RX": 18,
+        "SERIAL0_TX": 23,
+        "SERIAL2_RX": 29,
+        "SERIAL2_TX": 30,
+        "ADC1": 19,
+        "ADC2": 41,
+        "CS0": 19,
+        "CS1": 19,
+        "CTS0": 19,
+        "FCS": 6,
+        "FD0": 9,
+        "FD1": 7,
+        "FD2": 8,
+        "FD3": 11,
+        "FSCK": 10,
+        "MISO0": 22,
+        "MISO1": 22,
+        "MOSI0": 23,
+        "MOSI1": 23,
+        "PA00": 0,
+        "PA0": 0,
+        "PA05": 5,
+        "PA5": 5,
+        "PA06": 6,
+        "PA6": 6,
+        "PA07": 7,
+        "PA7": 7,
+        "PA08": 8,
+        "PA8": 8,
+        "PA09": 9,
+        "PA9": 9,
+        "PA10": 10,
+        "PA11": 11,
+        "PA12": 12,
+        "PA14": 14,
+        "PA15": 15,
+        "PA18": 18,
+        "PA19": 19,
+        "PA22": 22,
+        "PA23": 23,
+        "PA29": 29,
+        "PA30": 30,
+        "PWM1": 15,
+        "PWM2": 0,
+        "PWM3": 12,
+        "PWM4": 30,
+        "PWM5": 22,
+        "RTS0": 22,
+        "RX0": 18,
+        "RX2": 29,
+        "SCK0": 18,
+        "SCK1": 18,
+        "SCL1": 18,
+        "SDA1": 23,
+        "TX0": 23,
+        "TX2": 30,
+        "D0": 0,
+        "D1": 5,
+        "D2": 6,
+        "D3": 7,
+        "D4": 8,
+        "D5": 9,
+        "D6": 10,
+        "D7": 11,
+        "D8": 12,
+        "D9": 14,
+        "D10": 15,
+        "D11": 18,
+        "D12": 19,
+        "D13": 22,
+        "D14": 23,
+        "D15": 29,
+        "D16": 30,
+        "A0": 19,
         "A1": 41,
     },
     "generic-rtl8710bn-2mb-788k": {
@@ -930,13 +692,363 @@ RTL87XX_BOARD_PINS = {
         "D16": 30,
         "A0": 19,
     },
-    "wr2e": {
+    "generic-rtl8720cf-2mb-896k": {
+        "SPI0_CS_0": 2,
+        "SPI0_CS_1": 7,
+        "SPI0_CS_2": 15,
+        "SPI0_MISO_0": 10,
+        "SPI0_MISO_1": 20,
+        "SPI0_MOSI_0": 4,
+        "SPI0_MOSI_1": 9,
+        "SPI0_MOSI_2": 19,
+        "SPI0_SCK_0": 3,
+        "SPI0_SCK_1": 8,
+        "SPI0_SCK_2": 16,
+        "WIRE0_SCL_0": 2,
+        "WIRE0_SCL_1": 11,
+        "WIRE0_SCL_2": 15,
+        "WIRE0_SCL_3": 19,
+        "WIRE0_SDA_0": 3,
+        "WIRE0_SDA_1": 12,
+        "WIRE0_SDA_2": 16,
+        "WIRE0_SDA_3": 20,
+        "SERIAL0_CTS": 10,
+        "SERIAL0_RTS": 9,
+        "SERIAL0_RX_0": 12,
+        "SERIAL0_RX_1": 13,
+        "SERIAL0_TX_0": 11,
+        "SERIAL0_TX_1": 14,
+        "SERIAL1_CTS": 4,
+        "SERIAL1_RX_0": 0,
+        "SERIAL1_RX_1": 2,
+        "SERIAL1_TX_0": 1,
+        "SERIAL1_TX_1": 3,
+        "SERIAL2_CTS": 19,
+        "SERIAL2_RTS": 20,
+        "SERIAL2_RX": 15,
+        "SERIAL2_TX": 16,
+        "CS0": 15,
+        "CTS0": 10,
+        "CTS1": 4,
+        "CTS2": 19,
+        "MOSI0": 19,
+        "PA00": 0,
+        "PA0": 0,
+        "PA01": 1,
+        "PA1": 1,
+        "PA02": 2,
+        "PA2": 2,
+        "PA03": 3,
+        "PA3": 3,
+        "PA04": 4,
+        "PA4": 4,
+        "PA07": 7,
+        "PA7": 7,
+        "PA08": 8,
+        "PA8": 8,
+        "PA09": 9,
+        "PA9": 9,
+        "PA10": 10,
+        "PA11": 11,
+        "PA12": 12,
+        "PA13": 13,
+        "PA14": 14,
+        "PA15": 15,
+        "PA16": 16,
+        "PA17": 17,
+        "PA18": 18,
+        "PA19": 19,
+        "PA20": 20,
+        "PA23": 23,
+        "PWM0": 20,
+        "PWM5": 17,
+        "PWM6": 18,
+        "PWM7": 23,
+        "RTS0": 9,
+        "RTS2": 20,
+        "RX2": 15,
+        "SCK0": 16,
+        "TX2": 16,
+        "D0": 0,
+        "D1": 1,
+        "D2": 2,
+        "D3": 3,
+        "D4": 4,
+        "D5": 7,
+        "D6": 8,
+        "D7": 9,
+        "D8": 10,
+        "D9": 11,
+        "D10": 12,
+        "D11": 13,
+        "D12": 14,
+        "D13": 15,
+        "D14": 16,
+        "D15": 17,
+        "D16": 18,
+        "D17": 19,
+        "D18": 20,
+        "D19": 23,
+    },
+    "generic-rtl8720cf-2mb-992k": {
+        "SPI0_CS_0": 2,
+        "SPI0_CS_1": 7,
+        "SPI0_CS_2": 15,
+        "SPI0_MISO_0": 10,
+        "SPI0_MISO_1": 20,
+        "SPI0_MOSI_0": 4,
+        "SPI0_MOSI_1": 9,
+        "SPI0_MOSI_2": 19,
+        "SPI0_SCK_0": 3,
+        "SPI0_SCK_1": 8,
+        "SPI0_SCK_2": 16,
+        "WIRE0_SCL_0": 2,
+        "WIRE0_SCL_1": 11,
+        "WIRE0_SCL_2": 15,
+        "WIRE0_SCL_3": 19,
+        "WIRE0_SDA_0": 3,
+        "WIRE0_SDA_1": 12,
+        "WIRE0_SDA_2": 16,
+        "WIRE0_SDA_3": 20,
+        "SERIAL0_CTS": 10,
+        "SERIAL0_RTS": 9,
+        "SERIAL0_RX_0": 12,
+        "SERIAL0_RX_1": 13,
+        "SERIAL0_TX_0": 11,
+        "SERIAL0_TX_1": 14,
+        "SERIAL1_CTS": 4,
+        "SERIAL1_RX_0": 0,
+        "SERIAL1_RX_1": 2,
+        "SERIAL1_TX_0": 1,
+        "SERIAL1_TX_1": 3,
+        "SERIAL2_CTS": 19,
+        "SERIAL2_RTS": 20,
+        "SERIAL2_RX": 15,
+        "SERIAL2_TX": 16,
+        "CS0": 15,
+        "CTS0": 10,
+        "CTS1": 4,
+        "CTS2": 19,
+        "MOSI0": 19,
+        "PA00": 0,
+        "PA0": 0,
+        "PA01": 1,
+        "PA1": 1,
+        "PA02": 2,
+        "PA2": 2,
+        "PA03": 3,
+        "PA3": 3,
+        "PA04": 4,
+        "PA4": 4,
+        "PA07": 7,
+        "PA7": 7,
+        "PA08": 8,
+        "PA8": 8,
+        "PA09": 9,
+        "PA9": 9,
+        "PA10": 10,
+        "PA11": 11,
+        "PA12": 12,
+        "PA13": 13,
+        "PA14": 14,
+        "PA15": 15,
+        "PA16": 16,
+        "PA17": 17,
+        "PA18": 18,
+        "PA19": 19,
+        "PA20": 20,
+        "PA23": 23,
+        "PWM0": 20,
+        "PWM5": 17,
+        "PWM6": 18,
+        "PWM7": 23,
+        "RTS0": 9,
+        "RTS2": 20,
+        "RX2": 15,
+        "SCK0": 16,
+        "TX2": 16,
+        "D0": 0,
+        "D1": 1,
+        "D2": 2,
+        "D3": 3,
+        "D4": 4,
+        "D5": 7,
+        "D6": 8,
+        "D7": 9,
+        "D8": 10,
+        "D9": 11,
+        "D10": 12,
+        "D11": 13,
+        "D12": 14,
+        "D13": 15,
+        "D14": 16,
+        "D15": 17,
+        "D16": 18,
+        "D17": 19,
+        "D18": 20,
+        "D19": 23,
+    },
+    "generic-rtl8720cm-4mb-1712k": {
+        "SPI0_CS_0": 2,
+        "SPI0_CS_1": 7,
+        "SPI0_CS_2": 15,
+        "SPI0_MISO_0": 10,
+        "SPI0_MISO_1": 20,
+        "SPI0_MOSI_0": 4,
+        "SPI0_MOSI_1": 9,
+        "SPI0_MOSI_2": 19,
+        "SPI0_SCK_0": 3,
+        "SPI0_SCK_1": 8,
+        "SPI0_SCK_2": 16,
+        "WIRE0_SCL_0": 2,
+        "WIRE0_SCL_1": 11,
+        "WIRE0_SCL_2": 15,
+        "WIRE0_SCL_3": 19,
+        "WIRE0_SDA_0": 3,
+        "WIRE0_SDA_1": 12,
+        "WIRE0_SDA_2": 16,
+        "WIRE0_SDA_3": 20,
+        "SERIAL0_CTS": 10,
+        "SERIAL0_RTS": 9,
+        "SERIAL0_RX_0": 12,
+        "SERIAL0_RX_1": 13,
+        "SERIAL0_TX_0": 11,
+        "SERIAL0_TX_1": 14,
+        "SERIAL1_CTS": 4,
+        "SERIAL1_RX_0": 0,
+        "SERIAL1_RX_1": 2,
+        "SERIAL1_TX_0": 1,
+        "SERIAL1_TX_1": 3,
+        "SERIAL2_CTS": 19,
+        "SERIAL2_RTS": 20,
+        "SERIAL2_RX": 15,
+        "SERIAL2_TX": 16,
+        "CS0": 15,
+        "CTS0": 10,
+        "CTS1": 4,
+        "CTS2": 19,
+        "MOSI0": 19,
+        "PA00": 0,
+        "PA0": 0,
+        "PA01": 1,
+        "PA1": 1,
+        "PA02": 2,
+        "PA2": 2,
+        "PA03": 3,
+        "PA3": 3,
+        "PA04": 4,
+        "PA4": 4,
+        "PA07": 7,
+        "PA7": 7,
+        "PA08": 8,
+        "PA8": 8,
+        "PA09": 9,
+        "PA9": 9,
+        "PA10": 10,
+        "PA11": 11,
+        "PA12": 12,
+        "PA13": 13,
+        "PA14": 14,
+        "PA15": 15,
+        "PA16": 16,
+        "PA17": 17,
+        "PA18": 18,
+        "PA19": 19,
+        "PA20": 20,
+        "PA23": 23,
+        "PWM0": 20,
+        "PWM5": 17,
+        "PWM6": 18,
+        "PWM7": 23,
+        "RTS0": 9,
+        "RTS2": 20,
+        "RX2": 15,
+        "SCK0": 16,
+        "TX2": 16,
+        "D0": 0,
+        "D1": 1,
+        "D2": 2,
+        "D3": 3,
+        "D4": 4,
+        "D5": 7,
+        "D6": 8,
+        "D7": 9,
+        "D8": 10,
+        "D9": 11,
+        "D10": 12,
+        "D11": 13,
+        "D12": 14,
+        "D13": 15,
+        "D14": 16,
+        "D15": 17,
+        "D16": 18,
+        "D17": 19,
+        "D18": 20,
+        "D19": 23,
+    },
+    "t102-v1.1": {
         "WIRE0_SCL": 29,
+        "WIRE0_SDA": 30,
+        "WIRE1_SCL": 18,
+        "WIRE1_SDA": 23,
+        "SERIAL0_RX": 18,
+        "SERIAL0_TX": 23,
+        "SERIAL2_RX": 29,
+        "SERIAL2_TX": 30,
+        "MOSI0": 23,
+        "MOSI1": 23,
+        "PA00": 0,
+        "PA0": 0,
+        "PA05": 5,
+        "PA5": 5,
+        "PA12": 12,
+        "PA14": 14,
+        "PA15": 15,
+        "PA18": 18,
+        "PA23": 23,
+        "PA29": 29,
+        "PA30": 30,
+        "PWM1": 15,
+        "PWM2": 0,
+        "PWM3": 12,
+        "PWM4": 29,
+        "RX0": 18,
+        "RX2": 29,
+        "SCK0": 18,
+        "SCK1": 18,
+        "SCL0": 29,
+        "SCL1": 18,
+        "SDA0": 30,
+        "SDA1": 23,
+        "TX0": 23,
+        "TX2": 30,
+        "D0": 12,
+        "D1": 0,
+        "D2": 5,
+        "D3": 30,
+        "D4": 29,
+        "D5": 18,
+        "D6": 23,
+        "D7": 14,
+        "D8": 15,
+    },
+    "t103-v1.0": {
+        "SPI0_CS": 19,
+        "SPI0_MISO": 22,
+        "SPI0_MOSI": 23,
+        "SPI0_SCK": 18,
+        "SPI1_CS": 19,
+        "SPI1_MISO": 22,
+        "SPI1_MOSI": 23,
+        "SPI1_SCK": 18,
+        "WIRE0_SCL_0": 22,
+        "WIRE0_SCL_1": 29,
         "WIRE0_SDA_0": 19,
         "WIRE0_SDA_1": 30,
         "WIRE1_SCL": 18,
         "WIRE1_SDA": 23,
         "SERIAL0_CTS": 19,
+        "SERIAL0_RTS": 22,
         "SERIAL0_RX": 18,
         "SERIAL0_TX": 23,
         "SERIAL2_RX": 29,
@@ -946,8 +1058,12 @@ RTL87XX_BOARD_PINS = {
         "CS0": 19,
         "CS1": 19,
         "CTS0": 19,
+        "MISO0": 22,
+        "MISO1": 22,
         "MOSI0": 23,
         "MOSI1": 23,
+        "PA00": 0,
+        "PA0": 0,
         "PA05": 5,
         "PA5": 5,
         "PA12": 12,
@@ -955,30 +1071,35 @@ RTL87XX_BOARD_PINS = {
         "PA15": 15,
         "PA18": 18,
         "PA19": 19,
+        "PA22": 22,
         "PA23": 23,
         "PA29": 29,
         "PA30": 30,
         "PWM1": 15,
+        "PWM2": 0,
         "PWM3": 12,
-        "PWM4": 29,
+        "PWM4": 5,
+        "PWM5": 22,
+        "RTS0": 22,
         "RX0": 18,
         "RX2": 29,
         "SCK0": 18,
         "SCK1": 18,
-        "SCL0": 29,
         "SCL1": 18,
         "SDA1": 23,
         "TX0": 23,
         "TX2": 30,
-        "D0": 12,
-        "D1": 19,
-        "D2": 5,
-        "D3": 18,
-        "D4": 23,
-        "D5": 14,
-        "D6": 15,
-        "D7": 30,
-        "D8": 29,
+        "D0": 19,
+        "D1": 14,
+        "D2": 15,
+        "D3": 0,
+        "D4": 22,
+        "D5": 29,
+        "D6": 30,
+        "D7": 5,
+        "D8": 12,
+        "D9": 18,
+        "D10": 23,
         "A0": 19,
         "A1": 41,
     },
@@ -1051,76 +1172,129 @@ RTL87XX_BOARD_PINS = {
         "D10": 30,
         "A0": 19,
     },
-    "wr3l": {
-        "SPI0_CS": 19,
-        "SPI0_MISO": 22,
-        "SPI0_MOSI": 23,
-        "SPI0_SCK": 18,
-        "SPI1_CS": 19,
-        "SPI1_MISO": 22,
-        "SPI1_MOSI": 23,
-        "SPI1_SCK": 18,
-        "WIRE0_SCL_0": 22,
-        "WIRE0_SCL_1": 29,
-        "WIRE0_SDA_0": 19,
-        "WIRE0_SDA_1": 30,
-        "WIRE1_SCL": 18,
-        "WIRE1_SDA": 23,
-        "SERIAL0_CTS": 19,
-        "SERIAL0_RTS": 22,
-        "SERIAL0_RX": 18,
-        "SERIAL0_TX": 23,
-        "SERIAL2_RX": 29,
-        "SERIAL2_TX": 30,
-        "ADC1": 19,
-        "ADC2": 41,
-        "CS0": 19,
-        "CS1": 19,
-        "CTS0": 19,
-        "MISO0": 22,
-        "MISO1": 22,
-        "MOSI0": 23,
-        "MOSI1": 23,
+    "wbr1": {
+        "WIRE0_SCL_0": 2,
+        "WIRE0_SCL_1": 11,
+        "WIRE0_SCL_2": 15,
+        "WIRE0_SDA_0": 3,
+        "WIRE0_SDA_1": 12,
+        "WIRE0_SDA_2": 16,
+        "SERIAL0_RX_0": 12,
+        "SERIAL0_RX_1": 13,
+        "SERIAL0_TX_0": 11,
+        "SERIAL0_TX_1": 14,
+        "SERIAL1_CTS": 4,
+        "SERIAL1_RX_0": 0,
+        "SERIAL1_RX_1": 2,
+        "SERIAL1_TX_0": 1,
+        "SERIAL1_TX_1": 3,
+        "SERIAL2_RX": 15,
+        "SERIAL2_TX": 16,
+        "CTS1": 4,
+        "MOSI0": 4,
         "PA00": 0,
         "PA0": 0,
-        "PA05": 5,
-        "PA5": 5,
+        "PA01": 1,
+        "PA1": 1,
+        "PA02": 2,
+        "PA2": 2,
+        "PA03": 3,
+        "PA3": 3,
+        "PA04": 4,
+        "PA4": 4,
+        "PA11": 11,
         "PA12": 12,
+        "PA13": 13,
         "PA14": 14,
         "PA15": 15,
+        "PA16": 16,
+        "PA17": 17,
+        "PA18": 18,
+        "PWM5": 17,
+        "PWM6": 18,
+        "PWM7": 13,
+        "RX2": 15,
+        "SCL0": 15,
+        "SDA0": 12,
+        "TX2": 16,
+        "D0": 14,
+        "D1": 13,
+        "D2": 2,
+        "D3": 3,
+        "D4": 16,
+        "D5": 4,
+        "D6": 11,
+        "D7": 15,
+        "D8": 12,
+        "D9": 17,
+        "D10": 18,
+        "D11": 0,
+        "D12": 1,
+    },
+    "wbr3": {
+        "WIRE0_SCL_0": 2,
+        "WIRE0_SCL_1": 11,
+        "WIRE0_SCL_2": 15,
+        "WIRE0_SCL_3": 19,
+        "WIRE0_SDA_0": 3,
+        "WIRE0_SDA_1": 12,
+        "WIRE0_SDA_2": 16,
+        "SERIAL0_RX_0": 12,
+        "SERIAL0_RX_1": 13,
+        "SERIAL0_TX_0": 11,
+        "SERIAL0_TX_1": 14,
+        "SERIAL1_CTS": 4,
+        "SERIAL1_RX_0": 0,
+        "SERIAL1_RX_1": 2,
+        "SERIAL1_TX_0": 1,
+        "SERIAL1_TX_1": 3,
+        "SERIAL2_CTS": 19,
+        "SERIAL2_RX": 15,
+        "SERIAL2_TX": 16,
+        "CS0": 15,
+        "CTS1": 4,
+        "CTS2": 19,
+        "PA00": 0,
+        "PA0": 0,
+        "PA01": 1,
+        "PA1": 1,
+        "PA02": 2,
+        "PA2": 2,
+        "PA03": 3,
+        "PA3": 3,
+        "PA04": 4,
+        "PA4": 4,
+        "PA07": 7,
+        "PA7": 7,
+        "PA11": 11,
+        "PA12": 12,
+        "PA13": 13,
+        "PA14": 14,
+        "PA15": 15,
+        "PA16": 16,
+        "PA17": 17,
         "PA18": 18,
         "PA19": 19,
-        "PA22": 22,
-        "PA23": 23,
-        "PA29": 29,
-        "PA30": 30,
-        "PWM1": 15,
-        "PWM2": 0,
-        "PWM3": 12,
-        "PWM4": 5,
-        "PWM5": 22,
-        "RTS0": 22,
-        "RX0": 18,
-        "RX2": 29,
-        "SCK0": 18,
-        "SCK1": 18,
-        "SCL1": 18,
-        "SDA1": 23,
-        "TX0": 23,
-        "TX2": 30,
-        "D0": 22,
-        "D1": 19,
-        "D2": 14,
-        "D3": 15,
-        "D4": 0,
-        "D5": 29,
-        "D6": 30,
-        "D7": 5,
-        "D8": 12,
-        "D9": 18,
-        "D10": 23,
-        "A0": 19,
-        "A1": 41,
+        "PWM5": 17,
+        "PWM6": 18,
+        "RX2": 15,
+        "SDA0": 16,
+        "TX2": 16,
+        "D0": 7,
+        "D1": 11,
+        "D2": 2,
+        "D3": 3,
+        "D4": 4,
+        "D5": 12,
+        "D6": 16,
+        "D7": 17,
+        "D8": 18,
+        "D9": 19,
+        "D10": 13,
+        "D11": 14,
+        "D12": 15,
+        "D13": 0,
+        "D14": 1,
     },
     "wbru": {
         "SPI0_CS_0": 2,
@@ -1215,724 +1389,6 @@ RTL87XX_BOARD_PINS = {
         "D16": 10,
         "D17": 7,
     },
-    "wr2le": {
-        "MISO0": 22,
-        "MISO1": 22,
-        "PA05": 5,
-        "PA5": 5,
-        "PA12": 12,
-        "PA14": 14,
-        "PA15": 15,
-        "PA22": 22,
-        "PWM0": 14,
-        "PWM1": 15,
-        "PWM3": 12,
-        "PWM4": 5,
-        "PWM5": 22,
-        "RTS0": 22,
-        "SCL0": 22,
-        "D0": 15,
-        "D1": 14,
-        "D2": 5,
-        "D3": 22,
-        "D4": 12,
-    },
-    "bw15": {
-        "SPI0_CS_0": 2,
-        "SPI0_CS_1": 15,
-        "SPI0_MISO": 20,
-        "SPI0_MOSI_0": 4,
-        "SPI0_MOSI_1": 19,
-        "SPI0_SCK_0": 3,
-        "SPI0_SCK_1": 16,
-        "WIRE0_SCL_0": 2,
-        "WIRE0_SCL_1": 15,
-        "WIRE0_SCL_2": 19,
-        "WIRE0_SDA_0": 3,
-        "WIRE0_SDA_1": 16,
-        "WIRE0_SDA_2": 20,
-        "SERIAL0_RX": 13,
-        "SERIAL0_TX": 14,
-        "SERIAL1_CTS": 4,
-        "SERIAL1_RX_0": 0,
-        "SERIAL1_RX_1": 2,
-        "SERIAL1_TX_0": 1,
-        "SERIAL1_TX_1": 3,
-        "SERIAL2_CTS": 19,
-        "SERIAL2_RTS": 20,
-        "SERIAL2_RX": 15,
-        "SERIAL2_TX": 16,
-        "CTS1": 4,
-        "CTS2": 19,
-        "MISO0": 20,
-        "PA00": 0,
-        "PA0": 0,
-        "PA01": 1,
-        "PA1": 1,
-        "PA02": 2,
-        "PA2": 2,
-        "PA03": 3,
-        "PA3": 3,
-        "PA04": 4,
-        "PA4": 4,
-        "PA13": 13,
-        "PA14": 14,
-        "PA15": 15,
-        "PA16": 16,
-        "PA17": 17,
-        "PA18": 18,
-        "PA19": 19,
-        "PA20": 20,
-        "PWM1": 1,
-        "PWM5": 17,
-        "PWM6": 18,
-        "RTS2": 20,
-        "RX0": 13,
-        "RX2": 15,
-        "SCL0": 19,
-        "SDA0": 3,
-        "TX0": 14,
-        "TX2": 16,
-        "D0": 17,
-        "D1": 18,
-        "D2": 2,
-        "D3": 15,
-        "D4": 4,
-        "D5": 19,
-        "D6": 20,
-        "D7": 16,
-        "D8": 0,
-        "D9": 3,
-        "D10": 1,
-        "D11": 13,
-        "D12": 14,
-    },
-    "t103-v1.0": {
-        "SPI0_CS": 19,
-        "SPI0_MISO": 22,
-        "SPI0_MOSI": 23,
-        "SPI0_SCK": 18,
-        "SPI1_CS": 19,
-        "SPI1_MISO": 22,
-        "SPI1_MOSI": 23,
-        "SPI1_SCK": 18,
-        "WIRE0_SCL_0": 22,
-        "WIRE0_SCL_1": 29,
-        "WIRE0_SDA_0": 19,
-        "WIRE0_SDA_1": 30,
-        "WIRE1_SCL": 18,
-        "WIRE1_SDA": 23,
-        "SERIAL0_CTS": 19,
-        "SERIAL0_RTS": 22,
-        "SERIAL0_RX": 18,
-        "SERIAL0_TX": 23,
-        "SERIAL2_RX": 29,
-        "SERIAL2_TX": 30,
-        "ADC1": 19,
-        "ADC2": 41,
-        "CS0": 19,
-        "CS1": 19,
-        "CTS0": 19,
-        "MISO0": 22,
-        "MISO1": 22,
-        "MOSI0": 23,
-        "MOSI1": 23,
-        "PA00": 0,
-        "PA0": 0,
-        "PA05": 5,
-        "PA5": 5,
-        "PA12": 12,
-        "PA14": 14,
-        "PA15": 15,
-        "PA18": 18,
-        "PA19": 19,
-        "PA22": 22,
-        "PA23": 23,
-        "PA29": 29,
-        "PA30": 30,
-        "PWM1": 15,
-        "PWM2": 0,
-        "PWM3": 12,
-        "PWM4": 5,
-        "PWM5": 22,
-        "RTS0": 22,
-        "RX0": 18,
-        "RX2": 29,
-        "SCK0": 18,
-        "SCK1": 18,
-        "SCL1": 18,
-        "SDA1": 23,
-        "TX0": 23,
-        "TX2": 30,
-        "D0": 19,
-        "D1": 14,
-        "D2": 15,
-        "D3": 0,
-        "D4": 22,
-        "D5": 29,
-        "D6": 30,
-        "D7": 5,
-        "D8": 12,
-        "D9": 18,
-        "D10": 23,
-        "A0": 19,
-        "A1": 41,
-    },
-    "cr3l": {
-        "SPI0_CS_0": 2,
-        "SPI0_CS_1": 15,
-        "SPI0_MISO": 20,
-        "SPI0_MOSI_0": 4,
-        "SPI0_MOSI_1": 19,
-        "SPI0_SCK_0": 3,
-        "SPI0_SCK_1": 16,
-        "WIRE0_SCL_0": 2,
-        "WIRE0_SCL_1": 15,
-        "WIRE0_SCL_2": 19,
-        "WIRE0_SDA_0": 3,
-        "WIRE0_SDA_1": 16,
-        "WIRE0_SDA_2": 20,
-        "SERIAL0_RX": 13,
-        "SERIAL0_TX": 14,
-        "SERIAL1_CTS": 4,
-        "SERIAL1_RX": 2,
-        "SERIAL1_TX": 3,
-        "SERIAL2_CTS": 19,
-        "SERIAL2_RTS": 20,
-        "SERIAL2_RX": 15,
-        "SERIAL2_TX": 16,
-        "CTS1": 4,
-        "CTS2": 19,
-        "MISO0": 20,
-        "PA02": 2,
-        "PA2": 2,
-        "PA03": 3,
-        "PA3": 3,
-        "PA04": 4,
-        "PA4": 4,
-        "PA13": 13,
-        "PA14": 14,
-        "PA15": 15,
-        "PA16": 16,
-        "PA17": 17,
-        "PA18": 18,
-        "PA19": 19,
-        "PA20": 20,
-        "PWM0": 20,
-        "PWM5": 17,
-        "PWM6": 18,
-        "RTS2": 20,
-        "RX0": 13,
-        "RX1": 2,
-        "RX2": 15,
-        "SCL0": 19,
-        "SDA0": 16,
-        "TX0": 14,
-        "TX1": 3,
-        "TX2": 16,
-        "D0": 20,
-        "D1": 2,
-        "D2": 3,
-        "D3": 4,
-        "D4": 15,
-        "D5": 16,
-        "D6": 17,
-        "D7": 18,
-        "D8": 19,
-        "D9": 13,
-        "D10": 14,
-    },
-    "generic-rtl8720cm-4mb-1712k": {
-        "SPI0_CS_0": 2,
-        "SPI0_CS_1": 7,
-        "SPI0_CS_2": 15,
-        "SPI0_MISO_0": 10,
-        "SPI0_MISO_1": 20,
-        "SPI0_MOSI_0": 4,
-        "SPI0_MOSI_1": 9,
-        "SPI0_MOSI_2": 19,
-        "SPI0_SCK_0": 3,
-        "SPI0_SCK_1": 8,
-        "SPI0_SCK_2": 16,
-        "WIRE0_SCL_0": 2,
-        "WIRE0_SCL_1": 11,
-        "WIRE0_SCL_2": 15,
-        "WIRE0_SCL_3": 19,
-        "WIRE0_SDA_0": 3,
-        "WIRE0_SDA_1": 12,
-        "WIRE0_SDA_2": 16,
-        "WIRE0_SDA_3": 20,
-        "SERIAL0_CTS": 10,
-        "SERIAL0_RTS": 9,
-        "SERIAL0_RX_0": 12,
-        "SERIAL0_RX_1": 13,
-        "SERIAL0_TX_0": 11,
-        "SERIAL0_TX_1": 14,
-        "SERIAL1_CTS": 4,
-        "SERIAL1_RX_0": 0,
-        "SERIAL1_RX_1": 2,
-        "SERIAL1_TX_0": 1,
-        "SERIAL1_TX_1": 3,
-        "SERIAL2_CTS": 19,
-        "SERIAL2_RTS": 20,
-        "SERIAL2_RX": 15,
-        "SERIAL2_TX": 16,
-        "CS0": 15,
-        "CTS0": 10,
-        "CTS1": 4,
-        "CTS2": 19,
-        "MOSI0": 19,
-        "PA00": 0,
-        "PA0": 0,
-        "PA01": 1,
-        "PA1": 1,
-        "PA02": 2,
-        "PA2": 2,
-        "PA03": 3,
-        "PA3": 3,
-        "PA04": 4,
-        "PA4": 4,
-        "PA07": 7,
-        "PA7": 7,
-        "PA08": 8,
-        "PA8": 8,
-        "PA09": 9,
-        "PA9": 9,
-        "PA10": 10,
-        "PA11": 11,
-        "PA12": 12,
-        "PA13": 13,
-        "PA14": 14,
-        "PA15": 15,
-        "PA16": 16,
-        "PA17": 17,
-        "PA18": 18,
-        "PA19": 19,
-        "PA20": 20,
-        "PA23": 23,
-        "PWM0": 20,
-        "PWM5": 17,
-        "PWM6": 18,
-        "PWM7": 23,
-        "RTS0": 9,
-        "RTS2": 20,
-        "RX2": 15,
-        "SCK0": 16,
-        "TX2": 16,
-        "D0": 0,
-        "D1": 1,
-        "D2": 2,
-        "D3": 3,
-        "D4": 4,
-        "D5": 7,
-        "D6": 8,
-        "D7": 9,
-        "D8": 10,
-        "D9": 11,
-        "D10": 12,
-        "D11": 13,
-        "D12": 14,
-        "D13": 15,
-        "D14": 16,
-        "D15": 17,
-        "D16": 18,
-        "D17": 19,
-        "D18": 20,
-        "D19": 23,
-    },
-    "generic-rtl8720cf-2mb-896k": {
-        "SPI0_CS_0": 2,
-        "SPI0_CS_1": 7,
-        "SPI0_CS_2": 15,
-        "SPI0_MISO_0": 10,
-        "SPI0_MISO_1": 20,
-        "SPI0_MOSI_0": 4,
-        "SPI0_MOSI_1": 9,
-        "SPI0_MOSI_2": 19,
-        "SPI0_SCK_0": 3,
-        "SPI0_SCK_1": 8,
-        "SPI0_SCK_2": 16,
-        "WIRE0_SCL_0": 2,
-        "WIRE0_SCL_1": 11,
-        "WIRE0_SCL_2": 15,
-        "WIRE0_SCL_3": 19,
-        "WIRE0_SDA_0": 3,
-        "WIRE0_SDA_1": 12,
-        "WIRE0_SDA_2": 16,
-        "WIRE0_SDA_3": 20,
-        "SERIAL0_CTS": 10,
-        "SERIAL0_RTS": 9,
-        "SERIAL0_RX_0": 12,
-        "SERIAL0_RX_1": 13,
-        "SERIAL0_TX_0": 11,
-        "SERIAL0_TX_1": 14,
-        "SERIAL1_CTS": 4,
-        "SERIAL1_RX_0": 0,
-        "SERIAL1_RX_1": 2,
-        "SERIAL1_TX_0": 1,
-        "SERIAL1_TX_1": 3,
-        "SERIAL2_CTS": 19,
-        "SERIAL2_RTS": 20,
-        "SERIAL2_RX": 15,
-        "SERIAL2_TX": 16,
-        "CS0": 15,
-        "CTS0": 10,
-        "CTS1": 4,
-        "CTS2": 19,
-        "MOSI0": 19,
-        "PA00": 0,
-        "PA0": 0,
-        "PA01": 1,
-        "PA1": 1,
-        "PA02": 2,
-        "PA2": 2,
-        "PA03": 3,
-        "PA3": 3,
-        "PA04": 4,
-        "PA4": 4,
-        "PA07": 7,
-        "PA7": 7,
-        "PA08": 8,
-        "PA8": 8,
-        "PA09": 9,
-        "PA9": 9,
-        "PA10": 10,
-        "PA11": 11,
-        "PA12": 12,
-        "PA13": 13,
-        "PA14": 14,
-        "PA15": 15,
-        "PA16": 16,
-        "PA17": 17,
-        "PA18": 18,
-        "PA19": 19,
-        "PA20": 20,
-        "PA23": 23,
-        "PWM0": 20,
-        "PWM5": 17,
-        "PWM6": 18,
-        "PWM7": 23,
-        "RTS0": 9,
-        "RTS2": 20,
-        "RX2": 15,
-        "SCK0": 16,
-        "TX2": 16,
-        "D0": 0,
-        "D1": 1,
-        "D2": 2,
-        "D3": 3,
-        "D4": 4,
-        "D5": 7,
-        "D6": 8,
-        "D7": 9,
-        "D8": 10,
-        "D9": 11,
-        "D10": 12,
-        "D11": 13,
-        "D12": 14,
-        "D13": 15,
-        "D14": 16,
-        "D15": 17,
-        "D16": 18,
-        "D17": 19,
-        "D18": 20,
-        "D19": 23,
-    },
-    "generic-rtl8720cf-2mb-992k": {
-        "SPI0_CS_0": 2,
-        "SPI0_CS_1": 7,
-        "SPI0_CS_2": 15,
-        "SPI0_MISO_0": 10,
-        "SPI0_MISO_1": 20,
-        "SPI0_MOSI_0": 4,
-        "SPI0_MOSI_1": 9,
-        "SPI0_MOSI_2": 19,
-        "SPI0_SCK_0": 3,
-        "SPI0_SCK_1": 8,
-        "SPI0_SCK_2": 16,
-        "WIRE0_SCL_0": 2,
-        "WIRE0_SCL_1": 11,
-        "WIRE0_SCL_2": 15,
-        "WIRE0_SCL_3": 19,
-        "WIRE0_SDA_0": 3,
-        "WIRE0_SDA_1": 12,
-        "WIRE0_SDA_2": 16,
-        "WIRE0_SDA_3": 20,
-        "SERIAL0_CTS": 10,
-        "SERIAL0_RTS": 9,
-        "SERIAL0_RX_0": 12,
-        "SERIAL0_RX_1": 13,
-        "SERIAL0_TX_0": 11,
-        "SERIAL0_TX_1": 14,
-        "SERIAL1_CTS": 4,
-        "SERIAL1_RX_0": 0,
-        "SERIAL1_RX_1": 2,
-        "SERIAL1_TX_0": 1,
-        "SERIAL1_TX_1": 3,
-        "SERIAL2_CTS": 19,
-        "SERIAL2_RTS": 20,
-        "SERIAL2_RX": 15,
-        "SERIAL2_TX": 16,
-        "CS0": 15,
-        "CTS0": 10,
-        "CTS1": 4,
-        "CTS2": 19,
-        "MOSI0": 19,
-        "PA00": 0,
-        "PA0": 0,
-        "PA01": 1,
-        "PA1": 1,
-        "PA02": 2,
-        "PA2": 2,
-        "PA03": 3,
-        "PA3": 3,
-        "PA04": 4,
-        "PA4": 4,
-        "PA07": 7,
-        "PA7": 7,
-        "PA08": 8,
-        "PA8": 8,
-        "PA09": 9,
-        "PA9": 9,
-        "PA10": 10,
-        "PA11": 11,
-        "PA12": 12,
-        "PA13": 13,
-        "PA14": 14,
-        "PA15": 15,
-        "PA16": 16,
-        "PA17": 17,
-        "PA18": 18,
-        "PA19": 19,
-        "PA20": 20,
-        "PA23": 23,
-        "PWM0": 20,
-        "PWM5": 17,
-        "PWM6": 18,
-        "PWM7": 23,
-        "RTS0": 9,
-        "RTS2": 20,
-        "RX2": 15,
-        "SCK0": 16,
-        "TX2": 16,
-        "D0": 0,
-        "D1": 1,
-        "D2": 2,
-        "D3": 3,
-        "D4": 4,
-        "D5": 7,
-        "D6": 8,
-        "D7": 9,
-        "D8": 10,
-        "D9": 11,
-        "D10": 12,
-        "D11": 13,
-        "D12": 14,
-        "D13": 15,
-        "D14": 16,
-        "D15": 17,
-        "D16": 18,
-        "D17": 19,
-        "D18": 20,
-        "D19": 23,
-    },
-    "bw12": {
-        "SPI0_CS": 19,
-        "SPI0_MISO": 22,
-        "SPI0_MOSI": 23,
-        "SPI0_SCK": 18,
-        "SPI1_CS": 19,
-        "SPI1_MISO": 22,
-        "SPI1_MOSI": 23,
-        "SPI1_SCK": 18,
-        "WIRE0_SCL_0": 22,
-        "WIRE0_SCL_1": 29,
-        "WIRE0_SDA_0": 19,
-        "WIRE0_SDA_1": 30,
-        "WIRE1_SCL": 18,
-        "WIRE1_SDA": 23,
-        "SERIAL0_CTS": 19,
-        "SERIAL0_RTS": 22,
-        "SERIAL0_RX": 18,
-        "SERIAL0_TX": 23,
-        "SERIAL2_RX": 29,
-        "SERIAL2_TX": 30,
-        "ADC1": 19,
-        "CS0": 19,
-        "CS1": 19,
-        "CTS0": 19,
-        "MISO0": 22,
-        "MISO1": 22,
-        "MOSI0": 23,
-        "MOSI1": 23,
-        "PA00": 0,
-        "PA0": 0,
-        "PA05": 5,
-        "PA5": 5,
-        "PA12": 12,
-        "PA14": 14,
-        "PA15": 15,
-        "PA18": 18,
-        "PA19": 19,
-        "PA22": 22,
-        "PA23": 23,
-        "PA29": 29,
-        "PA30": 30,
-        "PWM1": 15,
-        "PWM2": 0,
-        "PWM3": 12,
-        "PWM4": 30,
-        "PWM5": 22,
-        "RTS0": 22,
-        "RX0": 18,
-        "RX2": 29,
-        "SCK0": 18,
-        "SCK1": 18,
-        "SCL1": 18,
-        "SDA1": 23,
-        "TX0": 23,
-        "TX2": 30,
-        "D0": 5,
-        "D1": 29,
-        "D2": 0,
-        "D3": 19,
-        "D4": 22,
-        "D5": 30,
-        "D6": 14,
-        "D7": 12,
-        "D8": 15,
-        "D9": 18,
-        "D10": 23,
-        "A0": 19,
-    },
-    "t102-v1.1": {
-        "WIRE0_SCL": 29,
-        "WIRE0_SDA": 30,
-        "WIRE1_SCL": 18,
-        "WIRE1_SDA": 23,
-        "SERIAL0_RX": 18,
-        "SERIAL0_TX": 23,
-        "SERIAL2_RX": 29,
-        "SERIAL2_TX": 30,
-        "MOSI0": 23,
-        "MOSI1": 23,
-        "PA00": 0,
-        "PA0": 0,
-        "PA05": 5,
-        "PA5": 5,
-        "PA12": 12,
-        "PA14": 14,
-        "PA15": 15,
-        "PA18": 18,
-        "PA23": 23,
-        "PA29": 29,
-        "PA30": 30,
-        "PWM1": 15,
-        "PWM2": 0,
-        "PWM3": 12,
-        "PWM4": 29,
-        "RX0": 18,
-        "RX2": 29,
-        "SCK0": 18,
-        "SCK1": 18,
-        "SCL0": 29,
-        "SCL1": 18,
-        "SDA0": 30,
-        "SDA1": 23,
-        "TX0": 23,
-        "TX2": 30,
-        "D0": 12,
-        "D1": 0,
-        "D2": 5,
-        "D3": 30,
-        "D4": 29,
-        "D5": 18,
-        "D6": 23,
-        "D7": 14,
-        "D8": 15,
-    },
-    "wr2l": {
-        "ADC1": 19,
-        "CS0": 19,
-        "CS1": 19,
-        "CTS0": 19,
-        "PA05": 5,
-        "PA5": 5,
-        "PA12": 12,
-        "PA14": 14,
-        "PA15": 15,
-        "PA19": 19,
-        "PWM0": 14,
-        "PWM1": 15,
-        "PWM3": 12,
-        "PWM4": 5,
-        "SDA0": 19,
-        "D0": 15,
-        "D1": 14,
-        "D2": 5,
-        "D3": 19,
-        "D4": 12,
-        "A0": 19,
-    },
-    "wbr1": {
-        "WIRE0_SCL_0": 2,
-        "WIRE0_SCL_1": 11,
-        "WIRE0_SCL_2": 15,
-        "WIRE0_SDA_0": 3,
-        "WIRE0_SDA_1": 12,
-        "WIRE0_SDA_2": 16,
-        "SERIAL0_RX_0": 12,
-        "SERIAL0_RX_1": 13,
-        "SERIAL0_TX_0": 11,
-        "SERIAL0_TX_1": 14,
-        "SERIAL1_CTS": 4,
-        "SERIAL1_RX_0": 0,
-        "SERIAL1_RX_1": 2,
-        "SERIAL1_TX_0": 1,
-        "SERIAL1_TX_1": 3,
-        "SERIAL2_RX": 15,
-        "SERIAL2_TX": 16,
-        "CTS1": 4,
-        "MOSI0": 4,
-        "PA00": 0,
-        "PA0": 0,
-        "PA01": 1,
-        "PA1": 1,
-        "PA02": 2,
-        "PA2": 2,
-        "PA03": 3,
-        "PA3": 3,
-        "PA04": 4,
-        "PA4": 4,
-        "PA11": 11,
-        "PA12": 12,
-        "PA13": 13,
-        "PA14": 14,
-        "PA15": 15,
-        "PA16": 16,
-        "PA17": 17,
-        "PA18": 18,
-        "PWM5": 17,
-        "PWM6": 18,
-        "PWM7": 13,
-        "RX2": 15,
-        "SCL0": 15,
-        "SDA0": 12,
-        "TX2": 16,
-        "D0": 14,
-        "D1": 13,
-        "D2": 2,
-        "D3": 3,
-        "D4": 16,
-        "D5": 4,
-        "D6": 11,
-        "D7": 15,
-        "D8": 12,
-        "D9": 17,
-        "D10": 18,
-        "D11": 0,
-        "D12": 1,
-    },
     "wr1": {
         "SPI0_CS": 19,
         "SPI0_MISO": 22,
@@ -2001,6 +1457,550 @@ RTL87XX_BOARD_PINS = {
         "A0": 19,
         "A1": 41,
     },
+    "wr1e": {
+        "SPI0_CS": 19,
+        "SPI0_MISO": 22,
+        "SPI0_MOSI": 23,
+        "SPI0_SCK": 18,
+        "SPI1_CS": 19,
+        "SPI1_MISO": 22,
+        "SPI1_MOSI": 23,
+        "SPI1_SCK": 18,
+        "WIRE0_SCL_0": 22,
+        "WIRE0_SCL_1": 29,
+        "WIRE0_SDA_0": 19,
+        "WIRE0_SDA_1": 30,
+        "WIRE1_SCL": 18,
+        "WIRE1_SDA": 23,
+        "SERIAL0_CTS": 19,
+        "SERIAL0_RTS": 22,
+        "SERIAL0_RX": 18,
+        "SERIAL0_TX": 23,
+        "SERIAL2_RX": 29,
+        "SERIAL2_TX": 30,
+        "ADC1": 19,
+        "ADC2": 41,
+        "CS0": 19,
+        "CS1": 19,
+        "CTS0": 19,
+        "MISO0": 22,
+        "MISO1": 22,
+        "MOSI0": 23,
+        "MOSI1": 23,
+        "PA05": 5,
+        "PA5": 5,
+        "PA12": 12,
+        "PA14": 14,
+        "PA15": 15,
+        "PA18": 18,
+        "PA19": 19,
+        "PA22": 22,
+        "PA23": 23,
+        "PA29": 29,
+        "PA30": 30,
+        "PWM1": 15,
+        "PWM3": 12,
+        "PWM4": 29,
+        "PWM5": 22,
+        "RTS0": 22,
+        "RX0": 18,
+        "RX2": 29,
+        "SCK0": 18,
+        "SCK1": 18,
+        "SCL1": 18,
+        "SDA1": 23,
+        "TX0": 23,
+        "TX2": 30,
+        "D0": 23,
+        "D1": 18,
+        "D2": 14,
+        "D3": 15,
+        "D4": 30,
+        "D5": 12,
+        "D6": 5,
+        "D7": 29,
+        "D8": 19,
+        "D9": 22,
+        "A0": 19,
+        "A1": 41,
+    },
+    "wr2": {
+        "WIRE0_SCL": 29,
+        "WIRE0_SDA": 30,
+        "WIRE1_SCL": 18,
+        "WIRE1_SDA": 23,
+        "SERIAL0_RX": 18,
+        "SERIAL0_TX": 23,
+        "SERIAL2_RX": 29,
+        "SERIAL2_TX": 30,
+        "ADC2": 41,
+        "MOSI0": 23,
+        "MOSI1": 23,
+        "PA00": 0,
+        "PA0": 0,
+        "PA05": 5,
+        "PA5": 5,
+        "PA12": 12,
+        "PA14": 14,
+        "PA15": 15,
+        "PA18": 18,
+        "PA23": 23,
+        "PA29": 29,
+        "PA30": 30,
+        "PWM1": 15,
+        "PWM2": 0,
+        "PWM3": 12,
+        "PWM4": 29,
+        "RX0": 18,
+        "RX2": 29,
+        "SCK0": 18,
+        "SCK1": 18,
+        "SCL0": 29,
+        "SCL1": 18,
+        "SDA0": 30,
+        "SDA1": 23,
+        "TX0": 23,
+        "TX2": 30,
+        "D0": 12,
+        "D1": 0,
+        "D2": 5,
+        "D4": 18,
+        "D5": 23,
+        "D6": 14,
+        "D7": 15,
+        "D8": 30,
+        "D9": 29,
+        "A1": 41,
+    },
+    "wr2e": {
+        "WIRE0_SCL": 29,
+        "WIRE0_SDA_0": 19,
+        "WIRE0_SDA_1": 30,
+        "WIRE1_SCL": 18,
+        "WIRE1_SDA": 23,
+        "SERIAL0_CTS": 19,
+        "SERIAL0_RX": 18,
+        "SERIAL0_TX": 23,
+        "SERIAL2_RX": 29,
+        "SERIAL2_TX": 30,
+        "ADC1": 19,
+        "ADC2": 41,
+        "CS0": 19,
+        "CS1": 19,
+        "CTS0": 19,
+        "MOSI0": 23,
+        "MOSI1": 23,
+        "PA05": 5,
+        "PA5": 5,
+        "PA12": 12,
+        "PA14": 14,
+        "PA15": 15,
+        "PA18": 18,
+        "PA19": 19,
+        "PA23": 23,
+        "PA29": 29,
+        "PA30": 30,
+        "PWM1": 15,
+        "PWM3": 12,
+        "PWM4": 29,
+        "RX0": 18,
+        "RX2": 29,
+        "SCK0": 18,
+        "SCK1": 18,
+        "SCL0": 29,
+        "SCL1": 18,
+        "SDA1": 23,
+        "TX0": 23,
+        "TX2": 30,
+        "D0": 12,
+        "D1": 19,
+        "D2": 5,
+        "D3": 18,
+        "D4": 23,
+        "D5": 14,
+        "D6": 15,
+        "D7": 30,
+        "D8": 29,
+        "A0": 19,
+        "A1": 41,
+    },
+    "wr2l": {
+        "ADC1": 19,
+        "CS0": 19,
+        "CS1": 19,
+        "CTS0": 19,
+        "PA05": 5,
+        "PA5": 5,
+        "PA12": 12,
+        "PA14": 14,
+        "PA15": 15,
+        "PA19": 19,
+        "PWM0": 14,
+        "PWM1": 15,
+        "PWM3": 12,
+        "PWM4": 5,
+        "SDA0": 19,
+        "D0": 15,
+        "D1": 14,
+        "D2": 5,
+        "D3": 19,
+        "D4": 12,
+        "A0": 19,
+    },
+    "wr2le": {
+        "MISO0": 22,
+        "MISO1": 22,
+        "PA05": 5,
+        "PA5": 5,
+        "PA12": 12,
+        "PA14": 14,
+        "PA15": 15,
+        "PA22": 22,
+        "PWM0": 14,
+        "PWM1": 15,
+        "PWM3": 12,
+        "PWM4": 5,
+        "PWM5": 22,
+        "RTS0": 22,
+        "SCL0": 22,
+        "D0": 15,
+        "D1": 14,
+        "D2": 5,
+        "D3": 22,
+        "D4": 12,
+    },
+    "wr3": {
+        "SPI0_CS": 19,
+        "SPI0_MISO": 22,
+        "SPI0_MOSI": 23,
+        "SPI0_SCK": 18,
+        "SPI1_CS": 19,
+        "SPI1_MISO": 22,
+        "SPI1_MOSI": 23,
+        "SPI1_SCK": 18,
+        "WIRE0_SCL_0": 22,
+        "WIRE0_SCL_1": 29,
+        "WIRE0_SDA_0": 19,
+        "WIRE0_SDA_1": 30,
+        "WIRE1_SCL": 18,
+        "WIRE1_SDA": 23,
+        "SERIAL0_CTS": 19,
+        "SERIAL0_RTS": 22,
+        "SERIAL0_RX": 18,
+        "SERIAL0_TX": 23,
+        "SERIAL2_RX": 29,
+        "SERIAL2_TX": 30,
+        "ADC1": 19,
+        "ADC2": 41,
+        "CS0": 19,
+        "CS1": 19,
+        "CTS0": 19,
+        "MISO0": 22,
+        "MISO1": 22,
+        "MOSI0": 23,
+        "MOSI1": 23,
+        "PA00": 0,
+        "PA0": 0,
+        "PA05": 5,
+        "PA5": 5,
+        "PA12": 12,
+        "PA14": 14,
+        "PA15": 15,
+        "PA18": 18,
+        "PA19": 19,
+        "PA22": 22,
+        "PA23": 23,
+        "PA29": 29,
+        "PA30": 30,
+        "PWM1": 15,
+        "PWM2": 0,
+        "PWM3": 12,
+        "PWM4": 5,
+        "PWM5": 22,
+        "RTS0": 22,
+        "RX0": 18,
+        "RX2": 29,
+        "SCK0": 18,
+        "SCK1": 18,
+        "SCL1": 18,
+        "SDA1": 23,
+        "TX0": 23,
+        "TX2": 30,
+        "D0": 22,
+        "D1": 19,
+        "D2": 14,
+        "D3": 15,
+        "D4": 0,
+        "D5": 29,
+        "D6": 30,
+        "D7": 5,
+        "D8": 12,
+        "D9": 18,
+        "D10": 23,
+        "A0": 19,
+        "A1": 41,
+    },
+    "wr3e": {
+        "SPI0_CS": 19,
+        "SPI0_MISO": 22,
+        "SPI0_MOSI": 23,
+        "SPI0_SCK": 18,
+        "SPI1_CS": 19,
+        "SPI1_MISO": 22,
+        "SPI1_MOSI": 23,
+        "SPI1_SCK": 18,
+        "WIRE0_SCL_0": 22,
+        "WIRE0_SCL_1": 29,
+        "WIRE0_SDA_0": 19,
+        "WIRE0_SDA_1": 30,
+        "WIRE1_SCL": 18,
+        "WIRE1_SDA": 23,
+        "SERIAL0_CTS": 19,
+        "SERIAL0_RTS": 22,
+        "SERIAL0_RX": 18,
+        "SERIAL0_TX": 23,
+        "SERIAL2_RX": 29,
+        "SERIAL2_TX": 30,
+        "ADC1": 19,
+        "ADC2": 41,
+        "CS0": 19,
+        "CS1": 19,
+        "CTS0": 19,
+        "MISO0": 22,
+        "MISO1": 22,
+        "MOSI0": 23,
+        "MOSI1": 23,
+        "PA00": 0,
+        "PA0": 0,
+        "PA05": 5,
+        "PA5": 5,
+        "PA12": 12,
+        "PA14": 14,
+        "PA15": 15,
+        "PA18": 18,
+        "PA19": 19,
+        "PA22": 22,
+        "PA23": 23,
+        "PA29": 29,
+        "PA30": 30,
+        "PWM1": 15,
+        "PWM2": 0,
+        "PWM3": 12,
+        "PWM4": 5,
+        "PWM5": 22,
+        "RTS0": 22,
+        "RX0": 18,
+        "RX2": 29,
+        "SCK0": 18,
+        "SCK1": 18,
+        "SCL1": 18,
+        "SDA1": 23,
+        "TX0": 23,
+        "TX2": 30,
+        "D0": 29,
+        "D1": 14,
+        "D2": 15,
+        "D3": 22,
+        "D4": 0,
+        "D5": 30,
+        "D6": 19,
+        "D7": 5,
+        "D8": 12,
+        "D9": 18,
+        "D10": 23,
+        "A0": 19,
+        "A1": 41,
+    },
+    "wr3l": {
+        "SPI0_CS": 19,
+        "SPI0_MISO": 22,
+        "SPI0_MOSI": 23,
+        "SPI0_SCK": 18,
+        "SPI1_CS": 19,
+        "SPI1_MISO": 22,
+        "SPI1_MOSI": 23,
+        "SPI1_SCK": 18,
+        "WIRE0_SCL_0": 22,
+        "WIRE0_SCL_1": 29,
+        "WIRE0_SDA_0": 19,
+        "WIRE0_SDA_1": 30,
+        "WIRE1_SCL": 18,
+        "WIRE1_SDA": 23,
+        "SERIAL0_CTS": 19,
+        "SERIAL0_RTS": 22,
+        "SERIAL0_RX": 18,
+        "SERIAL0_TX": 23,
+        "SERIAL2_RX": 29,
+        "SERIAL2_TX": 30,
+        "ADC1": 19,
+        "ADC2": 41,
+        "CS0": 19,
+        "CS1": 19,
+        "CTS0": 19,
+        "MISO0": 22,
+        "MISO1": 22,
+        "MOSI0": 23,
+        "MOSI1": 23,
+        "PA00": 0,
+        "PA0": 0,
+        "PA05": 5,
+        "PA5": 5,
+        "PA12": 12,
+        "PA14": 14,
+        "PA15": 15,
+        "PA18": 18,
+        "PA19": 19,
+        "PA22": 22,
+        "PA23": 23,
+        "PA29": 29,
+        "PA30": 30,
+        "PWM1": 15,
+        "PWM2": 0,
+        "PWM3": 12,
+        "PWM4": 5,
+        "PWM5": 22,
+        "RTS0": 22,
+        "RX0": 18,
+        "RX2": 29,
+        "SCK0": 18,
+        "SCK1": 18,
+        "SCL1": 18,
+        "SDA1": 23,
+        "TX0": 23,
+        "TX2": 30,
+        "D0": 22,
+        "D1": 19,
+        "D2": 14,
+        "D3": 15,
+        "D4": 0,
+        "D5": 29,
+        "D6": 30,
+        "D7": 5,
+        "D8": 12,
+        "D9": 18,
+        "D10": 23,
+        "A0": 19,
+        "A1": 41,
+    },
+    "wr3le": {
+        "SPI0_CS": 19,
+        "SPI0_MISO": 22,
+        "SPI0_MOSI": 23,
+        "SPI0_SCK": 18,
+        "SPI1_CS": 19,
+        "SPI1_MISO": 22,
+        "SPI1_MOSI": 23,
+        "SPI1_SCK": 18,
+        "WIRE0_SCL_0": 22,
+        "WIRE0_SCL_1": 29,
+        "WIRE0_SDA_0": 19,
+        "WIRE0_SDA_1": 30,
+        "WIRE1_SCL": 18,
+        "WIRE1_SDA": 23,
+        "SERIAL0_CTS": 19,
+        "SERIAL0_RTS": 22,
+        "SERIAL0_RX": 18,
+        "SERIAL0_TX": 23,
+        "SERIAL2_RX": 29,
+        "SERIAL2_TX": 30,
+        "ADC1": 19,
+        "ADC2": 41,
+        "CS0": 19,
+        "CS1": 19,
+        "CTS0": 19,
+        "MISO0": 22,
+        "MISO1": 22,
+        "MOSI0": 23,
+        "MOSI1": 23,
+        "PA00": 0,
+        "PA0": 0,
+        "PA05": 5,
+        "PA5": 5,
+        "PA12": 12,
+        "PA14": 14,
+        "PA15": 15,
+        "PA18": 18,
+        "PA19": 19,
+        "PA22": 22,
+        "PA23": 23,
+        "PA29": 29,
+        "PA30": 30,
+        "PWM1": 15,
+        "PWM2": 0,
+        "PWM3": 12,
+        "PWM4": 5,
+        "PWM5": 22,
+        "RTS0": 22,
+        "RX0": 18,
+        "RX2": 29,
+        "SCK0": 18,
+        "SCK1": 18,
+        "SCL1": 18,
+        "SDA1": 23,
+        "TX0": 23,
+        "TX2": 30,
+        "D0": 29,
+        "D1": 14,
+        "D2": 15,
+        "D3": 22,
+        "D4": 0,
+        "D5": 30,
+        "D6": 19,
+        "D7": 5,
+        "D8": 12,
+        "D9": 18,
+        "D10": 23,
+        "A0": 19,
+        "A1": 41,
+    },
+    "wr3n": {
+        "WIRE0_SCL": 29,
+        "WIRE0_SDA": 30,
+        "WIRE1_SCL": 18,
+        "WIRE1_SDA": 23,
+        "SERIAL0_RX": 18,
+        "SERIAL0_TX": 23,
+        "SERIAL2_RX": 29,
+        "SERIAL2_TX": 30,
+        "ADC2": 41,
+        "MOSI0": 23,
+        "MOSI1": 23,
+        "PA00": 0,
+        "PA0": 0,
+        "PA05": 5,
+        "PA5": 5,
+        "PA12": 12,
+        "PA14": 14,
+        "PA15": 15,
+        "PA18": 18,
+        "PA23": 23,
+        "PA29": 29,
+        "PA30": 30,
+        "PWM1": 15,
+        "PWM2": 0,
+        "PWM3": 12,
+        "PWM4": 5,
+        "RX0": 18,
+        "RX2": 29,
+        "SCK0": 18,
+        "SCK1": 18,
+        "SCL0": 29,
+        "SCL1": 18,
+        "SDA0": 30,
+        "SDA1": 23,
+        "TX0": 23,
+        "TX2": 30,
+        "D0": 29,
+        "D1": 14,
+        "D2": 15,
+        "D3": 0,
+        "D4": 30,
+        "D5": 5,
+        "D6": 12,
+        "D7": 18,
+        "D8": 23,
+        "A1": 41,
+    },
 }
 
 BOARDS = RTL87XX_BOARDS
diff --git a/platformio.ini b/platformio.ini
index bca29106167..061e92a64a5 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -224,7 +224,7 @@ build_unflags =
 ; This are common settings for the LibreTiny (all variants) using Arduino.
 [common:libretiny-arduino]
 extends = common:arduino
-platform = https://github.com/libretiny-eu/libretiny.git#v1.12.1
+platform = https://github.com/libretiny-eu/libretiny.git#v1.13.0
 framework = arduino
 lib_compat_mode = soft
 lib_deps =
@@ -525,7 +525,7 @@ build_unflags =
 
 [env:ln882h-arduino]
 extends = common:libretiny-arduino
-board = generic-ln882hki
+board = generic-ln882h
 build_flags =
     ${common:libretiny-arduino.build_flags}
     ${flags:runtime.build_flags}
diff --git a/tests/test_build_components/build_components_base.ln882x-ard.yaml b/tests/test_build_components/build_components_base.ln882x-ard.yaml
index 80fc6690f91..34abcb5a77f 100644
--- a/tests/test_build_components/build_components_base.ln882x-ard.yaml
+++ b/tests/test_build_components/build_components_base.ln882x-ard.yaml
@@ -3,7 +3,7 @@ esphome:
   friendly_name: $component_name
 
 ln882x:
-  board: generic-ln882hki
+  board: generic-ln882h
 
 logger:
   level: VERY_VERBOSE