From cca8337f0562afbfb11de5af92ba5dc3c9334991 Mon Sep 17 00:00:00 2001
From: Jason Chestnut <jason.chestnut@gmail.com>
Date: Wed, 23 Sep 2020 16:05:29 -0400
Subject: Add support to GPIO matrix driver for matrix polling, rather than
 interrupt-based IO.   - Add ZMK_KSCAN_MATRIX_POLLING config flag to Kconfig  
 - Update matrix driver code to use the above flag to conditionally add the
 handling code for polling operations.

---
 app/boards/arm/planck/Kconfig.defconfig                   | 3 +++
 app/boards/shields/clueboard_california/Kconfig.defconfig | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'app/boards')

diff --git a/app/boards/arm/planck/Kconfig.defconfig b/app/boards/arm/planck/Kconfig.defconfig
index 6f5bf52..913c1c1 100644
--- a/app/boards/arm/planck/Kconfig.defconfig
+++ b/app/boards/arm/planck/Kconfig.defconfig
@@ -11,4 +11,7 @@ config ZMK_KEYBOARD_NAME
 config ZMK_USB
 	default y
 
+config ZMK_KSCAN_MATRIX_POLLING
+    default y
+
 endif # BOARD_PLANCK_REV6
diff --git a/app/boards/shields/clueboard_california/Kconfig.defconfig b/app/boards/shields/clueboard_california/Kconfig.defconfig
index 2408f9f..e101ea7 100644
--- a/app/boards/shields/clueboard_california/Kconfig.defconfig
+++ b/app/boards/shields/clueboard_california/Kconfig.defconfig
@@ -8,7 +8,7 @@ config ZMK_KEYBOARD_NAME
 # across A & B controllers, and STM32F303CCT6 can't enable
 # interrutps for multiple controllers for the same "line"
 # for the external interrupts.
-config ZMK_KSCAN_GPIO_POLLING
+config ZMK_KSCAN_DIRECT_POLLING
 	default y
 
 endif
-- 
cgit v1.2.3


From 9be566603e2eb248fbaa7af65cba42d5c06dbd33 Mon Sep 17 00:00:00 2001
From: Pete Johanson <peter@peterjohanson.com>
Date: Thu, 6 Aug 2020 09:30:31 -0400
Subject: feat(kscan): Use PORT events for kscan matrix interrupts

* Lower power usage compared to regular interrupts on nrf52.
---
 app/boards/arm/nice_nano/nice_nano.dts | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/boards')

diff --git a/app/boards/arm/nice_nano/nice_nano.dts b/app/boards/arm/nice_nano/nice_nano.dts
index 2e9556b..3ffb0ea 100644
--- a/app/boards/arm/nice_nano/nice_nano.dts
+++ b/app/boards/arm/nice_nano/nice_nano.dts
@@ -31,6 +31,10 @@
 
 };
 
+&gpiote {
+	status = "okay";
+};
+
 &gpio0 {
 	status = "okay";
 };
-- 
cgit v1.2.3


From c54decd1443a41bd68905256db6286d51324c8e4 Mon Sep 17 00:00:00 2001
From: Mega Mind <68985133+megamind4089@users.noreply.github.com>
Date: Thu, 1 Oct 2020 23:57:16 +0800
Subject: Added Makerdiary M.2 module

---
 app/boards/arm/nrf52840_m2/CMakeLists.txt        | 13 ++++
 app/boards/arm/nrf52840_m2/Kconfig               | 10 +++
 app/boards/arm/nrf52840_m2/Kconfig.board         | 10 +++
 app/boards/arm/nrf52840_m2/Kconfig.defconfig     | 30 ++++++++
 app/boards/arm/nrf52840_m2/board.cmake           |  9 +++
 app/boards/arm/nrf52840_m2/nrf52840_m2.dts       | 97 ++++++++++++++++++++++++
 app/boards/arm/nrf52840_m2/nrf52840_m2.yaml      | 15 ++++
 app/boards/arm/nrf52840_m2/nrf52840_m2_defconfig | 23 ++++++
 8 files changed, 207 insertions(+)
 create mode 100644 app/boards/arm/nrf52840_m2/CMakeLists.txt
 create mode 100644 app/boards/arm/nrf52840_m2/Kconfig
 create mode 100644 app/boards/arm/nrf52840_m2/Kconfig.board
 create mode 100644 app/boards/arm/nrf52840_m2/Kconfig.defconfig
 create mode 100644 app/boards/arm/nrf52840_m2/board.cmake
 create mode 100644 app/boards/arm/nrf52840_m2/nrf52840_m2.dts
 create mode 100644 app/boards/arm/nrf52840_m2/nrf52840_m2.yaml
 create mode 100644 app/boards/arm/nrf52840_m2/nrf52840_m2_defconfig

(limited to 'app/boards')

