From 9e611e184bfd82b2877d3698273d582119f17679 Mon Sep 17 00:00:00 2001
From: Jack Hartstein <hartsteinjackint@yahoo.com>
Date: Sun, 27 Dec 2020 07:59:23 -0800
Subject: [PATCH] added usb and ble statements to Kconfig and updated readme

---
 app/boards/shields/duck/Kconfig.defconfig |  6 ++++++
 app/boards/shields/duck/Kconfig.shield    |  2 +-
 app/boards/shields/duck/README.md         |  2 +-
 app/boards/shields/duck/duck.conf         | 25 +++++++++++++++++++++++
 app/boards/shields/duck/duck.overlay      |  8 ++++----
 5 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/app/boards/shields/duck/Kconfig.defconfig b/app/boards/shields/duck/Kconfig.defconfig
index fd801036..b9fd98c1 100644
--- a/app/boards/shields/duck/Kconfig.defconfig
+++ b/app/boards/shields/duck/Kconfig.defconfig
@@ -8,4 +8,10 @@ if SHIELD_DUCK
 config ZMK_KEYBOARD_NAME
 	default "duck"
 
+config ZMK_USB
+	default y
+
+config ZMK_BLE
+	default y
+
 endif
diff --git a/app/boards/shields/duck/Kconfig.shield b/app/boards/shields/duck/Kconfig.shield
index abf2a946..71f70490 100644
--- a/app/boards/shields/duck/Kconfig.shield
+++ b/app/boards/shields/duck/Kconfig.shield
@@ -4,4 +4,4 @@
  # Author: Jack Hartstein
 
 config SHIELD_DUCK
-	def_bool $(shields_list_contains, duck)
+	def_bool $(shields_list_contains,duck)
diff --git a/app/boards/shields/duck/README.md b/app/boards/shields/duck/README.md
index 014097cd..ebc61103 100644
--- a/app/boards/shields/duck/README.md
+++ b/app/boards/shields/duck/README.md
@@ -1,6 +1,6 @@
 ## ZMK Firmware adapted for duckboard/nice!nano combo
 
-Last Updated: 26 Dec 2020
+Last Updated: 27 Dec 2020
 
 **_warning:_** this is beta firmware that is in its very early stages, many functions still need to be tested
 
diff --git a/app/boards/shields/duck/duck.conf b/app/boards/shields/duck/duck.conf
index ca37616e..c77c69fc 100644
--- a/app/boards/shields/duck/duck.conf
+++ b/app/boards/shields/duck/duck.conf
@@ -11,3 +11,28 @@ CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
 CONFIG_ZMK_RGB_UNDERGLOW=y
 # Use the STRIP config specific to the LEDs you're using
 CONFIG_WS2812_STRIP=y
+
+# USB debugging settings
+
+# Turn on logging, and set ZMK logging to debug output
+CONFIG_LOG=y
+CONFIG_ZMK_LOG_LEVEL_DBG=y
+
+# Turn on USB CDC ACM device
+CONFIG_USB=y
+CONFIG_USB_DEVICE_STACK=y
+CONFIG_USB_CDC_ACM=y
+CONFIG_USB_CDC_ACM_RINGBUF_SIZE=1024
+CONFIG_USB_CDC_ACM_DEVICE_NAME="CDC_ACM"
+CONFIG_USB_CDC_ACM_DEVICE_COUNT=1
+
+# Enable serial console
+CONFIG_SERIAL=y
+CONFIG_CONSOLE=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
+CONFIG_UART_LINE_CTRL=y
+
+# Enable USB UART, and set the console device
+CONFIG_UART_CONSOLE=y
+CONFIG_USB_UART_CONSOLE=y
+CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
diff --git a/app/boards/shields/duck/duck.overlay b/app/boards/shields/duck/duck.overlay
index 42255bfc..f42ac41c 100644
--- a/app/boards/shields/duck/duck.overlay
+++ b/app/boards/shields/duck/duck.overlay
@@ -20,10 +20,10 @@
 
 	row-gpios
     		= <&pro_micro_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-                , <&pro_micro_d 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+                , <&pro_micro_a 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
                 , <&pro_micro_d 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-                , <&pro_micro_d 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-                , <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+                , <&pro_micro_a 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+                , <&pro_micro_a 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
                 ;
 
 	col-gpios
@@ -31,7 +31,7 @@
 		, <&pro_micro_d 15 GPIO_ACTIVE_HIGH>
 		, <&pro_micro_d 14 GPIO_ACTIVE_HIGH>
 		, <&pro_micro_d 16 GPIO_ACTIVE_HIGH>
-		, <&pro_micro_d 10 GPIO_ACTIVE_HIGH>
+		, <&pro_micro_a 10 GPIO_ACTIVE_HIGH>
 		;
 	};
 };