Fix pinctrl (#45)

yumagulovrn · Mar 6, 2024 · 491c6c7 · 491c6c7
1 parent 9df2db2
commit 491c6c7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 17 deletions.
diff --git a/config/boards/arm/dao/board.cmake b/config/boards/arm/dao/board.cmake
@@ -1,8 +1,5 @@
-#
-# Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT
-#
 
 board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
+include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
-include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
diff --git a/config/boards/arm/dao/dao.dtsi b/config/boards/arm/dao/dao.dtsi
@@ -11,7 +11,7 @@
 
 
 / {
-	model = "dao";
+	model = "Dao";
 	compatible = "dao";
 
 	chosen {
@@ -71,6 +71,13 @@
 			;
 	};
 
+    leds {
+        compatible = "gpio-leds";
+        blue_led: led_0 {
+            gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
+        };
+    };
+
 	vbatt: vbatt {
 		compatible = "zmk,battery-voltage-divider";
 		label = "VBATT";
@@ -102,17 +109,6 @@
 	status = "okay";
 };
 
-&uart0 {
-	compatible = "nordic,nrf-uarte";
-	status = "okay";
-	current-speed = <115200>;
-	tx-pin = <19>;
-	rx-pin = <21>;
-	rts-pin = <23>;
-	cts-pin = <25>;
-};
-
-
 &flash0 {
 	/*
 	 * For more information, see:

diff --git a/config/boards/arm/dao/dao_left_defconfig b/config/boards/arm/dao/dao_left_defconfig
@@ -38,3 +38,5 @@ CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
 
 CONFIG_ZMK_USB=y	
 CONFIG_ZMK_BLE=y
+
+CONFIG_PINCTRL=n
diff --git a/config/boards/arm/dao/dao_right_defconfig b/config/boards/arm/dao/dao_right_defconfig
@@ -34,5 +34,7 @@ CONFIG_BUILD_OUTPUT_UF2=y
 # Increase transmit power level
 CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
 
-CONFIG_ZMK_USB=y	
+CONFIG_ZMK_USB=n	
 CONFIG_ZMK_BLE=y
+
+CONFIG_PINCTRL=n
Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,3 +38,5 @@ CONFIG_BT_CTLR_TX_PWR_PLUS_8=y

		CONFIG_ZMK_USB=y
		CONFIG_ZMK_BLE=y

		CONFIG_PINCTRL=n