From ae832125fcbb07b5e8234b9f29e4f04589f57a94 Mon Sep 17 00:00:00 2001
From: MakerJake <69777180+MakerJake01@users.noreply.github.com>
Date: Fri, 1 Oct 2021 18:48:41 -0400
Subject: [PATCH] added J46K and the col stagger verstion
---
app/boards/shields/j46k/Kconfig.defconfig | 10 +++++
app/boards/shields/j46k/Kconfig.shield | 5 +++
app/boards/shields/j46k/j46k.conf | 0
app/boards/shields/j46k/j46k.keymap | 25 ++++++++++++
app/boards/shields/j46k/j46k.overlay | 43 ++++++++++++++++++++
app/boards/shields/j46k/j46k.zmk.yml | 10 +++++
app/boards/shields/j46kcol/Kconfig.defconfig | 10 +++++
app/boards/shields/j46kcol/Kconfig.shield | 5 +++
app/boards/shields/j46kcol/j46kcol.conf | 0
app/boards/shields/j46kcol/j46kcol.keymap | 25 ++++++++++++
app/boards/shields/j46kcol/j46kcol.overlay | 43 ++++++++++++++++++++
app/boards/shields/j46kcol/j46kcol.zmk.yml | 10 +++++
12 files changed, 186 insertions(+)
create mode 100644 app/boards/shields/j46k/Kconfig.defconfig
create mode 100644 app/boards/shields/j46k/Kconfig.shield
create mode 100644 app/boards/shields/j46k/j46k.conf
create mode 100644 app/boards/shields/j46k/j46k.keymap
create mode 100644 app/boards/shields/j46k/j46k.overlay
create mode 100644 app/boards/shields/j46k/j46k.zmk.yml
create mode 100644 app/boards/shields/j46kcol/Kconfig.defconfig
create mode 100644 app/boards/shields/j46kcol/Kconfig.shield
create mode 100644 app/boards/shields/j46kcol/j46kcol.conf
create mode 100644 app/boards/shields/j46kcol/j46kcol.keymap
create mode 100644 app/boards/shields/j46kcol/j46kcol.overlay
create mode 100644 app/boards/shields/j46kcol/j46kcol.zmk.yml
diff --git a/app/boards/shields/j46k/Kconfig.defconfig b/app/boards/shields/j46k/Kconfig.defconfig
new file mode 100644
index 00000000..b2f4d918
--- /dev/null
+++ b/app/boards/shields/j46k/Kconfig.defconfig
@@ -0,0 +1,10 @@
+# Copyright (c) 2020 Pete Johanson, Richard Jones
+# SPDX-License-Identifier: MIT
+
+if SHIELD_j46k
+
+config ZMK_KEYBOARD_NAME
+ default "J46K"
+
+endif
+
diff --git a/app/boards/shields/j46k/Kconfig.shield b/app/boards/shields/j46k/Kconfig.shield
new file mode 100644
index 00000000..53edd33d
--- /dev/null
+++ b/app/boards/shields/j46k/Kconfig.shield
@@ -0,0 +1,5 @@
+# Copyright (c) 2020 Pete Johanson, Richard Jones
+# SPDX-License-Identifier: MIT
+
+config SHIELD_j46kcol
+ def_bool $(shields_list_contains,j46kcol)
diff --git a/app/boards/shields/j46k/j46k.conf b/app/boards/shields/j46k/j46k.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/boards/shields/j46k/j46k.keymap b/app/boards/shields/j46k/j46k.keymap
new file mode 100644
index 00000000..e330b96e
--- /dev/null
+++ b/app/boards/shields/j46k/j46k.keymap
@@ -0,0 +1,25 @@
+/*
+ * 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 {
+ bindings = <
+ &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC
+ &kp CLCK &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp RET
+ &kp LSHIFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT
+ &kp LCTRL &kp LGUI &kp LALT &kp SPACE &kp SPACE &kp SPACE &kp SPACE &kp SPACE &kp SPACE &kp RALT &kp RGUI &kp RCTRL
+ >;
+ };
+ };
+};
+
diff --git a/app/boards/shields/j46k/j46k.overlay b/app/boards/shields/j46k/j46k.overlay
new file mode 100644
index 00000000..e5d418a1
--- /dev/null
+++ b/app/boards/shields/j46k/j46k.overlay
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2020 Pete Johanson, Richard Jones
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <dt-bindings/zmk/matrix_transform.h>
+
+/ {
+ chosen {
+ zmk,kscan = &kscan0;
+ };
+
+ kscan0: kscan {
+ compatible = "zmk,kscan-gpio-matrix";
+ label = "KSCAN";
+
+ diode-direction = "col2row";
+ row-gpios
+ = <&pro_micro_d 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&pro_micro_d 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&pro_micro_d 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&pro_micro_d 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ ;
+
+ col-gpios
+ = <&pro_micro_d 1 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_d 0 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_d 4 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_d 5 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_d 6 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_d 7 GPIO_ACTIVE_HIGH>
+ , <&pro_micro_d 14 GPIO_ACTIVE_HIGH>
+ , <&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>
+ ;
+
+ };
+};
+
diff --git a/app/boards/shields/j46k/j46k.zmk.yml b/app/boards/shields/j46k/j46k.zmk.yml
new file mode 100644
index 00000000..e0393e3a
--- /dev/null
+++ b/app/boards/shields/j46k/j46k.zmk.yml
@@ -0,0 +1,10 @@
+file_format: "1"
+id: j46k
+name: J46K
+type: shield
+url: none
+requires: [pro_micro]
+features:
+ - keys
+
+
diff --git a/app/boards/shields/j46kcol/Kconfig.defconfig b/app/boards/shields/j46kcol/Kconfig.defconfig
new file mode 100644
index 00000000..be01c5f0
--- /dev/null
+++ b/app/boards/shields/j46kcol/Kconfig.defconfig
@@ -0,0 +1,10 @@
+# Copyright (c) 2020 Pete Johanson, Richard Jones
+# SPDX-License-Identifier: MIT
+
+if SHIELD_j46kcol
+
+config ZMK_KEYBOARD_NAME
+ default "J46KCol"
+
+endif
+
diff --git a/app/boards/shields/j46kcol/Kconfig.shield b/app/boards/shields/j46kcol/Kconfig.shield
new file mode 100644
index 00000000..53edd33d
--- /dev/null
+++ b/app/boards/shields/j46kcol/Kconfig.shield
@@ -0,0 +1,5 @@
+# Copyright (c) 2020 Pete Johanson, Richard Jones
+# SPDX-License-Identifier: MIT
+
+config SHIELD_j46kcol
+ def_bool $(shields_list_contains,j46kcol)
diff --git a/app/boards/shields/j46kcol/j46kcol.conf b/app/boards/shields/j46kcol/j46kcol.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/app/boards/shields/j46kcol/j46kcol.keymap b/app/boards/shields/j46kcol/j46kcol.keymap
new file mode 100644
index 00000000..52e5df9f
--- /dev/null
+++ b/app/boards/shields/j46kcol/j46kcol.keymap
@@ -0,0 +1,25 @@
+/*
+ * 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 {
+ bindings = <
+ &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC
+ &kp CLCK &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp RET
+ &kp LSHIFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT
+ &kp LCTRL &kp LGUI &kp LALT &kp SPACE &kp SPACE &kp SPACE &kp SPACE &kp SPACE &kp SPACE &bt BT_CLR &kp RGUI &kp RCTRL
+ >;
+ };
+ };
+};
+
diff --git a/app/boards/shields/j46kcol/j46kcol.overlay b/app/boards/shields/j46kcol/j46kcol.overlay
new file mode 100644
index 00000000..64328647
--- /dev/null
+++ b/app/boards/shields/j46kcol/j46kcol.overlay
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2020 Pete Johanson, Richard Jones
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <dt-bindings/zmk/matrix_transform.h>
+
+/ {
+ chosen {
+ zmk,kscan = &kscan0;
+ };
+
+ kscan0: kscan {
+ compatible = "zmk,kscan-gpio-matrix";
+ label = "KSCAN";
+
+ diode-direction = "col2row";
+ row-gpios
+ = <&gpio0 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&gpio0 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&gpio0 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&gpio0 28 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&gpio0 29 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&gpio0 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&gpio0 26 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&gpio0 27 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&gpio0 30 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&gpio0 31 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&gpio0 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&gpio0 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ ;
+
+ col-gpios
+ = <&gpio0 14 GPIO_ACTIVE_HIGH>
+ , <&gpio0 8 GPIO_ACTIVE_HIGH>
+ , <&gpio0 6 GPIO_ACTIVE_HIGH>
+ , <&gpio0 25 GPIO_ACTIVE_HIGH>
+ ;
+
+ };
+};
+
diff --git a/app/boards/shields/j46kcol/j46kcol.zmk.yml b/app/boards/shields/j46kcol/j46kcol.zmk.yml
new file mode 100644
index 00000000..bad0a50d
--- /dev/null
+++ b/app/boards/shields/j46kcol/j46kcol.zmk.yml
@@ -0,0 +1,10 @@
+file_format: "1"
+id: j46kcol
+name: J46K col stagger
+type: shield
+url: none
+requires: [makerdiary_nrf52840_m2]
+features:
+ - keys
+
+