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 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 app/boards/shields/m60/Kconfig.defconfig

(limited to 'app/boards/shields/m60/Kconfig.defconfig')

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
-- 
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/m60/Kconfig.defconfig | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/boards/shields/m60/Kconfig.defconfig')

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
 
-- 
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/shields/m60/Kconfig.defconfig | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'app/boards/shields/m60/Kconfig.defconfig')

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
-- 
cgit v1.2.3