diff --git a/app/boards/arm/nrf52840_m2/CMakeLists.txt b/app/boards/arm/nrf52840_m2/CMakeLists.txt
new file mode 100644
index 0000000..84b2ab9
--- /dev/null
+++ b/app/boards/arm/nrf52840_m2/CMakeLists.txt
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+#
+
+set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
+  COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/../tools/uf2/utils/uf2conv.py
+  -c
+  -b 0x26000
+  -f 0xADA52840
+  -o ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.uf2
+  ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.bin
+)
diff --git a/app/boards/arm/nrf52840_m2/Kconfig b/app/boards/arm/nrf52840_m2/Kconfig
new file mode 100644
index 0000000..faff492
--- /dev/null
+++ b/app/boards/arm/nrf52840_m2/Kconfig
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+#
+
+config BOARD_ENABLE_DCDC
+	bool "Enable DCDC mode"
+	select SOC_DCDC_NRF52X
+	default y
+	depends on BOARD_NRF52840_M2
diff --git a/app/boards/arm/nrf52840_m2/Kconfig.board b/app/boards/arm/nrf52840_m2/Kconfig.board
new file mode 100644
index 0000000..6ade68c
--- /dev/null
+++ b/app/boards/arm/nrf52840_m2/Kconfig.board
@@ -0,0 +1,10 @@
+# Maker Diary nrf52840 M.2 board configuration
+#
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+#
+
+config BOARD_NRF52840_M2
+	bool "nrf52480_m2"
+	depends on SOC_NRF52840_QIAA
+
diff --git a/app/boards/arm/nrf52840_m2/Kconfig.defconfig b/app/boards/arm/nrf52840_m2/Kconfig.defconfig
new file mode 100644
index 0000000..98fcd08
--- /dev/null
+++ b/app/boards/arm/nrf52840_m2/Kconfig.defconfig
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+#
+
+if BOARD_NRF52840_M2
+
+config BOARD
+	default "nrf52480_m2"
+
+if USB
+
+config USB_NRFX
+	default y
+
+config USB_DEVICE_STACK
+	default y
+
+endif # USB
+
+config BT_CTLR
+	default BT
+
+config ZMK_BLE
+	default y
+
+config ZMK_USB
+	default y
+
+endif # BOARD_NRF52840_M2
diff --git a/app/boards/arm/nrf52840_m2/board.cmake b/app/boards/arm/nrf52840_m2/board.cmake
new file mode 100644
index 0000000..f521e2c
--- /dev/null
+++ b/app/boards/arm/nrf52840_m2/board.cmake
@@ -0,0 +1,9 @@
+#
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+#
+
+board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
+
+include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
diff --git a/app/boards/arm/nrf52840_m2/nrf52840_m2.dts b/app/boards/arm/nrf52840_m2/nrf52840_m2.dts
new file mode 100644
index 0000000..fb5b0ff
--- /dev/null
+++ b/app/boards/arm/nrf52840_m2/nrf52840_m2.dts
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ * SPDX-License-Identifier: MIT
+ */
+
+/dts-v1/;
+#include <nordic/nrf52840_qiaa.dtsi>
+
+/ {
+	model = "Makerdiary nRF52840 M.2 module";
+	compatible = "makerdiary,nrf52840_m2";
+
+	chosen {
+		zephyr,code-partition = &code_partition;
+		//zephyr,console = &uart0;
+		//zephyr,bt-mon-uart = &uart0;
+		//zephyr,bt-c2h-uart = &uart0;
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		red_led: led_0 {
+			gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;
+			label = "Red LED";
+		};
+		green_led: led_1 {
+			gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
+			label = "Green LED";
+		};
+		blue_led: led_2 {
+			gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;
+			label = "Blue LED";
+		};
+	};
+
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&uart0 {
+	compatible = "nordic,nrf-uart";
+	status = "okay";
+	current-speed = <115200>;
+	tx-pin = <16>;
+	rx-pin = <15>;
+	rts-pin = <14>;
+	cts-pin = <13>;
+};
+
+&usbd {
+	compatible = "nordic,nrf-usbd";
+	status = "okay";
+};
+
+
+&flash0 {
+	/*
+	 * For more information, see:
+	 * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
+	 */
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		boot_partition: partition@0 {
+			label = "adafruit_boot";
+			reg = <0x000000000 0x0000C000>;
+		};
+		code_partition: partition@26000 {
+			label = "code_partition";
+			reg = <0x00026000 0x000d2000>;
+		};
+
+		/*
+		 * The flash starting at 0x000f8000 and ending at
+		 * 0x000fffff is reserved for use by the application.
+		 */
+
+		/*
+		 * Storage partition will be used by FCB/LittleFS/NVS
+		 * if enabled.
+		 */
+		storage_partition: partition@f8000 {
+			label = "storage";
+			reg = <0x000f8000 0x00008000>;
+		};
+	};
+};
diff --git a/app/boards/arm/nrf52840_m2/nrf52840_m2.yaml b/app/boards/arm/nrf52840_m2/nrf52840_m2.yaml
new file mode 100644
index 0000000..0a999bb
--- /dev/null
+++ b/app/boards/arm/nrf52840_m2/nrf52840_m2.yaml
@@ -0,0 +1,15 @@
+identifier: nrf52840_m2
+name: Makerdiary nRF52840 M.2 module
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+  - xtools
+supported:
+  - adc
+  - usb_device
+  - ble
+  - ieee802154
+  - pwm
+  - watchdog
diff --git a/app/boards/arm/nrf52840_m2/nrf52840_m2_defconfig b/app/boards/arm/nrf52840_m2/nrf52840_m2_defconfig
new file mode 100644
index 0000000..e74438b
--- /dev/null
+++ b/app/boards/arm/nrf52840_m2/nrf52840_m2_defconfig
@@ -0,0 +1,23 @@
+#
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+#
+
+CONFIG_SOC_SERIES_NRF52X=y
+CONFIG_SOC_NRF52840_QIAA=y
+CONFIG_BOARD_NRF52840_M2=y
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# enable GPIO
+CONFIG_GPIO=y
+
+CONFIG_USE_DT_CODE_PARTITION=y
+
+CONFIG_MPU_ALLOW_FLASH_WRITE=y
+CONFIG_NVS=y
+CONFIG_SETTINGS_NVS=y
+CONFIG_FLASH=y
+CONFIG_FLASH_PAGE_LAYOUT=y
+CONFIG_FLASH_MAP=y
-- 
cgit v1.2.3


From 9d06c730ba8b70429ecb67d3ff502ed1fde584bd Mon Sep 17 00:00:00 2001
From: Mega Mind <68985133+megamind4089@users.noreply.github.com>
Date: Fri, 2 Oct 2020 00:18:30 +0800
Subject: Added Makerdiary M60 keyboard

---
 app/boards/shields/m60/Kconfig.defconfig | 10 +++++
 app/boards/shields/m60/Kconfig.shield    |  5 +++
 app/boards/shields/m60/m60.conf          |  0
 app/boards/shields/m60/m60.keymap        | 26 +++++++++++++
 app/boards/shields/m60/m60.overlay       | 65 ++++++++++++++++++++++++++++++++
 app/boards/shields/m60/readme.md         | 15 ++++++++
 6 files changed, 121 insertions(+)
 create mode 100644 app/boards/shields/m60/Kconfig.defconfig
 create mode 100644 app/boards/shields/m60/Kconfig.shield
 create mode 100644 app/boards/shields/m60/m60.conf
 create mode 100644 app/boards/shields/m60/m60.keymap
 create mode 100644 app/boards/shields/m60/m60.overlay
 create mode 100644 app/boards/shields/m60/readme.md

(limited to 'app/boards')

