From 266c4b6533eda2044cb777a3b9d7bd2e040e43f5 Mon Sep 17 00:00:00 2001 From: Alex Kang Date: Tue, 12 Sep 2023 07:28:08 -0700 Subject: [PATCH] Separate Microdox V1 and V2 .zmk.yml files --- app/boards/shields/microdox/microdox.dtsi | 4 ---- app/boards/shields/microdox/microdox.zmk.yml | 2 -- app/boards/shields/microdox/microdox_common.dtsi | 2 ++ app/boards/shields/microdox/microdox_v2.dtsi | 4 ---- app/boards/shields/microdox/microdox_v2.zmk.yml | 13 +++++++++++++ 5 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 app/boards/shields/microdox/microdox_v2.zmk.yml diff --git a/app/boards/shields/microdox/microdox.dtsi b/app/boards/shields/microdox/microdox.dtsi index 49c1db4f..57247e68 100644 --- a/app/boards/shields/microdox/microdox.dtsi +++ b/app/boards/shields/microdox/microdox.dtsi @@ -7,10 +7,6 @@ #include "microdox_common.dtsi" / { - chosen { - zmk,kscan = &kscan0; - }; - kscan0: kscan { compatible = "zmk,kscan-gpio-matrix"; label = "KSCAN"; diff --git a/app/boards/shields/microdox/microdox.zmk.yml b/app/boards/shields/microdox/microdox.zmk.yml index 9db24ccf..389fbca4 100644 --- a/app/boards/shields/microdox/microdox.zmk.yml +++ b/app/boards/shields/microdox/microdox.zmk.yml @@ -11,5 +11,3 @@ features: siblings: - microdox_left - microdox_right - - microdox_v2_left - - microdox_v2_right diff --git a/app/boards/shields/microdox/microdox_common.dtsi b/app/boards/shields/microdox/microdox_common.dtsi index a0baa36a..0460e012 100644 --- a/app/boards/shields/microdox/microdox_common.dtsi +++ b/app/boards/shields/microdox/microdox_common.dtsi @@ -9,7 +9,9 @@ / { chosen { zephyr,display = &oled; + zmk,kscan = &kscan0; zmk,matrix_transform = &default_transform; + }; default_transform: keymap_transform_0 { diff --git a/app/boards/shields/microdox/microdox_v2.dtsi b/app/boards/shields/microdox/microdox_v2.dtsi index 36294874..93fa4445 100644 --- a/app/boards/shields/microdox/microdox_v2.dtsi +++ b/app/boards/shields/microdox/microdox_v2.dtsi @@ -7,10 +7,6 @@ #include "microdox_common.dtsi" / { - chosen { - zmk,kscan = &kscan0; - }; - kscan0: kscan { compatible = "zmk,kscan-gpio-matrix"; label = "KSCAN"; diff --git a/app/boards/shields/microdox/microdox_v2.zmk.yml b/app/boards/shields/microdox/microdox_v2.zmk.yml new file mode 100644 index 00000000..382a8529 --- /dev/null +++ b/app/boards/shields/microdox/microdox_v2.zmk.yml @@ -0,0 +1,13 @@ +file_format: "1" +id: microdox +name: Microdox +type: shield +url: https://boardsource.xyz/store/5f2e7e4a2902de7151494f92 +requires: [pro_micro] +exposes: [i2c_oled] +features: + - keys + - display +siblings: + - microdox_v2_left + - microdox_v2_right