summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/boards/arm/nrf52840_m2/board.cmake2
-rw-r--r--app/boards/shields/m60/Kconfig.defconfig3
-rw-r--r--app/boards/shields/m60/m60.keymap12
3 files changed, 12 insertions, 5 deletions
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
+ >;
+ };
};
};