diff --git a/app/boards/shields/m60/Kconfig.defconfig b/app/boards/shields/m60/Kconfig.defconfig
new file mode 100644
index 0000000..e358a58
--- /dev/null
+++ b/app/boards/shields/m60/Kconfig.defconfig
@@ -0,0 +1,10 @@
+
+if SHIELD_M60
+
+config ZMK_KEYBOARD_NAME
+	default "m60"
+
+config ZMK_KSCAN_MATRIX_POLLING
+	default y
+
+endif
diff --git a/app/boards/shields/m60/Kconfig.shield b/app/boards/shields/m60/Kconfig.shield
new file mode 100644
index 0000000..4ed58c4
--- /dev/null
+++ b/app/boards/shields/m60/Kconfig.shield
@@ -0,0 +1,5 @@
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+config SHIELD_M60
+	def_bool $(shields_list_contains,m60)
diff --git a/app/boards/shields/m60/m60.conf b/app/boards/shields/m60/m60.conf
new file mode 100644
index 0000000..e69de29
diff --git a/app/boards/shields/m60/m60.keymap b/app/boards/shields/m60/m60.keymap
new file mode 100644
index 0000000..aa0fa75
--- /dev/null
+++ b/app/boards/shields/m60/m60.keymap
@@ -0,0 +1,26 @@
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/keys.h>
+#include <dt-bindings/zmk/bt.h>
+
+/ {
+	keymap0: keymap {
+		compatible = "zmk,keymap";
+
+		default_layer {
+// ------------------------------------------------------------------------------------------
+// | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BKSP   |
+// | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   "|"   |
+// | CAPS  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |     ENTER    |
+// |  SHIFT  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |      SHIFT       |
+// |  CTL  |  WIN  |  ALT  |            SPACE               | ALT | MO(1) |  WIN  | CTRL    |
+// ------------------------------------------------------------------------------------------
+			bindings = <
+	&kp ESC &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &kp MINUS &kp EQL  &kp BKSP
+	&kp TAB  &kp   Q   &kp   W   &kp   E   &kp   R   &kp   T   &kp   Y   &kp   U   &kp   I   &kp   O   &kp   P   &kp LBKT &kp RBKT &kp BSLH
+	&kp CLCK  &kp   A   &kp   S   &kp   D   &kp   F   &kp   G   &kp   H   &kp   J   &kp   K   &kp   L   &kp  SCLN  &kp  QUOT        &kp RET
+	&kp LSFT   &kp   Z   &kp   X   &kp   C   &kp   V   &kp   B   &kp   N   &kp   M   &kp  CMMA &kp  DOT  &kp FSLH      &kp RSFT
+	&kp LCTL &kp   LGUI   &kp   LALT                     &kp SPC                         &kp  RALT  &mo  1  &kp  RGUI  &kp  RCTL
+			>;
+		};
+	};
+};
diff --git a/app/boards/shields/m60/m60.overlay b/app/boards/shields/m60/m60.overlay
new file mode 100644
index 0000000..c20d452
--- /dev/null
+++ b/app/boards/shields/m60/m60.overlay
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+#include <dt-bindings/zmk/matrix-transform.h>
+
+/ {
+	chosen {
+		zmk,kscan = &kscan0;
+		zmk,matrix_transform = &default_transform;
+	};
+
+	kscan0: kscan {
+		compatible = "zmk,kscan-gpio-matrix";
+		label = "KSCAN";
+
+		diode-direction = "col2row";
+		row-gpios
+			= <&gpio0 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&gpio0 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&gpio0 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&gpio0 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&gpio1 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&gpio1 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&gpio0 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&gpio0 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			;
+		col-gpios
+			= <&gpio0 19 GPIO_ACTIVE_HIGH>
+			, <&gpio0 20 GPIO_ACTIVE_HIGH>
+			, <&gpio0 21 GPIO_ACTIVE_HIGH>
+			, <&gpio0 22 GPIO_ACTIVE_HIGH>
+			, <&gpio0 23 GPIO_ACTIVE_HIGH>
+			, <&gpio0 24 GPIO_ACTIVE_HIGH>
+			, <&gpio0 25 GPIO_ACTIVE_HIGH>
+			, <&gpio0 26 GPIO_ACTIVE_HIGH>
+			;
+	};
+
+	default_transform: keymap_transform_0 {
+		compatible = "zmk,matrix-transform";
+		columns = <8>;
+		rows = <8>;
+// | MX1  | MX2  | MX3  | MX4  | MX5  | MX6  | MX7  | MX8  | MX9  | MX10 | MX11 | MX12 | MX13 |    MX14     |
+// |   MX15   | MX16 | MX17 | MX18 | MX19 | MX20 | MX21 | MX22 | MX23 | MX24 | MX25 | MX26 | MX27 |  MX28   |
+// |    MX29    | MX30 | MX31 | MX32 | MX33 | MX34 | MX35 | MX36 | MX37 | MX38 | MX39 | MX40 |     MX41     |
+// |     MX42      | MX43 | MX44 | MX45 | MX46 | MX47 | MX48 | MX49 | MX50 | MX51 | MX52 |       MX53       |
+// |  MX54  |  MX55  |  MX56  |                  MX57                   |  MX58  |  MX59  |  MX60  |  MX61  |
+        map = <
+RC(0,0)  RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4)     RC(1,5)
+RC(3,3)    RC(3,2) RC(3,1) RC(3,0) RC(2,7) RC(2,6) RC(2,5) RC(2,4) RC(2,3) RC(2,2) RC(2,1) RC(2,0) RC(1,7)   RC(1,6)
+RC(3,4)     RC(3,5) RC(3,6) RC(3,7) RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,7)          RC(5,0)
+RC(6,4)       RC(6,3) RC(6,2) RC(6,1) RC(6,0) RC(5,7) RC(5,6) RC(5,5) RC(5,4) RC(5,3) RC(5,2)                RC(5,1)
+RC(6,5)    RC(6,6)   RC(6,7)                     RC(7,0)                    RC(7,1)    RC(7,2)    RC(7,3)    RC(7,4)
+        >;
+	};
+
+	bt_unpair_combo: bt_unpair_combo {
+		compatible = "zmk,bt-unpair-combo";
+		key-positions = <0 53>;
+	};
+
+};
+
diff --git a/app/boards/shields/m60/readme.md b/app/boards/shields/m60/readme.md
new file mode 100644
index 0000000..7eaf226
--- /dev/null
+++ b/app/boards/shields/m60/readme.md
@@ -0,0 +1,15 @@
+# [Makerdiary M60](https://wiki.makerdiary.com/m60)
+
+A 60% ANSI keyboard designed and manufactured by Makerdiary.
+http://makerdairy.com
+
+## Features
+
+- Per key RGB LED.
+- Uses makerdiary M.2 nRF52840 module
+- Matrix wiring
+
+## Hardware Notes
+
+https://wiki.makerdiary.com/m60/developer_guide/hardware/
+
-- 
cgit v1.2.3


From e2299836bccf21bf56a4d34c5ed2f53a2fa21da2 Mon Sep 17 00:00:00 2001
From: Mega Mind <68985133+megamind4089@users.noreply.github.com>
Date: Sat, 3 Oct 2020 17:35:17 +0800
Subject: Update contributors in all keymap files

---
 app/boards/shields/clueboard_california/clueboard_california.keymap | 6 ++++++
 app/boards/shields/corne/corne.keymap                               | 6 ++++++
 app/boards/shields/iris/iris.keymap                                 | 2 +-
 app/boards/shields/kyria/kyria.keymap                               | 6 ++++++
 app/boards/shields/lily58/lily58.keymap                             | 6 ++++++
 app/boards/shields/m60/Kconfig.defconfig                            | 4 ++++
 app/boards/shields/m60/Kconfig.shield                               | 2 ++
 app/boards/shields/m60/m60.keymap                                   | 6 ++++++
 app/boards/shields/m60/m60.overlay                                  | 1 +
 app/boards/shields/romac/romac.keymap                               | 2 +-
 app/boards/shields/sofle/sofle.keymap                               | 6 ++++++
 app/boards/shields/splitreus62/splitreus62.keymap                   | 3 ++-
 12 files changed, 47 insertions(+), 3 deletions(-)

(limited to 'app/boards')

diff --git a/app/boards/shields/clueboard_california/clueboard_california.keymap b/app/boards/shields/clueboard_california/clueboard_california.keymap
index 7a84b11..44a0b07 100644
--- a/app/boards/shields/clueboard_california/clueboard_california.keymap
+++ b/app/boards/shields/clueboard_california/clueboard_california.keymap
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>
 
diff --git a/app/boards/shields/corne/corne.keymap b/app/boards/shields/corne/corne.keymap
index 5f0f15f..64d4a00 100644
--- a/app/boards/shields/corne/corne.keymap
+++ b/app/boards/shields/corne/corne.keymap
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>
 #include <dt-bindings/zmk/bt.h>
diff --git a/app/boards/shields/iris/iris.keymap b/app/boards/shields/iris/iris.keymap
index 6042ad7..8b06b1b 100644
--- a/app/boards/shields/iris/iris.keymap
+++ b/app/boards/shields/iris/iris.keymap
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Pete Johanson, Kurtis Lew
+ * Copyright (c) 2020 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */
diff --git a/app/boards/shields/kyria/kyria.keymap b/app/boards/shields/kyria/kyria.keymap
index f689ef6..ac0d13f 100644
--- a/app/boards/shields/kyria/kyria.keymap
+++ b/app/boards/shields/kyria/kyria.keymap
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>
 
diff --git a/app/boards/shields/lily58/lily58.keymap b/app/boards/shields/lily58/lily58.keymap
index 61c19f8..997a124 100644
--- a/app/boards/shields/lily58/lily58.keymap
+++ b/app/boards/shields/lily58/lily58.keymap
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>
 #include <dt-bindings/zmk/bt.h>
diff --git a/app/boards/shields/m60/Kconfig.defconfig b/app/boards/shields/m60/Kconfig.defconfig
index e358a58..56695b9 100644
--- a/app/boards/shields/m60/Kconfig.defconfig
+++ b/app/boards/shields/m60/Kconfig.defconfig
@@ -1,3 +1,7 @@
+#
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+#
 
 if SHIELD_M60
 
diff --git a/app/boards/shields/m60/Kconfig.shield b/app/boards/shields/m60/Kconfig.shield
index 4ed58c4..47a28e2 100644
--- a/app/boards/shields/m60/Kconfig.shield
+++ b/app/boards/shields/m60/Kconfig.shield
@@ -1,5 +1,7 @@
+#
 # Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT
+#
 
 config SHIELD_M60
 	def_bool $(shields_list_contains,m60)
diff --git a/app/boards/shields/m60/m60.keymap b/app/boards/shields/m60/m60.keymap
index aa0fa75..16ad247 100644
--- a/app/boards/shields/m60/m60.keymap
+++ b/app/boards/shields/m60/m60.keymap
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>
 #include <dt-bindings/zmk/bt.h>
