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 01/20] 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 +#include +#include + +/ { + 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 + +/ { + 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 +#include +#include + +/ { + 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 + +/ { + 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 + + From 41089edfd2fecebbf3234f39544c97f6ad34abf6 Mon Sep 17 00:00:00 2001 From: MakerJake <69777180+MakerJake01@users.noreply.github.com> Date: Fri, 1 Oct 2021 20:15:40 -0400 Subject: [PATCH 02/20] fixing it maybe --- app/boards/shields/j46k/Kconfig.shield | 2 +- app/boards/shields/j46k/j46k.keymap | 46 +++++++++++++++++++++-- app/boards/shields/j46kcol/j46kcol.keymap | 41 ++++++++++++++++++-- 3 files changed, 80 insertions(+), 9 deletions(-) diff --git a/app/boards/shields/j46k/Kconfig.shield b/app/boards/shields/j46k/Kconfig.shield index 53edd33d..485dd28d 100644 --- a/app/boards/shields/j46k/Kconfig.shield +++ b/app/boards/shields/j46k/Kconfig.shield @@ -1,5 +1,5 @@ # Copyright (c) 2020 Pete Johanson, Richard Jones # SPDX-License-Identifier: MIT -config SHIELD_j46kcol +config SHIELD_j46k def_bool $(shields_list_contains,j46kcol) diff --git a/app/boards/shields/j46k/j46k.keymap b/app/boards/shields/j46k/j46k.keymap index e330b96e..2c5b5e45 100644 --- a/app/boards/shields/j46k/j46k.keymap +++ b/app/boards/shields/j46k/j46k.keymap @@ -8,18 +8,56 @@ #include #include +#include +#include +#include +#include + +#define DEFAULT 0 +#define NUMBS 1 +#define FUNC 2 +#define MOUSE 3 + / { 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 + &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 &out OUT_TOG &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 &mo MOUSE &mo NUMBS &mo NUMBS &kp SPACE &kp SPACE &mo FUNC &bt BT_CLR &kp RGUI &kp RCTRL + >; + }; + + numbers_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 1 &kp 2 &kp 3 &kp 4 &kp 5 &kp 6 &kp 7 &kp 8 &kp 9 &kp 0 &kp RET + &kp LSHIFT &kp ! &kp @ &kp # &kp $ &kp % &kp ^ &kp & &kp * &kp ( &kp ) &kp RSHFT + &kp LCTRL &kp LGUI &kp LALT &mo MOUSE &mo NUMBS &mo NUMBS &kp SPACE &kp SPACE &mo FUNC &bt BT_CLR &kp RGUI &kp RCTRL + >; + }; + + func_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 &trans &trans &trans &kp SPACE &kp SPACE &trans &bt BT_CLR &kp RGUI &kp RCTRL + >; + }; + + mouse_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 &trans &trans &trans &kp SPACE &kp SPACE &trans &bt BT_CLR &kp RGUI &kp RCTRL >; }; }; }; + diff --git a/app/boards/shields/j46kcol/j46kcol.keymap b/app/boards/shields/j46kcol/j46kcol.keymap index 52e5df9f..ffb2fe05 100644 --- a/app/boards/shields/j46kcol/j46kcol.keymap +++ b/app/boards/shields/j46kcol/j46kcol.keymap @@ -7,6 +7,12 @@ #include #include #include +#include + +#define DEFAULT 0 +#define NUMBS 1 +#define FUNC 2 +#define MOUSE 3 / { keymap { @@ -14,10 +20,37 @@ 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 + &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 &out OUT_TOG &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 &mo MOUSE &mo NUMBS &mo NUMBS &kp SPACE &kp SPACE &mo FUNC &bt BT_CLR &kp RGUI &kp RCTRL + >; + }; + + numbers_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 1 &kp 2 &kp 3 &kp 4 &kp 5 &kp 6 &kp 7 &kp 8 &kp 9 &kp 0 &kp RET + &kp LSHIFT &kp ! &kp @ &kp # &kp $ &kp % &kp ^ &kp & &kp * &kp ( &kp ) &kp RSHFT + &kp LCTRL &kp LGUI &kp LALT &mo MOUSE &mo NUMBS &mo NUMBS &kp SPACE &kp SPACE &mo FUNC &bt BT_CLR &kp RGUI &kp RCTRL + >; + }; + + func_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 &trans &trans &trans &kp SPACE &kp SPACE &trans &bt BT_CLR &kp RGUI &kp RCTRL + >; + }; + + mouse_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 &trans &trans &trans &kp SPACE &kp SPACE &trans &bt BT_CLR &kp RGUI &kp RCTRL >; }; }; From c92f0882f236c80fc6395871d956ec0462c94363 Mon Sep 17 00:00:00 2001 From: MakerJake <69777180+MakerJake01@users.noreply.github.com> Date: Sat, 2 Oct 2021 01:20:35 -0400 Subject: [PATCH 03/20] The board works! Pogo. --- app/boards/shields/j46k/Kconfig.shield | 2 +- app/boards/shields/j46k/j46k.keymap | 28 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/boards/shields/j46k/Kconfig.shield b/app/boards/shields/j46k/Kconfig.shield index 485dd28d..19cac2c6 100644 --- a/app/boards/shields/j46k/Kconfig.shield +++ b/app/boards/shields/j46k/Kconfig.shield @@ -2,4 +2,4 @@ # SPDX-License-Identifier: MIT config SHIELD_j46k - def_bool $(shields_list_contains,j46kcol) + def_bool $(shields_list_contains,j46k) diff --git a/app/boards/shields/j46k/j46k.keymap b/app/boards/shields/j46k/j46k.keymap index 2c5b5e45..fa879835 100644 --- a/app/boards/shields/j46k/j46k.keymap +++ b/app/boards/shields/j46k/j46k.keymap @@ -25,36 +25,36 @@ 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 &out OUT_TOG &kp K &kp L &kp SEMI &kp RET + &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 &mo MOUSE &mo NUMBS &mo NUMBS &kp SPACE &kp SPACE &mo FUNC &bt BT_CLR &kp RGUI &kp RCTRL + &kp LCTRL &kp LGUI &kp LALT &mo MOUSE &mo NUMBS &mo NUMBS &kp SPACE &kp SPACE &mo FUNC &kp LALT &kp RGUI &kp RCTRL >; }; numbers_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 1 &kp 2 &kp 3 &kp 4 &kp 5 &kp 6 &kp 7 &kp 8 &kp 9 &kp 0 &kp RET - &kp LSHIFT &kp ! &kp @ &kp # &kp $ &kp % &kp ^ &kp & &kp * &kp ( &kp ) &kp RSHFT - &kp LCTRL &kp LGUI &kp LALT &mo MOUSE &mo NUMBS &mo NUMBS &kp SPACE &kp SPACE &mo FUNC &bt BT_CLR &kp RGUI &kp RCTRL + &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 + &kp C_MUTE &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp RET + &kp LSHIFT &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp ASTERISK &kp LPAR &kp RPAR &kp RSHFT + &kp LCTRL &kp LGUI &kp LALT &trans &trans &trans &trans &trans &trans &kp LALT &kp RGUI &kp RCTRL >; }; func_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 &trans &trans &trans &kp SPACE &kp SPACE &trans &bt BT_CLR &kp RGUI &kp RCTRL + &kp ESC &trans &kp PG_UP &trans &trans &trans &trans &trans &kp UP &trans &trans &kp BSPC + &kp TAB &kp HOME &kp PG_DN &kp C_VOL_UP &kp C_VOLUME_DOWN &kp MINUS &kp KP_EQUAL &kp LEFT &kp DOWN &kp RIGHT &kp SQT &kp GRAVE + &kp LSHIFT &kp C_PP &trans &trans &trans &kp LBKT &kp RBKT &trans &kp COMMA &kp DOT &kp BSLH &kp RSHFT + &kp LCTRL &kp LGUI &kp LALT &trans &trans &trans &trans &trans &trans &kp LALT &kp RGUI &kp RCTRL >; }; mouse_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 &trans &trans &trans &kp SPACE &kp SPACE &trans &bt BT_CLR &kp RGUI &kp RCTRL + &kp TAB &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &kp CLCK &trans &trans &trans &trans &bt BT_PRV &out OUT_TOG &trans &trans &trans &trans &trans + &kp LSHIFT &trans &trans &trans &trans &bt BT_NXT &bt BT_CLR &trans &trans &trans &trans &trans + &kp LCTRL &kp LGUI &kp LALT &trans &trans &trans &trans &trans &trans &kp LALT &kp RGUI &trans >; }; }; From fee231456bc60d423869c72089ad115857182f34 Mon Sep 17 00:00:00 2001 From: MakerJake <69777180+MakerJake01@users.noreply.github.com> Date: Sun, 3 Oct 2021 21:49:48 -0400 Subject: [PATCH 04/20] making sure things work and stuff. --- app/boards/shields/j46k/j46k.keymap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/boards/shields/j46k/j46k.keymap b/app/boards/shields/j46k/j46k.keymap index fa879835..e672c6cc 100644 --- a/app/boards/shields/j46k/j46k.keymap +++ b/app/boards/shields/j46k/j46k.keymap @@ -24,10 +24,10 @@ 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 &mo MOUSE &mo NUMBS &mo NUMBS &kp SPACE &kp SPACE &mo FUNC &kp LALT &kp RGUI &kp RCTRL + &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 &mo MOUSE &mo NUMBS &mo NUMBS &kp SPACE &kp SPACE &mo FUNC &kp LALT &kp RCTRL &kp RGUI >; }; From b6a03e55747d4746ae4bbbf2dda4929d47792254 Mon Sep 17 00:00:00 2001 From: MakerJake <69777180+MakerJake01@users.noreply.github.com> Date: Mon, 4 Oct 2021 16:27:40 -0400 Subject: [PATCH 05/20] changed the name of the J46K board --- app/boards/shields/{j46k => babyvble}/Kconfig.defconfig | 4 ++-- app/boards/shields/{j46k => babyvble}/Kconfig.shield | 4 ++-- app/boards/shields/{j46k/j46k.conf => babyvble/babyvble.conf} | 0 .../shields/{j46k/j46k.keymap => babyvble/babyvble.keymap} | 2 +- .../shields/{j46k/j46k.overlay => babyvble/babyvble.overlay} | 0 .../shields/{j46k/j46k.zmk.yml => babyvble/babyvble.zmk.yml} | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) rename app/boards/shields/{j46k => babyvble}/Kconfig.defconfig (74%) rename app/boards/shields/{j46k => babyvble}/Kconfig.shield (55%) rename app/boards/shields/{j46k/j46k.conf => babyvble/babyvble.conf} (100%) rename app/boards/shields/{j46k/j46k.keymap => babyvble/babyvble.keymap} (97%) rename app/boards/shields/{j46k/j46k.overlay => babyvble/babyvble.overlay} (100%) rename app/boards/shields/{j46k/j46k.zmk.yml => babyvble/babyvble.zmk.yml} (74%) diff --git a/app/boards/shields/j46k/Kconfig.defconfig b/app/boards/shields/babyvble/Kconfig.defconfig similarity index 74% rename from app/boards/shields/j46k/Kconfig.defconfig rename to app/boards/shields/babyvble/Kconfig.defconfig index b2f4d918..893c6540 100644 --- a/app/boards/shields/j46k/Kconfig.defconfig +++ b/app/boards/shields/babyvble/Kconfig.defconfig @@ -1,10 +1,10 @@ # Copyright (c) 2020 Pete Johanson, Richard Jones # SPDX-License-Identifier: MIT -if SHIELD_j46k +if SHIELD_babyvble config ZMK_KEYBOARD_NAME - default "J46K" + default "BabyvBle" endif diff --git a/app/boards/shields/j46k/Kconfig.shield b/app/boards/shields/babyvble/Kconfig.shield similarity index 55% rename from app/boards/shields/j46k/Kconfig.shield rename to app/boards/shields/babyvble/Kconfig.shield index 19cac2c6..f6cd256d 100644 --- a/app/boards/shields/j46k/Kconfig.shield +++ b/app/boards/shields/babyvble/Kconfig.shield @@ -1,5 +1,5 @@ # Copyright (c) 2020 Pete Johanson, Richard Jones # SPDX-License-Identifier: MIT -config SHIELD_j46k - def_bool $(shields_list_contains,j46k) +config SHIELD_babyvble + def_bool $(shields_list_contains,babyvble) diff --git a/app/boards/shields/j46k/j46k.conf b/app/boards/shields/babyvble/babyvble.conf similarity index 100% rename from app/boards/shields/j46k/j46k.conf rename to app/boards/shields/babyvble/babyvble.conf diff --git a/app/boards/shields/j46k/j46k.keymap b/app/boards/shields/babyvble/babyvble.keymap similarity index 97% rename from app/boards/shields/j46k/j46k.keymap rename to app/boards/shields/babyvble/babyvble.keymap index e672c6cc..4ffe5c17 100644 --- a/app/boards/shields/j46k/j46k.keymap +++ b/app/boards/shields/babyvble/babyvble.keymap @@ -43,7 +43,7 @@ func_layer { bindings = < &kp ESC &trans &kp PG_UP &trans &trans &trans &trans &trans &kp UP &trans &trans &kp BSPC - &kp TAB &kp HOME &kp PG_DN &kp C_VOL_UP &kp C_VOLUME_DOWN &kp MINUS &kp KP_EQUAL &kp LEFT &kp DOWN &kp RIGHT &kp SQT &kp GRAVE + &kp TAB &kp HOME &kp PG_DN &kp C_VOL_UP &kp C_VOLUME_DOWN &kp MINUS &kp EQUAL &kp LEFT &kp DOWN &kp RIGHT &kp SQT &kp GRAVE &kp LSHIFT &kp C_PP &trans &trans &trans &kp LBKT &kp RBKT &trans &kp COMMA &kp DOT &kp BSLH &kp RSHFT &kp LCTRL &kp LGUI &kp LALT &trans &trans &trans &trans &trans &trans &kp LALT &kp RGUI &kp RCTRL >; diff --git a/app/boards/shields/j46k/j46k.overlay b/app/boards/shields/babyvble/babyvble.overlay similarity index 100% rename from app/boards/shields/j46k/j46k.overlay rename to app/boards/shields/babyvble/babyvble.overlay diff --git a/app/boards/shields/j46k/j46k.zmk.yml b/app/boards/shields/babyvble/babyvble.zmk.yml similarity index 74% rename from app/boards/shields/j46k/j46k.zmk.yml rename to app/boards/shields/babyvble/babyvble.zmk.yml index e0393e3a..e207cc43 100644 --- a/app/boards/shields/j46k/j46k.zmk.yml +++ b/app/boards/shields/babyvble/babyvble.zmk.yml @@ -1,6 +1,6 @@ file_format: "1" -id: j46k -name: J46K +id: babyvble +name: BabyvBle type: shield url: none requires: [pro_micro] From eb61bc4c419514ca9863e0f0384f61d85e40361e Mon Sep 17 00:00:00 2001 From: MakerJake <69777180+MakerJake01@users.noreply.github.com> Date: Mon, 4 Oct 2021 16:34:27 -0400 Subject: [PATCH 06/20] maybe it works now but idk --- app/boards/shields/babyvble/Kconfig.defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boards/shields/babyvble/Kconfig.defconfig b/app/boards/shields/babyvble/Kconfig.defconfig index 893c6540..82a8d5d8 100644 --- a/app/boards/shields/babyvble/Kconfig.defconfig +++ b/app/boards/shields/babyvble/Kconfig.defconfig @@ -4,7 +4,7 @@ if SHIELD_babyvble config ZMK_KEYBOARD_NAME - default "BabyvBle" + default "babyvble" endif From 41efdc695e8132c593853f21a89f21e1e90a83d9 Mon Sep 17 00:00:00 2001 From: MakerJake <69777180+MakerJake01@users.noreply.github.com> Date: Mon, 4 Oct 2021 16:36:19 -0400 Subject: [PATCH 07/20] its just like not working --- app/boards/shields/babyvble/babyvble.zmk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boards/shields/babyvble/babyvble.zmk.yml b/app/boards/shields/babyvble/babyvble.zmk.yml index e207cc43..b95d20bf 100644 --- a/app/boards/shields/babyvble/babyvble.zmk.yml +++ b/app/boards/shields/babyvble/babyvble.zmk.yml @@ -1,6 +1,6 @@ file_format: "1" id: babyvble -name: BabyvBle +name: babyvble type: shield url: none requires: [pro_micro] From 7e6f3d1cf2c319965bee3bb467927234065ccf9c Mon Sep 17 00:00:00 2001 From: MakerJake <69777180+MakerJake01@users.noreply.github.com> Date: Mon, 4 Oct 2021 16:39:39 -0400 Subject: [PATCH 08/20] I think it was working but I didnt include the -p when building. --- app/boards/shields/babyvble/Kconfig.defconfig | 2 +- app/boards/shields/babyvble/babyvble.zmk.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/boards/shields/babyvble/Kconfig.defconfig b/app/boards/shields/babyvble/Kconfig.defconfig index 82a8d5d8..893c6540 100644 --- a/app/boards/shields/babyvble/Kconfig.defconfig +++ b/app/boards/shields/babyvble/Kconfig.defconfig @@ -4,7 +4,7 @@ if SHIELD_babyvble config ZMK_KEYBOARD_NAME - default "babyvble" + default "BabyvBle" endif diff --git a/app/boards/shields/babyvble/babyvble.zmk.yml b/app/boards/shields/babyvble/babyvble.zmk.yml index b95d20bf..e207cc43 100644 --- a/app/boards/shields/babyvble/babyvble.zmk.yml +++ b/app/boards/shields/babyvble/babyvble.zmk.yml @@ -1,6 +1,6 @@ file_format: "1" id: babyvble -name: babyvble +name: BabyvBle type: shield url: none requires: [pro_micro] From ea3cc378d43d28e7289347579e810d624f961aa8 Mon Sep 17 00:00:00 2001 From: MakerJake <69777180+MakerJake01@users.noreply.github.com> Date: Mon, 4 Oct 2021 19:54:44 -0400 Subject: [PATCH 09/20] sleep maybe --- app/boards/shields/babyvble/babyvble.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/app/boards/shields/babyvble/babyvble.conf b/app/boards/shields/babyvble/babyvble.conf index e69de29b..dcd95fed 100644 --- a/app/boards/shields/babyvble/babyvble.conf +++ b/app/boards/shields/babyvble/babyvble.conf @@ -0,0 +1 @@ +CONFIG_ZMK_SLEEP=y \ No newline at end of file From cee5314b547c60543285ce0b17b64284a962af74 Mon Sep 17 00:00:00 2001 From: MakerJake <69777180+MakerJake01@users.noreply.github.com> Date: Mon, 4 Oct 2021 20:48:24 -0400 Subject: [PATCH 10/20] added some more info --- app/boards/shields/babyvble/babyvble.zmk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boards/shields/babyvble/babyvble.zmk.yml b/app/boards/shields/babyvble/babyvble.zmk.yml index e207cc43..39055bf6 100644 --- a/app/boards/shields/babyvble/babyvble.zmk.yml +++ b/app/boards/shields/babyvble/babyvble.zmk.yml @@ -2,7 +2,7 @@ file_format: "1" id: babyvble name: BabyvBle type: shield -url: none +url: https://discord.gg/ktUDJ3w requires: [pro_micro] features: - keys From 097b735e64176f7e8388995aa5c863ef0693fd01 Mon Sep 17 00:00:00 2001 From: MakerJake <69777180+MakerJake01@users.noreply.github.com> Date: Mon, 4 Oct 2021 21:11:49 -0400 Subject: [PATCH 11/20] removed J46Kcol This is a board that is not yet working. removed for pr will work on it soon. --- 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 | 58 -------------------- app/boards/shields/j46kcol/j46kcol.overlay | 43 --------------- app/boards/shields/j46kcol/j46kcol.zmk.yml | 10 ---- 6 files changed, 126 deletions(-) delete mode 100644 app/boards/shields/j46kcol/Kconfig.defconfig delete mode 100644 app/boards/shields/j46kcol/Kconfig.shield delete mode 100644 app/boards/shields/j46kcol/j46kcol.conf delete mode 100644 app/boards/shields/j46kcol/j46kcol.keymap delete mode 100644 app/boards/shields/j46kcol/j46kcol.overlay delete mode 100644 app/boards/shields/j46kcol/j46kcol.zmk.yml diff --git a/app/boards/shields/j46kcol/Kconfig.defconfig b/app/boards/shields/j46kcol/Kconfig.defconfig deleted file mode 100644 index be01c5f0..00000000 --- a/app/boards/shields/j46kcol/Kconfig.defconfig +++ /dev/null @@ -1,10 +0,0 @@ -# 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 deleted file mode 100644 index 53edd33d..00000000 --- a/app/boards/shields/j46kcol/Kconfig.shield +++ /dev/null @@ -1,5 +0,0 @@ -# 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 deleted file mode 100644 index e69de29b..00000000 diff --git a/app/boards/shields/j46kcol/j46kcol.keymap b/app/boards/shields/j46kcol/j46kcol.keymap deleted file mode 100644 index ffb2fe05..00000000 --- a/app/boards/shields/j46kcol/j46kcol.keymap +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#include -#include -#include -#include - -#define DEFAULT 0 -#define NUMBS 1 -#define FUNC 2 -#define MOUSE 3 - -/ { - 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 &out OUT_TOG &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 &mo MOUSE &mo NUMBS &mo NUMBS &kp SPACE &kp SPACE &mo FUNC &bt BT_CLR &kp RGUI &kp RCTRL - >; - }; - - numbers_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 1 &kp 2 &kp 3 &kp 4 &kp 5 &kp 6 &kp 7 &kp 8 &kp 9 &kp 0 &kp RET - &kp LSHIFT &kp ! &kp @ &kp # &kp $ &kp % &kp ^ &kp & &kp * &kp ( &kp ) &kp RSHFT - &kp LCTRL &kp LGUI &kp LALT &mo MOUSE &mo NUMBS &mo NUMBS &kp SPACE &kp SPACE &mo FUNC &bt BT_CLR &kp RGUI &kp RCTRL - >; - }; - - func_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 &trans &trans &trans &kp SPACE &kp SPACE &trans &bt BT_CLR &kp RGUI &kp RCTRL - >; - }; - - mouse_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 &trans &trans &trans &kp SPACE &kp SPACE &trans &bt BT_CLR &kp RGUI &kp RCTRL - >; - }; - }; -}; - diff --git a/app/boards/shields/j46kcol/j46kcol.overlay b/app/boards/shields/j46kcol/j46kcol.overlay deleted file mode 100644 index 64328647..00000000 --- a/app/boards/shields/j46kcol/j46kcol.overlay +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2020 Pete Johanson, Richard Jones - * - * SPDX-License-Identifier: MIT - */ - -#include - -/ { - 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 deleted file mode 100644 index bad0a50d..00000000 --- a/app/boards/shields/j46kcol/j46kcol.zmk.yml +++ /dev/null @@ -1,10 +0,0 @@ -file_format: "1" -id: j46kcol -name: J46K col stagger -type: shield -url: none -requires: [makerdiary_nrf52840_m2] -features: - - keys - - From 5c2cee6ac4eec0e46583c5047705c13b1525cf81 Mon Sep 17 00:00:00 2001 From: MakerJake <69777180+MakerJake01@users.noreply.github.com> Date: Tue, 5 Oct 2021 16:17:44 -0400 Subject: [PATCH 12/20] changes to make it better for pr These changes have been recommended by dxmh. --- app/boards/shields/babyvble/Kconfig.defconfig | 7 ++-- app/boards/shields/babyvble/Kconfig.shield | 2 +- app/boards/shields/babyvble/babyvble.conf | 2 +- app/boards/shields/babyvble/babyvble.keymap | 4 +-- app/boards/shields/babyvble/babyvble.overlay | 36 +++++++++---------- app/boards/shields/babyvble/babyvble.zmk.yml | 4 +-- 6 files changed, 24 insertions(+), 31 deletions(-) diff --git a/app/boards/shields/babyvble/Kconfig.defconfig b/app/boards/shields/babyvble/Kconfig.defconfig index 893c6540..4ecaa4c3 100644 --- a/app/boards/shields/babyvble/Kconfig.defconfig +++ b/app/boards/shields/babyvble/Kconfig.defconfig @@ -1,10 +1,9 @@ -# Copyright (c) 2020 Pete Johanson, Richard Jones -# SPDX-License-Identifier: MIT +# Copyright (c) 2021 The ZMK Contributors +# SPDX-License-Identifier: MIT if SHIELD_babyvble config ZMK_KEYBOARD_NAME default "BabyvBle" -endif - +endif \ No newline at end of file diff --git a/app/boards/shields/babyvble/Kconfig.shield b/app/boards/shields/babyvble/Kconfig.shield index f6cd256d..10dc7f48 100644 --- a/app/boards/shields/babyvble/Kconfig.shield +++ b/app/boards/shields/babyvble/Kconfig.shield @@ -2,4 +2,4 @@ # SPDX-License-Identifier: MIT config SHIELD_babyvble - def_bool $(shields_list_contains,babyvble) + def_bool $(shields_list_contains,babyvble) \ No newline at end of file diff --git a/app/boards/shields/babyvble/babyvble.conf b/app/boards/shields/babyvble/babyvble.conf index dcd95fed..406f9a44 100644 --- a/app/boards/shields/babyvble/babyvble.conf +++ b/app/boards/shields/babyvble/babyvble.conf @@ -1 +1 @@ -CONFIG_ZMK_SLEEP=y \ No newline at end of file +# CONFIG_ZMK_SLEEP=y \ No newline at end of file diff --git a/app/boards/shields/babyvble/babyvble.keymap b/app/boards/shields/babyvble/babyvble.keymap index 4ffe5c17..c29ff1fe 100644 --- a/app/boards/shields/babyvble/babyvble.keymap +++ b/app/boards/shields/babyvble/babyvble.keymap @@ -58,6 +58,4 @@ >; }; }; -}; - - +}; \ No newline at end of file diff --git a/app/boards/shields/babyvble/babyvble.overlay b/app/boards/shields/babyvble/babyvble.overlay index e5d418a1..f11a0cd9 100644 --- a/app/boards/shields/babyvble/babyvble.overlay +++ b/app/boards/shields/babyvble/babyvble.overlay @@ -17,27 +17,25 @@ 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)> + = <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 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> + = <&pro_micro 1 GPIO_ACTIVE_HIGH> + , <&pro_micro 0 GPIO_ACTIVE_HIGH> + , <&pro_micro 4 GPIO_ACTIVE_HIGH> + , <&pro_micro 5 GPIO_ACTIVE_HIGH> + , <&pro_micro 6 GPIO_ACTIVE_HIGH> + , <&pro_micro 7 GPIO_ACTIVE_HIGH> + , <&pro_micro 14 GPIO_ACTIVE_HIGH> + , <&pro_micro 15 GPIO_ACTIVE_HIGH> + , <&pro_micro 18 GPIO_ACTIVE_HIGH> + , <&pro_micro 19 GPIO_ACTIVE_HIGH> + , <&pro_micro 20 GPIO_ACTIVE_HIGH> + , <&pro_micro 21 GPIO_ACTIVE_HIGH> ; - }; -}; - +}; \ No newline at end of file diff --git a/app/boards/shields/babyvble/babyvble.zmk.yml b/app/boards/shields/babyvble/babyvble.zmk.yml index 39055bf6..714d9b8f 100644 --- a/app/boards/shields/babyvble/babyvble.zmk.yml +++ b/app/boards/shields/babyvble/babyvble.zmk.yml @@ -5,6 +5,4 @@ type: shield url: https://discord.gg/ktUDJ3w requires: [pro_micro] features: - - keys - - + - keys \ No newline at end of file From fb550e560f5218dbb34cdf74c04c243864235214 Mon Sep 17 00:00:00 2001 From: MakerJake <69777180+MakerJake01@users.noreply.github.com> Date: Tue, 5 Oct 2021 16:40:18 -0400 Subject: [PATCH 13/20] updated copyright info. --- app/boards/shields/babyvble/Kconfig.shield | 2 +- app/boards/shields/babyvble/babyvble.keymap | 2 +- app/boards/shields/babyvble/babyvble.overlay | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/boards/shields/babyvble/Kconfig.shield b/app/boards/shields/babyvble/Kconfig.shield index 10dc7f48..cfc07f0f 100644 --- a/app/boards/shields/babyvble/Kconfig.shield +++ b/app/boards/shields/babyvble/Kconfig.shield @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Pete Johanson, Richard Jones +# Copyright (c) 2021 Pete Johanson, Richard Jones # SPDX-License-Identifier: MIT config SHIELD_babyvble diff --git a/app/boards/shields/babyvble/babyvble.keymap b/app/boards/shields/babyvble/babyvble.keymap index c29ff1fe..72025d4f 100644 --- a/app/boards/shields/babyvble/babyvble.keymap +++ b/app/boards/shields/babyvble/babyvble.keymap @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 The ZMK Contributors + * Copyright (c) 2021 The ZMK Contributors * * SPDX-License-Identifier: MIT */ diff --git a/app/boards/shields/babyvble/babyvble.overlay b/app/boards/shields/babyvble/babyvble.overlay index f11a0cd9..2c5963a2 100644 --- a/app/boards/shields/babyvble/babyvble.overlay +++ b/app/boards/shields/babyvble/babyvble.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Pete Johanson, Richard Jones + * Copyright (c) 2021 Pete Johanson, Richard Jones * * SPDX-License-Identifier: MIT */ From cad664a6a28048dba3d72220c39d77575684050d Mon Sep 17 00:00:00 2001 From: MakerJake <69777180+MakerJake01@users.noreply.github.com> Date: Tue, 5 Oct 2021 17:42:33 -0400 Subject: [PATCH 14/20] added delete --- app/boards/shields/babyvble/babyvble.keymap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boards/shields/babyvble/babyvble.keymap b/app/boards/shields/babyvble/babyvble.keymap index 72025d4f..589cabb4 100644 --- a/app/boards/shields/babyvble/babyvble.keymap +++ b/app/boards/shields/babyvble/babyvble.keymap @@ -42,7 +42,7 @@ func_layer { bindings = < - &kp ESC &trans &kp PG_UP &trans &trans &trans &trans &trans &kp UP &trans &trans &kp BSPC + &kp ESC &trans &kp PG_UP &trans &trans &trans &trans &trans &kp UP &trans &trans &kp DEL &kp TAB &kp HOME &kp PG_DN &kp C_VOL_UP &kp C_VOLUME_DOWN &kp MINUS &kp EQUAL &kp LEFT &kp DOWN &kp RIGHT &kp SQT &kp GRAVE &kp LSHIFT &kp C_PP &trans &trans &trans &kp LBKT &kp RBKT &trans &kp COMMA &kp DOT &kp BSLH &kp RSHFT &kp LCTRL &kp LGUI &kp LALT &trans &trans &trans &trans &trans &trans &kp LALT &kp RGUI &kp RCTRL From f96c21ec724c7d8f452997d1786e01ec7f74b5ec Mon Sep 17 00:00:00 2001 From: MakerJake <69777180+MakerJake01@users.noreply.github.com> Date: Mon, 25 Oct 2021 13:05:54 -0400 Subject: [PATCH 15/20] fixing copyright --- app/boards/shields/babyvble/Kconfig.shield | 2 +- app/boards/shields/babyvble/babyvble.overlay | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/boards/shields/babyvble/Kconfig.shield b/app/boards/shields/babyvble/Kconfig.shield index cfc07f0f..1f886742 100644 --- a/app/boards/shields/babyvble/Kconfig.shield +++ b/app/boards/shields/babyvble/Kconfig.shield @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Pete Johanson, Richard Jones +# Copyright (c) 2021 The ZMK Contributors # SPDX-License-Identifier: MIT config SHIELD_babyvble diff --git a/app/boards/shields/babyvble/babyvble.overlay b/app/boards/shields/babyvble/babyvble.overlay index 2c5963a2..98fce7ae 100644 --- a/app/boards/shields/babyvble/babyvble.overlay +++ b/app/boards/shields/babyvble/babyvble.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Pete Johanson, Richard Jones + * Copyright (c) 2021 The ZMK Contributors * * SPDX-License-Identifier: MIT */ From a73f78d5ba2bcd01391a6012d99cff4addd65987 Mon Sep 17 00:00:00 2001 From: MakerJake <69777180+MakerJake01@users.noreply.github.com> Date: Tue, 26 Oct 2021 17:04:09 -0400 Subject: [PATCH 16/20] Update app/boards/shields/babyvble/Kconfig.shield Co-authored-by: Dom H --- app/boards/shields/babyvble/Kconfig.shield | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boards/shields/babyvble/Kconfig.shield b/app/boards/shields/babyvble/Kconfig.shield index 1f886742..776bc679 100644 --- a/app/boards/shields/babyvble/Kconfig.shield +++ b/app/boards/shields/babyvble/Kconfig.shield @@ -1,5 +1,5 @@ # Copyright (c) 2021 The ZMK Contributors # SPDX-License-Identifier: MIT -config SHIELD_babyvble +config SHIELD_BABYVBLE def_bool $(shields_list_contains,babyvble) \ No newline at end of file From e4c3553d5c62eab6e79167d91f8d4e6aaabacbe1 Mon Sep 17 00:00:00 2001 From: MakerJake <69777180+MakerJake01@users.noreply.github.com> Date: Tue, 26 Oct 2021 17:04:13 -0400 Subject: [PATCH 17/20] Update app/boards/shields/babyvble/Kconfig.defconfig Co-authored-by: Dom H --- app/boards/shields/babyvble/Kconfig.defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boards/shields/babyvble/Kconfig.defconfig b/app/boards/shields/babyvble/Kconfig.defconfig index 4ecaa4c3..a2ab18be 100644 --- a/app/boards/shields/babyvble/Kconfig.defconfig +++ b/app/boards/shields/babyvble/Kconfig.defconfig @@ -1,7 +1,7 @@ # Copyright (c) 2021 The ZMK Contributors # SPDX-License-Identifier: MIT -if SHIELD_babyvble +if SHIELD_BABYVBLE config ZMK_KEYBOARD_NAME default "BabyvBle" From e84327c8e952c9a0724919b88c7acae568e75574 Mon Sep 17 00:00:00 2001 From: MakerJake <69777180+MakerJake01@users.noreply.github.com> Date: Tue, 26 Oct 2021 17:04:26 -0400 Subject: [PATCH 18/20] Update app/boards/shields/babyvble/babyvble.conf Co-authored-by: Dom H --- app/boards/shields/babyvble/babyvble.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/app/boards/shields/babyvble/babyvble.conf b/app/boards/shields/babyvble/babyvble.conf index 406f9a44..e69de29b 100644 --- a/app/boards/shields/babyvble/babyvble.conf +++ b/app/boards/shields/babyvble/babyvble.conf @@ -1 +0,0 @@ -# CONFIG_ZMK_SLEEP=y \ No newline at end of file From cbdeaada539c7ffcab861f77c4c3286fac08b58e Mon Sep 17 00:00:00 2001 From: MakerJake <69777180+MakerJake01@users.noreply.github.com> Date: Tue, 9 Nov 2021 10:41:34 -0500 Subject: [PATCH 19/20] removed redundant lines of code --- app/boards/shields/babyvble/babyvble.keymap | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/boards/shields/babyvble/babyvble.keymap b/app/boards/shields/babyvble/babyvble.keymap index 589cabb4..30086897 100644 --- a/app/boards/shields/babyvble/babyvble.keymap +++ b/app/boards/shields/babyvble/babyvble.keymap @@ -7,10 +7,7 @@ #include #include #include - -#include -#include -#include +#include #include #define DEFAULT 0 From efc6e55f95fa217a8678d248ab0803aad84471c4 Mon Sep 17 00:00:00 2001 From: MakerJake <69777180+MakerJake01@users.noreply.github.com> Date: Thu, 17 Mar 2022 17:35:54 -0400 Subject: [PATCH 20/20] Changed info link --- app/boards/shields/babyvble/babyvble.zmk.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/boards/shields/babyvble/babyvble.zmk.yml b/app/boards/shields/babyvble/babyvble.zmk.yml index 714d9b8f..ad021fb5 100644 --- a/app/boards/shields/babyvble/babyvble.zmk.yml +++ b/app/boards/shields/babyvble/babyvble.zmk.yml @@ -2,7 +2,7 @@ file_format: "1" id: babyvble name: BabyvBle type: shield -url: https://discord.gg/ktUDJ3w +url: https://github.com/MakerJake01/MakerJakes-keyboards/tree/main/BabyvBle requires: [pro_micro] features: - - keys \ No newline at end of file + - keys