From 1ddc9f9153c67bec4bcf7d837c617c711f317678 Mon Sep 17 00:00:00 2001
From: Dmitry Kupriyanov <kuban1408@gmail.com>
Date: Mon, 16 Jan 2023 12:45:50 +0400
Subject: [PATCH] Address comments

---
 app/boards/arm/dao/Kconfig.defconfig   | 12 ++----------
 app/boards/arm/dao/dao.conf            |  5 +++++
 app/boards/arm/dao/dao.dtsi            | 17 +++++++++++++++++
 app/boards/arm/dao/dao_left_defconfig  |  5 +----
 app/boards/arm/dao/dao_right_defconfig |  3 ---
 5 files changed, 25 insertions(+), 17 deletions(-)
 create mode 100644 app/boards/arm/dao/dao.conf

diff --git a/app/boards/arm/dao/Kconfig.defconfig b/app/boards/arm/dao/Kconfig.defconfig
index 1e80c3bc..b04b6e1e 100644
--- a/app/boards/arm/dao/Kconfig.defconfig
+++ b/app/boards/arm/dao/Kconfig.defconfig
@@ -6,19 +6,11 @@ if BOARD_DAO_LEFT
 	config ZMK_KEYBOARD_NAME
 	default "Dao"
 
-    config ZMK_SPLIT_BLE_ROLE_CENTRAL
+    config ZMK_SPLIT_ROLE_CENTRAL
 	default y
 
 endif # BOARD_DAO_LEFT
 
-if BOARD_DAO_RIGHT
-
-	config ZMK_KEYBOARD_NAME
-	default "Dao Right"
-
-endif # BOARD_DAO_RIGHT
-
-
 if BOARD_DAO_LEFT || BOARD_DAO_RIGHT
 
 config BOARD
@@ -49,4 +41,4 @@ config USB_DEVICE_STACK
 
 endif # USB
 
-endif # BOARD_DAO_LEFT || BOARD_DAO_RIGHT
+endif # BOARD_DAO_LEFT || BOARD_DAO_RIGHT
\ No newline at end of file
diff --git a/app/boards/arm/dao/dao.conf b/app/boards/arm/dao/dao.conf
new file mode 100644
index 00000000..e3d26480
--- /dev/null
+++ b/app/boards/arm/dao/dao.conf
@@ -0,0 +1,5 @@
+# Turn on logging, and set ZMK logging to debug output
+# CONFIG_ZMK_USB_LOGGING=y
+
+# Increase transmit power level
+CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
\ No newline at end of file
diff --git a/app/boards/arm/dao/dao.dtsi b/app/boards/arm/dao/dao.dtsi
index 7b9716f9..be78e489 100644
--- a/app/boards/arm/dao/dao.dtsi
+++ b/app/boards/arm/dao/dao.dtsi
@@ -40,6 +40,23 @@
 		>;
 	};
 
+	less_key_transform: keymap_transform_1 {
+		compatible = "zmk,matrix-transform";
+		columns = <12>;
+		rows = <4>;
+
+			// | SW1  | SW2  | SW3  | SW4  | SW5  | SW6  |   | SW6  | SW5  | SW4  | SW3  | SW2  | SW1  |
+			// | SW7  | SW8  | SW9  | SW10 | SW11 | SW12 |   | SW12 | SW11 | SW10 | SW9  | SW8  | SW7  |
+			// | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 |   | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 |
+			// |      |      |      | SW20 | SW21 | SW22 |   | SW22 | SW21 | SW20 |      |      |      |
+					map = <
+            RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)  RC(0,11) RC(0,10) RC(0,9) RC(0,8) RC(0,7) RC(0,6)
+            RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)  RC(1,11) RC(1,10) RC(1,9) RC(1,8) RC(1,7) RC(1,6)
+            RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5)  RC(2,11) RC(2,10) RC(2,9) RC(2,8) RC(2,7) RC(2,6)
+                                    RC(3,3) RC(3,4) RC(3,5)  RC(3,11) RC(3,10) RC(3,9)
+		>;
+	}
+
 	kscan0: kscan {
 		compatible = "zmk,kscan-gpio-matrix";
 		label = "KSCAN";
diff --git a/app/boards/arm/dao/dao_left_defconfig b/app/boards/arm/dao/dao_left_defconfig
index 7881f6c6..6061ea11 100644
--- a/app/boards/arm/dao/dao_left_defconfig
+++ b/app/boards/arm/dao/dao_left_defconfig
@@ -35,7 +35,4 @@ CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM=y
 # CONFIG_ZMK_LOG_LEVEL_DBG=y
 
 # Turn on uf2 build
-CONFIG_BUILD_OUTPUT_UF2=y
-
-# Increase transmit power level
-CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
+CONFIG_BUILD_OUTPUT_UF2=y
\ No newline at end of file
diff --git a/app/boards/arm/dao/dao_right_defconfig b/app/boards/arm/dao/dao_right_defconfig
index f743acfe..1c1cee39 100644
--- a/app/boards/arm/dao/dao_right_defconfig
+++ b/app/boards/arm/dao/dao_right_defconfig
@@ -34,6 +34,3 @@ CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM=y
 
 # Turn on uf2 build
 CONFIG_BUILD_OUTPUT_UF2=y
-
-# Increase transmit power level
-CONFIG_BT_CTLR_TX_PWR_PLUS_8=y