diff --git a/app/boards/shields/m60/m60.overlay b/app/boards/shields/m60/m60.overlay
index c20d452..babae2d 100644
--- a/app/boards/shields/m60/m60.overlay
+++ b/app/boards/shields/m60/m60.overlay
@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
+
 #include <dt-bindings/zmk/matrix-transform.h>
 
 / {
diff --git a/app/boards/shields/romac/romac.keymap b/app/boards/shields/romac/romac.keymap
index 97ea9c5..31e1ce8 100644
--- a/app/boards/shields/romac/romac.keymap
+++ b/app/boards/shields/romac/romac.keymap
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Pete Johanson, Richard Jones
+ * Copyright (c) 2020 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */
diff --git a/app/boards/shields/sofle/sofle.keymap b/app/boards/shields/sofle/sofle.keymap
index 1cbe742..e2ebc1a 100644
--- a/app/boards/shields/sofle/sofle.keymap
+++ b/app/boards/shields/sofle/sofle.keymap
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>
 #include <dt-bindings/zmk/bt.h>
diff --git a/app/boards/shields/splitreus62/splitreus62.keymap b/app/boards/shields/splitreus62/splitreus62.keymap
index 920e61a..07dd2ad 100644
--- a/app/boards/shields/splitreus62/splitreus62.keymap
+++ b/app/boards/shields/splitreus62/splitreus62.keymap
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2020 Derek Schmell
+ * Copyright (c) 2020 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */
 
+
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>
 
-- 
cgit v1.2.3


From b8cb5f939a3c018af13de7727c15d7765ea1f1c1 Mon Sep 17 00:00:00 2001
From: Mega Mind <68985133+megamind4089@users.noreply.github.com>
Date: Sat, 3 Oct 2020 18:21:22 +0800
Subject: M60 keymap update and misc changes

* Updated M60 keymap
* Make nrfjproj as default runner
* Remove the polling config
---
 app/boards/arm/nrf52840_m2/board.cmake   |  2 +-
 app/boards/shields/m60/Kconfig.defconfig |  3 ---
 app/boards/shields/m60/m60.keymap        | 12 +++++++++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'app/boards')

diff --git a/app/boards/arm/nrf52840_m2/board.cmake b/app/boards/arm/nrf52840_m2/board.cmake
index f521e2c..55b44e2 100644
--- a/app/boards/arm/nrf52840_m2/board.cmake
+++ b/app/boards/arm/nrf52840_m2/board.cmake
@@ -5,5 +5,5 @@
 
 board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
 
-include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
diff --git a/app/boards/shields/m60/Kconfig.defconfig b/app/boards/shields/m60/Kconfig.defconfig
index 56695b9..e31d5a5 100644
--- a/app/boards/shields/m60/Kconfig.defconfig
+++ b/app/boards/shields/m60/Kconfig.defconfig
@@ -8,7 +8,4 @@ if SHIELD_M60
 config ZMK_KEYBOARD_NAME
 	default "m60"
 
-config ZMK_KSCAN_MATRIX_POLLING
-	default y
-
 endif
diff --git a/app/boards/shields/m60/m60.keymap b/app/boards/shields/m60/m60.keymap
index 16ad247..cbe356c 100644
--- a/app/boards/shields/m60/m60.keymap
+++ b/app/boards/shields/m60/m60.keymap
@@ -15,7 +15,7 @@
 		default_layer {
 // ------------------------------------------------------------------------------------------
 // | ESC |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   BKSP   |
-// | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   "|"   |
+// | TAB  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \    |
 // | CAPS  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |     ENTER    |
 // |  SHIFT  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |      SHIFT       |
 // |  CTL  |  WIN  |  ALT  |            SPACE               | ALT | MO(1) |  WIN  | CTRL    |
@@ -28,5 +28,15 @@
 	&kp LCTL &kp   LGUI   &kp   LALT                     &kp SPC                         &kp  RALT  &mo  1  &kp  RGUI  &kp  RCTL
 			>;
 		};
+
+		fn_layer {
+			bindings = <
+&kp GRAV   &kp F1     &kp F2     &kp F3     &kp F4     &kp F5     &kp F6     &kp F7     &kp F8     &kp F9     &kp F10    &kp F11    &kp F12    &bootloader
+&trans         &bt BT_CLR &none      &none      &none      &none      &none      &none      &none      &none      &none      &none      &none      &reset
+&trans           &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &kp LARW   &kp DARW   &kp UARW   &kp RARW   &none      &none      &trans
+&trans                &none      &none      &none      &none      &none      &none      &none      &none      &none      &none      &trans
+&trans       &trans       &trans       &trans                                                                     &trans     &trans     &trans     &trans
+			>;
+		};
 	};
 };
-- 
cgit v1.2.3


From ce59223efe9062ac1da77bae93a3578ce0463b66 Mon Sep 17 00:00:00 2001
From: Pete Johanson <peter@peterjohanson.com>
Date: Mon, 5 Oct 2020 23:40:29 -0400
Subject: fix(shields): Typo in makerdiary URL.

---
 app/boards/shields/m60/readme.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'app/boards')

diff --git a/app/boards/shields/m60/readme.md b/app/boards/shields/m60/readme.md
index 7eaf226..e801c78 100644
--- a/app/boards/shields/m60/readme.md
+++ b/app/boards/shields/m60/readme.md
@@ -1,7 +1,7 @@
 # [Makerdiary M60](https://wiki.makerdiary.com/m60)
 
 A 60% ANSI keyboard designed and manufactured by Makerdiary.
-http://makerdairy.com
+http://makerdiary.com
 
 ## Features
 
@@ -12,4 +12,3 @@ http://makerdairy.com
 ## Hardware Notes
 
 https://wiki.makerdiary.com/m60/developer_guide/hardware/
-
-- 
cgit v1.2.3


From f3eaa7e4247321042618a732596f842e5bb104da Mon Sep 17 00:00:00 2001
From: Kellen Carey <kellen.carey@gmail.com>
Date: Wed, 7 Oct 2020 20:40:04 -0700
Subject: working shield, need to improve default keymap

---
 app/boards/shields/microdox/Kconfig.defconfig      | 58 ++++++++++++++++++
 app/boards/shields/microdox/Kconfig.shield         |  9 +++
 .../shields/microdox/boards/nice_nano.overlay      | 29 +++++++++
 app/boards/shields/microdox/microdox.conf          |  6 ++
 app/boards/shields/microdox/microdox.dtsi          | 71 ++++++++++++++++++++++
 app/boards/shields/microdox/microdox.keymap        | 57 +++++++++++++++++
 app/boards/shields/microdox/microdox_left.conf     |  2 +
 app/boards/shields/microdox/microdox_left.overlay  | 22 +++++++
 app/boards/shields/microdox/microdox_right.conf    |  2 +
 app/boards/shields/microdox/microdox_right.overlay | 26 ++++++++
 10 files changed, 282 insertions(+)
 create mode 100644 app/boards/shields/microdox/Kconfig.defconfig
 create mode 100644 app/boards/shields/microdox/Kconfig.shield
 create mode 100644 app/boards/shields/microdox/boards/nice_nano.overlay
 create mode 100644 app/boards/shields/microdox/microdox.conf
 create mode 100644 app/boards/shields/microdox/microdox.dtsi
 create mode 100644 app/boards/shields/microdox/microdox.keymap
 create mode 100644 app/boards/shields/microdox/microdox_left.conf
 create mode 100644 app/boards/shields/microdox/microdox_left.overlay
 create mode 100644 app/boards/shields/microdox/microdox_right.conf
 create mode 100644 app/boards/shields/microdox/microdox_right.overlay

(limited to 'app/boards')

