[release] v1.7.0

[misc] Update .clang-format style
[common] Cleanup mDNS code, cache service records (#263 )
2024-09-05 16:41:10 +02:00 · 2024-09-05 16:36:55 +02:00 · 2024-09-05 15:54:04 +02:00 · 2024-09-05 14:46:42 +02:00 · 2024-09-05 14:46:13 +02:00 · 2024-09-05 14:45:48 +02:00
116 changed files with 2394 additions and 764 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -1,3 +1,4 @@
+# 2024-07-30
 Language: Cpp
 BasedOnStyle: LLVM
 AlignAfterOpenBracket: BlockIndent
@@ -6,6 +7,7 @@ AlignConsecutiveAssignments: true
 AlignConsecutiveMacros: AcrossComments
 AlignTrailingComments: true
 AllowAllArgumentsOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortBlocksOnASingleLine: Empty
 AllowShortFunctionsOnASingleLine: Empty
 AlwaysBreakTemplateDeclarations: Yes
@@ -21,6 +23,7 @@ IndentCaseLabels: true
 IndentWidth: 4
 LambdaBodyIndentation: Signature
 MaxEmptyLinesToKeep: 1
+PenaltyReturnTypeOnItsOwnLine: 1000
 # PointerAlignment: Left # TODO enable this and reformat project
 QualifierAlignment: Left
 ReflowComments: true
--- a/.github/workflows/push-master.yml
+++ b/.github/workflows/push-master.yml
@@ -17,7 +17,7 @@ jobs:
          python-version: '3.10'

      - name: Install docs dependencies
-        run: pip install -U ltchiptool boardgen
+        run: pip install -U ltchiptool "boardgen>=0.11.0"

      - name: Generate docs and static JSON files
        run: |
--- a/SUMMARY.md
+++ b/SUMMARY.md
@@ -14,6 +14,7 @@
 * [](SUMMARY.md)
 * 🍪 Chip family docs & info
 	* [Beken BK72xx](docs/platform/beken-72xx/README.md)
+		* [Finding encryption keys](docs/platform/beken-72xx/keys.md)
 	* [Realtek Ameba - info](docs/platform/realtek-amb/README.md)
 	* [Realtek AmebaZ](docs/platform/realtek-ambz/README.md)
 		* [Debugging](docs/platform/realtek-ambz/debugging.md)
--- a/boards/_base/pcb/cb1s-test.json
+++ b/boards/_base/pcb/cb1s-test.json
@@ -1,6 +1,6 @@
 {
 	"pcb": {
-		"scale": 10,
+		"scale": 14,
 		"test_pads": {
 			"TSCK": "cb1s.back.sck.anchor",
 			"TCSN": "cb1s.back.csn.anchor",
--- a/boards/_base/pcb/cb2l-test.json
+++ b/boards/_base/pcb/cb2l-test.json
@@ -1,6 +1,5 @@
 {
 	"pcb": {
-		"scale": 11,
 		"test_pads": {
 			"TRST": "cb2l.back.rst.anchor",
 			"TRX1": "cb2l.back.u1_rxd.anchor",
--- a/boards/_base/pcb/cb2s-test.json
+++ b/boards/_base/pcb/cb2s-test.json
@@ -1,6 +1,5 @@
 {
 	"pcb": {
-		"scale": 11,
 		"test_pads": {
 			"TTX2": "cb2s.back.u2_txd.anchor",
 			"TRX2": "cb2s.back.u2_rxd.anchor",
--- a/boards/_base/pcb/t102.json
+++ b/boards/_base/pcb/t102.json
@@ -6,7 +6,8 @@
 			"rf-type1"
 		],
 		"scale": 10.5,
-		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD,SPI",
+		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD",
+		"drawing_hidden": "SPI",
 		"pinout": {
 			"1": {
 				"PWR": 3.3
--- a/boards/_base/pcb/t112.json
+++ b/boards/_base/pcb/t112.json
@@ -0,0 +1,70 @@
+{
+	"pcb": {
+		"templates": [
+			"esp01m-14",
+			"pcb-blue-light",
+			"rf-type1"
+		],
+		"scale": 10.5,
+		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD",
+		"drawing_hidden": "I2C,SPI",
+		"pinout": {
+			"1": {
+				"PWR": 3.3
+			},
+			"2": {
+				"IC": 2,
+				"ARD": "D0"
+			},
+			"3": {
+				"IC": 30,
+				"ARD": [
+					"D1",
+					"A0"
+				]
+			},
+			"4": {
+				"IC": 14,
+				"ARD": "D2"
+			},
+			"5": {
+				"IC": 13,
+				"ARD": "D3"
+			},
+			"6": {
+				"IC": 16,
+				"ARD": "D4"
+			},
+			"7": {
+				"NC": null
+			},
+			"8": {
+				"IC": 28,
+				"ARD": "D5"
+			},
+			"9": {
+				"IC": 29,
+				"ARD": "D6"
+			},
+			"10": {
+				"IC": 17,
+				"ARD": "D7"
+			},
+			"11": {
+				"IC": 32,
+				"ARD": "D8"
+			},
+			"12": {
+				"IC": 31,
+				"ARD": "D9"
+			},
+			"13": {
+				"IC": 1,
+				"ARD": "D10"
+			},
+			"14": {
+				"GND": null
+			}
+		}
+	}
+}
--- a/boards/_base/pcb/wa2.json
+++ b/boards/_base/pcb/wa2.json
@@ -1,6 +1,6 @@
 {
 	"pcb": {
-		"scale": 10.5,
+		"scale": 11,
 		"templates": [
 			"tuya2",
 			"pcb-blue-light",
--- a/boards/_base/pcb/wb2l-test.json
+++ b/boards/_base/pcb/wb2l-test.json
@@ -1,6 +1,5 @@
 {
 	"pcb": {
-		"scale": 11,
 		"test_pads": {
 			"TRST": "wb2l.back.rst.anchor",
 			"TRX1": "wb2l.back.u1_rxd.anchor",
--- a/boards/_base/pcb/wb2s.json
+++ b/boards/_base/pcb/wb2s.json
@@ -1,6 +1,5 @@
 {
 	"pcb": {
-		"scale": 10.5,
 		"templates": [
 			"tuya2",
 			"pcb-blue-light",
--- a/boards/_base/pcb/wb3l.json
+++ b/boards/_base/pcb/wb3l.json
@@ -9,7 +9,7 @@
 		"vars": {
 			"PINHOLE": 0
 		},
-		"pinout_hidden": "I2S,SD,SPI",
+		"pinout_hidden": "I2S,SD",
 		"pinout": {
 			"1": {
 				"NC": null
--- a/boards/_base/pcb/wr2.json
+++ b/boards/_base/pcb/wr2.json
@@ -1,7 +1,7 @@
 {
 	"pcb": {
-		"scale": 10.5,
-		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD,SPI",
+		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD",
+		"drawing_hidden": "SPI",
 		"pinout": {
 			"1": {
 				"PWR": 3.3
--- a/boards/_base/pcb/wr2e.json
+++ b/boards/_base/pcb/wr2e.json
@@ -1,7 +1,7 @@
 {
 	"pcb": {
-		"scale": 10.5,
-		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD,SPI,SDA0",
+		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD,SDA0",
+		"drawing_hidden": "SPI",
 		"pinout": {
 			"1": {
 				"PWR": 3.3
--- a/boards/_base/pcb/wr3n.json
+++ b/boards/_base/pcb/wr3n.json
@@ -3,7 +3,7 @@
 		"templates": [
 			"pcb-black"
 		],
-		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD,SPI",
+		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD",
 		"pinout": {
 			"1": {
 				"NC": null
--- a/boards/t102-v1.1.json
+++ b/boards/t102-v1.1.json
@@ -13,7 +13,8 @@
 	"url": "https://docs.libretiny.eu/boards/t102-v1.1/",
 	"vendor": "Unknown",
 	"doc": {
-		"fccid": "2AU7O-T102V11"
+		"fccid": "2AU7O-T102V11",
+		"mcu": "w302"
 	},
 	"pcb": {
 		"symbol": "T102_V1.1"
--- a/boards/t112-v1.1.json
+++ b/boards/t112-v1.1.json
@@ -0,0 +1,22 @@
+{
+	"_base": [
+		"realtek-ambz",
+		"realtek-ambz-2mb-788k",
+		"ic/rtl8710bn",
+		"pcb/t112"
+	],
+	"build": {
+		"mcu": "rtl8710bn",
+		"variant": "t112-v1.1"
+	},
+	"name": "T112_V1.1",
+	"url": "https://docs.libretiny.eu/boards/t112-v1.1/",
+	"vendor": "Unknown",
+	"doc": {
+		"fccid": "2AU7O-T102V11",
+		"mcu": "w302"
+	},
+	"pcb": {
+		"symbol": "T112_V1.1"
+	}
+}
--- a/boards/templates/tuya2.json
+++ b/boards/templates/tuya2.json
@@ -37,7 +37,7 @@
 		},
 		{
 			"type": "text",
-			"pos": "7.0,5.0",
+			"pos": "6.0,5.5",
 			"text": "${SYMBOL}",
 			"font_size": 1.0,
 			"fill": {
--- a/boards/templates/tuya2l.json
+++ b/boards/templates/tuya2l.json
@@ -39,7 +39,7 @@
 		},
 		{
 			"type": "text",
-			"pos": "4.0,5.5",
+			"pos": "6.0,5.5",
 			"text": "${SYMBOL}",
 			"font_size": 1.0,
 			"fill": {
--- a/boards/templates/tuyau.json
+++ b/boards/templates/tuyau.json
@@ -79,7 +79,7 @@
 		},
 		{
 			"type": "text",
-			"pos": "4.0,5.5",
+			"pos": "6.5,5.0",
 			"text": "${SYMBOL}",
 			"font_size": 1.0,
 			"fill": {
--- a/boards/variants/bw12.h
+++ b/boards/variants/bw12.h
@@ -14,14 +14,22 @@

 // SPI Interfaces
 // --------------
-#define PIN_SPI0_CS   19u // PA_19
-#define PIN_SPI0_MISO 22u // PA_22
-#define PIN_SPI0_MOSI 23u // PA_23
-#define PIN_SPI0_SCK  18u // PA_18
-#define PIN_SPI1_CS   19u // PA_19
-#define PIN_SPI1_MISO 22u // PA_22
-#define PIN_SPI1_MOSI 23u // PA_23
-#define PIN_SPI1_SCK  18u // PA_18
+#define PIN_SPI0_CS    19u // PA_19
+#define PIN_SPI0_MISO  22u // PA_22
+#define PIN_SPI0_MOSI  23u // PA_23
+#define PIN_SPI0_SCK   18u // PA_18
+#define PIN_SPI1_CS    19u // PA_19
+#define PIN_SPI1_MISO  22u // PA_22
+#define PIN_SPI1_MOSI  23u // PA_23
+#define PIN_SPI1_SCK   18u // PA_18
+#define PINS_SPI0_CS   (pin_size_t[]){19u}
+#define PINS_SPI0_MISO (pin_size_t[]){22u}
+#define PINS_SPI0_MOSI (pin_size_t[]){23u}
+#define PINS_SPI0_SCK  (pin_size_t[]){18u}
+#define PINS_SPI1_CS   (pin_size_t[]){19u}
+#define PINS_SPI1_MISO (pin_size_t[]){22u}
+#define PINS_SPI1_MOSI (pin_size_t[]){23u}
+#define PINS_SPI1_SCK  (pin_size_t[]){18u}

 // Wire Interfaces
 // ---------------
@@ -31,15 +39,25 @@
 #define PIN_WIRE0_SDA_1 30u // PA_30
 #define PIN_WIRE1_SCL   18u // PA_18
 #define PIN_WIRE1_SDA   23u // PA_23
+#define PINS_WIRE0_SCL  (pin_size_t[]){29u, 22u}
+#define PINS_WIRE0_SDA  (pin_size_t[]){19u, 30u}
+#define PINS_WIRE1_SCL  (pin_size_t[]){18u}
+#define PINS_WIRE1_SDA  (pin_size_t[]){23u}

 // Serial ports
 // ------------
-#define PIN_SERIAL0_CTS 19u // PA_19
-#define PIN_SERIAL0_RTS 22u // PA_22
-#define PIN_SERIAL0_RX  18u // PA_18
-#define PIN_SERIAL0_TX  23u // PA_23
-#define PIN_SERIAL2_RX  29u // PA_29
-#define PIN_SERIAL2_TX  30u // PA_30
+#define PIN_SERIAL0_CTS  19u // PA_19
+#define PIN_SERIAL0_RTS  22u // PA_22
+#define PIN_SERIAL0_RX   18u // PA_18
+#define PIN_SERIAL0_TX   23u // PA_23
+#define PIN_SERIAL2_RX   29u // PA_29
+#define PIN_SERIAL2_TX   30u // PA_30
+#define PINS_SERIAL0_CTS (pin_size_t[]){19u}
+#define PINS_SERIAL0_RTS (pin_size_t[]){22u}
+#define PINS_SERIAL0_RX  (pin_size_t[]){18u}
+#define PINS_SERIAL0_TX  (pin_size_t[]){23u}
+#define PINS_SERIAL2_RX  (pin_size_t[]){29u}
+#define PINS_SERIAL2_TX  (pin_size_t[]){30u}

 // Pin function macros
 // -------------------
@@ -62,7 +80,6 @@
 #define PIN_PA23  23u // PA_23
 #define PIN_PA29  29u // PA_29
 #define PIN_PA30  30u // PA_30
-#define PIN_PWM0  23u // PA_23
 #define PIN_PWM1  15u // PA_15
 #define PIN_PWM2  0u  // PA_0
 #define PIN_PWM3  12u // PA_12
@@ -73,9 +90,7 @@
 #define PIN_RX2   29u // PA_29
 #define PIN_SCK0  18u // PA_18
 #define PIN_SCK1  18u // PA_18
-#define PIN_SCL0  22u // PA_22
 #define PIN_SCL1  18u // PA_18
-#define PIN_SDA0  30u // PA_30
 #define PIN_SDA1  23u // PA_23
 #define PIN_TX0   23u // PA_23
 #define PIN_TX2   30u // PA_30
--- a/boards/variants/bw15.h
+++ b/boards/variants/bw15.h
@@ -21,6 +21,10 @@
 #define PIN_SPI0_MOSI_1 19u // PIN_A19
 #define PIN_SPI0_SCK_0  16u // PIN_A16
 #define PIN_SPI0_SCK_1  3u  // PIN_A3
+#define PINS_SPI0_CS    (pin_size_t[]){2u, 15u}
+#define PINS_SPI0_MISO  (pin_size_t[]){20u}
+#define PINS_SPI0_MOSI  (pin_size_t[]){4u, 19u}
+#define PINS_SPI0_SCK   (pin_size_t[]){16u, 3u}

 // Wire Interfaces
 // ---------------
@@ -30,6 +34,8 @@
 #define PIN_WIRE0_SDA_0 20u // PIN_A20
 #define PIN_WIRE0_SDA_1 16u // PIN_A16
 #define PIN_WIRE0_SDA_2 3u  // PIN_A3
+#define PINS_WIRE0_SCL  (pin_size_t[]){2u, 15u, 19u}
+#define PINS_WIRE0_SDA  (pin_size_t[]){20u, 16u, 3u}

 // Serial ports
 // ------------
@@ -44,14 +50,21 @@
 #define PIN_SERIAL2_RTS  20u // PIN_A20
 #define PIN_SERIAL2_RX   15u // PIN_A15
 #define PIN_SERIAL2_TX   16u // PIN_A16
+#define PINS_SERIAL0_RX  (pin_size_t[]){13u}
+#define PINS_SERIAL0_TX  (pin_size_t[]){14u}
+#define PINS_SERIAL1_CTS (pin_size_t[]){4u}
+#define PINS_SERIAL1_RX  (pin_size_t[]){2u, 0u}
+#define PINS_SERIAL1_TX  (pin_size_t[]){3u, 1u}
+#define PINS_SERIAL2_CTS (pin_size_t[]){19u}
+#define PINS_SERIAL2_RTS (pin_size_t[]){20u}
+#define PINS_SERIAL2_RX  (pin_size_t[]){15u}
+#define PINS_SERIAL2_TX  (pin_size_t[]){16u}

 // Pin function macros
 // -------------------
-#define PIN_CS0   15u // PIN_A15
 #define PIN_CTS1  4u  // PIN_A4
 #define PIN_CTS2  19u // PIN_A19
 #define PIN_MISO0 20u // PIN_A20
-#define PIN_MOSI0 19u // PIN_A19
 #define PIN_PA00  0u  // PIN_A0
 #define PIN_PA01  1u  // PIN_A1
 #define PIN_PA02  2u  // PIN_A2
@@ -65,23 +78,15 @@
 #define PIN_PA18  18u // PIN_A18
 #define PIN_PA19  19u // PIN_A19
 #define PIN_PA20  20u // PIN_A20
-#define PIN_PWM0  0u  // PIN_A0
 #define PIN_PWM1  1u  // PIN_A1
-#define PIN_PWM2  14u // PIN_A14
-#define PIN_PWM3  3u  // PIN_A3
-#define PIN_PWM4  16u // PIN_A16
 #define PIN_PWM5  17u // PIN_A17
 #define PIN_PWM6  18u // PIN_A18
-#define PIN_PWM7  13u // PIN_A13
 #define PIN_RTS2  20u // PIN_A20
 #define PIN_RX0   13u // PIN_A13
-#define PIN_RX1   0u  // PIN_A0
 #define PIN_RX2   15u // PIN_A15
-#define PIN_SCK0  3u  // PIN_A3
 #define PIN_SCL0  19u // PIN_A19
 #define PIN_SDA0  3u  // PIN_A3
 #define PIN_TX0   14u // PIN_A14
-#define PIN_TX1   1u  // PIN_A1
 #define PIN_TX2   16u // PIN_A16

 // Port availability
--- a/boards/variants/cb1s.h
+++ b/boards/variants/cb1s.h
@@ -14,17 +14,25 @@

 // Wire Interfaces
 // ---------------
-#define PIN_WIRE1_SCL 20u // GPIO20
-#define PIN_WIRE1_SDA 21u // GPIO21
-#define PIN_WIRE2_SCL 0u  // GPIO0
-#define PIN_WIRE2_SDA 1u  // GPIO1
+#define PIN_WIRE1_SCL  20u // GPIO20
+#define PIN_WIRE1_SDA  21u // GPIO21
+#define PIN_WIRE2_SCL  0u  // GPIO0
+#define PIN_WIRE2_SDA  1u  // GPIO1
+#define PINS_WIRE1_SCL (pin_size_t[]){20u}
+#define PINS_WIRE1_SDA (pin_size_t[]){21u}
+#define PINS_WIRE2_SCL (pin_size_t[]){0u}
+#define PINS_WIRE2_SDA (pin_size_t[]){1u}

 // Serial ports
 // ------------
-#define PIN_SERIAL1_RX 10u // GPIO10
-#define PIN_SERIAL1_TX 11u // GPIO11
-#define PIN_SERIAL2_RX 1u  // GPIO1
-#define PIN_SERIAL2_TX 0u  // GPIO0
+#define PIN_SERIAL1_RX  10u // GPIO10
+#define PIN_SERIAL1_TX  11u // GPIO11
+#define PIN_SERIAL2_RX  1u  // GPIO1
+#define PIN_SERIAL2_TX  0u  // GPIO0
+#define PINS_SERIAL1_RX (pin_size_t[]){10u}
+#define PINS_SERIAL1_TX (pin_size_t[]){11u}
+#define PINS_SERIAL2_RX (pin_size_t[]){1u}
+#define PINS_SERIAL2_TX (pin_size_t[]){0u}

 // Pin function macros
 // -------------------
--- a/boards/variants/cb2l.h
+++ b/boards/variants/cb2l.h
@@ -14,9 +14,12 @@

 // Serial ports
 // ------------
-#define PIN_SERIAL1_RX 10u // GPIO10
-#define PIN_SERIAL1_TX 11u // GPIO11
-#define PIN_SERIAL2_TX 0u  // GPIO0
+#define PIN_SERIAL1_RX  10u // GPIO10
+#define PIN_SERIAL1_TX  11u // GPIO11
+#define PIN_SERIAL2_TX  0u  // GPIO0
+#define PINS_SERIAL1_RX (pin_size_t[]){10u}
+#define PINS_SERIAL1_TX (pin_size_t[]){11u}
+#define PINS_SERIAL2_TX (pin_size_t[]){0u}

 // Pin function macros
 // -------------------
--- a/boards/variants/cb2s.h
+++ b/boards/variants/cb2s.h
@@ -14,15 +14,21 @@

 // Wire Interfaces
 // ---------------
-#define PIN_WIRE2_SCL 0u // GPIO0
-#define PIN_WIRE2_SDA 1u // GPIO1
+#define PIN_WIRE2_SCL  0u // GPIO0
+#define PIN_WIRE2_SDA  1u // GPIO1
+#define PINS_WIRE2_SCL (pin_size_t[]){0u}
+#define PINS_WIRE2_SDA (pin_size_t[]){1u}

 // Serial ports
 // ------------
-#define PIN_SERIAL1_RX 10u // GPIO10
-#define PIN_SERIAL1_TX 11u // GPIO11
-#define PIN_SERIAL2_RX 1u  // GPIO1
-#define PIN_SERIAL2_TX 0u  // GPIO0
+#define PIN_SERIAL1_RX  10u // GPIO10
+#define PIN_SERIAL1_TX  11u // GPIO11
+#define PIN_SERIAL2_RX  1u  // GPIO1
+#define PIN_SERIAL2_TX  0u  // GPIO0
+#define PINS_SERIAL1_RX (pin_size_t[]){10u}
+#define PINS_SERIAL1_TX (pin_size_t[]){11u}
+#define PINS_SERIAL2_RX (pin_size_t[]){1u}
+#define PINS_SERIAL2_TX (pin_size_t[]){0u}

 // Pin function macros
 // -------------------
--- a/boards/variants/cb3l.h
+++ b/boards/variants/cb3l.h
@@ -14,9 +14,12 @@

 // Serial ports
 // ------------
-#define PIN_SERIAL1_RX 10u // GPIO10
-#define PIN_SERIAL1_TX 11u // GPIO11
-#define PIN_SERIAL2_TX 0u  // GPIO0
+#define PIN_SERIAL1_RX  10u // GPIO10
+#define PIN_SERIAL1_TX  11u // GPIO11
+#define PIN_SERIAL2_TX  0u  // GPIO0
+#define PINS_SERIAL1_RX (pin_size_t[]){10u}
+#define PINS_SERIAL1_TX (pin_size_t[]){11u}
+#define PINS_SERIAL2_TX (pin_size_t[]){0u}

 // Pin function macros
 // -------------------
--- a/boards/variants/cb3s.h
+++ b/boards/variants/cb3s.h
@@ -17,12 +17,17 @@
 #define PIN_WIRE1_SCL   20u // GPIO20
 #define PIN_WIRE1_SDA_0 21u // GPIO21
 #define PIN_WIRE1_SDA_1 21u // GPIO21
+#define PINS_WIRE1_SCL  (pin_size_t[]){20u}
+#define PINS_WIRE1_SDA  (pin_size_t[]){21u, 21u}

 // Serial ports
 // ------------
-#define PIN_SERIAL1_RX 10u // GPIO10
-#define PIN_SERIAL1_TX 11u // GPIO11
-#define PIN_SERIAL2_TX 0u  // GPIO0
+#define PIN_SERIAL1_RX  10u // GPIO10
+#define PIN_SERIAL1_TX  11u // GPIO11
+#define PIN_SERIAL2_TX  0u  // GPIO0
+#define PINS_SERIAL1_RX (pin_size_t[]){10u}
+#define PINS_SERIAL1_TX (pin_size_t[]){11u}
+#define PINS_SERIAL2_TX (pin_size_t[]){0u}

 // Pin function macros
 // -------------------
--- a/boards/variants/cb3se.h
+++ b/boards/variants/cb3se.h
@@ -14,15 +14,21 @@

 // Wire Interfaces
 // ---------------
-#define PIN_WIRE2_SCL 0u // GPIO0
-#define PIN_WIRE2_SDA 1u // GPIO1
+#define PIN_WIRE2_SCL  0u // GPIO0
+#define PIN_WIRE2_SDA  1u // GPIO1
+#define PINS_WIRE2_SCL (pin_size_t[]){0u}
+#define PINS_WIRE2_SDA (pin_size_t[]){1u}

 // Serial ports
 // ------------
-#define PIN_SERIAL1_RX 10u // GPIO10
-#define PIN_SERIAL1_TX 11u // GPIO11
-#define PIN_SERIAL2_RX 1u  // GPIO1
-#define PIN_SERIAL2_TX 0u  // GPIO0
+#define PIN_SERIAL1_RX  10u // GPIO10
+#define PIN_SERIAL1_TX  11u // GPIO11
+#define PIN_SERIAL2_RX  1u  // GPIO1
+#define PIN_SERIAL2_TX  0u  // GPIO0
+#define PINS_SERIAL1_RX (pin_size_t[]){10u}
+#define PINS_SERIAL1_TX (pin_size_t[]){11u}
+#define PINS_SERIAL2_RX (pin_size_t[]){1u}
+#define PINS_SERIAL2_TX (pin_size_t[]){0u}

 // Pin function macros
 // -------------------
--- a/boards/variants/cblc5.h
+++ b/boards/variants/cblc5.h
@@ -14,15 +14,21 @@

 // Wire Interfaces
 // ---------------
-#define PIN_WIRE2_SCL 0u // GPIO0
-#define PIN_WIRE2_SDA 1u // GPIO1
+#define PIN_WIRE2_SCL  0u // GPIO0
+#define PIN_WIRE2_SDA  1u // GPIO1
+#define PINS_WIRE2_SCL (pin_size_t[]){0u}
+#define PINS_WIRE2_SDA (pin_size_t[]){1u}

 // Serial ports
 // ------------
-#define PIN_SERIAL1_RX 10u // GPIO10
-#define PIN_SERIAL1_TX 11u // GPIO11
-#define PIN_SERIAL2_RX 1u  // GPIO1
-#define PIN_SERIAL2_TX 0u  // GPIO0
+#define PIN_SERIAL1_RX  10u // GPIO10
+#define PIN_SERIAL1_TX  11u // GPIO11
+#define PIN_SERIAL2_RX  1u  // GPIO1
+#define PIN_SERIAL2_TX  0u  // GPIO0
+#define PINS_SERIAL1_RX (pin_size_t[]){10u}
+#define PINS_SERIAL1_TX (pin_size_t[]){11u}
+#define PINS_SERIAL2_RX (pin_size_t[]){1u}
+#define PINS_SERIAL2_TX (pin_size_t[]){0u}

 // Pin function macros
 // -------------------
--- a/boards/variants/cbu.h
+++ b/boards/variants/cbu.h
@@ -14,17 +14,25 @@

 // Wire Interfaces
 // ---------------
-#define PIN_WIRE1_SCL 20u // GPIO20
-#define PIN_WIRE1_SDA 21u // GPIO21
-#define PIN_WIRE2_SCL 0u  // GPIO0
-#define PIN_WIRE2_SDA 1u  // GPIO1
+#define PIN_WIRE1_SCL  20u // GPIO20
+#define PIN_WIRE1_SDA  21u // GPIO21
+#define PIN_WIRE2_SCL  0u  // GPIO0
+#define PIN_WIRE2_SDA  1u  // GPIO1
+#define PINS_WIRE1_SCL (pin_size_t[]){20u}
+#define PINS_WIRE1_SDA (pin_size_t[]){21u}
+#define PINS_WIRE2_SCL (pin_size_t[]){0u}
+#define PINS_WIRE2_SDA (pin_size_t[]){1u}

 // Serial ports
 // ------------
-#define PIN_SERIAL1_RX 10u // GPIO10
-#define PIN_SERIAL1_TX 11u // GPIO11
-#define PIN_SERIAL2_RX 1u  // GPIO1
-#define PIN_SERIAL2_TX 0u  // GPIO0
+#define PIN_SERIAL1_RX  10u // GPIO10
+#define PIN_SERIAL1_TX  11u // GPIO11
+#define PIN_SERIAL2_RX  1u  // GPIO1
+#define PIN_SERIAL2_TX  0u  // GPIO0
+#define PINS_SERIAL1_RX (pin_size_t[]){10u}
+#define PINS_SERIAL1_TX (pin_size_t[]){11u}
+#define PINS_SERIAL2_RX (pin_size_t[]){1u}
+#define PINS_SERIAL2_TX (pin_size_t[]){0u}

 // Pin function macros
 // -------------------
--- a/boards/variants/generic-bk7231n-qfn32-tuya.h
+++ b/boards/variants/generic-bk7231n-qfn32-tuya.h
@@ -14,17 +14,25 @@

 // Wire Interfaces
 // ---------------
-#define PIN_WIRE1_SCL 20u // GPIO20
-#define PIN_WIRE1_SDA 21u // GPIO21
-#define PIN_WIRE2_SCL 0u  // GPIO0
-#define PIN_WIRE2_SDA 1u  // GPIO1
+#define PIN_WIRE1_SCL  20u // GPIO20
+#define PIN_WIRE1_SDA  21u // GPIO21
+#define PIN_WIRE2_SCL  0u  // GPIO0
+#define PIN_WIRE2_SDA  1u  // GPIO1
+#define PINS_WIRE1_SCL (pin_size_t[]){20u}
+#define PINS_WIRE1_SDA (pin_size_t[]){21u}
+#define PINS_WIRE2_SCL (pin_size_t[]){0u}
+#define PINS_WIRE2_SDA (pin_size_t[]){1u}

 // Serial ports
 // ------------
-#define PIN_SERIAL1_RX 10u // GPIO10
-#define PIN_SERIAL1_TX 11u // GPIO11
-#define PIN_SERIAL2_RX 1u  // GPIO1
-#define PIN_SERIAL2_TX 0u  // GPIO0
+#define PIN_SERIAL1_RX  10u // GPIO10
+#define PIN_SERIAL1_TX  11u // GPIO11
+#define PIN_SERIAL2_RX  1u  // GPIO1
+#define PIN_SERIAL2_TX  0u  // GPIO0
+#define PINS_SERIAL1_RX (pin_size_t[]){10u}
+#define PINS_SERIAL1_TX (pin_size_t[]){11u}
+#define PINS_SERIAL2_RX (pin_size_t[]){1u}
+#define PINS_SERIAL2_TX (pin_size_t[]){0u}

 // Pin function macros
 // -------------------
--- a/boards/variants/generic-bk7231t-qfn32-tuya.h
+++ b/boards/variants/generic-bk7231t-qfn32-tuya.h
@@ -14,17 +14,25 @@

 // Wire Interfaces
 // ---------------
-#define PIN_WIRE1_SCL 20u // GPIO20
-#define PIN_WIRE1_SDA 21u // GPIO21
-#define PIN_WIRE2_SCL 0u  // GPIO0
-#define PIN_WIRE2_SDA 1u  // GPIO1
+#define PIN_WIRE1_SCL  20u // GPIO20
+#define PIN_WIRE1_SDA  21u // GPIO21
+#define PIN_WIRE2_SCL  0u  // GPIO0
+#define PIN_WIRE2_SDA  1u  // GPIO1
+#define PINS_WIRE1_SCL (pin_size_t[]){20u}
+#define PINS_WIRE1_SDA (pin_size_t[]){21u}
+#define PINS_WIRE2_SCL (pin_size_t[]){0u}
+#define PINS_WIRE2_SDA (pin_size_t[]){1u}

 // Serial ports
 // ------------
-#define PIN_SERIAL1_RX 10u // GPIO10
-#define PIN_SERIAL1_TX 11u // GPIO11
-#define PIN_SERIAL2_RX 1u  // GPIO1
-#define PIN_SERIAL2_TX 0u  // GPIO0
+#define PIN_SERIAL1_RX  10u // GPIO10
+#define PIN_SERIAL1_TX  11u // GPIO11
+#define PIN_SERIAL2_RX  1u  // GPIO1
+#define PIN_SERIAL2_TX  0u  // GPIO0
+#define PINS_SERIAL1_RX (pin_size_t[]){10u}
+#define PINS_SERIAL1_TX (pin_size_t[]){11u}
+#define PINS_SERIAL2_RX (pin_size_t[]){1u}
+#define PINS_SERIAL2_TX (pin_size_t[]){0u}

 // Pin function macros
 // -------------------
--- a/boards/variants/generic-bk7252.h
+++ b/boards/variants/generic-bk7252.h
@@ -14,19 +14,29 @@

 // Wire Interfaces
 // ---------------
-#define PIN_WIRE1_SCL 20u // GPIO20
-#define PIN_WIRE1_SDA 21u // GPIO21
-#define PIN_WIRE2_SCL 0u  // GPIO0
-#define PIN_WIRE2_SDA 1u  // GPIO1
+#define PIN_WIRE1_SCL  20u // GPIO20
+#define PIN_WIRE1_SDA  21u // GPIO21
+#define PIN_WIRE2_SCL  0u  // GPIO0
+#define PIN_WIRE2_SDA  1u  // GPIO1
+#define PINS_WIRE1_SCL (pin_size_t[]){20u}
+#define PINS_WIRE1_SDA (pin_size_t[]){21u}
+#define PINS_WIRE2_SCL (pin_size_t[]){0u}
+#define PINS_WIRE2_SDA (pin_size_t[]){1u}

 // Serial ports
 // ------------
-#define PIN_SERIAL1_CTS 12u // GPIO12
-#define PIN_SERIAL1_RTS 13u // GPIO13
-#define PIN_SERIAL1_RX  10u // GPIO10
-#define PIN_SERIAL1_TX  11u // GPIO11
-#define PIN_SERIAL2_RX  1u  // GPIO1
-#define PIN_SERIAL2_TX  0u  // GPIO0
+#define PIN_SERIAL1_CTS  12u // GPIO12
+#define PIN_SERIAL1_RTS  13u // GPIO13
+#define PIN_SERIAL1_RX   10u // GPIO10
+#define PIN_SERIAL1_TX   11u // GPIO11
+#define PIN_SERIAL2_RX   1u  // GPIO1
+#define PIN_SERIAL2_TX   0u  // GPIO0
+#define PINS_SERIAL1_CTS (pin_size_t[]){12u}
+#define PINS_SERIAL1_RTS (pin_size_t[]){13u}
+#define PINS_SERIAL1_RX  (pin_size_t[]){10u}
+#define PINS_SERIAL1_TX  (pin_size_t[]){11u}
+#define PINS_SERIAL2_RX  (pin_size_t[]){1u}
+#define PINS_SERIAL2_TX  (pin_size_t[]){0u}

 // Pin function macros
 // -------------------
--- a/boards/variants/generic-rtl8710bn-2mb-468k.h
+++ b/boards/variants/generic-rtl8710bn-2mb-468k.h
@@ -14,14 +14,22 @@

 // SPI Interfaces
 // --------------
-#define PIN_SPI0_CS   19u // PA_19
-#define PIN_SPI0_MISO 22u // PA_22
-#define PIN_SPI0_MOSI 23u // PA_23
-#define PIN_SPI0_SCK  18u // PA_18
-#define PIN_SPI1_CS   19u // PA_19
-#define PIN_SPI1_MISO 22u // PA_22
-#define PIN_SPI1_MOSI 23u // PA_23
-#define PIN_SPI1_SCK  18u // PA_18
+#define PIN_SPI0_CS    19u // PA_19
+#define PIN_SPI0_MISO  22u // PA_22
+#define PIN_SPI0_MOSI  23u // PA_23
+#define PIN_SPI0_SCK   18u // PA_18
+#define PIN_SPI1_CS    19u // PA_19
+#define PIN_SPI1_MISO  22u // PA_22
+#define PIN_SPI1_MOSI  23u // PA_23
+#define PIN_SPI1_SCK   18u // PA_18
+#define PINS_SPI0_CS   (pin_size_t[]){19u}
+#define PINS_SPI0_MISO (pin_size_t[]){22u}
+#define PINS_SPI0_MOSI (pin_size_t[]){23u}
+#define PINS_SPI0_SCK  (pin_size_t[]){18u}
+#define PINS_SPI1_CS   (pin_size_t[]){19u}
+#define PINS_SPI1_MISO (pin_size_t[]){22u}
+#define PINS_SPI1_MOSI (pin_size_t[]){23u}
+#define PINS_SPI1_SCK  (pin_size_t[]){18u}

 // Wire Interfaces
 // ---------------
@@ -31,15 +39,25 @@
 #define PIN_WIRE0_SDA_1 30u // PA_30
 #define PIN_WIRE1_SCL   18u // PA_18
 #define PIN_WIRE1_SDA   23u // PA_23
+#define PINS_WIRE0_SCL  (pin_size_t[]){22u, 29u}
+#define PINS_WIRE0_SDA  (pin_size_t[]){19u, 30u}
+#define PINS_WIRE1_SCL  (pin_size_t[]){18u}
+#define PINS_WIRE1_SDA  (pin_size_t[]){23u}

 // Serial ports
 // ------------
-#define PIN_SERIAL0_CTS 19u // PA_19
-#define PIN_SERIAL0_RTS 22u // PA_22
-#define PIN_SERIAL0_RX  18u // PA_18
-#define PIN_SERIAL0_TX  23u // PA_23
-#define PIN_SERIAL2_RX  29u // PA_29
-#define PIN_SERIAL2_TX  30u // PA_30
+#define PIN_SERIAL0_CTS  19u // PA_19
+#define PIN_SERIAL0_RTS  22u // PA_22
+#define PIN_SERIAL0_RX   18u // PA_18
+#define PIN_SERIAL0_TX   23u // PA_23
+#define PIN_SERIAL2_RX   29u // PA_29
+#define PIN_SERIAL2_TX   30u // PA_30
+#define PINS_SERIAL0_CTS (pin_size_t[]){19u}
+#define PINS_SERIAL0_RTS (pin_size_t[]){22u}
+#define PINS_SERIAL0_RX  (pin_size_t[]){18u}
+#define PINS_SERIAL0_TX  (pin_size_t[]){23u}
+#define PINS_SERIAL2_RX  (pin_size_t[]){29u}
+#define PINS_SERIAL2_TX  (pin_size_t[]){30u}

 // Pin function macros
 // -------------------
@@ -75,7 +93,6 @@
 #define PIN_PA23  23u // PA_23
 #define PIN_PA29  29u // PA_29
 #define PIN_PA30  30u // PA_30
-#define PIN_PWM0  23u // PA_23
 #define PIN_PWM1  15u // PA_15
 #define PIN_PWM2  0u  // PA_0
 #define PIN_PWM3  12u // PA_12
@@ -86,9 +103,7 @@
 #define PIN_RX2   29u // PA_29
 #define PIN_SCK0  18u // PA_18
 #define PIN_SCK1  18u // PA_18
-#define PIN_SCL0  29u // PA_29
 #define PIN_SCL1  18u // PA_18
-#define PIN_SDA0  30u // PA_30
 #define PIN_SDA1  23u // PA_23
 #define PIN_TX0   23u // PA_23
 #define PIN_TX2   30u // PA_30
--- a/boards/variants/generic-rtl8710bn-2mb-788k.h
+++ b/boards/variants/generic-rtl8710bn-2mb-788k.h
@@ -14,14 +14,22 @@

 // SPI Interfaces
 // --------------
-#define PIN_SPI0_CS   19u // PA_19
-#define PIN_SPI0_MISO 22u // PA_22
-#define PIN_SPI0_MOSI 23u // PA_23
-#define PIN_SPI0_SCK  18u // PA_18
-#define PIN_SPI1_CS   19u // PA_19
-#define PIN_SPI1_MISO 22u // PA_22
-#define PIN_SPI1_MOSI 23u // PA_23
-#define PIN_SPI1_SCK  18u // PA_18
+#define PIN_SPI0_CS    19u // PA_19
+#define PIN_SPI0_MISO  22u // PA_22
+#define PIN_SPI0_MOSI  23u // PA_23
+#define PIN_SPI0_SCK   18u // PA_18
+#define PIN_SPI1_CS    19u // PA_19
+#define PIN_SPI1_MISO  22u // PA_22
+#define PIN_SPI1_MOSI  23u // PA_23
+#define PIN_SPI1_SCK   18u // PA_18
+#define PINS_SPI0_CS   (pin_size_t[]){19u}
+#define PINS_SPI0_MISO (pin_size_t[]){22u}
+#define PINS_SPI0_MOSI (pin_size_t[]){23u}
+#define PINS_SPI0_SCK  (pin_size_t[]){18u}
+#define PINS_SPI1_CS   (pin_size_t[]){19u}
+#define PINS_SPI1_MISO (pin_size_t[]){22u}
+#define PINS_SPI1_MOSI (pin_size_t[]){23u}
+#define PINS_SPI1_SCK  (pin_size_t[]){18u}

 // Wire Interfaces
 // ---------------
@@ -31,15 +39,25 @@
 #define PIN_WIRE0_SDA_1 30u // PA_30
 #define PIN_WIRE1_SCL   18u // PA_18
 #define PIN_WIRE1_SDA   23u // PA_23
+#define PINS_WIRE0_SCL  (pin_size_t[]){22u, 29u}
+#define PINS_WIRE0_SDA  (pin_size_t[]){19u, 30u}
+#define PINS_WIRE1_SCL  (pin_size_t[]){18u}
+#define PINS_WIRE1_SDA  (pin_size_t[]){23u}

 // Serial ports
 // ------------
-#define PIN_SERIAL0_CTS 19u // PA_19
-#define PIN_SERIAL0_RTS 22u // PA_22
-#define PIN_SERIAL0_RX  18u // PA_18
-#define PIN_SERIAL0_TX  23u // PA_23
-#define PIN_SERIAL2_RX  29u // PA_29
-#define PIN_SERIAL2_TX  30u // PA_30
+#define PIN_SERIAL0_CTS  19u // PA_19
+#define PIN_SERIAL0_RTS  22u // PA_22
+#define PIN_SERIAL0_RX   18u // PA_18
+#define PIN_SERIAL0_TX   23u // PA_23
+#define PIN_SERIAL2_RX   29u // PA_29
+#define PIN_SERIAL2_TX   30u // PA_30
+#define PINS_SERIAL0_CTS (pin_size_t[]){19u}
+#define PINS_SERIAL0_RTS (pin_size_t[]){22u}
+#define PINS_SERIAL0_RX  (pin_size_t[]){18u}
+#define PINS_SERIAL0_TX  (pin_size_t[]){23u}
+#define PINS_SERIAL2_RX  (pin_size_t[]){29u}
+#define PINS_SERIAL2_TX  (pin_size_t[]){30u}

 // Pin function macros
 // -------------------
@@ -75,7 +93,6 @@
 #define PIN_PA23  23u // PA_23
 #define PIN_PA29  29u // PA_29
 #define PIN_PA30  30u // PA_30
-#define PIN_PWM0  23u // PA_23
 #define PIN_PWM1  15u // PA_15
 #define PIN_PWM2  0u  // PA_0
 #define PIN_PWM3  12u // PA_12
@@ -86,9 +103,7 @@
 #define PIN_RX2   29u // PA_29
 #define PIN_SCK0  18u // PA_18
 #define PIN_SCK1  18u // PA_18
-#define PIN_SCL0  29u // PA_29
 #define PIN_SCL1  18u // PA_18
-#define PIN_SDA0  30u // PA_30
 #define PIN_SDA1  23u // PA_23
 #define PIN_TX0   23u // PA_23
 #define PIN_TX2   30u // PA_30
--- a/boards/variants/generic-rtl8710bx-4mb-980k.h
+++ b/boards/variants/generic-rtl8710bx-4mb-980k.h
@@ -14,14 +14,22 @@

 // SPI Interfaces
 // --------------
-#define PIN_SPI0_CS   19u // PA_19
-#define PIN_SPI0_MISO 22u // PA_22
-#define PIN_SPI0_MOSI 23u // PA_23
-#define PIN_SPI0_SCK  18u // PA_18
-#define PIN_SPI1_CS   19u // PA_19
-#define PIN_SPI1_MISO 22u // PA_22
-#define PIN_SPI1_MOSI 23u // PA_23
-#define PIN_SPI1_SCK  18u // PA_18
+#define PIN_SPI0_CS    19u // PA_19
+#define PIN_SPI0_MISO  22u // PA_22
+#define PIN_SPI0_MOSI  23u // PA_23
+#define PIN_SPI0_SCK   18u // PA_18
+#define PIN_SPI1_CS    19u // PA_19
+#define PIN_SPI1_MISO  22u // PA_22
+#define PIN_SPI1_MOSI  23u // PA_23
+#define PIN_SPI1_SCK   18u // PA_18
+#define PINS_SPI0_CS   (pin_size_t[]){19u}
+#define PINS_SPI0_MISO (pin_size_t[]){22u}
+#define PINS_SPI0_MOSI (pin_size_t[]){23u}
+#define PINS_SPI0_SCK  (pin_size_t[]){18u}
+#define PINS_SPI1_CS   (pin_size_t[]){19u}
+#define PINS_SPI1_MISO (pin_size_t[]){22u}
+#define PINS_SPI1_MOSI (pin_size_t[]){23u}
+#define PINS_SPI1_SCK  (pin_size_t[]){18u}

 // Wire Interfaces
 // ---------------
@@ -31,15 +39,25 @@
 #define PIN_WIRE0_SDA_1 30u // PA_30
 #define PIN_WIRE1_SCL   18u // PA_18
 #define PIN_WIRE1_SDA   23u // PA_23
+#define PINS_WIRE0_SCL  (pin_size_t[]){22u, 29u}
+#define PINS_WIRE0_SDA  (pin_size_t[]){19u, 30u}
+#define PINS_WIRE1_SCL  (pin_size_t[]){18u}
+#define PINS_WIRE1_SDA  (pin_size_t[]){23u}

 // Serial ports
 // ------------
-#define PIN_SERIAL0_CTS 19u // PA_19
-#define PIN_SERIAL0_RTS 22u // PA_22
-#define PIN_SERIAL0_RX  18u // PA_18
-#define PIN_SERIAL0_TX  23u // PA_23
-#define PIN_SERIAL2_RX  29u // PA_29
-#define PIN_SERIAL2_TX  30u // PA_30
+#define PIN_SERIAL0_CTS  19u // PA_19
+#define PIN_SERIAL0_RTS  22u // PA_22
+#define PIN_SERIAL0_RX   18u // PA_18
+#define PIN_SERIAL0_TX   23u // PA_23
+#define PIN_SERIAL2_RX   29u // PA_29
+#define PIN_SERIAL2_TX   30u // PA_30
+#define PINS_SERIAL0_CTS (pin_size_t[]){19u}
+#define PINS_SERIAL0_RTS (pin_size_t[]){22u}
+#define PINS_SERIAL0_RX  (pin_size_t[]){18u}
+#define PINS_SERIAL0_TX  (pin_size_t[]){23u}
+#define PINS_SERIAL2_RX  (pin_size_t[]){29u}
+#define PINS_SERIAL2_TX  (pin_size_t[]){30u}

 // Pin function macros
 // -------------------
@@ -74,7 +92,6 @@
 #define PIN_PA23  23u // PA_23
 #define PIN_PA29  29u // PA_29
 #define PIN_PA30  30u // PA_30
-#define PIN_PWM0  23u // PA_23
 #define PIN_PWM1  15u // PA_15
 #define PIN_PWM2  0u  // PA_0
 #define PIN_PWM3  12u // PA_12
@@ -85,9 +102,7 @@
 #define PIN_RX2   29u // PA_29
 #define PIN_SCK0  18u // PA_18
 #define PIN_SCK1  18u // PA_18
-#define PIN_SCL0  29u // PA_29
 #define PIN_SCL1  18u // PA_18
-#define PIN_SDA0  30u // PA_30
 #define PIN_SDA1  23u // PA_23
 #define PIN_TX0   23u // PA_23
 #define PIN_TX2   30u // PA_30
--- a/boards/variants/generic-rtl8720cf-2mb-992k.h
+++ b/boards/variants/generic-rtl8720cf-2mb-992k.h
@@ -25,6 +25,10 @@
 #define PIN_SPI0_SCK_0  3u  // PIN_A3
 #define PIN_SPI0_SCK_1  8u  // PIN_A8
 #define PIN_SPI0_SCK_2  16u // PIN_A16
+#define PINS_SPI0_CS    (pin_size_t[]){2u, 7u, 15u}
+#define PINS_SPI0_MISO  (pin_size_t[]){10u, 20u}
+#define PINS_SPI0_MOSI  (pin_size_t[]){4u, 9u, 19u}
+#define PINS_SPI0_SCK   (pin_size_t[]){3u, 8u, 16u}

 // Wire Interfaces
 // ---------------
@@ -36,6 +40,8 @@
 #define PIN_WIRE0_SDA_1 12u // PIN_A12
 #define PIN_WIRE0_SDA_2 16u // PIN_A16
 #define PIN_WIRE0_SDA_3 20u // PIN_A20
+#define PINS_WIRE0_SCL  (pin_size_t[]){2u, 11u, 15u, 19u}
+#define PINS_WIRE0_SDA  (pin_size_t[]){3u, 12u, 16u, 20u}

 // Serial ports
 // ------------
@@ -54,6 +60,17 @@
 #define PIN_SERIAL2_RTS  20u // PIN_A20
 #define PIN_SERIAL2_RX   15u // PIN_A15
 #define PIN_SERIAL2_TX   16u // PIN_A16
+#define PINS_SERIAL0_CTS (pin_size_t[]){10u}
+#define PINS_SERIAL0_RTS (pin_size_t[]){9u}
+#define PINS_SERIAL0_RX  (pin_size_t[]){12u, 13u}
+#define PINS_SERIAL0_TX  (pin_size_t[]){11u, 14u}
+#define PINS_SERIAL1_CTS (pin_size_t[]){4u}
+#define PINS_SERIAL1_RX  (pin_size_t[]){0u, 2u}
+#define PINS_SERIAL1_TX  (pin_size_t[]){1u, 3u}
+#define PINS_SERIAL2_CTS (pin_size_t[]){19u}
+#define PINS_SERIAL2_RTS (pin_size_t[]){20u}
+#define PINS_SERIAL2_RX  (pin_size_t[]){15u}
+#define PINS_SERIAL2_TX  (pin_size_t[]){16u}

 // Pin function macros
 // -------------------
@@ -61,7 +78,6 @@
 #define PIN_CTS0  10u // PIN_A10
 #define PIN_CTS1  4u  // PIN_A4
 #define PIN_CTS2  19u // PIN_A19
-#define PIN_MISO0 20u // PIN_A20
 #define PIN_MOSI0 19u // PIN_A19
 #define PIN_PA00  0u  // PIN_A0
 #define PIN_PA01  1u  // PIN_A1
@@ -84,23 +100,13 @@
 #define PIN_PA20  20u // PIN_A20
 #define PIN_PA23  23u // PIN_A23
 #define PIN_PWM0  20u // PIN_A20
-#define PIN_PWM1  12u // PIN_A12
-#define PIN_PWM2  14u // PIN_A14
-#define PIN_PWM3  15u // PIN_A15
-#define PIN_PWM4  16u // PIN_A16
 #define PIN_PWM5  17u // PIN_A17
 #define PIN_PWM6  18u // PIN_A18
 #define PIN_PWM7  23u // PIN_A23
 #define PIN_RTS0  9u  // PIN_A9
 #define PIN_RTS2  20u // PIN_A20
-#define PIN_RX0   13u // PIN_A13
-#define PIN_RX1   2u  // PIN_A2
 #define PIN_RX2   15u // PIN_A15
 #define PIN_SCK0  16u // PIN_A16
-#define PIN_SCL0  19u // PIN_A19
-#define PIN_SDA0  20u // PIN_A20
-#define PIN_TX0   14u // PIN_A14
-#define PIN_TX1   3u  // PIN_A3
 #define PIN_TX2   16u // PIN_A16

 // Port availability
--- a/boards/variants/lsc-lma35-t.h
+++ b/boards/variants/lsc-lma35-t.h
@@ -14,15 +14,21 @@

 // Wire Interfaces
 // ---------------
-#define PIN_WIRE2_SCL 0u // GPIO0
-#define PIN_WIRE2_SDA 1u // GPIO1
+#define PIN_WIRE2_SCL  0u // GPIO0
+#define PIN_WIRE2_SDA  1u // GPIO1
+#define PINS_WIRE2_SCL (pin_size_t[]){0u}
+#define PINS_WIRE2_SDA (pin_size_t[]){1u}

 // Serial ports
 // ------------
-#define PIN_SERIAL1_RX 10u // GPIO10
-#define PIN_SERIAL1_TX 11u // GPIO11
-#define PIN_SERIAL2_RX 1u  // GPIO1
-#define PIN_SERIAL2_TX 0u  // GPIO0
+#define PIN_SERIAL1_RX  10u // GPIO10
+#define PIN_SERIAL1_TX  11u // GPIO11
+#define PIN_SERIAL2_RX  1u  // GPIO1
+#define PIN_SERIAL2_TX  0u  // GPIO0
+#define PINS_SERIAL1_RX (pin_size_t[]){10u}
+#define PINS_SERIAL1_TX (pin_size_t[]){11u}
+#define PINS_SERIAL2_RX (pin_size_t[]){1u}
+#define PINS_SERIAL2_TX (pin_size_t[]){0u}

 // Pin function macros
 // -------------------
--- a/boards/variants/lsc-lma35.h
+++ b/boards/variants/lsc-lma35.h
@@ -14,15 +14,21 @@

 // Wire Interfaces
 // ---------------
-#define PIN_WIRE2_SCL 0u // GPIO0
-#define PIN_WIRE2_SDA 1u // GPIO1
+#define PIN_WIRE2_SCL  0u // GPIO0
+#define PIN_WIRE2_SDA  1u // GPIO1
+#define PINS_WIRE2_SCL (pin_size_t[]){0u}
+#define PINS_WIRE2_SDA (pin_size_t[]){1u}

 // Serial ports
 // ------------
-#define PIN_SERIAL1_RX 10u // GPIO10
-#define PIN_SERIAL1_TX 11u // GPIO11
-#define PIN_SERIAL2_RX 1u  // GPIO1
-#define PIN_SERIAL2_TX 0u  // GPIO0
+#define PIN_SERIAL1_RX  10u // GPIO10
+#define PIN_SERIAL1_TX  11u // GPIO11
+#define PIN_SERIAL2_RX  1u  // GPIO1
+#define PIN_SERIAL2_TX  0u  // GPIO0
+#define PINS_SERIAL1_RX (pin_size_t[]){10u}
+#define PINS_SERIAL1_TX (pin_size_t[]){11u}
+#define PINS_SERIAL2_RX (pin_size_t[]){1u}
+#define PINS_SERIAL2_TX (pin_size_t[]){0u}

 // Pin function macros
 // -------------------
--- a/boards/variants/t102-v1.1.h
+++ b/boards/variants/t102-v1.1.h
@@ -14,17 +14,25 @@

 // Wire Interfaces
 // ---------------
-#define PIN_WIRE0_SCL 29u // PA_29
-#define PIN_WIRE0_SDA 30u // PA_30
-#define PIN_WIRE1_SCL 18u // PA_18
-#define PIN_WIRE1_SDA 23u // PA_23
+#define PIN_WIRE0_SCL  29u // PA_29
+#define PIN_WIRE0_SDA  30u // PA_30
+#define PIN_WIRE1_SCL  18u // PA_18
+#define PIN_WIRE1_SDA  23u // PA_23
+#define PINS_WIRE0_SCL (pin_size_t[]){29u}
+#define PINS_WIRE0_SDA (pin_size_t[]){30u}
+#define PINS_WIRE1_SCL (pin_size_t[]){18u}
+#define PINS_WIRE1_SDA (pin_size_t[]){23u}

 // Serial ports
 // ------------
-#define PIN_SERIAL0_RX 18u // PA_18
-#define PIN_SERIAL0_TX 23u // PA_23
-#define PIN_SERIAL2_RX 29u // PA_29
-#define PIN_SERIAL2_TX 30u // PA_30
+#define PIN_SERIAL0_RX  18u // PA_18
+#define PIN_SERIAL0_TX  23u // PA_23
+#define PIN_SERIAL2_RX  29u // PA_29
+#define PIN_SERIAL2_TX  30u // PA_30
+#define PINS_SERIAL0_RX (pin_size_t[]){18u}
+#define PINS_SERIAL0_TX (pin_size_t[]){23u}
+#define PINS_SERIAL2_RX (pin_size_t[]){29u}
+#define PINS_SERIAL2_TX (pin_size_t[]){30u}

 // Pin function macros
 // -------------------
@@ -39,7 +47,6 @@
 #define PIN_PA23  23u // PA_23
 #define PIN_PA29  29u // PA_29
 #define PIN_PA30  30u // PA_30
-#define PIN_PWM0  14u // PA_14
 #define PIN_PWM1  15u // PA_15
 #define PIN_PWM2  0u  // PA_0
 #define PIN_PWM3  12u // PA_12
--- a/boards/variants/t103-v1.0.h
+++ b/boards/variants/t103-v1.0.h
@@ -14,14 +14,22 @@

 // SPI Interfaces
 // --------------
-#define PIN_SPI0_CS   19u // PA_19
-#define PIN_SPI0_MISO 22u // PA_22
-#define PIN_SPI0_MOSI 23u // PA_23
-#define PIN_SPI0_SCK  18u // PA_18
-#define PIN_SPI1_CS   19u // PA_19
-#define PIN_SPI1_MISO 22u // PA_22
-#define PIN_SPI1_MOSI 23u // PA_23
-#define PIN_SPI1_SCK  18u // PA_18
+#define PIN_SPI0_CS    19u // PA_19
+#define PIN_SPI0_MISO  22u // PA_22
+#define PIN_SPI0_MOSI  23u // PA_23
+#define PIN_SPI0_SCK   18u // PA_18
+#define PIN_SPI1_CS    19u // PA_19
+#define PIN_SPI1_MISO  22u // PA_22
+#define PIN_SPI1_MOSI  23u // PA_23
+#define PIN_SPI1_SCK   18u // PA_18
+#define PINS_SPI0_CS   (pin_size_t[]){19u}
+#define PINS_SPI0_MISO (pin_size_t[]){22u}
+#define PINS_SPI0_MOSI (pin_size_t[]){23u}
+#define PINS_SPI0_SCK  (pin_size_t[]){18u}
+#define PINS_SPI1_CS   (pin_size_t[]){19u}
+#define PINS_SPI1_MISO (pin_size_t[]){22u}
+#define PINS_SPI1_MOSI (pin_size_t[]){23u}
+#define PINS_SPI1_SCK  (pin_size_t[]){18u}

 // Wire Interfaces
 // ---------------
@@ -31,15 +39,25 @@
 #define PIN_WIRE0_SDA_1 30u // PA_30
 #define PIN_WIRE1_SCL   18u // PA_18
 #define PIN_WIRE1_SDA   23u // PA_23
+#define PINS_WIRE0_SCL  (pin_size_t[]){22u, 29u}
+#define PINS_WIRE0_SDA  (pin_size_t[]){19u, 30u}
+#define PINS_WIRE1_SCL  (pin_size_t[]){18u}
+#define PINS_WIRE1_SDA  (pin_size_t[]){23u}

 // Serial ports
 // ------------
-#define PIN_SERIAL0_CTS 19u // PA_19
-#define PIN_SERIAL0_RTS 22u // PA_22
-#define PIN_SERIAL0_RX  18u // PA_18
-#define PIN_SERIAL0_TX  23u // PA_23
-#define PIN_SERIAL2_RX  29u // PA_29
-#define PIN_SERIAL2_TX  30u // PA_30
+#define PIN_SERIAL0_CTS  19u // PA_19
+#define PIN_SERIAL0_RTS  22u // PA_22
+#define PIN_SERIAL0_RX   18u // PA_18
+#define PIN_SERIAL0_TX   23u // PA_23
+#define PIN_SERIAL2_RX   29u // PA_29
+#define PIN_SERIAL2_TX   30u // PA_30
+#define PINS_SERIAL0_CTS (pin_size_t[]){19u}
+#define PINS_SERIAL0_RTS (pin_size_t[]){22u}
+#define PINS_SERIAL0_RX  (pin_size_t[]){18u}
+#define PINS_SERIAL0_TX  (pin_size_t[]){23u}
+#define PINS_SERIAL2_RX  (pin_size_t[]){29u}
+#define PINS_SERIAL2_TX  (pin_size_t[]){30u}

 // Pin function macros
 // -------------------
@@ -63,7 +81,6 @@
 #define PIN_PA23  23u // PA_23
 #define PIN_PA29  29u // PA_29
 #define PIN_PA30  30u // PA_30
-#define PIN_PWM0  23u // PA_23
 #define PIN_PWM1  15u // PA_15
 #define PIN_PWM2  0u  // PA_0
 #define PIN_PWM3  12u // PA_12
@@ -74,9 +91,7 @@
 #define PIN_RX2   29u // PA_29
 #define PIN_SCK0  18u // PA_18
 #define PIN_SCK1  18u // PA_18
-#define PIN_SCL0  29u // PA_29
 #define PIN_SCL1  18u // PA_18
-#define PIN_SDA0  30u // PA_30
 #define PIN_SDA1  23u // PA_23
 #define PIN_TX0   23u // PA_23
 #define PIN_TX2   30u // PA_30
--- a/boards/variants/t112-v1.1.c
+++ b/boards/variants/t112-v1.1.c
@@ -0,0 +1,48 @@
+/* This file was auto-generated from t112-v1.1.json using boardgen */
+
+#include <Arduino.h>
+
+#ifdef LT_VARIANT_INCLUDE
+#include LT_VARIANT_INCLUDE
+#endif
+
+// clang-format off
+PinInfo lt_arduino_pin_info_list[PINS_COUNT] = {
+	// D0: PA29, UART2_RX, I2C0_SCL, PWM4
+	{PA_29, PIN_GPIO | PIN_IRQ | PIN_PWM | PIN_I2C | PIN_UART,                     PIN_NONE, 0},
+	// D1: PA19, ADC1, UART0_CTS, SPI0_CS, SPI1_CS, I2C0_SDA, SD_D3, TMR5_TRIG, I2S0_TX
+	{PA_19, PIN_GPIO | PIN_IRQ | PIN_ADC | PIN_I2C | PIN_I2S | PIN_SPI | PIN_UART, PIN_NONE, 0},
+	// D2: PA15, PWM1, SWDIO
+	{PA_15, PIN_GPIO | PIN_IRQ | PIN_PWM | PIN_SWD,                                PIN_NONE, 0},
+	// D3: PA14, PWM0, SWCLK
+	{PA_14, PIN_GPIO | PIN_IRQ | PIN_PWM | PIN_SWD,                                PIN_NONE, 0},
+	// D4: PA00, PWM2
+	{PA_0,  PIN_GPIO | PIN_IRQ | PIN_PWM,                                          PIN_NONE, 0},
+	// D5: PA05, PWM4, WAKE1
+	{PA_5,  PIN_GPIO | PIN_IRQ | PIN_PWM,                                          PIN_NONE, 0},
+	// D6: PA18, UART0_RX, SPI0_SCK, SPI1_SCK, I2C1_SCL, SD_D2, TMR4_TRIG, I2S0_MCK, WAKE0
+	{PA_18, PIN_GPIO | PIN_IRQ | PIN_I2C | PIN_I2S | PIN_SPI | PIN_UART,           PIN_NONE, 0},
+	// D7: PA12, PWM3
+	{PA_12, PIN_GPIO | PIN_IRQ | PIN_PWM,                                          PIN_NONE, 0},
+	// D8: PA23, UART0_TX, SPI0_MOSI, SPI1_MOSI, I2C1_SDA, SD_D1, PWM0, WAKE3
+	{PA_23, PIN_GPIO | PIN_IRQ | PIN_PWM | PIN_I2C | PIN_SPI | PIN_UART,           PIN_NONE, 0},
+	// D9: PA22, UART0_RTS, SPI0_MISO, SPI1_MISO, I2C0_SCL, SD_D0, PWM5, I2S0_WS, WAKE2
+	{PA_22, PIN_GPIO | PIN_IRQ | PIN_PWM | PIN_I2C | PIN_I2S | PIN_SPI | PIN_UART, PIN_NONE, 0},
+	// D10: PA30, UART2_TX, I2C0_SDA, PWM4
+	{PA_30, PIN_GPIO | PIN_IRQ | PIN_PWM | PIN_I2C | PIN_UART,                     PIN_NONE, 0},
+};
+
+PinInfo *lt_arduino_pin_gpio_map[] = {
+	[0]  = &(lt_arduino_pin_info_list[4]),  // PA_0 (D4)
+	[5]  = &(lt_arduino_pin_info_list[5]),  // PA_5 (D5)
+	[12] = &(lt_arduino_pin_info_list[7]),  // PA_12 (D7)
+	[14] = &(lt_arduino_pin_info_list[3]),  // PA_14 (D3)
+	[15] = &(lt_arduino_pin_info_list[2]),  // PA_15 (D2)
+	[18] = &(lt_arduino_pin_info_list[6]),  // PA_18 (D6)
+	[19] = &(lt_arduino_pin_info_list[1]),  // PA_19 (D1)
+	[22] = &(lt_arduino_pin_info_list[9]),  // PA_22 (D9)
+	[23] = &(lt_arduino_pin_info_list[8]),  // PA_23 (D8)
+	[29] = &(lt_arduino_pin_info_list[0]),  // PA_29 (D0)
+	[30] = &(lt_arduino_pin_info_list[10]), // PA_30 (D10)
+};
+// clang-format on
--- a/boards/variants/t112-v1.1.h
+++ b/boards/variants/t112-v1.1.h
@@ -0,0 +1,138 @@
+/* This file was auto-generated from t112-v1.1.json using boardgen */
+
+#pragma once
+
+// clang-format off
+
+// Pins
+// ----
+#define PINS_COUNT         11 // Total GPIO count
+#define NUM_DIGITAL_PINS   11 // Digital inputs/outputs
+#define NUM_ANALOG_INPUTS  1  // ADC inputs
+#define NUM_ANALOG_OUTPUTS 9  // PWM & DAC outputs
+#define PINS_GPIO_MAX      30 // Last usable GPIO number
+
+// SPI Interfaces
+// --------------
+#define PIN_SPI0_CS    19u // PA_19
+#define PIN_SPI0_MISO  22u // PA_22
+#define PIN_SPI0_MOSI  23u // PA_23
+#define PIN_SPI0_SCK   18u // PA_18
+#define PIN_SPI1_CS    19u // PA_19
+#define PIN_SPI1_MISO  22u // PA_22
+#define PIN_SPI1_MOSI  23u // PA_23
+#define PIN_SPI1_SCK   18u // PA_18
+#define PINS_SPI0_CS   (pin_size_t[]){19u}
+#define PINS_SPI0_MISO (pin_size_t[]){22u}
+#define PINS_SPI0_MOSI (pin_size_t[]){23u}
+#define PINS_SPI0_SCK  (pin_size_t[]){18u}
+#define PINS_SPI1_CS   (pin_size_t[]){19u}
+#define PINS_SPI1_MISO (pin_size_t[]){22u}
+#define PINS_SPI1_MOSI (pin_size_t[]){23u}
+#define PINS_SPI1_SCK  (pin_size_t[]){18u}
+
+// Wire Interfaces
+// ---------------
+#define PIN_WIRE0_SCL_0 29u // PA_29
+#define PIN_WIRE0_SCL_1 22u // PA_22
+#define PIN_WIRE0_SDA_0 19u // PA_19
+#define PIN_WIRE0_SDA_1 30u // PA_30
+#define PIN_WIRE1_SCL   18u // PA_18
+#define PIN_WIRE1_SDA   23u // PA_23
+#define PINS_WIRE0_SCL  (pin_size_t[]){29u, 22u}
+#define PINS_WIRE0_SDA  (pin_size_t[]){19u, 30u}
+#define PINS_WIRE1_SCL  (pin_size_t[]){18u}
+#define PINS_WIRE1_SDA  (pin_size_t[]){23u}
+
+// Serial ports
+// ------------
+#define PIN_SERIAL0_CTS  19u // PA_19
+#define PIN_SERIAL0_RTS  22u // PA_22
+#define PIN_SERIAL0_RX   18u // PA_18
+#define PIN_SERIAL0_TX   23u // PA_23
+#define PIN_SERIAL2_RX   29u // PA_29
+#define PIN_SERIAL2_TX   30u // PA_30
+#define PINS_SERIAL0_CTS (pin_size_t[]){19u}
+#define PINS_SERIAL0_RTS (pin_size_t[]){22u}
+#define PINS_SERIAL0_RX  (pin_size_t[]){18u}
+#define PINS_SERIAL0_TX  (pin_size_t[]){23u}
+#define PINS_SERIAL2_RX  (pin_size_t[]){29u}
+#define PINS_SERIAL2_TX  (pin_size_t[]){30u}
+
+// Pin function macros
+// -------------------
+#define PIN_ADC1  19u // PA_19
+#define PIN_CS0   19u // PA_19
+#define PIN_CS1   19u // PA_19
+#define PIN_CTS0  19u // PA_19
+#define PIN_MISO0 22u // PA_22
+#define PIN_MISO1 22u // PA_22
+#define PIN_MOSI0 23u // PA_23
+#define PIN_MOSI1 23u // PA_23
+#define PIN_PA00  0u  // PA_0
+#define PIN_PA05  5u  // PA_5
+#define PIN_PA12  12u // PA_12
+#define PIN_PA14  14u // PA_14
+#define PIN_PA15  15u // PA_15
+#define PIN_PA18  18u // PA_18
+#define PIN_PA19  19u // PA_19
+#define PIN_PA22  22u // PA_22
+#define PIN_PA23  23u // PA_23
+#define PIN_PA29  29u // PA_29
+#define PIN_PA30  30u // PA_30
+#define PIN_PWM1  15u // PA_15
+#define PIN_PWM2  0u  // PA_0
+#define PIN_PWM3  12u // PA_12
+#define PIN_PWM4  30u // PA_30
+#define PIN_PWM5  22u // PA_22
+#define PIN_RTS0  22u // PA_22
+#define PIN_RX0   18u // PA_18
+#define PIN_RX2   29u // PA_29
+#define PIN_SCK0  18u // PA_18
+#define PIN_SCK1  18u // PA_18
+#define PIN_SCL1  18u // PA_18
+#define PIN_SDA1  23u // PA_23
+#define PIN_TX0   23u // PA_23
+#define PIN_TX2   30u // PA_30
+
+// Port availability
+// -----------------
+#define HAS_SERIAL0             1
+#define HAS_SERIAL2             1
+#define HAS_SPI0                1
+#define HAS_SPI1                1
+#define HAS_WIRE0               1
+#define HAS_WIRE1               1
+#define SERIAL_INTERFACES_COUNT 2
+#define SPI_INTERFACES_COUNT    2
+#define WIRE_INTERFACES_COUNT   2
+
+// Arduino pin names
+// -----------------
+#define PIN_D0  29u // PA_29
+#define PIN_D1  19u // PA_19
+#define PIN_D2  15u // PA_15
+#define PIN_D3  14u // PA_14
+#define PIN_D4  0u  // PA_0
+#define PIN_D5  5u  // PA_5
+#define PIN_D6  18u // PA_18
+#define PIN_D7  12u // PA_12
+#define PIN_D8  23u // PA_23
+#define PIN_D9  22u // PA_22
+#define PIN_D10 30u // PA_30
+#define PIN_A0  19u // PA_19
+
+// Static pin names
+// ----------------
+static const unsigned char A0 = PIN_A0;
+static const unsigned char D0 = PIN_D0;
+static const unsigned char D1 = PIN_D1;
+static const unsigned char D2 = PIN_D2;
+static const unsigned char D3 = PIN_D3;
+static const unsigned char D4 = PIN_D4;
+static const unsigned char D5 = PIN_D5;
+static const unsigned char D6 = PIN_D6;
+static const unsigned char D7 = PIN_D7;
+static const unsigned char D8 = PIN_D8;
+static const unsigned char D9 = PIN_D9;
+static const unsigned char D10 = PIN_D10;
--- a/boards/variants/wa2.h
+++ b/boards/variants/wa2.h
@@ -14,14 +14,19 @@

 // Wire Interfaces
 // ---------------
-#define PIN_WIRE1_SCL 20u // GPIO20
-#define PIN_WIRE1_SDA 21u // GPIO21
+#define PIN_WIRE1_SCL  20u // GPIO20
+#define PIN_WIRE1_SDA  21u // GPIO21
+#define PINS_WIRE1_SCL (pin_size_t[]){20u}
+#define PINS_WIRE1_SDA (pin_size_t[]){21u}

 // Serial ports
 // ------------
-#define PIN_SERIAL1_RX 10u // GPIO10
-#define PIN_SERIAL1_TX 11u // GPIO11
-#define PIN_SERIAL2_TX 0u  // GPIO0
+#define PIN_SERIAL1_RX  10u // GPIO10
+#define PIN_SERIAL1_TX  11u // GPIO11
+#define PIN_SERIAL2_TX  0u  // GPIO0
+#define PINS_SERIAL1_RX (pin_size_t[]){10u}
+#define PINS_SERIAL1_TX (pin_size_t[]){11u}
+#define PINS_SERIAL2_TX (pin_size_t[]){0u}

 // Pin function macros
 // -------------------
--- a/boards/variants/wb1s.h
+++ b/boards/variants/wb1s.h
@@ -14,15 +14,21 @@

 // Wire Interfaces
 // ---------------
-#define PIN_WIRE2_SCL 0u // GPIO0
-#define PIN_WIRE2_SDA 1u // GPIO1
+#define PIN_WIRE2_SCL  0u // GPIO0
+#define PIN_WIRE2_SDA  1u // GPIO1
+#define PINS_WIRE2_SCL (pin_size_t[]){0u}
+#define PINS_WIRE2_SDA (pin_size_t[]){1u}

 // Serial ports
 // ------------
-#define PIN_SERIAL1_RX 10u // GPIO10
-#define PIN_SERIAL1_TX 11u // GPIO11
-#define PIN_SERIAL2_RX 1u  // GPIO1
-#define PIN_SERIAL2_TX 0u  // GPIO0
+#define PIN_SERIAL1_RX  10u // GPIO10
+#define PIN_SERIAL1_TX  11u // GPIO11
+#define PIN_SERIAL2_RX  1u  // GPIO1
+#define PIN_SERIAL2_TX  0u  // GPIO0
+#define PINS_SERIAL1_RX (pin_size_t[]){10u}
+#define PINS_SERIAL1_TX (pin_size_t[]){11u}
+#define PINS_SERIAL2_RX (pin_size_t[]){1u}
+#define PINS_SERIAL2_TX (pin_size_t[]){0u}

 // Pin function macros
 // -------------------
--- a/boards/variants/wb2l-m1.h
+++ b/boards/variants/wb2l-m1.h
@@ -14,17 +14,25 @@

 // Wire Interfaces
 // ---------------
-#define PIN_WIRE1_SCL 20u // GPIO20
-#define PIN_WIRE1_SDA 21u // GPIO21
-#define PIN_WIRE2_SCL 0u  // GPIO0
-#define PIN_WIRE2_SDA 1u  // GPIO1
+#define PIN_WIRE1_SCL  20u // GPIO20
+#define PIN_WIRE1_SDA  21u // GPIO21
+#define PIN_WIRE2_SCL  0u  // GPIO0
+#define PIN_WIRE2_SDA  1u  // GPIO1
+#define PINS_WIRE1_SCL (pin_size_t[]){20u}
+#define PINS_WIRE1_SDA (pin_size_t[]){21u}
+#define PINS_WIRE2_SCL (pin_size_t[]){0u}
+#define PINS_WIRE2_SDA (pin_size_t[]){1u}

 // Serial ports
 // ------------
-#define PIN_SERIAL1_RX 10u // GPIO10
-#define PIN_SERIAL1_TX 11u // GPIO11
-#define PIN_SERIAL2_RX 1u  // GPIO1
-#define PIN_SERIAL2_TX 0u  // GPIO0
+#define PIN_SERIAL1_RX  10u // GPIO10
+#define PIN_SERIAL1_TX  11u // GPIO11
+#define PIN_SERIAL2_RX  1u  // GPIO1
+#define PIN_SERIAL2_TX  0u  // GPIO0
+#define PINS_SERIAL1_RX (pin_size_t[]){10u}
+#define PINS_SERIAL1_TX (pin_size_t[]){11u}
+#define PINS_SERIAL2_RX (pin_size_t[]){1u}
+#define PINS_SERIAL2_TX (pin_size_t[]){0u}

 // Pin function macros
 // -------------------
--- a/boards/variants/wb2l.h
+++ b/boards/variants/wb2l.h
@@ -14,17 +14,25 @@

 // Wire Interfaces
 // ---------------
-#define PIN_WIRE1_SCL 20u // GPIO20
-#define PIN_WIRE1_SDA 21u // GPIO21
-#define PIN_WIRE2_SCL 0u  // GPIO0
-#define PIN_WIRE2_SDA 1u  // GPIO1
+#define PIN_WIRE1_SCL  20u // GPIO20
+#define PIN_WIRE1_SDA  21u // GPIO21
+#define PIN_WIRE2_SCL  0u  // GPIO0
+#define PIN_WIRE2_SDA  1u  // GPIO1
+#define PINS_WIRE1_SCL (pin_size_t[]){20u}
+#define PINS_WIRE1_SDA (pin_size_t[]){21u}
+#define PINS_WIRE2_SCL (pin_size_t[]){0u}
+#define PINS_WIRE2_SDA (pin_size_t[]){1u}

 // Serial ports
 // ------------
-#define PIN_SERIAL1_RX 10u // GPIO10
-#define PIN_SERIAL1_TX 11u // GPIO11
-#define PIN_SERIAL2_RX 1u  // GPIO1
-#define PIN_SERIAL2_TX 0u  // GPIO0
+#define PIN_SERIAL1_RX  10u // GPIO10
+#define PIN_SERIAL1_TX  11u // GPIO11
+#define PIN_SERIAL2_RX  1u  // GPIO1
+#define PIN_SERIAL2_TX  0u  // GPIO0
+#define PINS_SERIAL1_RX (pin_size_t[]){10u}
+#define PINS_SERIAL1_TX (pin_size_t[]){11u}
+#define PINS_SERIAL2_RX (pin_size_t[]){1u}
+#define PINS_SERIAL2_TX (pin_size_t[]){0u}

 // Pin function macros
 // -------------------
--- a/boards/variants/wb2s.h
+++ b/boards/variants/wb2s.h
@@ -14,17 +14,25 @@

 // Wire Interfaces
 // ---------------
-#define PIN_WIRE1_SCL 20u // GPIO20
-#define PIN_WIRE1_SDA 21u // GPIO21
-#define PIN_WIRE2_SCL 0u  // GPIO0
-#define PIN_WIRE2_SDA 1u  // GPIO1
+#define PIN_WIRE1_SCL  20u // GPIO20
+#define PIN_WIRE1_SDA  21u // GPIO21
+#define PIN_WIRE2_SCL  0u  // GPIO0
+#define PIN_WIRE2_SDA  1u  // GPIO1
+#define PINS_WIRE1_SCL (pin_size_t[]){20u}
+#define PINS_WIRE1_SDA (pin_size_t[]){21u}
+#define PINS_WIRE2_SCL (pin_size_t[]){0u}
+#define PINS_WIRE2_SDA (pin_size_t[]){1u}

 // Serial ports
 // ------------
-#define PIN_SERIAL1_RX 10u // GPIO10
-#define PIN_SERIAL1_TX 11u // GPIO11
-#define PIN_SERIAL2_RX 1u  // GPIO1
-#define PIN_SERIAL2_TX 0u  // GPIO0
+#define PIN_SERIAL1_RX  10u // GPIO10
+#define PIN_SERIAL1_TX  11u // GPIO11
+#define PIN_SERIAL2_RX  1u  // GPIO1
+#define PIN_SERIAL2_TX  0u  // GPIO0
+#define PINS_SERIAL1_RX (pin_size_t[]){10u}
+#define PINS_SERIAL1_TX (pin_size_t[]){11u}
+#define PINS_SERIAL2_RX (pin_size_t[]){1u}
+#define PINS_SERIAL2_TX (pin_size_t[]){0u}

 // Pin function macros
 // -------------------
--- a/boards/variants/wb3l.h
+++ b/boards/variants/wb3l.h
@@ -14,17 +14,25 @@

 // Wire Interfaces
 // ---------------
-#define PIN_WIRE1_SCL 20u // GPIO20
-#define PIN_WIRE1_SDA 21u // GPIO21
-#define PIN_WIRE2_SCL 0u  // GPIO0
-#define PIN_WIRE2_SDA 1u  // GPIO1
+#define PIN_WIRE1_SCL  20u // GPIO20
+#define PIN_WIRE1_SDA  21u // GPIO21
+#define PIN_WIRE2_SCL  0u  // GPIO0
+#define PIN_WIRE2_SDA  1u  // GPIO1
+#define PINS_WIRE1_SCL (pin_size_t[]){20u}
+#define PINS_WIRE1_SDA (pin_size_t[]){21u}
+#define PINS_WIRE2_SCL (pin_size_t[]){0u}
+#define PINS_WIRE2_SDA (pin_size_t[]){1u}

 // Serial ports
 // ------------
-#define PIN_SERIAL1_RX 10u // GPIO10
-#define PIN_SERIAL1_TX 11u // GPIO11
-#define PIN_SERIAL2_RX 1u  // GPIO1
-#define PIN_SERIAL2_TX 0u  // GPIO0
+#define PIN_SERIAL1_RX  10u // GPIO10
+#define PIN_SERIAL1_TX  11u // GPIO11
+#define PIN_SERIAL2_RX  1u  // GPIO1
+#define PIN_SERIAL2_TX  0u  // GPIO0
+#define PINS_SERIAL1_RX (pin_size_t[]){10u}
+#define PINS_SERIAL1_TX (pin_size_t[]){11u}
+#define PINS_SERIAL2_RX (pin_size_t[]){1u}
+#define PINS_SERIAL2_TX (pin_size_t[]){0u}

 // Pin function macros
 // -------------------
--- a/boards/variants/wb3s.h
+++ b/boards/variants/wb3s.h
@@ -14,17 +14,25 @@

 // Wire Interfaces
 // ---------------
-#define PIN_WIRE1_SCL 20u // GPIO20
-#define PIN_WIRE1_SDA 21u // GPIO21
-#define PIN_WIRE2_SCL 0u  // GPIO0
-#define PIN_WIRE2_SDA 1u  // GPIO1
+#define PIN_WIRE1_SCL  20u // GPIO20
+#define PIN_WIRE1_SDA  21u // GPIO21
+#define PIN_WIRE2_SCL  0u  // GPIO0
+#define PIN_WIRE2_SDA  1u  // GPIO1
+#define PINS_WIRE1_SCL (pin_size_t[]){20u}
+#define PINS_WIRE1_SDA (pin_size_t[]){21u}
+#define PINS_WIRE2_SCL (pin_size_t[]){0u}
+#define PINS_WIRE2_SDA (pin_size_t[]){1u}

 // Serial ports
 // ------------
-#define PIN_SERIAL1_RX 10u // GPIO10
-#define PIN_SERIAL1_TX 11u // GPIO11
-#define PIN_SERIAL2_RX 1u  // GPIO1
-#define PIN_SERIAL2_TX 0u  // GPIO0
+#define PIN_SERIAL1_RX  10u // GPIO10
+#define PIN_SERIAL1_TX  11u // GPIO11
+#define PIN_SERIAL2_RX  1u  // GPIO1
+#define PIN_SERIAL2_TX  0u  // GPIO0
+#define PINS_SERIAL1_RX (pin_size_t[]){10u}
+#define PINS_SERIAL1_TX (pin_size_t[]){11u}
+#define PINS_SERIAL2_RX (pin_size_t[]){1u}
+#define PINS_SERIAL2_TX (pin_size_t[]){0u}

 // Pin function macros
 // -------------------
--- a/boards/variants/wblc5.h
+++ b/boards/variants/wblc5.h
@@ -14,17 +14,25 @@

 // Wire Interfaces
 // ---------------
-#define PIN_WIRE1_SCL 20u // GPIO20
-#define PIN_WIRE1_SDA 21u // GPIO21
-#define PIN_WIRE2_SCL 0u  // GPIO0
-#define PIN_WIRE2_SDA 1u  // GPIO1
+#define PIN_WIRE1_SCL  20u // GPIO20
+#define PIN_WIRE1_SDA  21u // GPIO21
+#define PIN_WIRE2_SCL  0u  // GPIO0
+#define PIN_WIRE2_SDA  1u  // GPIO1
+#define PINS_WIRE1_SCL (pin_size_t[]){20u}
+#define PINS_WIRE1_SDA (pin_size_t[]){21u}
+#define PINS_WIRE2_SCL (pin_size_t[]){0u}
+#define PINS_WIRE2_SDA (pin_size_t[]){1u}

 // Serial ports
 // ------------
-#define PIN_SERIAL1_RX 10u // GPIO10
-#define PIN_SERIAL1_TX 11u // GPIO11
-#define PIN_SERIAL2_RX 1u  // GPIO1
-#define PIN_SERIAL2_TX 0u  // GPIO0
+#define PIN_SERIAL1_RX  10u // GPIO10
+#define PIN_SERIAL1_TX  11u // GPIO11
+#define PIN_SERIAL2_RX  1u  // GPIO1
+#define PIN_SERIAL2_TX  0u  // GPIO0
+#define PINS_SERIAL1_RX (pin_size_t[]){10u}
+#define PINS_SERIAL1_TX (pin_size_t[]){11u}
+#define PINS_SERIAL2_RX (pin_size_t[]){1u}
+#define PINS_SERIAL2_TX (pin_size_t[]){0u}

 // Pin function macros
 // -------------------
--- a/boards/variants/wr1.h
+++ b/boards/variants/wr1.h
@@ -14,14 +14,22 @@

 // SPI Interfaces
 // --------------
-#define PIN_SPI0_CS   19u // PA_19
-#define PIN_SPI0_MISO 22u // PA_22
-#define PIN_SPI0_MOSI 23u // PA_23
-#define PIN_SPI0_SCK  18u // PA_18
-#define PIN_SPI1_CS   19u // PA_19
-#define PIN_SPI1_MISO 22u // PA_22
-#define PIN_SPI1_MOSI 23u // PA_23
-#define PIN_SPI1_SCK  18u // PA_18
+#define PIN_SPI0_CS    19u // PA_19
+#define PIN_SPI0_MISO  22u // PA_22
+#define PIN_SPI0_MOSI  23u // PA_23
+#define PIN_SPI0_SCK   18u // PA_18
+#define PIN_SPI1_CS    19u // PA_19
+#define PIN_SPI1_MISO  22u // PA_22
+#define PIN_SPI1_MOSI  23u // PA_23
+#define PIN_SPI1_SCK   18u // PA_18
+#define PINS_SPI0_CS   (pin_size_t[]){19u}
+#define PINS_SPI0_MISO (pin_size_t[]){22u}
+#define PINS_SPI0_MOSI (pin_size_t[]){23u}
+#define PINS_SPI0_SCK  (pin_size_t[]){18u}
+#define PINS_SPI1_CS   (pin_size_t[]){19u}
+#define PINS_SPI1_MISO (pin_size_t[]){22u}
+#define PINS_SPI1_MOSI (pin_size_t[]){23u}
+#define PINS_SPI1_SCK  (pin_size_t[]){18u}

 // Wire Interfaces
 // ---------------
@@ -31,15 +39,25 @@
 #define PIN_WIRE0_SDA_1 19u // PA_19
 #define PIN_WIRE1_SCL   18u // PA_18
 #define PIN_WIRE1_SDA   23u // PA_23
+#define PINS_WIRE0_SCL  (pin_size_t[]){29u, 22u}
+#define PINS_WIRE0_SDA  (pin_size_t[]){30u, 19u}
+#define PINS_WIRE1_SCL  (pin_size_t[]){18u}
+#define PINS_WIRE1_SDA  (pin_size_t[]){23u}

 // Serial ports
 // ------------
-#define PIN_SERIAL0_CTS 19u // PA_19
-#define PIN_SERIAL0_RTS 22u // PA_22
-#define PIN_SERIAL0_RX  18u // PA_18
-#define PIN_SERIAL0_TX  23u // PA_23
-#define PIN_SERIAL2_RX  29u // PA_29
-#define PIN_SERIAL2_TX  30u // PA_30
+#define PIN_SERIAL0_CTS  19u // PA_19
+#define PIN_SERIAL0_RTS  22u // PA_22
+#define PIN_SERIAL0_RX   18u // PA_18
+#define PIN_SERIAL0_TX   23u // PA_23
+#define PIN_SERIAL2_RX   29u // PA_29
+#define PIN_SERIAL2_TX   30u // PA_30
+#define PINS_SERIAL0_CTS (pin_size_t[]){19u}
+#define PINS_SERIAL0_RTS (pin_size_t[]){22u}
+#define PINS_SERIAL0_RX  (pin_size_t[]){18u}
+#define PINS_SERIAL0_TX  (pin_size_t[]){23u}
+#define PINS_SERIAL2_RX  (pin_size_t[]){29u}
+#define PINS_SERIAL2_TX  (pin_size_t[]){30u}

 // Pin function macros
 // -------------------
@@ -62,7 +80,6 @@
 #define PIN_PA23  23u // PA_23
 #define PIN_PA29  29u // PA_29
 #define PIN_PA30  30u // PA_30
-#define PIN_PWM0  14u // PA_14
 #define PIN_PWM1  15u // PA_15
 #define PIN_PWM2  0u  // PA_0
 #define PIN_PWM4  29u // PA_29
@@ -72,9 +89,7 @@
 #define PIN_RX2   29u // PA_29
 #define PIN_SCK0  18u // PA_18
 #define PIN_SCK1  18u // PA_18
-#define PIN_SCL0  22u // PA_22
 #define PIN_SCL1  18u // PA_18
-#define PIN_SDA0  19u // PA_19
 #define PIN_SDA1  23u // PA_23
 #define PIN_TX0   23u // PA_23
 #define PIN_TX2   30u // PA_30
--- a/boards/variants/wr1e.h
+++ b/boards/variants/wr1e.h
@@ -14,14 +14,22 @@

 // SPI Interfaces
 // --------------
-#define PIN_SPI0_CS   19u // PA_19
-#define PIN_SPI0_MISO 22u // PA_22
-#define PIN_SPI0_MOSI 23u // PA_23
-#define PIN_SPI0_SCK  18u // PA_18
-#define PIN_SPI1_CS   19u // PA_19
-#define PIN_SPI1_MISO 22u // PA_22
-#define PIN_SPI1_MOSI 23u // PA_23
-#define PIN_SPI1_SCK  18u // PA_18
+#define PIN_SPI0_CS    19u // PA_19
+#define PIN_SPI0_MISO  22u // PA_22
+#define PIN_SPI0_MOSI  23u // PA_23
+#define PIN_SPI0_SCK   18u // PA_18
+#define PIN_SPI1_CS    19u // PA_19
+#define PIN_SPI1_MISO  22u // PA_22
+#define PIN_SPI1_MOSI  23u // PA_23
+#define PIN_SPI1_SCK   18u // PA_18
+#define PINS_SPI0_CS   (pin_size_t[]){19u}
+#define PINS_SPI0_MISO (pin_size_t[]){22u}
+#define PINS_SPI0_MOSI (pin_size_t[]){23u}
+#define PINS_SPI0_SCK  (pin_size_t[]){18u}
+#define PINS_SPI1_CS   (pin_size_t[]){19u}
+#define PINS_SPI1_MISO (pin_size_t[]){22u}
+#define PINS_SPI1_MOSI (pin_size_t[]){23u}
+#define PINS_SPI1_SCK  (pin_size_t[]){18u}

 // Wire Interfaces
 // ---------------
@@ -31,15 +39,25 @@
 #define PIN_WIRE0_SDA_1 19u // PA_19
 #define PIN_WIRE1_SCL   18u // PA_18
 #define PIN_WIRE1_SDA   23u // PA_23
+#define PINS_WIRE0_SCL  (pin_size_t[]){29u, 22u}
+#define PINS_WIRE0_SDA  (pin_size_t[]){30u, 19u}
+#define PINS_WIRE1_SCL  (pin_size_t[]){18u}
+#define PINS_WIRE1_SDA  (pin_size_t[]){23u}

 // Serial ports
 // ------------
-#define PIN_SERIAL0_CTS 19u // PA_19
-#define PIN_SERIAL0_RTS 22u // PA_22
-#define PIN_SERIAL0_RX  18u // PA_18
-#define PIN_SERIAL0_TX  23u // PA_23
-#define PIN_SERIAL2_RX  29u // PA_29
-#define PIN_SERIAL2_TX  30u // PA_30
+#define PIN_SERIAL0_CTS  19u // PA_19
+#define PIN_SERIAL0_RTS  22u // PA_22
+#define PIN_SERIAL0_RX   18u // PA_18
+#define PIN_SERIAL0_TX   23u // PA_23
+#define PIN_SERIAL2_RX   29u // PA_29
+#define PIN_SERIAL2_TX   30u // PA_30
+#define PINS_SERIAL0_CTS (pin_size_t[]){19u}
+#define PINS_SERIAL0_RTS (pin_size_t[]){22u}
+#define PINS_SERIAL0_RX  (pin_size_t[]){18u}
+#define PINS_SERIAL0_TX  (pin_size_t[]){23u}
+#define PINS_SERIAL2_RX  (pin_size_t[]){29u}
+#define PINS_SERIAL2_TX  (pin_size_t[]){30u}

 // Pin function macros
 // -------------------
@@ -62,7 +80,6 @@
 #define PIN_PA23  23u // PA_23
 #define PIN_PA29  29u // PA_29
 #define PIN_PA30  30u // PA_30
-#define PIN_PWM0  14u // PA_14
 #define PIN_PWM1  15u // PA_15
 #define PIN_PWM3  12u // PA_12
 #define PIN_PWM4  29u // PA_29
@@ -72,9 +89,7 @@
 #define PIN_RX2   29u // PA_29
 #define PIN_SCK0  18u // PA_18
 #define PIN_SCK1  18u // PA_18
-#define PIN_SCL0  22u // PA_22
 #define PIN_SCL1  18u // PA_18
-#define PIN_SDA0  19u // PA_19
 #define PIN_SDA1  23u // PA_23
 #define PIN_TX0   23u // PA_23
 #define PIN_TX2   30u // PA_30
--- a/boards/variants/wr2.h
+++ b/boards/variants/wr2.h
@@ -14,17 +14,25 @@

 // Wire Interfaces
 // ---------------
-#define PIN_WIRE0_SCL 29u // PA_29
-#define PIN_WIRE0_SDA 30u // PA_30
-#define PIN_WIRE1_SCL 18u // PA_18
-#define PIN_WIRE1_SDA 23u // PA_23
+#define PIN_WIRE0_SCL  29u // PA_29
+#define PIN_WIRE0_SDA  30u // PA_30
+#define PIN_WIRE1_SCL  18u // PA_18
+#define PIN_WIRE1_SDA  23u // PA_23
+#define PINS_WIRE0_SCL (pin_size_t[]){29u}
+#define PINS_WIRE0_SDA (pin_size_t[]){30u}
+#define PINS_WIRE1_SCL (pin_size_t[]){18u}
+#define PINS_WIRE1_SDA (pin_size_t[]){23u}

 // Serial ports
 // ------------
-#define PIN_SERIAL0_RX 18u // PA_18
-#define PIN_SERIAL0_TX 23u // PA_23
-#define PIN_SERIAL2_RX 29u // PA_29
-#define PIN_SERIAL2_TX 30u // PA_30
+#define PIN_SERIAL0_RX  18u // PA_18
+#define PIN_SERIAL0_TX  23u // PA_23
+#define PIN_SERIAL2_RX  29u // PA_29
+#define PIN_SERIAL2_TX  30u // PA_30
+#define PINS_SERIAL0_RX (pin_size_t[]){18u}
+#define PINS_SERIAL0_TX (pin_size_t[]){23u}
+#define PINS_SERIAL2_RX (pin_size_t[]){29u}
+#define PINS_SERIAL2_TX (pin_size_t[]){30u}

 // Pin function macros
 // -------------------
@@ -40,7 +48,6 @@
 #define PIN_PA23  23u // PA_23
 #define PIN_PA29  29u // PA_29
 #define PIN_PA30  30u // PA_30
-#define PIN_PWM0  14u // PA_14
 #define PIN_PWM1  15u // PA_15
 #define PIN_PWM2  0u  // PA_0
 #define PIN_PWM3  12u // PA_12
--- a/boards/variants/wr2e.h
+++ b/boards/variants/wr2e.h
@@ -19,14 +19,23 @@
 #define PIN_WIRE0_SDA_1 30u // PA_30
 #define PIN_WIRE1_SCL   18u // PA_18
 #define PIN_WIRE1_SDA   23u // PA_23
+#define PINS_WIRE0_SCL  (pin_size_t[]){29u}
+#define PINS_WIRE0_SDA  (pin_size_t[]){19u, 30u}
+#define PINS_WIRE1_SCL  (pin_size_t[]){18u}
+#define PINS_WIRE1_SDA  (pin_size_t[]){23u}

 // Serial ports
 // ------------
-#define PIN_SERIAL0_CTS 19u // PA_19
-#define PIN_SERIAL0_RX  18u // PA_18
-#define PIN_SERIAL0_TX  23u // PA_23
-#define PIN_SERIAL2_RX  29u // PA_29
-#define PIN_SERIAL2_TX  30u // PA_30
+#define PIN_SERIAL0_CTS  19u // PA_19
+#define PIN_SERIAL0_RX   18u // PA_18
+#define PIN_SERIAL0_TX   23u // PA_23
+#define PIN_SERIAL2_RX   29u // PA_29
+#define PIN_SERIAL2_TX   30u // PA_30
+#define PINS_SERIAL0_CTS (pin_size_t[]){19u}
+#define PINS_SERIAL0_RX  (pin_size_t[]){18u}
+#define PINS_SERIAL0_TX  (pin_size_t[]){23u}
+#define PINS_SERIAL2_RX  (pin_size_t[]){29u}
+#define PINS_SERIAL2_TX  (pin_size_t[]){30u}

 // Pin function macros
 // -------------------
@@ -46,7 +55,6 @@
 #define PIN_PA23  23u // PA_23
 #define PIN_PA29  29u // PA_29
 #define PIN_PA30  30u // PA_30
-#define PIN_PWM0  14u // PA_14
 #define PIN_PWM1  15u // PA_15
 #define PIN_PWM3  12u // PA_12
 #define PIN_PWM4  29u // PA_29
@@ -56,7 +64,6 @@
 #define PIN_SCK1  18u // PA_18
 #define PIN_SCL0  29u // PA_29
 #define PIN_SCL1  18u // PA_18
-#define PIN_SDA0  30u // PA_30
 #define PIN_SDA1  23u // PA_23
 #define PIN_TX0   23u // PA_23
 #define PIN_TX2   30u // PA_30
--- a/boards/variants/wr3.h
+++ b/boards/variants/wr3.h
@@ -14,14 +14,22 @@

 // SPI Interfaces
 // --------------
-#define PIN_SPI0_CS   19u // PA_19
-#define PIN_SPI0_MISO 22u // PA_22
-#define PIN_SPI0_MOSI 23u // PA_23
-#define PIN_SPI0_SCK  18u // PA_18
-#define PIN_SPI1_CS   19u // PA_19
-#define PIN_SPI1_MISO 22u // PA_22
-#define PIN_SPI1_MOSI 23u // PA_23
-#define PIN_SPI1_SCK  18u // PA_18
+#define PIN_SPI0_CS    19u // PA_19
+#define PIN_SPI0_MISO  22u // PA_22
+#define PIN_SPI0_MOSI  23u // PA_23
+#define PIN_SPI0_SCK   18u // PA_18
+#define PIN_SPI1_CS    19u // PA_19
+#define PIN_SPI1_MISO  22u // PA_22
+#define PIN_SPI1_MOSI  23u // PA_23
+#define PIN_SPI1_SCK   18u // PA_18
+#define PINS_SPI0_CS   (pin_size_t[]){19u}
+#define PINS_SPI0_MISO (pin_size_t[]){22u}
+#define PINS_SPI0_MOSI (pin_size_t[]){23u}
+#define PINS_SPI0_SCK  (pin_size_t[]){18u}
+#define PINS_SPI1_CS   (pin_size_t[]){19u}
+#define PINS_SPI1_MISO (pin_size_t[]){22u}
+#define PINS_SPI1_MOSI (pin_size_t[]){23u}
+#define PINS_SPI1_SCK  (pin_size_t[]){18u}

 // Wire Interfaces
 // ---------------
@@ -31,15 +39,25 @@
 #define PIN_WIRE0_SDA_1 30u // PA_30
 #define PIN_WIRE1_SCL   18u // PA_18
 #define PIN_WIRE1_SDA   23u // PA_23
+#define PINS_WIRE0_SCL  (pin_size_t[]){22u, 29u}
+#define PINS_WIRE0_SDA  (pin_size_t[]){19u, 30u}
+#define PINS_WIRE1_SCL  (pin_size_t[]){18u}
+#define PINS_WIRE1_SDA  (pin_size_t[]){23u}

 // Serial ports
 // ------------
-#define PIN_SERIAL0_CTS 19u // PA_19
-#define PIN_SERIAL0_RTS 22u // PA_22
-#define PIN_SERIAL0_RX  18u // PA_18
-#define PIN_SERIAL0_TX  23u // PA_23
-#define PIN_SERIAL2_RX  29u // PA_29
-#define PIN_SERIAL2_TX  30u // PA_30
+#define PIN_SERIAL0_CTS  19u // PA_19
+#define PIN_SERIAL0_RTS  22u // PA_22
+#define PIN_SERIAL0_RX   18u // PA_18
+#define PIN_SERIAL0_TX   23u // PA_23
+#define PIN_SERIAL2_RX   29u // PA_29
+#define PIN_SERIAL2_TX   30u // PA_30
+#define PINS_SERIAL0_CTS (pin_size_t[]){19u}
+#define PINS_SERIAL0_RTS (pin_size_t[]){22u}
+#define PINS_SERIAL0_RX  (pin_size_t[]){18u}
+#define PINS_SERIAL0_TX  (pin_size_t[]){23u}
+#define PINS_SERIAL2_RX  (pin_size_t[]){29u}
+#define PINS_SERIAL2_TX  (pin_size_t[]){30u}

 // Pin function macros
 // -------------------
@@ -63,7 +81,6 @@
 #define PIN_PA23  23u // PA_23
 #define PIN_PA29  29u // PA_29
 #define PIN_PA30  30u // PA_30
-#define PIN_PWM0  23u // PA_23
 #define PIN_PWM1  15u // PA_15
 #define PIN_PWM2  0u  // PA_0
 #define PIN_PWM3  12u // PA_12
@@ -74,9 +91,7 @@
 #define PIN_RX2   29u // PA_29
 #define PIN_SCK0  18u // PA_18
 #define PIN_SCK1  18u // PA_18
-#define PIN_SCL0  29u // PA_29
 #define PIN_SCL1  18u // PA_18
-#define PIN_SDA0  30u // PA_30
 #define PIN_SDA1  23u // PA_23
 #define PIN_TX0   23u // PA_23
 #define PIN_TX2   30u // PA_30
--- a/boards/variants/wr3e.h
+++ b/boards/variants/wr3e.h
@@ -14,14 +14,22 @@

 // SPI Interfaces
 // --------------
-#define PIN_SPI0_CS   19u // PA_19
-#define PIN_SPI0_MISO 22u // PA_22
-#define PIN_SPI0_MOSI 23u // PA_23
-#define PIN_SPI0_SCK  18u // PA_18
-#define PIN_SPI1_CS   19u // PA_19
-#define PIN_SPI1_MISO 22u // PA_22
-#define PIN_SPI1_MOSI 23u // PA_23
-#define PIN_SPI1_SCK  18u // PA_18
+#define PIN_SPI0_CS    19u // PA_19
+#define PIN_SPI0_MISO  22u // PA_22
+#define PIN_SPI0_MOSI  23u // PA_23
+#define PIN_SPI0_SCK   18u // PA_18
+#define PIN_SPI1_CS    19u // PA_19
+#define PIN_SPI1_MISO  22u // PA_22
+#define PIN_SPI1_MOSI  23u // PA_23
+#define PIN_SPI1_SCK   18u // PA_18
+#define PINS_SPI0_CS   (pin_size_t[]){19u}
+#define PINS_SPI0_MISO (pin_size_t[]){22u}
+#define PINS_SPI0_MOSI (pin_size_t[]){23u}
+#define PINS_SPI0_SCK  (pin_size_t[]){18u}
+#define PINS_SPI1_CS   (pin_size_t[]){19u}
+#define PINS_SPI1_MISO (pin_size_t[]){22u}
+#define PINS_SPI1_MOSI (pin_size_t[]){23u}
+#define PINS_SPI1_SCK  (pin_size_t[]){18u}

 // Wire Interfaces
 // ---------------
@@ -31,15 +39,25 @@
 #define PIN_WIRE0_SDA_1 19u // PA_19
 #define PIN_WIRE1_SCL   18u // PA_18
 #define PIN_WIRE1_SDA   23u // PA_23
+#define PINS_WIRE0_SCL  (pin_size_t[]){29u, 22u}
+#define PINS_WIRE0_SDA  (pin_size_t[]){30u, 19u}
+#define PINS_WIRE1_SCL  (pin_size_t[]){18u}
+#define PINS_WIRE1_SDA  (pin_size_t[]){23u}

 // Serial ports
 // ------------
-#define PIN_SERIAL0_CTS 19u // PA_19
-#define PIN_SERIAL0_RTS 22u // PA_22
-#define PIN_SERIAL0_RX  18u // PA_18
-#define PIN_SERIAL0_TX  23u // PA_23
-#define PIN_SERIAL2_RX  29u // PA_29
-#define PIN_SERIAL2_TX  30u // PA_30
+#define PIN_SERIAL0_CTS  19u // PA_19
+#define PIN_SERIAL0_RTS  22u // PA_22
+#define PIN_SERIAL0_RX   18u // PA_18
+#define PIN_SERIAL0_TX   23u // PA_23
+#define PIN_SERIAL2_RX   29u // PA_29
+#define PIN_SERIAL2_TX   30u // PA_30
+#define PINS_SERIAL0_CTS (pin_size_t[]){19u}
+#define PINS_SERIAL0_RTS (pin_size_t[]){22u}
+#define PINS_SERIAL0_RX  (pin_size_t[]){18u}
+#define PINS_SERIAL0_TX  (pin_size_t[]){23u}
+#define PINS_SERIAL2_RX  (pin_size_t[]){29u}
+#define PINS_SERIAL2_TX  (pin_size_t[]){30u}

 // Pin function macros
 // -------------------
@@ -63,7 +81,6 @@
 #define PIN_PA23  23u // PA_23
 #define PIN_PA29  29u // PA_29
 #define PIN_PA30  30u // PA_30
-#define PIN_PWM0  23u // PA_23
 #define PIN_PWM1  15u // PA_15
 #define PIN_PWM2  0u  // PA_0
 #define PIN_PWM3  12u // PA_12
@@ -74,9 +91,7 @@
 #define PIN_RX2   29u // PA_29
 #define PIN_SCK0  18u // PA_18
 #define PIN_SCK1  18u // PA_18
-#define PIN_SCL0  22u // PA_22
 #define PIN_SCL1  18u // PA_18
-#define PIN_SDA0  19u // PA_19
 #define PIN_SDA1  23u // PA_23
 #define PIN_TX0   23u // PA_23
 #define PIN_TX2   30u // PA_30
--- a/boards/variants/wr3l.h
+++ b/boards/variants/wr3l.h
@@ -14,14 +14,22 @@

 // SPI Interfaces
 // --------------
-#define PIN_SPI0_CS   19u // PA_19
-#define PIN_SPI0_MISO 22u // PA_22
-#define PIN_SPI0_MOSI 23u // PA_23
-#define PIN_SPI0_SCK  18u // PA_18
-#define PIN_SPI1_CS   19u // PA_19
-#define PIN_SPI1_MISO 22u // PA_22
-#define PIN_SPI1_MOSI 23u // PA_23
-#define PIN_SPI1_SCK  18u // PA_18
+#define PIN_SPI0_CS    19u // PA_19
+#define PIN_SPI0_MISO  22u // PA_22
+#define PIN_SPI0_MOSI  23u // PA_23
+#define PIN_SPI0_SCK   18u // PA_18
+#define PIN_SPI1_CS    19u // PA_19
+#define PIN_SPI1_MISO  22u // PA_22
+#define PIN_SPI1_MOSI  23u // PA_23
+#define PIN_SPI1_SCK   18u // PA_18
+#define PINS_SPI0_CS   (pin_size_t[]){19u}
+#define PINS_SPI0_MISO (pin_size_t[]){22u}
+#define PINS_SPI0_MOSI (pin_size_t[]){23u}
+#define PINS_SPI0_SCK  (pin_size_t[]){18u}
+#define PINS_SPI1_CS   (pin_size_t[]){19u}
+#define PINS_SPI1_MISO (pin_size_t[]){22u}
+#define PINS_SPI1_MOSI (pin_size_t[]){23u}
+#define PINS_SPI1_SCK  (pin_size_t[]){18u}

 // Wire Interfaces
 // ---------------
@@ -31,15 +39,25 @@
 #define PIN_WIRE0_SDA_1 30u // PA_30
 #define PIN_WIRE1_SCL   18u // PA_18
 #define PIN_WIRE1_SDA   23u // PA_23
+#define PINS_WIRE0_SCL  (pin_size_t[]){22u, 29u}
+#define PINS_WIRE0_SDA  (pin_size_t[]){19u, 30u}
+#define PINS_WIRE1_SCL  (pin_size_t[]){18u}
+#define PINS_WIRE1_SDA  (pin_size_t[]){23u}

 // Serial ports
 // ------------
-#define PIN_SERIAL0_CTS 19u // PA_19
-#define PIN_SERIAL0_RTS 22u // PA_22
-#define PIN_SERIAL0_RX  18u // PA_18
-#define PIN_SERIAL0_TX  23u // PA_23
-#define PIN_SERIAL2_RX  29u // PA_29
-#define PIN_SERIAL2_TX  30u // PA_30
+#define PIN_SERIAL0_CTS  19u // PA_19
+#define PIN_SERIAL0_RTS  22u // PA_22
+#define PIN_SERIAL0_RX   18u // PA_18
+#define PIN_SERIAL0_TX   23u // PA_23
+#define PIN_SERIAL2_RX   29u // PA_29
+#define PIN_SERIAL2_TX   30u // PA_30
+#define PINS_SERIAL0_CTS (pin_size_t[]){19u}
+#define PINS_SERIAL0_RTS (pin_size_t[]){22u}
+#define PINS_SERIAL0_RX  (pin_size_t[]){18u}
+#define PINS_SERIAL0_TX  (pin_size_t[]){23u}
+#define PINS_SERIAL2_RX  (pin_size_t[]){29u}
+#define PINS_SERIAL2_TX  (pin_size_t[]){30u}

 // Pin function macros
 // -------------------
@@ -63,7 +81,6 @@
 #define PIN_PA23  23u // PA_23
 #define PIN_PA29  29u // PA_29
 #define PIN_PA30  30u // PA_30
-#define PIN_PWM0  23u // PA_23
 #define PIN_PWM1  15u // PA_15
 #define PIN_PWM2  0u  // PA_0
 #define PIN_PWM3  12u // PA_12
@@ -74,9 +91,7 @@
 #define PIN_RX2   29u // PA_29
 #define PIN_SCK0  18u // PA_18
 #define PIN_SCK1  18u // PA_18
-#define PIN_SCL0  29u // PA_29
 #define PIN_SCL1  18u // PA_18
-#define PIN_SDA0  30u // PA_30
 #define PIN_SDA1  23u // PA_23
 #define PIN_TX0   23u // PA_23
 #define PIN_TX2   30u // PA_30
--- a/boards/variants/wr3le.h
+++ b/boards/variants/wr3le.h
@@ -14,14 +14,22 @@

 // SPI Interfaces
 // --------------
-#define PIN_SPI0_CS   19u // PA_19
-#define PIN_SPI0_MISO 22u // PA_22
-#define PIN_SPI0_MOSI 23u // PA_23
-#define PIN_SPI0_SCK  18u // PA_18
-#define PIN_SPI1_CS   19u // PA_19
-#define PIN_SPI1_MISO 22u // PA_22
-#define PIN_SPI1_MOSI 23u // PA_23
-#define PIN_SPI1_SCK  18u // PA_18
+#define PIN_SPI0_CS    19u // PA_19
+#define PIN_SPI0_MISO  22u // PA_22
+#define PIN_SPI0_MOSI  23u // PA_23
+#define PIN_SPI0_SCK   18u // PA_18
+#define PIN_SPI1_CS    19u // PA_19
+#define PIN_SPI1_MISO  22u // PA_22
+#define PIN_SPI1_MOSI  23u // PA_23
+#define PIN_SPI1_SCK   18u // PA_18
+#define PINS_SPI0_CS   (pin_size_t[]){19u}
+#define PINS_SPI0_MISO (pin_size_t[]){22u}
+#define PINS_SPI0_MOSI (pin_size_t[]){23u}
+#define PINS_SPI0_SCK  (pin_size_t[]){18u}
+#define PINS_SPI1_CS   (pin_size_t[]){19u}
+#define PINS_SPI1_MISO (pin_size_t[]){22u}
+#define PINS_SPI1_MOSI (pin_size_t[]){23u}
+#define PINS_SPI1_SCK  (pin_size_t[]){18u}

 // Wire Interfaces
 // ---------------
@@ -31,15 +39,25 @@
 #define PIN_WIRE0_SDA_1 19u // PA_19
 #define PIN_WIRE1_SCL   18u // PA_18
 #define PIN_WIRE1_SDA   23u // PA_23
+#define PINS_WIRE0_SCL  (pin_size_t[]){29u, 22u}
+#define PINS_WIRE0_SDA  (pin_size_t[]){30u, 19u}
+#define PINS_WIRE1_SCL  (pin_size_t[]){18u}
+#define PINS_WIRE1_SDA  (pin_size_t[]){23u}

 // Serial ports
 // ------------
-#define PIN_SERIAL0_CTS 19u // PA_19
-#define PIN_SERIAL0_RTS 22u // PA_22
-#define PIN_SERIAL0_RX  18u // PA_18
-#define PIN_SERIAL0_TX  23u // PA_23
-#define PIN_SERIAL2_RX  29u // PA_29
-#define PIN_SERIAL2_TX  30u // PA_30
+#define PIN_SERIAL0_CTS  19u // PA_19
+#define PIN_SERIAL0_RTS  22u // PA_22
+#define PIN_SERIAL0_RX   18u // PA_18
+#define PIN_SERIAL0_TX   23u // PA_23
+#define PIN_SERIAL2_RX   29u // PA_29
+#define PIN_SERIAL2_TX   30u // PA_30
+#define PINS_SERIAL0_CTS (pin_size_t[]){19u}
+#define PINS_SERIAL0_RTS (pin_size_t[]){22u}
+#define PINS_SERIAL0_RX  (pin_size_t[]){18u}
+#define PINS_SERIAL0_TX  (pin_size_t[]){23u}
+#define PINS_SERIAL2_RX  (pin_size_t[]){29u}
+#define PINS_SERIAL2_TX  (pin_size_t[]){30u}

 // Pin function macros
 // -------------------
@@ -63,7 +81,6 @@
 #define PIN_PA23  23u // PA_23
 #define PIN_PA29  29u // PA_29
 #define PIN_PA30  30u // PA_30
-#define PIN_PWM0  23u // PA_23
 #define PIN_PWM1  15u // PA_15
 #define PIN_PWM2  0u  // PA_0
 #define PIN_PWM3  12u // PA_12
@@ -74,9 +91,7 @@
 #define PIN_RX2   29u // PA_29
 #define PIN_SCK0  18u // PA_18
 #define PIN_SCK1  18u // PA_18
-#define PIN_SCL0  22u // PA_22
 #define PIN_SCL1  18u // PA_18
-#define PIN_SDA0  19u // PA_19
 #define PIN_SDA1  23u // PA_23
 #define PIN_TX0   23u // PA_23
 #define PIN_TX2   30u // PA_30
--- a/boards/variants/wr3n.h
+++ b/boards/variants/wr3n.h
@@ -14,17 +14,25 @@

 // Wire Interfaces
 // ---------------
-#define PIN_WIRE0_SCL 29u // PA_29
-#define PIN_WIRE0_SDA 30u // PA_30
-#define PIN_WIRE1_SCL 18u // PA_18
-#define PIN_WIRE1_SDA 23u // PA_23
+#define PIN_WIRE0_SCL  29u // PA_29
+#define PIN_WIRE0_SDA  30u // PA_30
+#define PIN_WIRE1_SCL  18u // PA_18
+#define PIN_WIRE1_SDA  23u // PA_23
+#define PINS_WIRE0_SCL (pin_size_t[]){29u}
+#define PINS_WIRE0_SDA (pin_size_t[]){30u}
+#define PINS_WIRE1_SCL (pin_size_t[]){18u}
+#define PINS_WIRE1_SDA (pin_size_t[]){23u}

 // Serial ports
 // ------------
-#define PIN_SERIAL0_RX 18u // PA_18
-#define PIN_SERIAL0_TX 23u // PA_23
-#define PIN_SERIAL2_RX 29u // PA_29
-#define PIN_SERIAL2_TX 30u // PA_30
+#define PIN_SERIAL0_RX  18u // PA_18
+#define PIN_SERIAL0_TX  23u // PA_23
+#define PIN_SERIAL2_RX  29u // PA_29
+#define PIN_SERIAL2_TX  30u // PA_30
+#define PINS_SERIAL0_RX (pin_size_t[]){18u}
+#define PINS_SERIAL0_TX (pin_size_t[]){23u}
+#define PINS_SERIAL2_RX (pin_size_t[]){29u}
+#define PINS_SERIAL2_TX (pin_size_t[]){30u}

 // Pin function macros
 // -------------------
@@ -40,7 +48,6 @@
 #define PIN_PA23  23u // PA_23
 #define PIN_PA29  29u // PA_29
 #define PIN_PA30  30u // PA_30
-#define PIN_PWM0  23u // PA_23
 #define PIN_PWM1  15u // PA_15
 #define PIN_PWM2  0u  // PA_0
 #define PIN_PWM3  12u // PA_12
--- a/builder/frameworks/base.py
+++ b/builder/frameworks/base.py
@@ -20,8 +20,6 @@ env.ParseCustomOptions(platform)
 env.ParseCustomFlashLayout(platform, board)
 # Add flash layout C defines
 env.AddFlashLayout(board)
-# Write custom header options
-env.ApplyCustomOptions(platform)
 # Export board manifest for ltchiptool
 env.ExportBoardData(board)
 # Print information about versions and custom options
--- a/builder/utils/cores.py
+++ b/builder/utils/cores.py
@@ -89,15 +89,17 @@ def env_add_arduino_libraries(env: Environment, queue, name: str, path: str) ->
        srcs=[
            "+<**/*.c*>",
        ],
-        includes=[
-            "!<*/.>",
-            "!<*/*>",
-        ]
-        if name.startswith("common")
-        else [
-            "!<.>",
-            "!<*>",
-        ],
+        includes=(
+            [
+                "!<*/.>",
+                "!<*/*>",
+            ]
+            if name.startswith("common")
+            else [
+                "!<.>",
+                "!<*>",
+            ]
+        ),
    )
    return True

--- a/builder/utils/env.py
+++ b/builder/utils/env.py
@@ -126,7 +126,7 @@ def env_print_info(
    if env.get("FLASH_IS_CUSTOM", False):
        print("CUSTOM FLASH LAYOUT:")
        for name, layout in board.get("flash").items():
-            (_, _, length) = v.partition("+")
+            (_, _, length) = layout.partition("+")
            length = int(length, 16)
            print(f" - {name}: {layout} ({sizeof(length)})")

--- a/builder/utils/libs-queue.py
+++ b/builder/utils/libs-queue.py
@@ -184,6 +184,9 @@ class LibraryQueue:
        else:
            self.env.Append(CPPPATH=self.includes)

+        # prepend headers with custom options
+        self.env.ApplyCustomOptions(self.env.PioPlatform())
+
        # clone the environment for the whole library queue
        queue_env = self.env.Clone()
        # add private options to the cloned environment
--- a/cores/beken-72xx/arduino/libraries/WiFi/WiFi.cpp
+++ b/cores/beken-72xx/arduino/libraries/WiFi/WiFi.cpp
@@ -5,8 +5,9 @@
 WiFiClass::WiFiClass() {
 	data = (WiFiData *)calloc(1, sizeof(WiFiData));

-	DATA->scanSem	  = xSemaphoreCreateBinary();
-	STA_CFG.dhcp_mode = DHCP_CLIENT;
+	DATA->scanSem		  = xSemaphoreCreateBinary();
+	STA_CFG.dhcp_mode	  = DHCP_CLIENT;
+	STA_ADV_CFG.dhcp_mode = DHCP_CLIENT;
 }

 WiFiClass::~WiFiClass() {
--- a/cores/beken-72xx/arduino/libraries/WiFi/WiFiEvents.cpp
+++ b/cores/beken-72xx/arduino/libraries/WiFi/WiFiEvents.cpp
@@ -27,6 +27,40 @@ static void wifiEventTask(void *arg) {
 	}
 }

+// There is a race condition, when we have an event about a successful
+// connection but no SSID yet returned by BDK. Even a single millisecond
+// delay should prevent this from happening. It's better to waste a bit
+// of time here than to lose a valid connection down the line.
+static String waitForValidSSID(WiFiClass *pWiFi) {
+	String result;
+
+	// Read the initial value that might just be available already.
+	result = pWiFi->SSID();
+
+	if (!result.length()) {
+		std::size_t i = 0;
+		for (; i < 10; i++) {
+			// Delay and query again.
+			delay(1);
+			result = pWiFi->SSID();
+
+			if (result.length()) {
+				LT_DM(WIFI, "Got valid SSID after %u delays", i + 1);
+				break;
+			}
+
+			// It's a good idea to yield.
+			yield();
+		}
+
+		if (!result.length()) {
+			LT_WM(WIFI, "Could not obtain a valid SSID after %u delays", i);
+		}
+	}
+
+	return result;
+}
+
 void wifiEventSendArduino(EventId event) {
 	event = (EventId)(RW_EVT_ARDUINO | event);
 	wifiStatusCallback((rw_evt_type *)&event);
@@ -52,11 +86,6 @@ void wifiEventHandler(rw_evt_type event) {

 	LT_DM(WIFI, "BK event %u", event);

-	if (event <= RW_EVT_STA_GOT_IP)
-		pDATA->lastStaEvent = event;
-	else
-		pDATA->lastApEvent = event;
-
 	EventId eventId;
 	EventInfo eventInfo;
 	String ssid;
@@ -103,7 +132,7 @@ void wifiEventHandler(rw_evt_type event) {

 		case RW_EVT_STA_CONNECTED:
 			eventId								  = ARDUINO_EVENT_WIFI_STA_CONNECTED;
-			ssid								  = pWiFi->SSID();
+			ssid								  = waitForValidSSID(pWiFi);
 			eventInfo.wifi_sta_connected.ssid_len = ssid.length();
 			eventInfo.wifi_sta_connected.channel  = pWiFi->channel();
 			eventInfo.wifi_sta_connected.authmode = pWiFi->getEncryption();
@@ -145,5 +174,13 @@ void wifiEventHandler(rw_evt_type event) {
 			break;
 	}

+	// Publish state update only after the event data is retrieved.
+	// This relates to the race condition with RW_EVT_STA_CONNECTED.
+	if (event <= RW_EVT_STA_GOT_IP) {
+		pDATA->lastStaEvent = event;
+	} else {
+		pDATA->lastApEvent = event;
+	}
+
 	pWiFi->postEvent(eventId, eventInfo);
 }
--- a/cores/beken-72xx/arduino/libraries/WiFi/WiFiGeneric.cpp
+++ b/cores/beken-72xx/arduino/libraries/WiFi/WiFiGeneric.cpp
@@ -80,7 +80,30 @@ IPAddress WiFiClass::hostByName(const char *hostname) {
 	ip_addr_t ip;
 	int ret = netconn_gethostbyname(hostname, &ip);
 	if (ret == ERR_OK) {
-		return ip.addr;
+#ifdef CONFIG_IPV6
+		if (IP_IS_V6(&ip)) {
+			ip6_addr_t *ip6 = ip_2_ip6(&ip);
+			return IPAddress(
+				IP6_ADDR_BLOCK1(ip6) >> 8,
+				IP6_ADDR_BLOCK1(ip6) & 0xff,
+				IP6_ADDR_BLOCK2(ip6) >> 8,
+				IP6_ADDR_BLOCK2(ip6) & 0xff,
+				IP6_ADDR_BLOCK3(ip6) >> 8,
+				IP6_ADDR_BLOCK3(ip6) & 0xff,
+				IP6_ADDR_BLOCK4(ip6) >> 8,
+				IP6_ADDR_BLOCK4(ip6) & 0xff,
+				IP6_ADDR_BLOCK5(ip6) >> 8,
+				IP6_ADDR_BLOCK5(ip6) & 0xff,
+				IP6_ADDR_BLOCK6(ip6) >> 8,
+				IP6_ADDR_BLOCK6(ip6) & 0xff,
+				IP6_ADDR_BLOCK7(ip6) >> 8,
+				IP6_ADDR_BLOCK7(ip6) & 0xff,
+				IP6_ADDR_BLOCK8(ip6) >> 8,
+				IP6_ADDR_BLOCK8(ip6) & 0xff
+			);
+		}
+#endif
+		return IPAddress(ip_addr_get_ip4_u32(&ip));
 	}
 	return IPAddress();
 }
--- a/cores/beken-72xx/arduino/libraries/WiFi/WiFiPrivate.h
+++ b/cores/beken-72xx/arduino/libraries/WiFi/WiFiPrivate.h
@@ -57,6 +57,7 @@ extern void wifiEventHandler(rw_evt_type event);

 typedef struct {
 	network_InitTypeDef_st configSta;
+	network_InitTypeDef_adv_st configStaAdv;
 	network_InitTypeDef_ap_st configAp;
 	unsigned long scannedAt;
 	SemaphoreHandle_t scanSem;
@@ -73,6 +74,7 @@ typedef struct {
 #define cDATA ((WiFiData *)cls->data)

 #define STA_CFG		(DATA->configSta)
+#define STA_ADV_CFG (DATA->configStaAdv)
 #define AP_CFG		(DATA->configAp)
 #define IP_STATUS	(DATA->statusIp)
 #define LINK_STATUS (DATA->statusLink)
--- a/cores/beken-72xx/arduino/libraries/WiFi/WiFiSTA.cpp
+++ b/cores/beken-72xx/arduino/libraries/WiFi/WiFiSTA.cpp
@@ -2,8 +2,13 @@

 #include "WiFiPrivate.h"

-WiFiStatus
-WiFiClass::begin(const char *ssid, const char *passphrase, int32_t channel, const uint8_t *bssid, bool connect) {
+WiFiStatus WiFiClass::begin(
+	const char *ssid,
+	const char *passphrase,
+	int32_t channel,
+	const uint8_t *bssid,
+	bool connect
+) {
 	if (!enableSTA(true))
 		return WL_CONNECT_FAILED;
 	if (!validate(ssid, passphrase))
@@ -13,11 +18,26 @@ WiFiClass::begin(const char *ssid, const char *passphrase, int32_t channel, cons

 	disconnect(false);

-	strcpy(STA_CFG.wifi_ssid, ssid);
-	if (passphrase) {
-		strcpy(STA_CFG.wifi_key, passphrase);
+	if (bssid) {
+		strcpy(STA_ADV_CFG.ap_info.ssid, ssid);
+		if (passphrase) {
+			strcpy(STA_ADV_CFG.key, passphrase);
+			STA_ADV_CFG.key_len = strlen(passphrase);
+		} else {
+			STA_ADV_CFG.key[0]	= '\0';
+			STA_ADV_CFG.key_len = 0;
+		}
+		STA_ADV_CFG.ap_info.channel		= channel;
+		STA_ADV_CFG.wifi_retry_interval = 100;
 	} else {
-		STA_CFG.wifi_bssid[0] = '\0';
+		strcpy(STA_CFG.wifi_ssid, ssid);
+		if (passphrase) {
+			strcpy(STA_CFG.wifi_key, passphrase);
+		} else {
+			STA_CFG.wifi_key[0] = '\0';
+		}
+		STA_CFG.wifi_retry_interval = 100;
+		STA_CFG.wifi_mode			= BK_STATION;
 	}

 	if (reconnect(bssid))
@@ -27,21 +47,31 @@ WiFiClass::begin(const char *ssid, const char *passphrase, int32_t channel, cons
 }

 bool WiFiClass::config(IPAddress localIP, IPAddress gateway, IPAddress subnet, IPAddress dns1, IPAddress dns2) {
-	STA_CFG.dhcp_mode = localIP ? DHCP_DISABLE : DHCP_CLIENT;
+	STA_CFG.dhcp_mode	  = localIP ? DHCP_DISABLE : DHCP_CLIENT;
+	STA_ADV_CFG.dhcp_mode = localIP ? DHCP_DISABLE : DHCP_CLIENT;
 	if (localIP) {
 		sprintf(STA_CFG.local_ip_addr, IP_FMT, localIP[0], localIP[1], localIP[2], localIP[3]);
 		sprintf(STA_CFG.net_mask, IP_FMT, subnet[0], subnet[1], subnet[2], subnet[3]);
 		sprintf(STA_CFG.gateway_ip_addr, IP_FMT, gateway[0], gateway[1], gateway[2], gateway[3]);
+		sprintf(STA_ADV_CFG.local_ip_addr, IP_FMT, localIP[0], localIP[1], localIP[2], localIP[3]);
+		sprintf(STA_ADV_CFG.net_mask, IP_FMT, subnet[0], subnet[1], subnet[2], subnet[3]);
+		sprintf(STA_ADV_CFG.gateway_ip_addr, IP_FMT, gateway[0], gateway[1], gateway[2], gateway[3]);
 		if (dns1) {
 			sprintf(STA_CFG.dns_server_ip_addr, IP_FMT, dns1[0], dns1[1], dns1[2], dns1[3]);
+			sprintf(STA_ADV_CFG.dns_server_ip_addr, IP_FMT, dns1[0], dns1[1], dns1[2], dns1[3]);
 		} else {
-			STA_CFG.dns_server_ip_addr[0] = '\0';
+			STA_CFG.dns_server_ip_addr[0]	  = '\0';
+			STA_ADV_CFG.dns_server_ip_addr[0] = '\0';
 		}
 	} else {
-		STA_CFG.local_ip_addr[0]	  = '\0';
-		STA_CFG.net_mask[0]			  = '\0';
-		STA_CFG.gateway_ip_addr[0]	  = '\0';
-		STA_CFG.dns_server_ip_addr[0] = '\0';
+		STA_CFG.local_ip_addr[0]		  = '\0';
+		STA_CFG.net_mask[0]				  = '\0';
+		STA_CFG.gateway_ip_addr[0]		  = '\0';
+		STA_CFG.dns_server_ip_addr[0]	  = '\0';
+		STA_ADV_CFG.local_ip_addr[0]	  = '\0';
+		STA_ADV_CFG.net_mask[0]			  = '\0';
+		STA_ADV_CFG.gateway_ip_addr[0]	  = '\0';
+		STA_ADV_CFG.dns_server_ip_addr[0] = '\0';
 	}

 	// from wlan_ui.c:1370
@@ -74,10 +104,8 @@ bool WiFiClass::reconnect(const uint8_t *bssid) {

 	LT_DM(WIFI, "Data = %p", DATA->configSta);

-	STA_CFG.wifi_mode			= BK_STATION;
-	STA_CFG.wifi_retry_interval = 100;
 	if (bssid)
-		memcpy(STA_CFG.wifi_bssid, bssid, 6);
+		memcpy(STA_ADV_CFG.ap_info.bssid, bssid, 6);
 	else
 		memset(STA_CFG.wifi_bssid, 0x00, 6);

@@ -91,7 +119,11 @@ bool WiFiClass::reconnect(const uint8_t *bssid) {
 	LT_DM(WIFI, "Starting WiFi...");

 	__wrap_bk_printf_disable();
-	bk_wlan_start_sta(&STA_CFG);
+	if (bssid) {
+		bk_wlan_start_sta_adv(&STA_ADV_CFG);
+	} else {
+		bk_wlan_start_sta(&STA_CFG);
+	}
 	__wrap_bk_printf_enable();

 	LT_DM(WIFI, "Start OK");
@@ -219,3 +251,41 @@ WiFiAuthMode WiFiClass::getEncryption() {
 	STA_GET_LINK_STATUS_RETURN(WIFI_AUTH_INVALID);
 	return securityTypeToAuthMode(LINK_STATUS.security);
 }
+#ifdef CONFIG_IPV6
+bool WiFiClass::enableIpV6() {
+	return true;
+}
+
+IPv6Address WiFiClass::localIPv6() {
+	struct netif *ifs = (struct netif *)net_get_sta_handle();
+	std::vector<IPv6Address> result;
+	struct wlan_ip_config addr;
+	int nr_addresses = 0;
+
+	if (sta_ip_is_start())
+		nr_addresses = net_get_if_ipv6_pref_addr(&addr, ifs);
+
+	for (int i = 0; i < nr_addresses; i++) {
+		if (ip6_addr_islinklocal(&addr.ipv6[i]))
+			return IPv6Address(addr.ipv6[i].addr);
+	}
+
+	return IPv6Address();
+}
+
+std::vector<IPv6Address> WiFiClass::allLocalIPv6() {
+	struct netif *ifs = (struct netif *)net_get_sta_handle();
+	std::vector<IPv6Address> result;
+	struct wlan_ip_config addr;
+	int nr_addresses = 0;
+
+	if (sta_ip_is_start())
+		nr_addresses = net_get_if_ipv6_pref_addr(&addr, ifs);
+
+	for (int i = 0; i < nr_addresses; i++) {
+		result.push_back(IPv6Address(addr.ipv6[i].addr));
+	}
+
+	return result;
+}
+#endif
--- a/cores/beken-72xx/arduino/libraries/WiFi/WiFiScan.cpp
+++ b/cores/beken-72xx/arduino/libraries/WiFi/WiFiScan.cpp
@@ -15,20 +15,27 @@ static void scanHandler(void *ctx, uint8_t param) {
 		return;
 	}

+	uint8_t apNum = 0;
 	ScanResult_adv result;
+	result.ApNum  = 0;
+	result.ApList = NULL;
 	if (wlan_sta_scan_result(&result)) {
 		LT_EM(WIFI, "Failed to get scan result");
 		goto end;
 	}
 	LT_IM(WIFI, "Found %d APs", result.ApNum);

-	cls->scanAlloc(result.ApNum);
-	if (!scan->ap) {
+	apNum = cls->scanAlloc(result.ApNum);
+	if (0 == apNum) {
 		LT_WM(WIFI, "scan->ap alloc failed");
 		goto end;
 	}

-	for (uint8_t i = 0; i < result.ApNum; i++) {
+	if (apNum < result.ApNum) {
+		LT_WM(WIFI, "alloc failed, only %d APs will be copied");
+	}
+
+	for (uint8_t i = 0; i < apNum; i++) {
 		scan->ap[i].ssid	= strdup(result.ApList[i].ssid);
 		scan->ap[i].auth	= securityTypeToAuthMode(result.ApList[i].security);
 		scan->ap[i].rssi	= result.ApList[i].ApPower;
@@ -47,6 +54,9 @@ end:
 		scan->running = false;
 		xSemaphoreGive(cDATA->scanSem);
 	}
+	if (result.ApList) {
+		free(result.ApList);
+	}
 	LT_HEAP_I();
 	return;
 }
--- a/cores/beken-72xx/arduino/src/wiring.c
+++ b/cores/beken-72xx/arduino/src/wiring.c
@@ -108,10 +108,13 @@ void pinRemoveMode(PinInfo *pin, uint32_t mask) {
 		pinDisable(pin, PIN_IRQ);
 	}
 	if ((mask & PIN_PWM) && (pin->enabled & PIN_PWM)) {
-		data->pwm->cfg.bits.en = PWM_DISABLE;
-		__wrap_bk_printf_disable();
-		sddev_control(PWM_DEV_NAME, CMD_PWM_DEINIT_PARAM, data->pwm);
-		__wrap_bk_printf_enable();
+		if (data->pwmState != LT_PWM_STOPPED) {
+			data->pwmState		  = LT_PWM_STOPPED;
+			data->pwm.cfg.bits.en = PWM_DISABLE;
+			__wrap_bk_printf_disable();
+			sddev_control(PWM_DEV_NAME, CMD_PWM_DEINIT_PARAM, &data->pwm);
+			__wrap_bk_printf_enable();
+		}
 		pinDisable(pin, PIN_PWM);
 	}
 }
--- a/cores/beken-72xx/arduino/src/wiring_analog.c
+++ b/cores/beken-72xx/arduino/src/wiring_analog.c
@@ -51,7 +51,6 @@ static uint8_t gpioToAdc(GPIO_INDEX gpio) {
 	return 0;
 }

-static pwm_param_t pwm;
 static uint16_t adcData[1];

 uint16_t analogReadVoltage(pin_size_t pinNumber) {
@@ -66,13 +65,21 @@ uint16_t analogReadVoltage(pin_size_t pinNumber) {
 	adc.pData		   = adcData;
 	adc.data_buff_size = 1;
 	handle			   = ddev_open(SARADC_DEV_NAME, &status, (uint32_t)&adc);
-	if (status)
+	if (handle == -1) {
 		return 0;
+	}
+
+	if (status != SARADC_SUCCESS) {
+		ddev_close(handle);
+		return 0;
+	}
+
 	// wait for data
 	while (!adc.has_data || adc.current_sample_data_cnt < 1) {
 		delay(1);
 	}
-	ddev_control(handle, SARADC_CMD_RUN_OR_STOP_ADC, (void *)false);
+	uint8_t run_stop = 0; // stop
+	ddev_control(handle, SARADC_CMD_RUN_OR_STOP_ADC, &run_stop);
 	ddev_close(handle);
 	return adcData[0];
 }
@@ -87,46 +94,57 @@ void analogWrite(pin_size_t pinNumber, int value) {
 	// GPIO can't be used together with PWM
 	pinRemoveMode(pin, PIN_GPIO | PIN_IRQ);

-	float percent	   = value * 1.0 / ((1 << _analogWriteResolution) - 1);
 	uint32_t frequency = 26 * _analogWritePeriod - 1;
+
+	if (!pinEnabled(pin, PIN_PWM)) {
+		pinEnable(pin, PIN_PWM);
+		data->pwmState			  = LT_PWM_STOPPED;
+		data->pwm.channel		  = gpioToPwm(pin->gpio);
+		data->pwm.cfg.bits.en	  = PWM_ENABLE;
+		data->pwm.cfg.bits.int_en = PWM_INT_DIS;
+		data->pwm.cfg.bits.mode	  = PWM_PWM_MODE;
+		data->pwm.cfg.bits.clk	  = PWM_CLK_26M;
+		data->pwm.end_value		  = frequency;
+		data->pwm.p_Int_Handler	  = NULL;
+	}
+
+	float percent	   = value * 1.0 / ((1 << _analogWriteResolution) - 1);
 	uint32_t dutyCycle = percent * frequency;
-	pwm.channel		   = gpioToPwm(pin->gpio);
+	uint32_t channel   = data->pwm.channel;
 #if CFG_SOC_NAME != SOC_BK7231N
-	pwm.duty_cycle = dutyCycle;
+	data->pwm.duty_cycle = dutyCycle;
 #else
-	pwm.duty_cycle1 = dutyCycle;
-	pwm.duty_cycle2 = 0;
-	pwm.duty_cycle3 = 0;
+	data->pwm.duty_cycle1 = dutyCycle;
+	data->pwm.duty_cycle2 = 0;
+	data->pwm.duty_cycle3 = 0;
 #endif

-	if (dutyCycle) {
-		if (!pinEnabled(pin, PIN_PWM)) {
+	if ((data->pwmState == LT_PWM_STOPPED) || (data->pwmState == LT_PWM_PAUSED)) {
+		if (dutyCycle) {
 			// enable PWM and set its value
-			pwm.cfg.bits.en		= PWM_ENABLE;
-			pwm.cfg.bits.int_en = PWM_INT_DIS;
-			pwm.cfg.bits.mode	= PWM_PWM_MODE;
-			pwm.cfg.bits.clk	= PWM_CLK_26M;
-			pwm.end_value		= frequency;
-			pwm.p_Int_Handler	= NULL;
+
 			__wrap_bk_printf_disable();
-			sddev_control(PWM_DEV_NAME, CMD_PWM_INIT_PARAM, &pwm);
-			sddev_control(PWM_DEV_NAME, CMD_PWM_INIT_LEVL_SET_HIGH, &pwm.channel);
-			sddev_control(PWM_DEV_NAME, CMD_PWM_UNIT_ENABLE, &pwm.channel);
+			sddev_control(PWM_DEV_NAME, CMD_PWM_INIT_PARAM, &data->pwm);
+			sddev_control(PWM_DEV_NAME, CMD_PWM_INIT_LEVL_SET_HIGH, &channel);
+			sddev_control(PWM_DEV_NAME, CMD_PWM_UNIT_ENABLE, &channel);
+			__wrap_bk_printf_enable();
+
+			data->pwmState = LT_PWM_RUNNING;
+		}
+	} else if (data->pwmState == LT_PWM_RUNNING) {
+		if (dutyCycle) {
+			__wrap_bk_printf_disable();
+			sddev_control(PWM_DEV_NAME, CMD_PWM_INIT_LEVL_SET_HIGH, &channel);
+			sddev_control(PWM_DEV_NAME, CMD_PWM_SET_DUTY_CYCLE, &data->pwm);
 			__wrap_bk_printf_enable();
-			// pass global PWM object pointer
-			data->pwm = &pwm;
-			pinEnable(pin, PIN_PWM);
 		} else {
-			// update duty cycle
-			sddev_control(PWM_DEV_NAME, CMD_PWM_SET_DUTY_CYCLE, &pwm);
+			__wrap_bk_printf_disable();
+			sddev_control(PWM_DEV_NAME, CMD_PWM_INIT_LEVL_SET_LOW, &channel);
+			sddev_control(PWM_DEV_NAME, CMD_PWM_SET_DUTY_CYCLE, &data->pwm);
+			sddev_control(PWM_DEV_NAME, CMD_PWM_UNIT_DISABLE, &channel);
+			__wrap_bk_printf_enable();
+
+			data->pwmState = LT_PWM_PAUSED;
 		}
-	} else {
-		if (pinEnabled(pin, PIN_PWM)) {
-			// disable PWM
-			pinRemoveMode(pin, PIN_PWM);
-		}
-		// force level as LOW
-		pinMode(pinNumber, OUTPUT);
-		digitalWrite(pinNumber, LOW);
 	}
 }
--- a/cores/beken-72xx/arduino/src/wiring_data.h
+++ b/cores/beken-72xx/arduino/src/wiring_data.h
@@ -9,8 +9,11 @@
 extern "C" {
 #endif

+typedef enum lt_pwm_state_tag { LT_PWM_STOPPED, LT_PWM_RUNNING, LT_PWM_PAUSED } lt_pwm_state_t;
+
 struct PinData_s {
-	pwm_param_t *pwm;
+	pwm_param_t pwm;
+	lt_pwm_state_t pwmState;
 	PinMode gpioMode;
 	PinStatus irqMode;
 	void *irqHandler;
--- a/cores/beken-72xx/arduino/src/wiring_irq.c
+++ b/cores/beken-72xx/arduino/src/wiring_irq.c
@@ -9,19 +9,19 @@ static void irqHandler(unsigned char gpio) {
 	PinData *data = pinData(pin);
 	if (!data->irqHandler)
 		return;
-	if (data->irqChange) {
-		if (data->gpioMode == INPUT_PULLDOWN) {
-			data->gpioMode = INPUT_PULLUP;
-			gpio_int_enable(pin->gpio, GPIO_INT_LEVEL_FALLING, irqHandler);
-		} else if (data->gpioMode == INPUT_PULLUP) {
-			data->gpioMode = INPUT_PULLDOWN;
-			gpio_int_enable(pin->gpio, GPIO_INT_LEVEL_RISING, irqHandler);
-		}
-	}
 	if (!data->irqParam)
 		((voidFuncPtr)data->irqHandler)();
 	else
 		((voidFuncPtrParam)data->irqHandler)(data->irqParam);
+	if (data->irqChange) {
+		if (data->irqMode == RISING) {
+			data->irqMode = FALLING;
+			gpio_int_enable(pin->gpio, GPIO_INT_LEVEL_FALLING, irqHandler);
+		} else {
+			data->irqMode = RISING;
+			gpio_int_enable(pin->gpio, GPIO_INT_LEVEL_RISING, irqHandler);
+		}
+	}
 }

 void attachInterruptParam(pin_size_t interruptNumber, voidFuncPtrParam callback, PinStatus mode, void *param) {
@@ -52,7 +52,13 @@ void attachInterruptParam(pin_size_t interruptNumber, voidFuncPtrParam callback,
 			event = GPIO_INT_LEVEL_RISING;
 			break;
 		case CHANGE:
-			event  = GPIO_INT_LEVEL_FALLING;
+			if (gpio_input(pin->gpio)) {
+				event = GPIO_INT_LEVEL_FALLING;
+				mode  = FALLING;
+			} else {
+				event = GPIO_INT_LEVEL_RISING;
+				mode  = RISING;
+			}
 			change = true;
 			break;
 		default:
--- a/cores/beken-72xx/base/api/lt_device.c
+++ b/cores/beken-72xx/base/api/lt_device.c
@@ -31,10 +31,12 @@ lt_reboot_reason_t lt_get_reboot_reason() {
 		case RESET_SOURCE_CRASH_UNUSED:
 		case RESET_SOURCE_CRASH_PER_XAT0:
 			return REBOOT_REASON_CRASH;
-		case RESET_SOURCE_DEEPPS_GPIO:
-		case RESET_SOURCE_DEEPPS_RTC:
 		case RESET_SOURCE_DEEPPS_USB:
-			return REBOOT_REASON_SLEEP;
+			return REBOOT_REASON_SLEEP_USB;
+		case RESET_SOURCE_DEEPPS_GPIO:
+			return REBOOT_REASON_SLEEP_GPIO;
+		case RESET_SOURCE_DEEPPS_RTC:
+			return REBOOT_REASON_SLEEP_RTC;
 		default:
 			return REBOOT_REASON_UNKNOWN;
 	}
--- a/cores/beken-72xx/base/api/lt_sleep.c
+++ b/cores/beken-72xx/base/api/lt_sleep.c
@@ -19,14 +19,21 @@ void lt_deep_sleep_unset_gpio(uint32_t gpio_index_map) {
 	deep_sleep_param.gpio_index_map &= (~gpio_index_map);
 }

-void lt_deep_sleep_config_timer(uint32_t sleep_duration) {
-	deep_sleep_param.wake_up_way |= PS_DEEP_WAKEUP_RTC;
-	uint64_t duration_math = 32768 * sleep_duration;
-	if (duration_math / 1000 > 0xFFFFFFFF) {
-		// Sleep forever
-		deep_sleep_param.sleep_time = 0xFFFFFFFF;
+void lt_deep_sleep_keep_floating_gpio(uint32_t gpio_index_map, bool enabled) {
+	if (enabled) {
+		deep_sleep_param.gpio_stay_lo_map |= gpio_index_map;
 	} else {
-		deep_sleep_param.sleep_time = (duration_math / 1000) & 0xFFFFFFFF;
+		deep_sleep_param.gpio_stay_lo_map &= (~gpio_index_map);
+	}
+}
+
+void lt_deep_sleep_config_timer(uint32_t sleep_duration_ms) {
+	deep_sleep_param.wake_up_way |= PS_DEEP_WAKEUP_RTC;
+	uint64_t sleep_ticks = 32.768 * sleep_duration_ms;
+	if (sleep_ticks >= 0xFFFFFFFF) {
+		deep_sleep_param.sleep_time = 0xFFFFFFFE;
+	} else {
+		deep_sleep_param.sleep_time = sleep_ticks & 0xFFFFFFFF;
 	}
 }

@@ -34,7 +41,7 @@ void lt_deep_sleep_enter() {
 	bk_misc_update_set_type(RESET_SOURCE_DEEPPS_GPIO);
 	GLOBAL_INT_DECLARATION();
 	GLOBAL_INT_DISABLE();
-	sctrl_enter_rtos_deep_sleep((PS_DEEP_CTRL_PARAM *)&deep_sleep_param);
+	sctrl_enter_rtos_deep_sleep_fix((PS_DEEP_CTRL_PARAM *)&deep_sleep_param);
 	ps_delay(500);
 	GLOBAL_INT_RESTORE();
 }
--- a/cores/beken-72xx/base/config/lwipopts.h
+++ b/cores/beken-72xx/base/config/lwipopts.h
@@ -10,8 +10,10 @@
 #define LWIP_NETIF_EXT_STATUS_CALLBACK 1
 #define MEMP_NUM_UDP_PCB			   (MAX_SOCKETS_UDP + 2 + 1)

+#ifndef CONFIG_IPV6
 #define ip_addr	  ip4_addr
 #define ip_addr_t ip4_addr_t
+#endif

 // increase TCP/IP thread stack size (was 512)
 #undef TCPIP_THREAD_STACKSIZE
--- a/cores/beken-72xx/base/config/tls_config.h
+++ b/cores/beken-72xx/base/config/tls_config.h
@@ -0,0 +1,9 @@
+/* Copyright (c) Kuba Szczodrzyński 2024-05-18. */
+
+#pragma once
+
+#include_next "tls_config.h"
+
+// allow more entropy sources
+#undef MBEDTLS_ENTROPY_MAX_SOURCES
+#define MBEDTLS_ENTROPY_MAX_SOURCES 10
--- a/cores/beken-72xx/base/fixups/sys_ctrl.c
+++ b/cores/beken-72xx/base/fixups/sys_ctrl.c
@@ -0,0 +1,431 @@
+#include "include.h"
+#include "sys_ctrl.h"
+
+#include "flash_pub.h"
+#include "power_save_pub.h"
+#include "gpio_pub.h"
+#include "reg_rc.h"
+#include "manual_ps_pub.h"
+
+// usage:
+// extern void sctrl_enter_rtos_deep_sleep_fix(PS_DEEP_CTRL_PARAM *deep_param);
+
+static void sctrl_mac_ahb_slave_clock_disable(void)
+{
+    UINT32 reg;
+#if (CFG_SOC_NAME == SOC_BK7271)
+    reg = REG_READ(SCTRL_CONTROL);
+    reg &= ~MAC_HCLK_EN_BIT;
+    REG_WRITE(SCTRL_CONTROL, reg);
+#else
+    reg = REG_READ(SCTRL_MODEM_CORE_RESET_PHY_HCLK);
+    reg &= ~MAC_HCLK_EN_BIT;
+    REG_WRITE(SCTRL_MODEM_CORE_RESET_PHY_HCLK, reg);
+#endif
+}
+
+// This is a patched version, where `gpio_stay_*_map` arguments are actually
+// taken into account as intended. The offical doc says that they control
+// whether the original voltage should 'stay' (float) instead of configuring
+// pins to pullup/pulldown.
+//
+// https://docs.bekencorp.com/sdk_3.0.x/bk7238/build/en/latest/developer-guide/power_save/sleep_test.html
+void sctrl_enter_rtos_deep_sleep_fix(PS_DEEP_CTRL_PARAM *deep_param)
+{
+    DD_HANDLE flash_hdl;
+    UINT32 status;
+    UINT32 param;
+    UINT32 reg;
+    UINT32 i;
+
+    uart_wait_tx_over();
+
+    /* close all peri clock*/
+    REG_WRITE(ICU_PERI_CLK_PWD, 0xfffff);  //  icu: 0x2;
+
+#if CFG_USE_UART2
+    uart2_exit();
+#endif
+#if CFG_USE_UART1
+    uart1_exit();
+#endif
+
+#if (CFG_SOC_NAME == SOC_BK7231U) || (SOC_BK7231N == CFG_SOC_NAME)
+    reg = REG_READ(SCTRL_LOW_PWR_CLK);
+    reg &=~(LPO_CLK_MUX_MASK);
+    reg |=(LPO_SRC_ROSC << LPO_CLK_MUX_POSI);
+    REG_WRITE(SCTRL_LOW_PWR_CLK, reg);
+
+    REG_WRITE(SCTRL_ROSC_CAL, 0x75);
+    REG_WRITE(SCTRL_ROSC_CAL, 0x77);
+#else
+    /*ana_reg set*/
+    REG_WRITE(SCTRL_ANALOG_CTRL0, 0x7819a59b);
+    REG_WRITE(SCTRL_ANALOG_CTRL1, 0x7819a59b);
+    REG_WRITE(SCTRL_ANALOG_CTRL2, 0x84036080);
+    REG_WRITE(SCTRL_ANALOG_CTRL3, 0x180004a0);
+    REG_WRITE(SCTRL_ANALOG_CTRL4, 0x84200e52);
+    REG_WRITE(SCTRL_ANALOG_CTRL5, 0x3b13b13b);
+#if (CFG_SOC_NAME != SOC_BK7231)
+    REG_WRITE(SCTRL_ANALOG_CTRL6, 0xb09350);
+#endif
+#if (CFG_SOC_NAME == SOC_BK7221U)
+    REG_WRITE(SCTRL_ANALOG_CTRL7, 0x441a7f0);
+    REG_WRITE(SCTRL_ANALOG_CTRL8, 0x3b187c);
+    REG_WRITE(SCTRL_ANALOG_CTRL9, 0x82204007);
+    REG_WRITE(SCTRL_ANALOG_CTRL10, 0x80801432);
+#endif
+#endif
+    ps_delay(10);
+    /*clear int*/
+    REG_WRITE(ICU_INTERRUPT_ENABLE, 0);
+
+    extern void gpio_ops_disable_filter(void);
+    gpio_ops_disable_filter();
+
+    /*  disable gpio0~31*/
+    REG_WRITE(SCTRL_GPIO_WAKEUP_EN,0x0);  //sys_ctrl : 0x48;
+    REG_WRITE(SCTRL_GPIO_WAKEUP_INT_STATUS,0xFFFFFFFF);  //sys_ctrl : 0x4a;
+
+#if (CFG_SOC_NAME != SOC_BK7231N)
+    /*	disable gpio32~39*/
+    REG_WRITE(SCTRL_GPIO_WAKEUP_EN1,0x0);  //sys_ctrl : 0x51;
+    REG_WRITE(SCTRL_GPIO_WAKEUP_INT_STATUS1,0xFF);  //sys_ctrl : 0x53;
+#endif
+
+    REG_WRITE(SCTRL_BLOCK_EN_MUX, 0x0);   //sys_ctrl : 0x4F;
+
+    /* ROSC_TIMER_int_clear*/
+    reg = REG_READ(SCTRL_ROSC_TIMER);
+    reg = reg| ROSC_TIMER_INT_STATUS_BIT ;
+    REG_WRITE(SCTRL_ROSC_TIMER,reg);      //sys_ctrl : 0x47;
+
+    /*ROSC_TIMER close */
+    reg = REG_READ(SCTRL_ROSC_TIMER);
+    reg = reg & (~ROSC_TIMER_ENABLE_BIT);																   //'C'
+    REG_WRITE(SCTRL_ROSC_TIMER,reg);
+
+    reg = REG_READ(SCTRL_LOW_PWR_CLK);
+    reg &=~(LPO_CLK_MUX_MASK);
+    if(deep_param->lpo_32k_src == LPO_SELECT_32K_XTAL)
+    {
+        reg |=(LPO_SRC_32K_XTAL << LPO_CLK_MUX_POSI);
+    }
+    else
+    {
+        reg |=(LPO_SRC_ROSC << LPO_CLK_MUX_POSI);
+    }
+
+    REG_WRITE(SCTRL_LOW_PWR_CLK, reg);    //sys_ctrl : 0x40;
+
+    /* close all peri int*/
+    //    REG_WRITE(ICU_INTERRUPT_ENABLE, 0);
+
+    /* MAC pwd*/
+    REG_WRITE(SCTRL_PWR_MAC_MODEM, MAC_PWD << MAC_PWD_POSI);   //sys_ctrl : 0x43;
+
+    sctrl_mac_ahb_slave_clock_disable();
+
+    /* Mac Subsystem clock 480m disable*/
+    reg = REG_READ(SCTRL_CONTROL);
+    REG_WRITE(SCTRL_CONTROL, reg | MAC_CLK480M_PWD_BIT);
+
+    /* Modem pwd*/
+    REG_WRITE(SCTRL_PWR_MAC_MODEM, MODEM_PWD << MODEM_PWD_POSI);
+
+    /* Modem AHB clock disable*/
+    reg = REG_READ(SCTRL_MODEM_CORE_RESET_PHY_HCLK);
+    reg &= ~PHY_HCLK_EN_BIT;
+    REG_WRITE(SCTRL_MODEM_CORE_RESET_PHY_HCLK, reg);
+
+    /* Modem Subsystem clock 480m disable*/
+    reg = REG_READ(SCTRL_CONTROL);
+    REG_WRITE(SCTRL_CONTROL, reg | MODEM_CLK480M_PWD_BIT);
+
+    /* Flash 26MHz clock select dco clock*/
+    flash_hdl = ddev_open(FLASH_DEV_NAME, &status, 0);
+    ASSERT(DD_HANDLE_UNVALID != flash_hdl);
+    ddev_control(flash_hdl, CMD_FLASH_SET_DCO, 0);
+
+    /* MCLK(main clock) select:dco*/ /* MCLK division*/
+    reg = REG_READ(SCTRL_CONTROL);
+    reg &= ~(MCLK_MUX_MASK << MCLK_MUX_POSI);
+    reg &= ~(MCLK_DIV_MASK << MCLK_DIV_POSI);
+    REG_WRITE(SCTRL_CONTROL, reg);                                     //0x02
+
+    if(deep_param->lpo_32k_src == LPO_SELECT_32K_XTAL)
+    {
+        reg = REG_READ(SCTRL_CONTROL);
+        reg =((reg & (~0xF0)) | (0<<4));
+        reg =((reg & (~0x03)) | (0<<MCLK_MUX_POSI));
+        reg =((reg & (~0x100)) | FLASH_26M_MUX_BIT);
+        REG_WRITE(SCTRL_CONTROL,reg); //sys_ctrl : 0x02;
+    }
+
+    ps_delay(10);
+
+    reg = 0x0;
+    reg = (reg &(~(BLOCK_EN_WORD_MASK << 20))&(~(0x7FFFUL<<5)) &(~(0x01UL<<1)));
+    reg = (reg |(BLOCK_EN_WORD_PWD<< 20 )|BLK_EN_FLASH|BLK_EN_ROSC32K|BLK_EN_DIGITAL_CORE|BLK_EN_ANALOG_SYS_LDO);
+    if(deep_param->lpo_32k_src == LPO_SELECT_32K_XTAL)
+    {
+        reg = (reg |BLK_EN_32K_XTAL|BLK_EN_26M_XTAL);
+    }
+    REG_WRITE(SCTRL_BLOCK_EN_CFG, reg);                  //sys_ctrl : 0x4B;                   //'E'
+
+#if (CFG_SOC_NAME != SOC_BK7231U) && (SOC_BK7231N != CFG_SOC_NAME)
+    reg = REG_READ(SCTRL_ROSC_CAL);                           //ROSC Calibration disable
+    reg =(reg  & (~0x01));
+    REG_WRITE(SCTRL_ROSC_CAL, reg);
+#endif
+
+    for(i=0; i<GPIONUM; i++)
+    {
+#if (CFG_SOC_NAME == SOC_BK7231N)
+        if(((i > GPIO1) && (i < GPIO6))
+            || ((i > GPIO11) && (i < GPIO14))
+            || ((i > GPIO17) && (i < GPIO20))
+            || ((i > GPIO24) && (i < GPIO26))
+            || ((i > GPIO26) && (i < GPIO28)))
+        {
+            continue;
+        }
+#endif
+        if(((i < BITS_INT)&&(deep_param->gpio_stay_lo_map & (0x01UL << i)))
+        ||((deep_param->gpio_index_map & (0x01UL << i)))
+        ||((deep_param->gpio_last_index_map & (0x01UL << i)))
+        ||((i >= BITS_INT)&&(deep_param->gpio_stay_hi_map & (0x01UL << (i - BITS_INT)))) )
+        {
+            continue;
+        }
+        param = GPIO_CFG_PARAM(i, GMODE_DEEP_PS);	/*set gpio 0~39 as high impendance*/
+        sddev_control(GPIO_DEV_NAME, CMD_GPIO_CFG, &param);
+    }
+
+    if (((deep_param->wake_up_way & PS_DEEP_WAKEUP_RTC))
+        && (deep_param->sleep_time!= 0xffffffff))
+    {
+    /*ROSC_TIMER  init*/
+#if (CFG_SOC_NAME != SOC_BK7231)
+        reg = (deep_param->sleep_time >> 16)& 0xffff;                                          //'A'
+        REG_WRITE(SCTRL_ROSC_TIMER_H,reg);
+#endif
+
+        reg = REG_READ(SCTRL_ROSC_TIMER);
+        reg |= ROSC_TIMER_INT_STATUS_BIT;                                                                   //'C'
+        REG_WRITE(SCTRL_ROSC_TIMER,reg);  //sys_ctrl : 0x47;
+
+        reg = REG_READ(SCTRL_ROSC_TIMER);
+        reg &= ~(ROSC_TIMER_PERIOD_MASK << ROSC_TIMER_PERIOD_POSI);
+        reg |= ((deep_param->sleep_time & ROSC_TIMER_PERIOD_MASK) << ROSC_TIMER_PERIOD_POSI);
+        REG_WRITE(SCTRL_ROSC_TIMER,reg);   //sys_ctrl : 0x47;                         //'D'
+
+        reg = REG_READ(SCTRL_ROSC_TIMER);
+        reg |= ROSC_TIMER_ENABLE_BIT;
+        REG_WRITE(SCTRL_ROSC_TIMER,reg);  //sys_ctrl : 0x47;                             //'B'
+
+        if(deep_param->lpo_32k_src == LPO_SELECT_32K_XTAL)
+        {
+            REG_WRITE(SCTRL_CONTROL, 0x330100);
+            REG_WRITE(SCTRL_BLOCK_EN_CFG, (0x15D|(0xA5C<<20)));
+            REG_WRITE(SCTRL_ROSC_CAL, 0x30);
+            REG_WRITE(SCTRL_LOW_PWR_CLK, 0x01);
+            REG_WRITE(SCTRL_MODEM_CORE_RESET_PHY_HCLK, 0x03);
+            REG_WRITE(SCTRL_CLK_GATING, 0x1ff);
+        }
+    }
+
+#if ((CFG_SOC_NAME != SOC_BK7231N) && (CFG_SOC_NAME != SOC_BK7236))
+    if ((deep_param->wake_up_way & PS_DEEP_WAKEUP_GPIO))
+    {
+        for (i = 0; i < BITS_INT; i++)
+        {
+#if(BITS_INT > GPIONUM)
+            if(i >= GPIONUM)
+            {
+                break;
+            }
+#endif
+            if (deep_param->gpio_index_map & (0x01UL << i))			/*set gpio 0~31 mode*/
+            {
+                if( deep_param->gpio_edge_map & (0x01UL << i))      //0:high,1:low.
+                {
+                    if (deep_param->gpio_stay_lo_map & (0x01UL << i)) {
+                        param = GPIO_CFG_PARAM(i, GMODE_INPUT);
+                    } else {
+                        param = GPIO_CFG_PARAM(i, GMODE_INPUT_PULLUP);
+                    }
+                    sddev_control(GPIO_DEV_NAME, CMD_GPIO_CFG, &param);
+                    if(0x1 != (UINT32)gpio_ctrl( CMD_GPIO_INPUT, &i))
+                    {   /*check gpio really input value,to correct wrong edge setting*/
+                        param = GPIO_CFG_PARAM(i, GMODE_INPUT);
+                        sddev_control(GPIO_DEV_NAME, CMD_GPIO_CFG, &param);
+                        deep_param->gpio_edge_map &= ~(0x01UL << i);
+                    }
+                }
+                else
+                {
+                    if (deep_param->gpio_stay_lo_map & (0x01UL << i)) {
+                        param = GPIO_CFG_PARAM(i, GMODE_INPUT);
+                    } else {
+                        param = GPIO_CFG_PARAM(i, GMODE_INPUT_PULLDOWN);
+                    }
+                    sddev_control(GPIO_DEV_NAME, CMD_GPIO_CFG, &param);
+                    if(0x0 != (UINT32)gpio_ctrl( CMD_GPIO_INPUT, &i))
+                    {   /*check gpio really input value,to correct wrong edge setting*/
+                        param = GPIO_CFG_PARAM(i, GMODE_INPUT);
+                        sddev_control(GPIO_DEV_NAME, CMD_GPIO_CFG, &param);
+                        deep_param->gpio_edge_map |= (0x01UL << i);
+                    }
+                }
+            }
+        }
+
+        for (i = 0; i < (GPIONUM - BITS_INT); i++)
+        {
+            if (deep_param->gpio_last_index_map & (0x01UL << i))				/*set gpio 32~39 mode*/
+            {
+                if( deep_param->gpio_last_edge_map  & (0x01UL << i))
+                {
+                    if (deep_param->gpio_stay_hi_map & (0x01UL << (i - BITS_INT))) {
+                        param = GPIO_CFG_PARAM(i + BITS_INT, GMODE_INPUT);
+                    } else {
+                        param = GPIO_CFG_PARAM(i + BITS_INT, GMODE_INPUT_PULLUP);
+                    }
+                    sddev_control(GPIO_DEV_NAME, CMD_GPIO_CFG, &param);
+                    reg = i + BITS_INT;
+                    if(0x1 != (UINT32)gpio_ctrl( CMD_GPIO_INPUT, &reg))
+                    {   /*check gpio really input value,to correct wrong edge setting*/
+                        param = GPIO_CFG_PARAM(i + BITS_INT, GMODE_INPUT);
+                        sddev_control(GPIO_DEV_NAME, CMD_GPIO_CFG, &param);
+                        deep_param->gpio_last_edge_map &= ~(0x01UL << i);
+                    }
+                }
+                else
+                {
+                    if (deep_param->gpio_stay_hi_map & (0x01UL << (i - BITS_INT))) {
+                        param = GPIO_CFG_PARAM(i + BITS_INT, GMODE_INPUT);
+                    } else {
+                        param = GPIO_CFG_PARAM(i + BITS_INT, GMODE_INPUT_PULLDOWN);
+                    }
+                    sddev_control(GPIO_DEV_NAME, CMD_GPIO_CFG, &param);
+                    reg = i + BITS_INT;
+                    if(0x0 != (UINT32)gpio_ctrl( CMD_GPIO_INPUT, &reg))
+                    {   /*check gpio really input value,to correct wrong edge setting*/
+                        param = GPIO_CFG_PARAM(i + BITS_INT, GMODE_INPUT);
+                        sddev_control(GPIO_DEV_NAME, CMD_GPIO_CFG, &param);
+                        deep_param->gpio_last_edge_map |= (0x01UL << i);
+                    }
+                }
+            }
+        }
+
+        /* set gpio 0~31 mode*/
+        reg = 0xFFFFFFFF;
+        REG_WRITE(SCTRL_GPIO_WAKEUP_INT_STATUS,reg);
+        reg = deep_param->gpio_edge_map;
+        REG_WRITE(SCTRL_GPIO_WAKEUP_TYPE,reg);
+        reg = deep_param->gpio_index_map;
+        REG_WRITE(SCTRL_GPIO_WAKEUP_EN,reg);
+
+        /* set gpio 31~32 mode*/
+        reg = 0xFF;
+        REG_WRITE(SCTRL_GPIO_WAKEUP_INT_STATUS1,reg);
+
+        reg = deep_param->gpio_last_edge_map;
+        REG_WRITE(SCTRL_GPIO_WAKEUP_TYPE1,reg);
+
+        reg = deep_param->gpio_last_index_map;
+        REG_WRITE(SCTRL_GPIO_WAKEUP_EN1,reg);
+    }
+#elif ((CFG_SOC_NAME == SOC_BK7231N) || (CFG_SOC_NAME == SOC_BK7236))
+    if(( deep_param->wake_up_way & PS_DEEP_WAKEUP_GPIO ))
+    {
+        for ( i = 0; i < BITS_INT; i++ )
+        {
+#if(BITS_INT > GPIONUM)
+            if( i >= GPIONUM )
+            {
+                break;
+            }
+#endif
+            if((( i > GPIO1 ) && ( i < GPIO6 ))
+            || (( i > GPIO11 ) && ( i < GPIO14 ))
+            || (( i > GPIO17 ) && ( i < GPIO20 ))
+            || (( i > GPIO24 ) && ( i < GPIO26 ))
+            || (( i > GPIO26 ) && ( i < GPIO28 )))
+            {
+                continue;
+            }
+
+            if ( deep_param->gpio_index_map & ( 0x01UL << i ))
+            {
+                int type_h,type_l;
+                type_l = deep_param->gpio_edge_map;
+                type_h = 0x0;
+
+                /* low level or negedge wakeup */
+                if(( type_h & ( 0x01UL << i )) == ( type_l & ( 0x01UL << i )))
+                {
+                    if (deep_param->gpio_stay_lo_map & (0x01UL << i)) {
+                        param = GPIO_CFG_PARAM(i, GMODE_INPUT);
+                    } else {
+                        param = GPIO_CFG_PARAM(i, GMODE_INPUT_PULLUP);
+                    }
+                    sddev_control(GPIO_DEV_NAME, CMD_GPIO_CFG, &param);
+                }
+                else    /* high level or posedge wakeup */
+                {
+                    if (deep_param->gpio_stay_lo_map & (0x01UL << i)) {
+                        param = GPIO_CFG_PARAM(i, GMODE_INPUT);
+                    } else {
+                        param = GPIO_CFG_PARAM(i, GMODE_INPUT_PULLDOWN);
+                    }
+                    sddev_control(GPIO_DEV_NAME, CMD_GPIO_CFG, &param);
+                }
+
+                REG_WRITE(SCTRL_GPIO_WAKEUP_TYPE, type_l);
+                REG_WRITE(SCTRL_GPIO_WAKEUP_TYPE_SELECT, type_h);
+            }
+        }
+
+        reg = deep_param->gpio_index_map;
+        REG_WRITE(SCTRL_GPIO_WAKEUP_EN,reg);
+    }
+#endif
+
+#if (CFG_SOC_NAME != SOC_BK7231N)
+    REG_WRITE(SCTRL_USB_PLUG_WAKEUP,USB_PLUG_IN_INT_BIT|USB_PLUG_OUT_INT_BIT);
+    if(deep_param->wake_up_way & PS_DEEP_WAKEUP_USB)
+    {
+        REG_WRITE(SCTRL_USB_PLUG_WAKEUP,USB_PLUG_IN_EN_BIT|USB_PLUG_OUT_EN_BIT);
+    }
+#endif
+
+#ifdef BK_DEEP_SLEEP_DEBUG
+    BK_DEEP_SLEEP_PRT("SCTRL_CONTROL=0x%08X\r\n", REG_READ(SCTRL_CONTROL));
+    BK_DEEP_SLEEP_PRT("SCTRL_SLEEP=0x%08X\r\n", REG_READ(SCTRL_SLEEP));
+    BK_DEEP_SLEEP_PRT("SCTRL_ROSC_TIMER=0x%08X\r\n", REG_READ(SCTRL_ROSC_TIMER));
+    BK_DEEP_SLEEP_PRT("SCTRL_BLOCK_EN_CFG=0x%08X\r\n", REG_READ(SCTRL_BLOCK_EN_CFG));
+    BK_DEEP_SLEEP_PRT("SCTRL_ROSC_CAL=0x%08X\r\n", REG_READ(SCTRL_ROSC_CAL));
+    BK_DEEP_SLEEP_PRT("SCTRL_BLOCK_EN_MUX=0x%08X\r\n", REG_READ(SCTRL_BLOCK_EN_MUX));
+    BK_DEEP_SLEEP_PRT("SCTRL_LOW_PWR_CLK=0x%08X\r\n", REG_READ(SCTRL_LOW_PWR_CLK));
+    BK_DEEP_SLEEP_PRT("SCTRL_PWR_MAC_MODEM=0x%08X\r\n", REG_READ(SCTRL_PWR_MAC_MODEM));
+    BK_DEEP_SLEEP_PRT("SCTRL_MODEM_CORE_RESET_PHY_HCLK=0x%08X\r\n", REG_READ(SCTRL_MODEM_CORE_RESET_PHY_HCLK));
+    BK_DEEP_SLEEP_PRT("SCTRL_CLK_GATING=0x%08X\r\n", REG_READ(SCTRL_CLK_GATING));
+    BK_DEEP_SLEEP_PRT("SCTRL_GPIO_WAKEUP_INT_STATUS=0x%08X\r\n", REG_READ(SCTRL_GPIO_WAKEUP_INT_STATUS));
+    BK_DEEP_SLEEP_PRT("SCTRL_GPIO_WAKEUP_TYPE=0x%08X\r\n", REG_READ(SCTRL_GPIO_WAKEUP_TYPE));
+    BK_DEEP_SLEEP_PRT("SCTRL_GPIO_WAKEUP_EN=0x%08X\r\n", REG_READ(SCTRL_GPIO_WAKEUP_EN));
+    BK_DEEP_SLEEP_PRT("SCTRL_GPIO_WAKEUP_INT_STATUS1=0x%08X\r\n", REG_READ(SCTRL_GPIO_WAKEUP_INT_STATUS1));
+    BK_DEEP_SLEEP_PRT("SCTRL_GPIO_WAKEUP_TYPE1=0x%08X\r\n", REG_READ(SCTRL_GPIO_WAKEUP_TYPE1));
+    BK_DEEP_SLEEP_PRT("SCTRL_GPIO_WAKEUP_EN1=0x%08X\r\n", REG_READ(SCTRL_GPIO_WAKEUP_EN1));
+#endif
+
+    /* enter deep_sleep mode */
+    reg = REG_READ(SCTRL_SLEEP);
+    reg &= ~(SLEEP_MODE_MASK << SLEEP_MODE_POSI);
+    reg = reg | SLEEP_MODE_CFG_DEEP_WORD;
+    REG_WRITE(SCTRL_SLEEP, reg);
+
+    delay(5);
+}
--- a/cores/beken-72xx/base/sdk_extern.h
+++ b/cores/beken-72xx/base/sdk_extern.h
@@ -18,7 +18,7 @@ uint32_t wdt_ctrl(uint32_t cmd, void *param);
 void bk_send_byte(uint8_t uport, uint8_t data);
 void uart_hw_set_change(uint8_t uport, bk_uart_config_t *uart_config);
 int uart_rx_callback_set(int uport, uart_callback callback, void *param);
-void sctrl_enter_rtos_deep_sleep(PS_DEEP_CTRL_PARAM *deep_param);
+void sctrl_enter_rtos_deep_sleep_fix(PS_DEEP_CTRL_PARAM *deep_param);
 void ps_delay(volatile UINT16 times);

 #ifdef __cplusplus
--- a/cores/beken-72xx/base/wraps/BkDriverFlash.c
+++ b/cores/beken-72xx/base/wraps/BkDriverFlash.c
@@ -70,8 +70,12 @@ OSStatus __wrap_bk_flash_erase(bk_partition_t partition, uint32_t off_set, uint3
 	return kNoErr;
 }

-OSStatus
-__wrap_bk_flash_write(bk_partition_t partition, volatile uint32_t off_set, uint8_t *inBuffer, uint32_t inBufferLength) {
+OSStatus __wrap_bk_flash_write(
+	bk_partition_t partition,
+	volatile uint32_t off_set,
+	uint8_t *inBuffer,
+	uint32_t inBufferLength
+) {
 	UINT32 status;
 	DD_HANDLE flash_hdl;
 	uint32_t start_addr;
@@ -98,8 +102,12 @@ __wrap_bk_flash_write(bk_partition_t partition, volatile uint32_t off_set, uint8
 	return kNoErr;
 }

-OSStatus
-__wrap_bk_flash_read(bk_partition_t partition, volatile uint32_t off_set, uint8_t *outBuffer, uint32_t inBufferLength) {
+OSStatus __wrap_bk_flash_read(
+	bk_partition_t partition,
+	volatile uint32_t off_set,
+	uint8_t *outBuffer,
+	uint32_t inBufferLength
+) {
 	UINT32 status;
 	uint32_t start_addr;
 	DD_HANDLE flash_hdl;
--- a/cores/common/arduino/libraries/api/Serial/Serial.cpp
+++ b/cores/common/arduino/libraries/api/Serial/Serial.cpp
@@ -24,7 +24,7 @@ void SerialClass::adrParse(uint8_t c) {
 #endif

 int SerialClass::available() {
-	return this->buf && this->buf->available();
+	return this->buf ? this->buf->available() : 0;
 }

 int SerialClass::peek() {
--- a/cores/common/arduino/libraries/api/WiFi/WiFi.h
+++ b/cores/common/arduino/libraries/api/WiFi/WiFi.h
@@ -97,8 +97,13 @@ class WiFiClass {
 		const uint8_t *bssid   = NULL,
 		bool connect		   = true
 	);
-	WiFiStatus
-	begin(char *ssid, char *passphrase = NULL, int32_t channel = 0, const uint8_t *bssid = NULL, bool connect = true);
+	WiFiStatus begin(
+		char *ssid,
+		char *passphrase	 = NULL,
+		int32_t channel		 = 0,
+		const uint8_t *bssid = NULL,
+		bool connect		 = true
+	);

 	bool config(
 		IPAddress localIP,
@@ -129,6 +134,8 @@ class WiFiClass {
 	uint8_t subnetCIDR();
 	bool enableIpV6();
 	IPv6Address localIPv6();
+	std::vector<IPv6Address> allLocalIPv6();
+
 	const char *getHostname();
 	bool setHostname(const char *hostname);
 	bool setMacAddress(const uint8_t *mac);
@@ -176,7 +183,11 @@ class WiFiClass {

  public: /* WiFiAP.cpp */
 	bool softAP(
-		const char *ssid, const char *passphrase = NULL, int channel = 1, bool ssidHidden = false, int maxClients = 4
+		const char *ssid,
+		const char *passphrase = NULL,
+		int channel			   = 1,
+		bool ssidHidden		   = false,
+		int maxClients		   = 4
 	);
 	bool softAPConfig(IPAddress localIP, IPAddress gateway, IPAddress subnet);
 	bool softAPdisconnect(bool wifiOff = false);
--- a/cores/common/arduino/libraries/api/WiFi/WiFiSTA.cpp
+++ b/cores/common/arduino/libraries/api/WiFi/WiFiSTA.cpp
@@ -44,5 +44,9 @@ __attribute__((weak)) bool WiFiClass::enableIpV6() {
 }

 __attribute__((weak)) IPv6Address WiFiClass::localIPv6() {
-	return IPv6Address();
+	return {};
+}
+
+__attribute__((weak)) std::vector<IPv6Address> WiFiClass::allLocalIPv6() {
+	return {};
 }
--- a/cores/common/arduino/libraries/api/WiFi/WiFiScan.cpp
+++ b/cores/common/arduino/libraries/api/WiFi/WiFiScan.cpp
@@ -3,7 +3,12 @@
 #include "WiFi.h"

 bool WiFiClass::getNetworkInfo(
-	uint8_t networkItem, String &ssid, WiFiAuthMode &encType, int32_t &rssi, uint8_t *&bssid, int32_t &channel
+	uint8_t networkItem,
+	String &ssid,
+	WiFiAuthMode &encType,
+	int32_t &rssi,
+	uint8_t *&bssid,
+	int32_t &channel
 ) {
 	ssid	= SSID(networkItem);
 	encType = encryptionType(networkItem);
@@ -39,13 +44,23 @@ void WiFiClass::scanDelete() {
 }

 uint8_t WiFiClass::scanAlloc(uint8_t count) {
-	uint8_t last = scan->count;
-	scan->count	 = count;
-	scan->ap	 = (WiFiScanAP *)realloc(scan->ap, count * sizeof(WiFiScanAP));
-	if (!scan->ap)
-		return 255;
-	memset(scan->ap + last, 0, sizeof(WiFiScanAP));
-	return last;
+	if ((!scan->ap) || (count > scan->count)) {
+		auto newMem = (WiFiScanAP *)realloc(scan->ap, count * sizeof(WiFiScanAP));
+		if (!newMem) {
+			return scan->count;
+		}
+		scan->ap = newMem;
+	}
+	if (!scan->ap) {
+		scan->count = 0;
+		return 0;
+	}
+	if (count > scan->count) {
+		// clear only new entries
+		memset(scan->ap + scan->count, 0, sizeof(WiFiScanAP) * (count - scan->count));
+	}
+	scan->count = count;
+	return count;
 }

 String WiFiClass::SSID(uint8_t networkItem) {
--- a/cores/common/arduino/libraries/common/Update/Update.cpp
+++ b/cores/common/arduino/libraries/common/Update/Update.cpp
@@ -149,8 +149,8 @@ size_t UpdateClass::write(const uint8_t *data, size_t len) {
 	if (!this->ctx)
 		return 0;

-	size_t written = lt_ota_write(ctx, data, len);
 	MD5Update(this->md5Ctx, data, len);
+	size_t written = lt_ota_write(ctx, data, len);
 	if (written != len)
 		this->cleanup(/* clearError= */ false);
 	return written;
--- a/cores/common/arduino/libraries/common/WiFiClient/MbedTLSClient.cpp
+++ b/cores/common/arduino/libraries/common/WiFiClient/MbedTLSClient.cpp
@@ -86,13 +86,21 @@ int MbedTLSClient::connect(const char *host, uint16_t port, int32_t timeout) {
 }

 int MbedTLSClient::connect(
-	IPAddress ip, uint16_t port, const char *rootCABuf, const char *clientCert, const char *clientKey
+	IPAddress ip,
+	uint16_t port,
+	const char *rootCABuf,
+	const char *clientCert,
+	const char *clientKey
 ) {
 	return connect(ipToString(ip).c_str(), port, 0, rootCABuf, clientCert, clientKey, NULL, NULL) == 0;
 }

 int MbedTLSClient::connect(
-	const char *host, uint16_t port, const char *rootCABuf, const char *clientCert, const char *clientKey
+	const char *host,
+	uint16_t port,
+	const char *rootCABuf,
+	const char *clientCert,
+	const char *clientKey
 ) {
 	return connect(host, port, 0, rootCABuf, clientCert, clientKey, NULL, NULL) == 0;
 }
--- a/cores/common/arduino/libraries/common/WiFiClient/WiFiClientSecure.h
+++ b/cores/common/arduino/libraries/common/WiFiClient/WiFiClientSecure.h
@@ -26,12 +26,22 @@

 class IWiFiClientSecure {
  public:
-	virtual int
-	connect(IPAddress ip, uint16_t port, const char *rootCABuf, const char *clientCert, const char *clientKey) = 0;
-	virtual int
-	connect(const char *host, uint16_t port, const char *rootCABuf, const char *clientCert, const char *clientKey) = 0;
-	virtual int connect(IPAddress ip, uint16_t port, const char *pskIdent, const char *psk)						   = 0;
-	virtual int connect(const char *host, uint16_t port, const char *pskIdent, const char *psk)					   = 0;
+	virtual int connect(
+		IPAddress ip,
+		uint16_t port,
+		const char *rootCABuf,
+		const char *clientCert,
+		const char *clientKey
+	) = 0;
+	virtual int connect(
+		const char *host,
+		uint16_t port,
+		const char *rootCABuf,
+		const char *clientCert,
+		const char *clientKey
+	)																							= 0;
+	virtual int connect(IPAddress ip, uint16_t port, const char *pskIdent, const char *psk)		= 0;
+	virtual int connect(const char *host, uint16_t port, const char *pskIdent, const char *psk) = 0;

 	virtual int lastError(char *buf, const size_t size) = 0;
 	virtual void setInsecure() = 0; // Don't validate the chain, just accept whatever is given. VERY INSECURE!
--- a/cores/common/arduino/libraries/common/mDNS/LwIPmDNS.cpp
+++ b/cores/common/arduino/libraries/common/mDNS/LwIPmDNS.cpp
@@ -20,11 +20,45 @@ extern "C" {

 #if LWIP_MDNS_RESPONDER

-static std::vector<char *> services_name;
-static std::vector<char *> services;
-static std::vector<uint8_t> protos;
-static std::vector<uint16_t> ports;
-static std::vector<std::vector<char *>> records;
+struct CachedService {
+	CachedService(const char *_name, const char *_service, mdns_sd_proto _proto, uint16_t _port)
+		: name(strdup(_name)), service(strdup(_service)), proto(_proto), port(_port) {}
+
+	CachedService(const CachedService &)			= delete;
+	CachedService &operator=(const CachedService &) = delete;
+
+	CachedService(CachedService &&other)
+		: name(other.name), service(other.service), proto(other.proto), port(other.port),
+		  records(std::move(other.records)) {
+		other.name	  = nullptr;
+		other.service = nullptr;
+		other.records.clear();
+	}
+
+	~CachedService() {
+		if (name) {
+			free(name);
+		}
+
+		if (service) {
+			free(service);
+		}
+
+		for (auto &str : records) {
+			if (str) {
+				free(str);
+			}
+		}
+	}
+
+	char *name;
+	char *service;
+	mdns_sd_proto proto;
+	uint16_t port;
+	std::vector<char *> records;
+};
+
+static std::vector<CachedService> sCachedServices;

 static const char *hostName;
 #ifdef LWIP_NETIF_EXT_STATUS_CALLBACK
@@ -33,46 +67,72 @@ NETIF_DECLARE_EXT_CALLBACK(netif_callback)

 mDNS::mDNS() {}

-mDNS::~mDNS() {}
+mDNS::~mDNS() {
+	cleanup();
+}
+
+void mDNS::cleanup() {
+	sCachedServices.clear();
+
+	free((void *)hostName);
+	hostName = NULL;
+
+	free((void *)instanceName);
+	instanceName = NULL;
+}

 static void mdnsTxtCallback(struct mdns_service *service, void *userdata) {
 	size_t index = (size_t)userdata;
-	if (index >= records.size())
+	if (index >= sCachedServices.size())
 		return;

-	for (const auto record : records[index]) {
+	for (const auto &record : sCachedServices[index].records) {
 		err_t err = mdns_resp_add_service_txtitem(service, record, strlen(record));
-		if (err != ERR_OK)
-			return;
+		if (err != ERR_OK) {
+			LT_DM(MDNS, "Error %d while adding txt record: %s", err, record);
+		}
 	}
 }

+#if LWIP_VERSION_SIMPLE < 20200 // TTL removed in LwIP commit 62fb2fd749b (2.2.0 release)
 static void mdnsStatusCallback(struct netif *netif, uint8_t result) {
 	LT_DM(MDNS, "Status: netif %u, status %u", netif->num, result);
 }
+#else
+static void mdnsStatusCallback(struct netif *netif, uint8_t result, int8_t slot) {
+	LT_DM(MDNS, "Status: netif %u, status %u slot %d", netif->num, result, slot);
+}
+#endif

 #ifdef LWIP_NETIF_EXT_STATUS_CALLBACK
 static void addServices(struct netif *netif) {
-	for (uint8_t i = 0; i < services.size(); i++) {
+	for (uint8_t i = 0; i < sCachedServices.size(); i++) {
+		const auto &cachedService = sCachedServices[i];
 		LT_DM(
 			MDNS,
 			"Add service: netif %u / %s / %s / %u / %u",
 			netif->num,
-			services_name[i],
-			services[i],
-			protos[i],
-			ports[i]
+			cachedService.name,
+			cachedService.service,
+			cachedService.proto,
+			cachedService.port
 		);
-		mdns_resp_add_service(
+		s8_t slot = mdns_resp_add_service(
 			netif,
-			services_name[i],
-			services[i],
-			(mdns_sd_proto)protos[i],
-			ports[i],
+			cachedService.name,
+			cachedService.service,
+			cachedService.proto,
+			cachedService.port,
+#if LWIP_VERSION_SIMPLE < 20200 // TTL removed in LwIP commit 62fb2fd749b (2.2.0 release)
 			255,
+#endif
 			mdnsTxtCallback,
 			reinterpret_cast<void *>(i) // index of newly added service
 		);
+
+		if (slot < 0) {
+			LT_DM(MDNS, "mdns_resp_add_service returned error %d", slot);
+		}
 	}
 }
 #endif
@@ -85,7 +145,11 @@ static bool enableMDNS(struct netif *netif) {
 			igmp_start(netif);
 			LT_DM(MDNS, "Added IGMP to netif %u", netif->num);
 		}
+#if LWIP_VERSION_SIMPLE < 20200 // TTL removed in LwIP commit 62fb2fd749b (2.2.0 release)
 		err_t ret = mdns_resp_add_netif(netif, hostName, 255);
+#else
+		err_t ret = mdns_resp_add_netif(netif, hostName);
+#endif
 		if (ret == ERR_OK) {
 			LT_DM(MDNS, "mDNS started on netif %u, announcing it to network", netif->num);
 #if LWIP_VERSION_SIMPLE >= 20100
@@ -102,14 +166,17 @@ static bool enableMDNS(struct netif *netif) {
 }

 #ifdef LWIP_NETIF_EXT_STATUS_CALLBACK
-static void
-mdns_netif_ext_status_callback(struct netif *netif, netif_nsc_reason_t reason, const netif_ext_callback_args_t *args) {
+static void mdns_netif_ext_status_callback(
+	struct netif *netif,
+	netif_nsc_reason_t reason,
+	const netif_ext_callback_args_t *args
+) {
 	if (reason & LWIP_NSC_NETIF_REMOVED) {
 		LT_DM(MDNS, "Netif removed, stopping mDNS on netif %u", netif->num);
 		mdns_resp_remove_netif(netif);
-	} else if (reason & LWIP_NSC_STATUS_CHANGED) {
-		LT_DM(MDNS, "Netif changed, starting mDNS on netif %u", netif->num);
-		if (enableMDNS(netif) && services.size() > 0) {
+	} else if ((reason & LWIP_NSC_STATUS_CHANGED) || (reason & LWIP_NSC_NETIF_ADDED)) {
+		LT_DM(MDNS, "Netif changed/added, starting mDNS on netif %u", netif->num);
+		if (enableMDNS(netif) && sCachedServices.size() > 0) {
 			LT_DM(MDNS, "Adding services to netif %u", netif->num);
 			addServices(netif);
 		}
@@ -136,63 +203,71 @@ bool mDNS::begin(const char *hostname) {
 }

 void mDNS::end() {
+#ifdef LWIP_NETIF_EXT_STATUS_CALLBACK
+	netif_remove_ext_callback(&netif_callback);
+#endif
+
 	struct netif *netif = netif_list;
 	while (netif != NULL) {
 		if (netif_is_up(netif))
 			mdns_resp_remove_netif(netif);
 		netif = netif->next;
 	}
+
+	cleanup();
 }

 bool mDNS::addServiceImpl(const char *name, const char *service, uint8_t proto, uint16_t port) {
 	bool added			= false;
 	struct netif *netif = netif_list;
+
+	std::size_t serviceIndex = sCachedServices.size();
+	// add the service to TXT record arrays
+	sCachedServices.emplace_back(name, service, (mdns_sd_proto)proto, port);
+
 	while (netif != NULL) {
 		if (netif_is_up(netif)) {
 			// register TXT callback;
 			// pass service index as userdata parameter
 			LT_DM(MDNS, "Add service: netif %u / %s / %s / %u / %u", netif->num, name, service, proto, port);
-			mdns_resp_add_service(
+			s8_t slot = mdns_resp_add_service(
 				netif,
 				name,
 				service,
 				(mdns_sd_proto)proto,
 				port,
+#if LWIP_VERSION_SIMPLE < 20200 // TTL removed in LwIP commit 62fb2fd749b (2.2.0 release)
 				255,
+#endif
 				mdnsTxtCallback,
-				(void *)services.size() // index of newly added service
+				(void *)serviceIndex // index of newly added service
 			);
+
+			if (slot < 0) {
+				LT_DM(MDNS, "mdns_resp_add_service returned error %d", slot);
+			}
+
 			added = true;
 		}
 		netif = netif->next;
 	}

-	if (!added)
-		return false;
-
-	// add the service to TXT record arrays
-	services_name.push_back(strdup(name));
-	services.push_back(strdup(service));
-	protos.push_back(proto);
-	ports.push_back(port);
-	records.emplace_back();
-
-	return true;
+	return added;
 }

 bool mDNS::addServiceTxtImpl(const char *service, uint8_t proto, const char *item) {
-	int8_t index = -1;
-	for (uint8_t i = 0; i < services.size(); i++) {
+	uint8_t i;
+	for (i = 0; i < sCachedServices.size(); i++) {
+		const auto &cachedService = sCachedServices[i];
 		// find a matching service
-		if (strcmp(services[i], service) == 0 && protos[i] == proto) {
-			index = i;
+		if (strcmp(cachedService.service, service) == 0 && cachedService.proto == proto) {
 			break;
 		}
 	}
-	if (index == -1)
+	if (i == sCachedServices.size())
 		return false;

-	records[index].push_back(strdup(item));
+	sCachedServices[i].records.push_back(strdup(item));
 	return true;
 }

--- a/cores/common/arduino/libraries/common/mDNS/mDNS.cpp
+++ b/cores/common/arduino/libraries/common/mDNS/mDNS.cpp
@@ -2,14 +2,23 @@

 #include "mDNS.h"

-static char *ensureUnderscore(const char *value) {
-	uint8_t len	 = strlen(value) + 1;
+static char *ensureUnderscore(char *value) {
+	if (value[0] == '_') {
+		return value;
+	}
+	size_t len	 = strlen(value) + 1 + 1; // 1 for underscore, 1 for null-terminator
 	char *result = (char *)malloc(len);
 	result[0]	 = '_';
-	strcpy(result + 1, value + (value[0] == '_'));
+	strcpy(result + 1, value);
 	return result;
 }

+static inline void freeIfCopied(const char *original, char *duplicate) {
+	if ((duplicate) && (original != duplicate)) {
+		free(duplicate);
+	}
+}
+
 void mDNS::setInstanceName(const char *name) {
 	if (instanceName)
 		free(instanceName);
@@ -21,7 +30,7 @@ bool mDNS::addService(char *service, char *proto, uint16_t port) {
 	uint8_t _proto = strncmp(proto + (proto[0] == '_'), "tcp", 3) == 0 ? MDNS_TCP : MDNS_UDP;

 	bool result = addServiceImpl(instanceName ? instanceName : "LT mDNS", _service, _proto, port);
-	free(_service);
+	freeIfCopied(service, _service);
 	return result;
 }

@@ -34,7 +43,7 @@ bool mDNS::addServiceTxt(char *service, char *proto, char *key, char *value) {
 	sprintf(txt, "%s=%s", key, value);

 	bool result = addServiceTxtImpl(_service, _proto, txt);
-	free(_service);
+	freeIfCopied(service, _service);
 	free(txt);
 	return result;
 }
--- a/cores/common/arduino/libraries/common/mDNS/mDNS.h
+++ b/cores/common/arduino/libraries/common/mDNS/mDNS.h
@@ -51,6 +51,7 @@ class mDNS {
  private:
 	bool addServiceImpl(const char *name, const char *service, uint8_t proto, uint16_t port);
 	bool addServiceTxtImpl(const char *service, uint8_t proto, const char *item);
+	void cleanup();

 	char *instanceName = NULL;

--- a/cores/common/arduino/libraries/ext/HTTPClient/HTTPClient.cpp
+++ b/cores/common/arduino/libraries/ext/HTTPClient/HTTPClient.cpp
@@ -321,7 +321,12 @@ bool HTTPClient::begin(String host, uint16_t port, String uri, const char *CAcer
 }

 bool HTTPClient::begin(
-	String host, uint16_t port, String uri, const char *CAcert, const char *cli_cert, const char *cli_key
+	String host,
+	uint16_t port,
+	String uri,
+	const char *CAcert,
+	const char *cli_cert,
+	const char *cli_key
 ) {
 	if (_client && !_tcpDeprecated) {
 		log_d("mix up of new and deprecated api");
--- a/cores/common/arduino/libraries/ext/WebServer/WebServer.h
+++ b/cores/common/arduino/libraries/ext/WebServer/WebServer.h
@@ -81,7 +81,9 @@ class WebServer {

 	bool authenticate(const char *username, const char *password);
 	void requestAuthentication(
-		HTTPAuthMethod mode = BASIC_AUTH, const char *realm = NULL, const String &authFailMsg = String("")
+		HTTPAuthMethod mode		  = BASIC_AUTH,
+		const char *realm		  = NULL,
+		const String &authFailMsg = String("")
 	);

 	typedef std::function<void(void)> THandlerFunction;
--- a/cores/common/arduino/libraries/ext/WebServer/detail/RequestHandlersImpl.h
+++ b/cores/common/arduino/libraries/ext/WebServer/detail/RequestHandlersImpl.h
@@ -10,7 +10,10 @@ using namespace mime;
 class FunctionRequestHandler : public RequestHandler {
  public:
 	FunctionRequestHandler(
-		WebServer::THandlerFunction fn, WebServer::THandlerFunction ufn, const Uri &uri, HTTPMethod method
+		WebServer::THandlerFunction fn,
+		WebServer::THandlerFunction ufn,
+		const Uri &uri,
+		HTTPMethod method
 	)
 		: _fn(fn), _ufn(ufn), _uri(uri.clone()), _method(method) {
 		_uri->initPathArgs(pathArgs);
--- a/cores/common/base/api/lt_device.c
+++ b/cores/common/base/api/lt_device.c
@@ -62,8 +62,12 @@ const char *lt_get_reboot_reason_name(lt_reboot_reason_t reason) {
 			return "WDT Reset";
 		case REBOOT_REASON_CRASH:
 			return "Crash";
-		case REBOOT_REASON_SLEEP:
-			return "Sleep Wakeup";
+		case REBOOT_REASON_SLEEP_GPIO:
+			return "Sleep Wakeup (GPIO)";
+		case REBOOT_REASON_SLEEP_RTC:
+			return "Sleep Wakeup (RTC)";
+		case REBOOT_REASON_SLEEP_USB:
+			return "Sleep Wakeup (USB)";
 		case REBOOT_REASON_DEBUGGER:
 			return "Debugger";
 		default:
--- a/cores/common/base/api/lt_device.h
+++ b/cores/common/base/api/lt_device.h
@@ -4,32 +4,40 @@

 #include <libretiny.h>

-#define RESET_REASON_UNKNOWN  REBOOT_REASON_UNKNOWN
-#define RESET_REASON_POWER	  REBOOT_REASON_POWER
-#define RESET_REASON_BROWNOUT REBOOT_REASON_BROWNOUT
-#define RESET_REASON_HARDWARE REBOOT_REASON_HARDWARE
-#define RESET_REASON_SOFTWARE REBOOT_REASON_SOFTWARE
-#define RESET_REASON_WATCHDOG REBOOT_REASON_WATCHDOG
-#define RESET_REASON_CRASH	  REBOOT_REASON_CRASH
-#define RESET_REASON_SLEEP	  REBOOT_REASON_SLEEP
-#define RESET_REASON_MAX	  REBOOT_REASON_MAX
+#define RESET_REASON_UNKNOWN	REBOOT_REASON_UNKNOWN
+#define RESET_REASON_POWER		REBOOT_REASON_POWER
+#define RESET_REASON_BROWNOUT	REBOOT_REASON_BROWNOUT
+#define RESET_REASON_HARDWARE	REBOOT_REASON_HARDWARE
+#define RESET_REASON_SOFTWARE	REBOOT_REASON_SOFTWARE
+#define RESET_REASON_WATCHDOG	REBOOT_REASON_WATCHDOG
+#define RESET_REASON_CRASH		REBOOT_REASON_CRASH
+#define RESET_REASON_SLEEP_GPIO REBOOT_REASON_SLEEP_GPIO
+#define RESET_REASON_SLEEP_RTC	REBOOT_REASON_SLEEP_RTC
+#define RESET_REASON_SLEEP_USB	REBOOT_REASON_SLEEP_USB
+#define RESET_REASON_MAX		REBOOT_REASON_MAX

 /**
 * @brief Reset reason enumeration.
 */
 typedef enum {
-	REBOOT_REASON_UNKNOWN  = 1,
-	REBOOT_REASON_POWER	   = 2,
-	REBOOT_REASON_BROWNOUT = 3,
-	REBOOT_REASON_HARDWARE = 4,
-	REBOOT_REASON_SOFTWARE = 5,
-	REBOOT_REASON_WATCHDOG = 6,
-	REBOOT_REASON_CRASH	   = 7,
-	REBOOT_REASON_SLEEP	   = 8,
-	REBOOT_REASON_DEBUGGER = 9,
-	REBOOT_REASON_MAX	   = 10,
+	REBOOT_REASON_UNKNOWN	 = 1,
+	REBOOT_REASON_POWER		 = 2,
+	REBOOT_REASON_BROWNOUT	 = 3,
+	REBOOT_REASON_HARDWARE	 = 4,
+	REBOOT_REASON_SOFTWARE	 = 5,
+	REBOOT_REASON_WATCHDOG	 = 6,
+	REBOOT_REASON_CRASH		 = 7,
+	REBOOT_REASON_SLEEP_GPIO = 8,
+	REBOOT_REASON_SLEEP_RTC	 = 9,
+	REBOOT_REASON_SLEEP_USB	 = 10,
+	REBOOT_REASON_DEBUGGER	 = 11,
+	REBOOT_REASON_MAX		 = 12,
 } lt_reboot_reason_t;

+// RESET_REASON_SLEEP deprecated, kept for compatibility
+#define RESET_REASON_SLEEP	REBOOT_REASON_SLEEP_GPIO
+#define REBOOT_REASON_SLEEP REBOOT_REASON_SLEEP_GPIO
+
 /**
 * @brief Debugging mode enumeration.
 */
--- a/cores/common/base/api/lt_sleep.c
+++ b/cores/common/base/api/lt_sleep.c
@@ -6,6 +6,8 @@ __attribute__((weak)) void lt_deep_sleep_config_gpio(uint32_t gpio_index_map, bo

 __attribute__((weak)) void lt_deep_sleep_unset_gpio(uint32_t gpio_index_map);

+__attribute__((weak)) void lt_deep_sleep_keep_floating_gpio(uint32_t gpio_index_map, bool on_high);
+
 __attribute__((weak)) void lt_deep_sleep_config_timer(uint32_t sleep_duration);

 __attribute__((weak)) void lt_deep_sleep_enter();
--- a/cores/common/base/api/lt_sleep.h
+++ b/cores/common/base/api/lt_sleep.h
@@ -19,6 +19,21 @@ void lt_deep_sleep_config_gpio(uint32_t gpio_index_map, bool on_high);
 */
 void lt_deep_sleep_unset_gpio(uint32_t gpio_index_map);

+/**
+ * @brief Configure GPIO pins to be kept floating
+ *
+ * This prevents pins from being configured as pullup/pulldown, based on
+ * the configured wake-up mode (low/high), upon entering deep sleep.
+ * This is important, as some-low power devices may be unable to ever
+ * overcome the internal pull strength and change the level. One example
+ * of such device is a magnetic door sensor that must be able to wake on
+ * level change in both directions.
+ *
+ * @param gpio_index_map bitMap of the pins to set/unset as floating
+ * @param enabled whether to set pins to floating or roll back to default mode
+ */
+void lt_deep_sleep_keep_floating_gpio(uint32_t gpio_index_map, bool enabled);
+
 /**
 * @brief Set a sleep timer to wake up the device
 * @param sleep_duration the time in milliseconds to sleep
--- a/cores/common/base/config/lwipopts.h
+++ b/cores/common/base/config/lwipopts.h
@@ -15,8 +15,15 @@

 // set lwIP debugging options according to LT config
 #if LT_DEBUG_LWIP
+// enable main debugging switch
 #undef LWIP_DEBUG
 #define LWIP_DEBUG 1
+// enable all messages
+#undef LWIP_DBG_MIN_LEVEL
+#define LWIP_DBG_MIN_LEVEL 0
+// enable all debugging types
+#undef LWIP_DBG_TYPES_ON
+#define LWIP_DBG_TYPES_ON 0xF8
 // make lwIP use printf() library
 #include <stdio.h>
 #undef LWIP_PLATFORM_DIAG
--- a/cores/common/base/lt_logger.h
+++ b/cores/common/base/lt_logger.h
@@ -100,31 +100,31 @@ void lt_log_disable();
 #endif

 // ESP32 compat
-#define log_printf(...)		LT_I(__VA_ARGS__)
-#define log_v(...)			LT_V(__VA_ARGS__)
-#define log_d(...)			LT_D(__VA_ARGS__)
-#define log_i(...)			LT_I(__VA_ARGS__)
-#define log_w(...)			LT_W(__VA_ARGS__)
-#define log_e(...)			LT_E(__VA_ARGS__)
-#define log_n(...)			LT_E(__VA_ARGS__)
-#define isr_log_v(...)		LT_V(__VA_ARGS__)
-#define isr_log_d(...)		LT_D(__VA_ARGS__)
-#define isr_log_i(...)		LT_I(__VA_ARGS__)
-#define isr_log_w(...)		LT_W(__VA_ARGS__)
-#define isr_log_e(...)		LT_E(__VA_ARGS__)
-#define isr_log_n(...)		LT_E(__VA_ARGS__)
-#define ESP_LOGV(...)		LT_V(__VA_ARGS__)
-#define ESP_LOGD(...)		LT_D(__VA_ARGS__)
-#define ESP_LOGI(...)		LT_I(__VA_ARGS__)
-#define ESP_LOGW(...)		LT_W(__VA_ARGS__)
-#define ESP_LOGE(...)		LT_E(__VA_ARGS__)
-#define ESP_EARLY_LOGV(...) LT_V(__VA_ARGS__)
-#define ESP_EARLY_LOGD(...) LT_D(__VA_ARGS__)
-#define ESP_EARLY_LOGI(...) LT_I(__VA_ARGS__)
-#define ESP_EARLY_LOGW(...) LT_W(__VA_ARGS__)
-#define ESP_EARLY_LOGE(...) LT_E(__VA_ARGS__)
-#define ets_printf(...)		LT_I(__VA_ARGS__)
-#define ETS_PRINTF(...)		LT_I(__VA_ARGS__)
+#define log_printf(...)			 LT_I(__VA_ARGS__)
+#define log_v(...)				 LT_V(__VA_ARGS__)
+#define log_d(...)				 LT_D(__VA_ARGS__)
+#define log_i(...)				 LT_I(__VA_ARGS__)
+#define log_w(...)				 LT_W(__VA_ARGS__)
+#define log_e(...)				 LT_E(__VA_ARGS__)
+#define log_n(...)				 LT_E(__VA_ARGS__)
+#define isr_log_v(...)			 LT_V(__VA_ARGS__)
+#define isr_log_d(...)			 LT_D(__VA_ARGS__)
+#define isr_log_i(...)			 LT_I(__VA_ARGS__)
+#define isr_log_w(...)			 LT_W(__VA_ARGS__)
+#define isr_log_e(...)			 LT_E(__VA_ARGS__)
+#define isr_log_n(...)			 LT_E(__VA_ARGS__)
+#define ESP_LOGV(tag, ...)		 LT_V(__VA_ARGS__)
+#define ESP_LOGD(tag, ...)		 LT_D(__VA_ARGS__)
+#define ESP_LOGI(tag, ...)		 LT_I(__VA_ARGS__)
+#define ESP_LOGW(tag, ...)		 LT_W(__VA_ARGS__)
+#define ESP_LOGE(tag, ...)		 LT_E(__VA_ARGS__)
+#define ESP_EARLY_LOGV(tag, ...) LT_V(__VA_ARGS__)
+#define ESP_EARLY_LOGD(tag, ...) LT_D(__VA_ARGS__)
+#define ESP_EARLY_LOGI(tag, ...) LT_I(__VA_ARGS__)
+#define ESP_EARLY_LOGW(tag, ...) LT_W(__VA_ARGS__)
+#define ESP_EARLY_LOGE(tag, ...) LT_E(__VA_ARGS__)
+#define ets_printf(...)			 LT_I(__VA_ARGS__)
+#define ETS_PRINTF(...)			 LT_I(__VA_ARGS__)

 #define LT_RET(ret)                                                                                                    \
 	LT_E("ret=%d", ret);                                                                                               \
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kuba Szczodrzyński	0f6c31386b	[release] v1.7.0 Some checks failed Release / Run Clang lint (push) Has been cancelled Details Release / Publish PlatformIO platform (push) Has been cancelled Details Release / Publish GitHub release (push) Has been cancelled Details	2024-09-05 16:41:10 +02:00
Kuba Szczodrzyński	a9009a8cee	[misc] Update .clang-format style	2024-09-05 16:36:55 +02:00
Piotr Szulc	31e1d51dbd	[common] Cleanup mDNS code, cache service records (#263 ) * Handle possible failure of mdns_resp_add_service * One more place where mdns_resp_add_service may fail * addServiceImpl should always store services * Register in services when new netif is added * Refactored handling of cached services. --------- Co-authored-by: Kuba Szczodrzyński <kuba@szczodrzynski.pl>	2024-09-05 15:54:04 +02:00
Luca Olivetti	41819f2fd6	[beken-72xx] Fix CHANGE interrupt logic (#290 ) * fix CHANGE interrupt for beken-72xx * Update cores/beken-72xx/arduino/src/wiring_irq.c --------- Co-authored-by: Kuba Szczodrzyński <kuba@szczodrzynski.pl>	2024-09-05 14:46:42 +02:00
David Woodhouse	17043f634f	[beken-72xx] Add IPv6 and lwIP 2.2.0 support (#292 ) * mDNS: Fix build against LwIP 2.2.0 * Stop defining ip_addr_t when !CONFIG_IPV6 The only reason we had to do this is because we forgot to define LWIP_IPV4, which is fixed in our LwIP port now, but keep it around for !CONFIG_IPV6 for now for builds against older LwIP. * Allow returning IPv6 results from WiFiClass::hostByName() * Add ipv6 and extra mDNS files for LwIP 2.2.0 * Add IPv6 support to BK72xx WifiSTA Add an allLocalIPv6() method to return a vector of addresses, rather than just one. It's not clear where the enableIpV6() and localIPv6() methods came from; they don't seem to be part of the standard Arduino class. Eventually at least for ESPHome, I'd like to stop using these classes and just let the ESPHome wifi component talk directly to LwIP. Or maybe LibreTiny should offer an API compatible with the esp-idf one which is a light wrapper around LwIP. But short of a major refactor, this seems like a reasonable option. * Update LwIP default to 2.2.0 * Apply suggestions from code review --------- Co-authored-by: Kuba Szczodrzyński <kuba@szczodrzynski.pl>	2024-09-05 14:46:13 +02:00
devgs	e1c5761df9	[beken-72xx] Allow setting deep sleep wake-up pins as floating (#275 ) According to guide `gpio_stay_*_map` are specifically there to prevent pulling pins to a specific level and let them float during deep sleep. https://docs.bekencorp.com/sdk_3.0.x/bk7238/build/en/latest/developer-guide/power_save/sleep_test.html This allows any external low-power circuitry to change a pin level, as required, to trigger the wake up This requires changes in BDK and was implemented via fixup. Also, exposed `gpio_stay_lo_map` parameter via `lt_deep_sleep_keep_floating_gpio` to manage this configuration for pins in range P0-P31.	2024-09-05 14:45:48 +02:00
Kuba Szczodrzyński	fbaae21011	[release] v1.6.0 Some checks failed Release / Run Clang lint (push) Has been cancelled Details Release / Publish PlatformIO platform (push) Has been cancelled Details Release / Publish GitHub release (push) Has been cancelled Details	2024-05-31 15:01:17 +02:00
Jaco Malan	fa2064b957	[realtek-ambz] Temporarily workaround CHANGE interrupts not supported (#282 ) * fix change interruptsnot supported on rtl8710b * Update cores/realtek-amb/arduino/src/wiring_irq.c --------- Co-authored-by: Kuba Szczodrzyński <kuba@szczodrzynski.pl>	2024-05-31 14:59:46 +02:00
Kuba Szczodrzyński	21a194f43d	[core] Fix lwIP debugging support	2024-05-31 14:58:38 +02:00
devgs	b255402659	[beken-72xx] Fix race condition when checking Wi-Fi SSID (#274 ) * Fix for a race condition in WiFi connection loop There seems to be the race between the event RW_EVT_STA_CONNECTED and an actual valid SSID value returned by BDK. If even a small delay is injected immediately after the event reception the valid value becomes available. Without this fix, due to a polling nature of ESPHome WiFiComponent::check_connecting_finished function may observe the WiFiSTAConnectStatus::CONNECTED status but with an empty SSID value, leading to `Incomplete connection.` warning and immediate attempt to start another connection, while the current one was actually established. * Fixed clang format conformance * Apply suggestions from code review * Update cores/beken-72xx/arduino/libraries/WiFi/WiFiEvents.cpp Co-authored-by: Cossid <83468485+Cossid@users.noreply.github.com> --------- Co-authored-by: Kuba Szczodrzyński <kuba@szczodrzynski.pl> Co-authored-by: Cossid <83468485+Cossid@users.noreply.github.com>	2024-05-31 14:54:41 +02:00
Kuba Szczodrzyński	dfabfbb921	[beken-72xx] Increase MBEDTLS_ENTROPY_MAX_SOURCES	2024-05-18 13:50:25 +02:00
Kuba Szczodrzyński	3b36a70c9a	[core] Fix ESP_LOG#() macro syntax	2024-05-18 13:50:10 +02:00
Piotr Szulc	d1386a8e9d	[libs] Fix mDNS string memory corruption, print error on record add failure (#260 ) * Fixed unsafe conversion to underscore string * Fixed formatting * Save one byte if underscore not needed * Don't allocate new string if already underscored * Fix missing first character while copying * Renamed function and made it inline * Don't use signed index variable when searching for service * Add proper cleanup of LwIPmDNS - Free allocated memory both on end() and in the destructor - Unregister callback from netif * Don't free const pointer * Removed unneeded casting * Don't break the loop if failed to add txt record * Fixed code formatting	2024-03-08 12:21:14 +01:00
Kuba Szczodrzyński	67b92b7f56	[release] v1.5.1 Some checks failed Release / Run Clang lint (push) Has been cancelled Details Release / Publish PlatformIO platform (push) Has been cancelled Details Release / Publish GitHub release (push) Has been cancelled Details	2024-02-29 14:14:01 +01:00
Hajo Noerenberg	a1f8516e60	[realtek-ambz] Fix crash after WiFi scan (#258 )	2024-02-26 21:35:35 +01:00
cap9qd	cf52021d38	[core] Split reboot reasons due to wakeup (#254 ) * Updates to break out wakeup reasons. Per https://github.com/libretiny-eu/libretiny/issues/234 * Update cores/common/base/api/lt_device.h Co-authored-by: Kuba Szczodrzyński <kuba@szczodrzynski.pl> * fix clang-format * Fix formatting of python files. * Update lt_device.h --------- Co-authored-by: Kuba Szczodrzyński <kuba@szczodrzynski.pl>	2024-02-25 18:45:22 +01:00
cap9qd	b78c9387a6	[beken-72xx] Fix duration rollover in deep sleep (#253 )	2024-02-22 20:24:40 +01:00
Kuba Szczodrzyński	b748d99437	[release] v1.5.0 Some checks failed Release / Run Clang lint (push) Has been cancelled Details Release / Publish PlatformIO platform (push) Has been cancelled Details Release / Publish GitHub release (push) Has been cancelled Details	2024-02-20 17:16:15 +01:00
Anna	9a33fc0a69	[docs] Improve getting started guide (#252 ) * Update Readme & improve md layout - ESPHome now supports LibreTiny natively - Added extra PIO docs references - Reworded some sections slightly, to accomodate proper grammar - PIO deprecated the `platformio platform install` command, replaced this with the official recommendation/replacement * Use backslash for line break, revert changing indent --------- Co-authored-by: Kuba Szczodrzyński <kuba@szczodrzynski.pl>	2024-02-20 17:14:12 +01:00
Hajo Noerenberg	4cddc01f22	[libs] Fix MD5 calculation during OTA update (#240 )	2024-01-17 22:49:33 +01:00
Piotr Szulc	1d80b5fff7	[beken-72xx] Free list returned by wlan_sta_scan_result() (#226 ) * Free list returned by wlan_sta_scan_result() * scanAlloc improvements There were a few things I didn't like about this function: 1) realloc() was called a bit too often. 2) if realloc() failed, the previous memory was not freed. 3) scanAlloc returned previous count or 255 on error. But there was no real check for error and 255 could've been used as index to null. I think it's better to simple return boolean. 4) scanAlloc was clearing memory only up to (and excluding) the new entries. * Corrected clearing new entries in scanAlloc * scanAlloc() now returns number of allocated items * Fixed compilation issues related to goto.	2024-01-06 19:41:01 +01:00
Cossid	140cf07173	[docs] Use official ESPHome version, add LT dev version guide (#223 ) * Update ESPHome documentation * Update note format * Switch to https github format, give manual PR checkout instructions until a better method is found. * Fix yaml sample spacing * Fix indent * Add addon migration info * Replace spaces with tabs --------- Co-authored-by: Kuba Szczodrzyński <kuba@szczodrzynski.pl>	2024-01-06 19:40:44 +01:00
Piotr Szulc	1e3a82f439	[beken-72xx] Improve ddev ADC support (#220 )	2024-01-06 19:40:33 +01:00
Cossid	c90794e9f5	[beken-72xx] Allow connecting to specific BSSID if provided (#209 ) * Switch to bk_wlan_start_sta_adv for specific bssid control. * Allow split sta/adv_sta configs. * Add wifi_mode back for regular STA mode. * Fix apparent bug of setting null/empty wifi key. Reset STA_ADV_CFG.dhcp_mode in reconnect, as it seems to not survive for some reason. Do les _CFG setting in reconnect() * Move all _CFG setting to begin() * Fix dhcp_mode in STA_ADV_CFG. * Remove no longer necessary dhcp_mode re-set. * Formatting cleanups. * Formatting. * Update cores/beken-72xx/arduino/libraries/WiFi/WiFiSTA.cpp * Apply suggestions from code review --------- Co-authored-by: Kuba Szczodrzyński <kuba@szczodrzynski.pl>	2024-01-06 19:40:08 +01:00
Kuba Szczodrzyński	03c723c73d	[docs] Add draft Beken key extraction docs	2024-01-06 19:20:03 +01:00
Gerard Du Pre	bad2ffdd07	[docs] Update docker compose image name (#225 ) The docs about using docker compose for libre tuya had an error. When setting what image to use in compose you dont have to put docker pull, just the image you are going to use	2023-12-25 19:42:53 +01:00
Piotr Szulc	eed39c9cfb	[beken-72xx] Pause PWM instead of stopping, track PWM state (#222 ) * Pause PWM instead of stopping on duty cycle 0. * Merged paused and stopped conditions	2023-12-16 13:57:47 +01:00
Piotr Szulc	7bd6d1d815	[beken-72xx] Fix stopping PWM, use pin-scoped PWM struct (#215 ) * Fixed stopping PWM * Clang-formatted as required * Use separate memory block for each pwm pin	2023-12-08 19:20:41 +01:00
Piotr Szulc	bb7fcd5c4d	[docs] Add more UPK key descriptions (#219 ) * Added description of some UPK keys * More keys described. This time by experimenting on my PIR-enabled lamp. Motion is reported correctly via GPIO defined as pirin_pin. I am also trying to set the PIR sensitivity by applying PWM to the pirsense_pin, and I _think_ it works. More experiments are needed. * Add UPK2ESPHome link, reformat table * Add descriptions from BK7231N SDK * Update docs/resources/tuya-pin-config.md * Corrected description of cwmaxp * Description of ambient light sensor values --------- Co-authored-by: Kuba Szczodrzyński <kuba@szczodrzynski.pl>	2023-12-08 19:13:15 +01:00
Kuba Szczodrzyński	9b8e00c7fa	[boards] Support and validate MCU name aliases	2023-11-14 22:38:22 +01:00
Kuba Szczodrzyński	b97825d552	[boards] Add T112_V1.1 board, change scaling of small boards	2023-11-14 22:30:13 +01:00
Kuba Szczodrzyński	085b5aed16	[boards] Update boardgen to v0.10.1	2023-10-28 14:58:52 +02:00
protectivedad	7f43624824	[builder] Fix printing flash layout in env.py (#191 ) Pointed to the proper item.	2023-10-27 13:34:09 +02:00
Kuba Szczodrzyński	1ed0000819	[release] v1.4.1 Some checks failed Release / Run Clang lint (push) Has been cancelled Details Release / Publish PlatformIO platform (push) Has been cancelled Details Release / Publish GitHub release (push) Has been cancelled Details	2023-09-22 17:54:18 +02:00
Mike La Spina	3b79636d00	[libs] Fix SerialClass available() return value (#173 ) Co-authored-by: descipher <120155735+GelidusResearch@users.noreply.github.com>	2023-09-21 17:19:51 +02:00