feat: rebase to rev C

Author: kanru

config/boards/arm/whkb_pro2/Kconfig.defconfig

@@ -4,7 +4,7 @@
 if BOARD_WHKB_PRO2
 
 config ZMK_KEYBOARD_NAME
-    default "WHKB Pro2 Rev A"
+    default "WHKB Pro2"
 
 config BOARD
     default "whkb_pro2"

config/boards/arm/whkb_pro2/board.cmake

@@ -0,0 +1 @@
+include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)

config/boards/arm/whkb_pro2/revision.cmake

@@ -0,0 +1,3 @@
+board_check_revision(FORMAT LETTER
+                     DEFAULT_REVISION C
+)

config/boards/arm/whkb_pro2/whkb_pro2.dts

@@ -19,37 +19,16 @@
         zephyr,console = &cdc_acm_uart;
         zmk,battery = &vbatt0;
     };
-
-    vbatt0: vbatt0 {
-        compatible = "zmk,battery-voltage-divider";
-        io-channels = <&adc 1>; // P0.03
-        output-ohms = <2000000>;
-        full-ohms = <(1000000 + 2000000)>;
-        power-gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>; // P0.02
-    };
-
-    hhkb_pro2_connector: hhkb_pro2_connector {
-        compatible = "zmk,hhkb-pro2-header";
-        #gpio-cells = <2>;
-        gpio-map-mask = <0xffffffff 0xffffffc0>;
-        gpio-map-pass-thru = <0 0x3f>;
-        gpio-map = <0 0 &gpio0 31 NRF_GPIO_DRIVE_S0H1>,
-                   <1 0 &gpio0 4 0>,
-                   <2 0 &gpio0 5 0>,
-                   <3 0 &gpio0 22 0>,
-                   <4 0 &gpio0 7 0>,
-                   <5 0 &gpio1 9 0>,
-                   <6 0 &gpio0 12 0>,
-                   <7 0 &gpio0 23 0>,
-                   <8 0 &gpio0 21 0>,
-                   <9 0 &gpio0 19 0>;
-    };
 };
 
 &adc {
     status = "okay";
 };
 
+&gpiote {
+    status = "okay";
+};
+
 &gpio0 {
     status = "okay";
 };

config/boards/arm/whkb_pro2/whkb_pro2_A.conf

@@ -0,0 +1 @@
+CONFIG_ZMK_KEYBOARD_NAME="WHKB Pro2 Rev A"

config/boards/arm/whkb_pro2/whkb_pro2_A.overlay

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2021 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <zephyr/dt-bindings/gpio/nordic-nrf-gpio.h>
+
+/ {
+    vbatt0: vbatt0 {
+        compatible = "zmk,battery-voltage-divider";
+        io-channels = <&adc 1>; // P0.03
+        output-ohms = <2000000>;
+        full-ohms = <(1000000 + 2000000)>;
+        power-gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>; // P0.02
+    };
+
+    hhkb_pro2_connector: hhkb_pro2_connector {
+        compatible = "zmk,hhkb-pro2-header";
+        #gpio-cells = <2>;
+        gpio-map-mask = <0xffffffff 0xffffffc0>;
+        gpio-map-pass-thru = <0 0x3f>;
+        gpio-map = <0 0 &gpio0 31 NRF_GPIO_DRIVE_S0H1>,
+                   <1 0 &gpio0 4 0>,
+                   <2 0 &gpio0 5 0>,
+                   <3 0 &gpio0 22 0>,
+                   <4 0 &gpio0 7 0>,
+                   <5 0 &gpio1 9 0>,
+                   <6 0 &gpio0 12 0>,
+                   <7 0 &gpio0 23 0>,
+                   <8 0 &gpio0 21 0>,
+                   <9 0 &gpio0 19 0>;
+    };
+};

config/boards/arm/whkb_pro2/whkb_pro2_C.conf

@@ -0,0 +1 @@
+CONFIG_ZMK_KEYBOARD_NAME="WHKB Pro2 Rev C"

config/boards/arm/whkb_pro2/whkb_pro2_C.overlay

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2021 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <zephyr/dt-bindings/gpio/nordic-nrf-gpio.h>
+
+/ {
+    vbatt0: vbatt0 {
+        compatible = "zmk,battery-nrf-vddh";
+    };
+
+    hhkb_pro2_connector: hhkb_pro2_connector {
+        compatible = "zmk,hhkb-pro2-header";
+        #gpio-cells = <2>;
+        gpio-map-mask = <0xffffffff 0xffffffc0>;
+        gpio-map-pass-thru = <0 0x3f>;
+        gpio-map = <0 0 &gpio0 29 0>, // LDO_ENABLE
+                   <1 0 &gpio0 13 0>,
+                   <2 0 &gpio0 20 0>,
+                   <3 0 &gpio0 17 0>,
+                   <4 0 &gpio0 15 0>,
+                   <5 0 &gpio0 7 0>,
+                   <6 0 &gpio0 12 0>,
+                   <7 0 &gpio0 4 0>,
+                   <8 0 &gpio0 8 0>,
+                   <9 0 &gpio0 6 0>;
+    };
+};

config/zephyr/kscan/kscan_hhkb_pro2.c

@@ -235,7 +235,7 @@ static const struct kscan_driver_api kscan_hhkb_pro2_api = {
                           NULL,                                                            \
                           &kscan_hhkb_pro2_data##inst,                                     \
                           &kscan_hhkb_pro2_config##inst,                                   \
-                          APPLICATION,                                                     \
+                          POST_KERNEL,                                                     \
                           CONFIG_APPLICATION_INIT_PRIORITY,                                \
                           &kscan_hhkb_pro2_api);