diff --git a/app/boards/shields/microdox/Kconfig.defconfig b/app/boards/shields/microdox/Kconfig.defconfig
new file mode 100644
index 0000000..218443f
--- /dev/null
+++ b/app/boards/shields/microdox/Kconfig.defconfig
@@ -0,0 +1,58 @@
+
+if SHIELD_MICRODOX_LEFT
+
+config ZMK_KEYBOARD_NAME
+	default "Microdox Left"
+
+endif
+
+
+if SHIELD_MICRODOX_RIGHT
+
+config ZMK_KEYBOARD_NAME
+	default "Microdox Right"
+
+endif
+
+if SHIELD_MICRODOX_LEFT || SHIELD_MICRODOX_RIGHT
+
+config ZMK_SPLIT
+	default y
+ 
+if ZMK_DISPLAY
+
+config I2C
+	default y
+
+config SSD1306
+	default y
+
+config SSD1306_REVERSE_MODE
+	default y
+
+endif # ZMK_DISPLAY
+
+if LVGL
+
+config LVGL_HOR_RES
+	default 128
+
+config LVGL_VER_RES
+	default 32
+
+config LVGL_VDB_SIZE
+	default 64
+
+config LVGL_DPI
+	default 148
+
+config LVGL_BITS_PER_PIXEL
+	default 1
+
+choice LVGL_COLOR_DEPTH
+	default LVGL_COLOR_DEPTH_1
+endchoice
+
+endif # LVGL
+
+endif
diff --git a/app/boards/shields/microdox/Kconfig.shield b/app/boards/shields/microdox/Kconfig.shield
new file mode 100644
index 0000000..7d7148d
--- /dev/null
+++ b/app/boards/shields/microdox/Kconfig.shield
@@ -0,0 +1,9 @@
+# Copyright (c) 2020 Pete Johanson
+# Copyright (c) 2020 Kellen Carey
+# SPDX-License-Identifier: MIT
+
+config SHIELD_MICRODOX_LEFT
+	def_bool $(shields_list_contains,microdox_left)
+
+config SHIELD_MICRODOX_RIGHT
+	def_bool $(shields_list_contains,microdox_right)
diff --git a/app/boards/shields/microdox/boards/nice_nano.overlay b/app/boards/shields/microdox/boards/nice_nano.overlay
new file mode 100644
index 0000000..c7c3eb8
--- /dev/null
+++ b/app/boards/shields/microdox/boards/nice_nano.overlay
@@ -0,0 +1,29 @@
+&spi1 {
+	compatible = "nordic,nrf-spi";
+	/* Cannot be used together with i2c0. */
+	status = "okay";
+	mosi-pin = <6>;
+	// Unused pins, needed for SPI definition, but not used by the ws2812 driver itself.
+	sck-pin = <5>;
+	miso-pin = <7>;
+
+	led_strip: ws2812@0 {
+		compatible = "worldsemi,ws2812-spi";
+		label = "SK6812mini";
+
+		/* SPI */
+		reg = <0>; /* ignored, but necessary for SPI bindings */
+		spi-max-frequency = <4000000>;
+
+		/* WS2812 */
+		chain-length = <6>; /* There are per-key RGB, but the first 6 are underglow */
+		spi-one-frame = <0x70>;
+		spi-zero-frame = <0x40>;
+	};
+};
+
+/ {
+	chosen {
+		zmk,underglow = &led_strip;
+	};
+};
diff --git a/app/boards/shields/microdox/microdox.conf b/app/boards/shields/microdox/microdox.conf
new file mode 100644
index 0000000..b79385b
--- /dev/null
+++ b/app/boards/shields/microdox/microdox.conf
@@ -0,0 +1,6 @@
+# Uncomment the following lines to enable the Corne RGB Underglow
+# ZMK_RGB_UNDERGLOW=y
+# CONFIG_WS2812_STRIP=y
+
+# Uncomment the following line to enable the Corne OLED Display
+# CONFIG_ZMK_DISPLAY=y
diff --git a/app/boards/shields/microdox/microdox.dtsi b/app/boards/shields/microdox/microdox.dtsi
new file mode 100644
index 0000000..bf7950d
--- /dev/null
+++ b/app/boards/shields/microdox/microdox.dtsi
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2020 Pete Johanson
+ * Copyright (c) 2020 Kellen Carey
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <dt-bindings/zmk/matrix-transform.h>
+
+/ {
+	chosen {
+		zmk,kscan = &kscan0;
+		zmk,matrix_transform = &default_transform;
+	};
+
+	default_transform: keymap_transform_0 {
+		compatible = "zmk,matrix-transform";
+		columns = <10>;
+		rows = <4>;
+// | SW1  | SW2  | SW3  | SW4  | SW5  |   | SW5  | SW4  | SW3  | SW2  | SW1  |
+// | SW6  | SW7  | SW8  | SW9  | SW10 |   | SW10 | SW9  | SW8  | SW7  | SW6  |
+// | SW11 | SW12 | SW13 | SW14 | SW15 |   | SW15 | SW14 | SW13 | SW12 | SW11 |
+//               | SW16 | SW17 | SW18 |   | SW18 | SW17 | SW16 |
+		map = <
+RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4)  RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9)
+RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4)  RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9)
+RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4)  RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)
+                RC(3,2) RC(3,3) RC(3,4)  RC(3,5) RC(3,6) RC(3,7)
+		>;
+	};
+
+	kscan0: kscan {
+		compatible = "zmk,kscan-gpio-matrix";
+		label = "KSCAN";
+
+		diode-direction = "col2row";
+		row-gpios
+			= <&pro_micro_d 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+			, <&pro_micro_d 10 (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)>
+			;
+		
+	};
+
+	bt_unpair_combo: bt_unpair_combo {
+		compatible = "zmk,bt-unpair-combo";
+	};
+
+	// TODO: per-key RGB node(s)?
+};
+
+&pro_micro_i2c {
+	status = "okay";
+
+	oled: ssd1306@3c {
+		compatible = "solomon,ssd1306fb";
+		reg = <0x3c>;
+		label = "DISPLAY";
+		width = <128>;
+		height = <32>;
+		segment-offset = <0>;
+		page-offset = <0>;
+		display-offset = <0>;
+		multiplex-ratio = <31>;
+		segment-remap;
+		com-invdir;
+		com-sequential;
+		prechargep = <0x22>;
+	};
+};
diff --git a/app/boards/shields/microdox/microdox.keymap b/app/boards/shields/microdox/microdox.keymap
new file mode 100644
index 0000000..fa43a63
--- /dev/null
+++ b/app/boards/shields/microdox/microdox.keymap
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/keys.h>
+#include <dt-bindings/zmk/bt.h>
+
+/ {
+        keymap {
+                compatible = "zmk,keymap";
+
+                default_layer {
+// -----------------------------------------------------------------------------------------
+// |  TAB |  Q  |  W  |  E  |  R  |  T  |   |  Y  |  U   |  I  |  O  |  P  | BKSP |
+// | CTRL |  A  |  S  |  D  |  F  |  G  |   |  H  |  J   |  K  |  L  |  ;  |  '   |
+// | SHFT |  Z  |  X  |  C  |  V  |  B  |   |  N  |  M   |  ,  |  .  |  /  | SHFT |
+//                    | GUI | LWR | SPC |   | ENT | RSE  | ALT |
+                        bindings = <
+   &kp Q &kp W &kp E &kp R &kp T   &kp Y &kp U  &kp I    &kp O   &kp P
+   &kp A &kp S &kp D &kp F &kp G   &kp H &kp J  &kp K    &kp L   &kp SCLN
+   &kp Z &kp X &kp C &kp V &kp B   &kp N &kp M  &kp CMMA &kp DOT &kp FSLH
+          &kp LGUI &mo 1 &kp SPC   &kp RET &mo 2 &kp RALT
+                        >;
+                };
+                lower_layer {
+// -----------------------------------------------------------------------------------------
+// |  ESC |  1  |  2  |  3  |  4  |  5  |   |  6  |  7  |  8  |  9  |  0  | BKSP |
+// | BTCLR| BT1 | BT2 | BT3 | BT4 | BT5 |   | LFT | DWN |  UP | RGT |     |      |
+// | SHFT |     |     |     |     |     |   |     |     |     |     |     |      |
+//                    | GUI |     | SPC |   | ENT |     | ALT |
+                        bindings = <
+   &kp NUM_1    &kp NUM_2    &kp NUM_3    &kp NUM_4    &kp NUM_5         &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0
+   &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4      &kp LARW  &kp DARW  &kp UARW  &kp RARW  &trans
+   &trans       &trans       &trans       &trans       &trans            &trans    &trans    &trans    &trans    &trans
+                             &kp LGUI     &trans       &kp SPC           &kp RET   &trans    &kp RALT
+                        >;
+                };
+
+                raise_layer {
+// -----------------------------------------------------------------------------------------
+// |  ESC |  !  |  @  |  #  |  $  |  %  |   |  ^  |  &  |  *  |  (  |  )  | BKSP |
+// | CTRL |     |     |     |     |     |   |  -  |  =  |  {  |  }  | "|" |  `   |
+// | SHFT |     |     |     |     |     |   |  _  |  +  |  [  |  ]  |  \  |  ~   | // TODO: Fix this row when &mkp is committed
+//                    | GUI |     | SPC |   | ENT |     | ALT |
+                        bindings = <
+   &kp BANG  &kp ATSN  &kp HASH  &kp CURU  &kp PRCT    &kp CRRT  &kp AMPS &kp KMLT &kp LPRN &kp RPRN
+   &trans    &trans    &trans    &trans    &trans      &kp MINUS &kp EQL  &kp LBKT &kp RBKT &kp PIPE
+   &trans    &trans    &trans    &trans    &trans      &trans    &trans   &trans   &trans   &kp BSLH
+                       &kp LGUI  &trans    &kp SPC     &kp RET   &trans   &kp RALT
+                        >;
+                };
+        };
+};
+
diff --git a/app/boards/shields/microdox/microdox_left.conf b/app/boards/shields/microdox/microdox_left.conf
new file mode 100644
index 0000000..1e028a7
--- /dev/null
+++ b/app/boards/shields/microdox/microdox_left.conf
@@ -0,0 +1,2 @@
+CONFIG_ZMK_SPLIT=y
+CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y
diff --git a/app/boards/shields/microdox/microdox_left.overlay b/app/boards/shields/microdox/microdox_left.overlay
new file mode 100644
index 0000000..0a3f823
--- /dev/null
+++ b/app/boards/shields/microdox/microdox_left.overlay
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2020 Pete Johanson
+ * Copyright (c) 2020 Kellen Carey
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "microdox.dtsi"
+
+&kscan0 {
+	col-gpios
+		= <&pro_micro_a  3 GPIO_ACTIVE_HIGH>
+		, <&pro_micro_a  2 GPIO_ACTIVE_HIGH>
+		, <&pro_micro_a  1 GPIO_ACTIVE_HIGH>
+		, <&pro_micro_a  0 GPIO_ACTIVE_HIGH>
+		, <&pro_micro_d 15 GPIO_ACTIVE_HIGH>
+		;
+};
+
+&bt_unpair_combo {
+	key-positions = <0 38>;
+};
diff --git a/app/boards/shields/microdox/microdox_right.conf b/app/boards/shields/microdox/microdox_right.conf
new file mode 100644
index 0000000..990cf7c
--- /dev/null
+++ b/app/boards/shields/microdox/microdox_right.conf
@@ -0,0 +1,2 @@
+CONFIG_ZMK_SPLIT=y
+CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y
diff --git a/app/boards/shields/microdox/microdox_right.overlay b/app/boards/shields/microdox/microdox_right.overlay
new file mode 100644
index 0000000..2638a39
--- /dev/null
+++ b/app/boards/shields/microdox/microdox_right.overlay
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2020 Pete Johanson
+ * Copyright (c) 2020 Kellen Carey
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "microdox.dtsi"
+
+&default_transform {
+	col-offset = <5>;
+};
+
+&kscan0 {
+	col-gpios
+		= <&pro_micro_d 15 GPIO_ACTIVE_HIGH>
+		, <&pro_micro_a  0 GPIO_ACTIVE_HIGH>
+		, <&pro_micro_a  1 GPIO_ACTIVE_HIGH>
+		, <&pro_micro_a  2 GPIO_ACTIVE_HIGH>
+		, <&pro_micro_a  3 GPIO_ACTIVE_HIGH>
+		;
+};
+
+&bt_unpair_combo {
+	key-positions = <9 35>;
+};
-- 
cgit v1.2.3


From ca29c40206031f95525c29750650013efc0e56f1 Mon Sep 17 00:00:00 2001
From: Kellen Carey <kellen.carey@gmail.com>
Date: Wed, 7 Oct 2020 21:22:08 -0700
Subject: clean up keymap

---
 app/boards/shields/microdox/microdox.keymap | 52 ++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 19 deletions(-)

(limited to 'app/boards')

diff --git a/app/boards/shields/microdox/microdox.keymap b/app/boards/shields/microdox/microdox.keymap
index fa43a63..916141c 100644
--- a/app/boards/shields/microdox/microdox.keymap
+++ b/app/boards/shields/microdox/microdox.keymap
@@ -14,37 +14,37 @@
 
                 default_layer {
 // -----------------------------------------------------------------------------------------
-// |  TAB |  Q  |  W  |  E  |  R  |  T  |   |  Y  |  U   |  I  |  O  |  P  | BKSP |
-// | CTRL |  A  |  S  |  D  |  F  |  G  |   |  H  |  J   |  K  |  L  |  ;  |  '   |
-// | SHFT |  Z  |  X  |  C  |  V  |  B  |   |  N  |  M   |  ,  |  .  |  /  | SHFT |
-//                    | GUI | LWR | SPC |   | ENT | RSE  | ALT |
+// |  Q  |  W  |  E  |  R  |  T   |   |  Y  |  U   |  I  |  O  |  P  |
+// |  A  |  S  |  D  |  F  |  G   |   |  H  |  J   |  K  |  L  |  ;  |
+// |  Z  |  X  |  C  |  V  |  B   |   |  N  |  M   |  ,  |  .  |  /  |
+//             | GUI | NAV | SHFT |   | SPC | SYM  | ALT |
                         bindings = <
    &kp Q &kp W &kp E &kp R &kp T   &kp Y &kp U  &kp I    &kp O   &kp P
    &kp A &kp S &kp D &kp F &kp G   &kp H &kp J  &kp K    &kp L   &kp SCLN
    &kp Z &kp X &kp C &kp V &kp B   &kp N &kp M  &kp CMMA &kp DOT &kp FSLH
-          &kp LGUI &mo 1 &kp SPC   &kp RET &mo 2 &kp RALT
+          &kp LGUI &mo 1 &kp LSFT   &kp SPC &mo 2 &kp RALT
                         >;
                 };
-                lower_layer {
+                nav_layer {
 // -----------------------------------------------------------------------------------------
-// |  ESC |  1  |  2  |  3  |  4  |  5  |   |  6  |  7  |  8  |  9  |  0  | BKSP |
-// | BTCLR| BT1 | BT2 | BT3 | BT4 | BT5 |   | LFT | DWN |  UP | RGT |     |      |
-// | SHFT |     |     |     |     |     |   |     |     |     |     |     |      |
-//                    | GUI |     | SPC |   | ENT |     | ALT |
+// |     |     | ESC |  ~   |     |   | TAB | HOME |  UP  | END | DEL  |
+// |     | GUI | ALT | CTRL | NUM |   |  /  | LEFT | DOWN | RGT | BKSP |
+// |     |     |     |      |     |   |  \  | ENT  |      |     |      |
+//             |     |      |     |   |     |      |      |
                         bindings = <
-   &kp NUM_1    &kp NUM_2    &kp NUM_3    &kp NUM_4    &kp NUM_5         &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0
-   &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4      &kp LARW  &kp DARW  &kp UARW  &kp RARW  &trans
-   &trans       &trans       &trans       &trans       &trans            &trans    &trans    &trans    &trans    &trans
-                             &kp LGUI     &trans       &kp SPC           &kp RET   &trans    &kp RALT
+   &trans &trans  &kp ESC  &kp TILD &trans     &kp TAB  &kp HOME &kp UARW &kp END  &kp DEL
+   &trans &kp GUI &kp RALT &kp LCTL &mo 3      &kp FSLH &kp LARW &kp DARW &kp RARW &kp BKSP
+   &trans &trans  &trans   &trans   &trans     &kp BSLH &kp RET  &trans   &trans    &trans
+                  &trans   &trans   &trans     &trans   &trans   &trans
                         >;
                 };
 
-                raise_layer {
+                sym_layer {
 // -----------------------------------------------------------------------------------------
-// |  ESC |  !  |  @  |  #  |  $  |  %  |   |  ^  |  &  |  *  |  (  |  )  | BKSP |
-// | CTRL |     |     |     |     |     |   |  -  |  =  |  {  |  }  | "|" |  `   |
-// | SHFT |     |     |     |     |     |   |  _  |  +  |  [  |  ]  |  \  |  ~   | // TODO: Fix this row when &mkp is committed
-//                    | GUI |     | SPC |   | ENT |     | ALT |
+// |  !  |  @  |  #  |  $  |  %  |   |  ^  |  &  |  *  |  (  |  )  |
+// |     |     |     |     |     |   |  -  |  =  |  {  |  }  | "|" |
+// |     |     |     |     |     |   |  _  |  +  |  [  |  ]  |  \  |
+//             | GUI |     | SPC |   | ENT |     | ALT |
                         bindings = <
    &kp BANG  &kp ATSN  &kp HASH  &kp CURU  &kp PRCT    &kp CRRT  &kp AMPS &kp KMLT &kp LPRN &kp RPRN
    &trans    &trans    &trans    &trans    &trans      &kp MINUS &kp EQL  &kp LBKT &kp RBKT &kp PIPE
@@ -52,6 +52,20 @@
                        &kp LGUI  &trans    &kp SPC     &kp RET   &trans   &kp RALT
                         >;
                 };
+
+                num_layer {
+// -----------------------------------------------------------------------------------------
+// |     |     |     |     |     |   |  A  |  7  |  8  |  9  |  D  |
+// |     |     |     |     |     |   |  B  |  4  |  5  |  6  |  E  |
+// |     |     |     |     |     |   |  C  |  1  |  2  |  3  |  F  |
+//             |     |     |     |   |  0  |  .  |     |
+                        bindings = <
+   &trans &trans &trans &trans &trans    &kp A     &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp D
+   &trans &trans &trans &trans &trans    &kp B     &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp E
+   &trans &trans &trans &trans &trans    &kp C     &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp F
+                 &trans &trans &trans    &kp NUM_0 &kp DOT   &trans
+                        >;
+                };
         };
 };
 
-- 
cgit v1.2.3


From 0b125c028c65ff4a5e326760a7d0ac0f8941899c Mon Sep 17 00:00:00 2001
From: Kellen Carey <kellen.carey@gmail.com>
Date: Fri, 9 Oct 2020 11:48:06 -0700
Subject: address pr comments

---
 app/boards/shields/microdox/Kconfig.defconfig        |  2 ++
 app/boards/shields/microdox/Kconfig.shield           |  3 +--
 app/boards/shields/microdox/boards/nice_nano.overlay |  5 +++++
 app/boards/shields/microdox/microdox.dtsi            |  7 +------
 app/boards/shields/microdox/microdox.keymap          | 16 +++++++++-------
 app/boards/shields/microdox/microdox_left.overlay    |  4 ----
 app/boards/shields/microdox/microdox_right.overlay   |  4 ----
 7 files changed, 18 insertions(+), 23 deletions(-)

(limited to 'app/boards')

diff --git a/app/boards/shields/microdox/Kconfig.defconfig b/app/boards/shields/microdox/Kconfig.defconfig
index 218443f..4840ece 100644
--- a/app/boards/shields/microdox/Kconfig.defconfig
+++ b/app/boards/shields/microdox/Kconfig.defconfig
@@ -1,3 +1,5 @@
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
 
 if SHIELD_MICRODOX_LEFT
 
diff --git a/app/boards/shields/microdox/Kconfig.shield b/app/boards/shields/microdox/Kconfig.shield
index 7d7148d..ac79eab 100644
--- a/app/boards/shields/microdox/Kconfig.shield
+++ b/app/boards/shields/microdox/Kconfig.shield
@@ -1,5 +1,4 @@
-# Copyright (c) 2020 Pete Johanson
-# Copyright (c) 2020 Kellen Carey
+# Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
 config SHIELD_MICRODOX_LEFT
diff --git a/app/boards/shields/microdox/boards/nice_nano.overlay b/app/boards/shields/microdox/boards/nice_nano.overlay
index c7c3eb8..58cd861 100644
--- a/app/boards/shields/microdox/boards/nice_nano.overlay
+++ b/app/boards/shields/microdox/boards/nice_nano.overlay
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
 &spi1 {
 	compatible = "nordic,nrf-spi";
 	/* Cannot be used together with i2c0. */
diff --git a/app/boards/shields/microdox/microdox.dtsi b/app/boards/shields/microdox/microdox.dtsi
index bf7950d..55c67dd 100644
--- a/app/boards/shields/microdox/microdox.dtsi
+++ b/app/boards/shields/microdox/microdox.dtsi
@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020 Pete Johanson
- * Copyright (c) 2020 Kellen Carey
+ * Copyright (c) 2020 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */
@@ -43,10 +42,6 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4)  RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)
 		
 	};
 
-	bt_unpair_combo: bt_unpair_combo {
-		compatible = "zmk,bt-unpair-combo";
-	};
-
 	// TODO: per-key RGB node(s)?
 };
 
diff --git a/app/boards/shields/microdox/microdox.keymap b/app/boards/shields/microdox/microdox.keymap
index 916141c..5747771 100644
--- a/app/boards/shields/microdox/microdox.keymap
+++ b/app/boards/shields/microdox/microdox.keymap
@@ -27,15 +27,15 @@
                 };
                 nav_layer {
 // -----------------------------------------------------------------------------------------
-// |     |     | ESC |  ~   |     |   | TAB | HOME |  UP  | END | DEL  |
-// |     | GUI | ALT | CTRL | NUM |   |  /  | LEFT | DOWN | RGT | BKSP |
-// |     |     |     |      |     |   |  \  | ENT  |      |     |      |
+// |BTCLR|     | ESC |  ~   |     |   | TAB | HOME |  UP  | END | DEL  |
+// | BT1 | GUI | ALT | CTRL | NUM |   |  /  | LEFT | DOWN | RGT | BKSP |
+// | BT2 |     |     |      |     |   |  \  | ENT  |      |     |      |
 //             |     |      |     |   |     |      |      |
                         bindings = <
-   &trans &trans  &kp ESC  &kp TILD &trans     &kp TAB  &kp HOME &kp UARW &kp END  &kp DEL
-   &trans &kp GUI &kp RALT &kp LCTL &mo 3      &kp FSLH &kp LARW &kp DARW &kp RARW &kp BKSP
-   &trans &trans  &trans   &trans   &trans     &kp BSLH &kp RET  &trans   &trans    &trans
-                  &trans   &trans   &trans     &trans   &trans   &trans
+   &bt BT_CLR   &trans  &kp ESC  &kp TILD &trans     &kp TAB  &kp HOME &kp UARW &kp END  &kp DEL
+   &bt BT_SEL 0 &kp GUI &kp RALT &kp LCTL &mo 3      &kp FSLH &kp LARW &kp DARW &kp RARW &kp BKSP
+   &bt BT_SEL 1 &trans  &trans   &trans   &trans     &kp BSLH &kp RET  &trans   &trans    &trans
+                        &trans   &trans   &trans     &trans   &trans   &trans
                         >;
                 };
 
@@ -53,6 +53,8 @@
                         >;
                 };
 
+// This layer is unreachable until "tri layer state" is sorted out.
+// Leaving it here for completeness.
                 num_layer {
 // -----------------------------------------------------------------------------------------
 // |     |     |     |     |     |   |  A  |  7  |  8  |  9  |  D  |
diff --git a/app/boards/shields/microdox/microdox_left.overlay b/app/boards/shields/microdox/microdox_left.overlay
index 0a3f823..07dc0d2 100644
--- a/app/boards/shields/microdox/microdox_left.overlay
+++ b/app/boards/shields/microdox/microdox_left.overlay
@@ -16,7 +16,3 @@
 		, <&pro_micro_d 15 GPIO_ACTIVE_HIGH>
 		;
 };
-
-&bt_unpair_combo {
-	key-positions = <0 38>;
-};
diff --git a/app/boards/shields/microdox/microdox_right.overlay b/app/boards/shields/microdox/microdox_right.overlay
index 2638a39..a0d8601 100644
--- a/app/boards/shields/microdox/microdox_right.overlay
+++ b/app/boards/shields/microdox/microdox_right.overlay
@@ -20,7 +20,3 @@
 		, <&pro_micro_a  3 GPIO_ACTIVE_HIGH>
 		;
 };
-
-&bt_unpair_combo {
-	key-positions = <9 35>;
-};
-- 
cgit v1.2.3


From a695d0d3596817834f7465e029d0205fc9235499 Mon Sep 17 00:00:00 2001
From: Kellen Carey <kellen.carey@gmail.com>
Date: Fri, 9 Oct 2020 12:18:57 -0700
Subject: oops

---
 app/boards/shields/microdox/microdox_left.overlay  | 3 +--
 app/boards/shields/microdox/microdox_right.overlay | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'app/boards')

diff --git a/app/boards/shields/microdox/microdox_left.overlay b/app/boards/shields/microdox/microdox_left.overlay
index 07dc0d2..4d0378e 100644
--- a/app/boards/shields/microdox/microdox_left.overlay
+++ b/app/boards/shields/microdox/microdox_left.overlay
@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020 Pete Johanson
- * Copyright (c) 2020 Kellen Carey
+ * Copyright (c) 2020 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */
diff --git a/app/boards/shields/microdox/microdox_right.overlay b/app/boards/shields/microdox/microdox_right.overlay
index a0d8601..c5622b2 100644
--- a/app/boards/shields/microdox/microdox_right.overlay
+++ b/app/boards/shields/microdox/microdox_right.overlay
@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2020 Pete Johanson
- * Copyright (c) 2020 Kellen Carey
+ * Copyright (c) 2020 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */
-- 
cgit v1.2.3


From 4d81b10ba7047a4dbd63cfe33ac879ecf437e108 Mon Sep 17 00:00:00 2001
From: Mega Mind <68985133+megamind4089@users.noreply.github.com>
Date: Tue, 6 Oct 2020 15:52:21 +0800
Subject: Added driver to control the external power output

This PR adds support to control the external power output from controllers like nice!nano, nRFMicro etc

I have implemented based on my understanding of Pete suggestion on this feature.

Testing done:

    Tested by enabling and disabling the ext_power from application and verified
    Verified the application does not crash with boards that does not have ext_power support
    Note:
    I did not test this in nice!nano since I don't have the boards. Will get help from others once the behavior PR is up

Next Steps:

    Create a behavior PR to control enable/disable ext_power
---
 app/boards/arm/nice_nano/nice_nano.dts          |  5 +++++
 app/boards/arm/nrfmicro/nrfmicro_11.dts         |  5 +++++
 app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts |  5 +++++
 app/boards/arm/nrfmicro/nrfmicro_13.dts         |  5 +++++
 app/boards/arm/nrfmicro/pinmux.c                | 11 -----------
 5 files changed, 20 insertions(+), 11 deletions(-)

(limited to 'app/boards')

diff --git a/app/boards/arm/nice_nano/nice_nano.dts b/app/boards/arm/nice_nano/nice_nano.dts
index 3ffb0ea..0538b1d 100644
--- a/app/boards/arm/nice_nano/nice_nano.dts
+++ b/app/boards/arm/nice_nano/nice_nano.dts
@@ -29,6 +29,11 @@
 		};
 	};
 
+	ext-power {
+		compatible = "zmk,ext-power-generic";
+		label = "EXT_POWER";
+		control-gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+	};
 };
 
 &gpiote {
diff --git a/app/boards/arm/nrfmicro/nrfmicro_11.dts b/app/boards/arm/nrfmicro/nrfmicro_11.dts
index 95bd8ad..87c650e 100644
--- a/app/boards/arm/nrfmicro/nrfmicro_11.dts
+++ b/app/boards/arm/nrfmicro/nrfmicro_11.dts
@@ -26,6 +26,11 @@
 		};
 	};
 
+	ext-power {
+		compatible = "zmk,ext-power-generic";
+		label = "EXT_POWER";
+		control-gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+	};
 };
 
 &gpio0 {
diff --git a/app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts b/app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts
index 85693a8..ea15b81 100644
--- a/app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts
+++ b/app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts
@@ -26,6 +26,11 @@
 		};
 	};
 
+	ext-power {
+		compatible = "zmk,ext-power-generic";
+		label = "EXT_POWER";
+		control-gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+	};
 };
 
 &gpio0 {
diff --git a/app/boards/arm/nrfmicro/nrfmicro_13.dts b/app/boards/arm/nrfmicro/nrfmicro_13.dts
index 95bd8ad..ef43946 100644
--- a/app/boards/arm/nrfmicro/nrfmicro_13.dts
+++ b/app/boards/arm/nrfmicro/nrfmicro_13.dts
@@ -26,6 +26,11 @@
 		};
 	};
 
+	ext-power {
+		compatible = "zmk,ext-power-generic";
+		label = "EXT_POWER";
+		control-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+	};
 };
 
 &gpio0 {
diff --git a/app/boards/arm/nrfmicro/pinmux.c b/app/boards/arm/nrfmicro/pinmux.c
index 4e330b6..30117d0 100644
--- a/app/boards/arm/nrfmicro/pinmux.c
+++ b/app/boards/arm/nrfmicro/pinmux.c
@@ -14,25 +14,14 @@
 static int pinmux_nrfmicro_init(struct device *port) {
     ARG_UNUSED(port);
 
-    struct device *p1 = device_get_binding("GPIO_1");
-
 #if CONFIG_BOARD_NRFMICRO_13
     struct device *p0 = device_get_binding("GPIO_0");
-    // enable EXT_VCC (use 0 for nRFMicro 1.3, use 1 for nRFMicro 1.1)
-    gpio_pin_configure(p1, 9, GPIO_OUTPUT);
-    gpio_pin_set(p1, 9, 0);
-
 #if CONFIG_BOARD_NRFMICRO_CHARGER
     gpio_pin_configure(p0, 5, GPIO_OUTPUT);
     gpio_pin_set(p0, 5, 0);
 #else
     gpio_pin_configure(p0, 5, GPIO_INPUT);
 #endif
-
-#else
-    // enable EXT_VCC (use 0 for nRFMicro 1.3, use 1 for nRFMicro 1.1)
-    gpio_pin_configure(p1, 9, GPIO_OUTPUT);
-    gpio_pin_set(p1, 9, 1);
 #endif
     return 0;
 }
-- 
cgit v1.2.3