From 4fdecfd536fd5e605be85597f6619414ab85ce5d Mon Sep 17 00:00:00 2001
From: 280Zo <1754228+280Zo@users.noreply.github.com>
Date: Sat, 9 Nov 2024 23:56:14 -0800
Subject: [PATCH] Fix/left side wake (#13)
* add wakeup-source; to prevent CONFIG_ZMK_SLEEP from keeping the keyboard asleep
* add wakeup-source; to dongle config to prevent CONFIG_ZMK_SLEEP from keeping the keyboard asleep
* update keymap formatting
---------
Co-authored-by: 280Zo <280Zo@users.noreply.github.com>
---
boards/shields/charybdis-bt/charybdis.dtsi | 1 +
.../charybdis-bt/charybdis_left.overlay | 8 +++---
.../shields/charybdis-dongle/charybdis.dtsi | 1 +
config/charybdis.keymap | 6 ++---
keymap-drawer/charybdis.svg | 25 +++++++++----------
keymap-drawer/charybdis.yaml | 8 +++---
6 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/boards/shields/charybdis-bt/charybdis.dtsi b/boards/shields/charybdis-bt/charybdis.dtsi
index 07399b9d..f02112c8 100644
--- a/boards/shields/charybdis-bt/charybdis.dtsi
+++ b/boards/shields/charybdis-bt/charybdis.dtsi
@@ -42,6 +42,7 @@
};
kscan0: kscan {
+ wakeup-source;
diode-direction = "row2col";
};
};
\ No newline at end of file
diff --git a/boards/shields/charybdis-bt/charybdis_left.overlay b/boards/shields/charybdis-bt/charybdis_left.overlay
index df11e51e..e3e36410 100644
--- a/boards/shields/charybdis-bt/charybdis_left.overlay
+++ b/boards/shields/charybdis-bt/charybdis_left.overlay
@@ -21,8 +21,10 @@
;
};
+// https://github.com/badjeff/zmk-pmw3610-driver
/ {
- vtrackball: virtual_input_trackball {
- compatible = "zmk,virtual-input";
- };
+ trackball_listener {
+ compatible = "zmk,input-listener";
+ device = <&trackball>;
+ };
};
\ No newline at end of file
diff --git a/boards/shields/charybdis-dongle/charybdis.dtsi b/boards/shields/charybdis-dongle/charybdis.dtsi
index 56c6aeaf..f9311e34 100644
--- a/boards/shields/charybdis-dongle/charybdis.dtsi
+++ b/boards/shields/charybdis-dongle/charybdis.dtsi
@@ -44,6 +44,7 @@
};
kscan0: kscan {
+ wakeup-source;
diode-direction = "row2col";
};
};
\ No newline at end of file
diff --git a/config/charybdis.keymap b/config/charybdis.keymap
index 547c9777..59805bd1 100644
--- a/config/charybdis.keymap
+++ b/config/charybdis.keymap
@@ -171,12 +171,12 @@
// ╭────────────────┬──────────────┬─────────────────────────┬─────────────────────────────┬──────────────────┬──────────────────╮ ╭────────────────┬─────────────────┬──────────────────────────────────┬──────────────────────────────┬────────────────────────┬──────────────╮
&to 0 &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &td_layers
// ├────────────────┼──────────────┼─────────────────────────┼─────────────────────────────┼──────────────────┼──────────────────┤ ├────────────────┼─────────────────┼──────────────────────────────────┼──────────────────────────────┼────────────────────────┼──────────────┤
- &hm LCMD TAB < 2 A &hm LEFT_ALT S &hm LCTRL D &hm LEFT_SHIFT F &kp G &kp H &hm LEFT_SHIFT J &hm RCTRL K &hm RIGHT_ALT L &hm LCMD SEMICOLON &kp DEL
+ &hm LCMD TAB < 2 A &hm LEFT_ALT S &hm LCTRL D &hm LEFT_SHIFT F &kp G &kp H &hm LEFT_SHIFT J &hm RCTRL K &hm RIGHT_ALT L &hm LCMD SEMICOLON &kp DEL
// ├────────────────┼──────────────┼─────────────────────────┼─────────────────────────────┼──────────────────┼──────────────────┤ ├────────────────┼─────────────────┼──────────────────────────────────┼──────────────────────────────┼────────────────────────┼──────────────┤
&kp C_AC_SEARCH &kp Z &hm LC(LA(LEFT_SHIFT)) X &hm LA(LC(LG(LEFT_SHIFT))) C &kp V &kp B &kp N &kp M &hm LA(LC(LG(LEFT_SHIFT))) COMMA &hm LC(LA(LEFT_SHIFT)) PERIOD &kp FSLH &kp F12
// ╰────────────────┴──────────────┴─────────────────────────┼─────────────────────────────┼──────────────────┼──────────────────┤ ├────────────────┼─────────────────┼──────────────────────────────────┴──────────────────────────────┴────────────────────────┴──────────────╯
- < 1 BACKSPACE &mkp LCLK &td_cursor < 7 RETURN < 3 SPACE
- // ╰─────────────────┴──────────────┴──────────────────╯ ╰────────────────┴──────────────╯
+ &td_cursor &mkp LCLK < 1 BACKSPACE < 7 RETURN < 3 SPACE
+ // ╰─────────────┴──────────────────┴──────────────────╯ ╰────────────────┴──────────────╯
>;
};
diff --git a/keymap-drawer/charybdis.svg b/keymap-drawer/charybdis.svg
index 7e6a1ed4..818fcd14 100644
--- a/keymap-drawer/charybdis.svg
+++ b/keymap-drawer/charybdis.svg
@@ -334,11 +334,9 @@ path.combo { stroke: #7f7f7f; }
-BACKSPACE
+SCRLSLOW
-
-NUM
-
+
@@ -350,9 +348,11 @@ path.combo { stroke: #7f7f7f; }
-SCRLSLOW
+BACKSPACE
-
+
+NUM
+
@@ -549,18 +549,17 @@ path.combo { stroke: #7f7f7f; }
-
-
-
+
+
+
-
-
-
-▽
+
+
+
diff --git a/keymap-drawer/charybdis.yaml b/keymap-drawer/charybdis.yaml
index e8996e6e..57ef84ba 100644
--- a/keymap-drawer/charybdis.yaml
+++ b/keymap-drawer/charybdis.yaml
@@ -36,9 +36,9 @@ layers:
- {t: ., h: MEH}
- /
- DEV TOOLS
- - {t: BACK SPACE, h: NUM}
- - L CLK
- SCRL SLOW
+ - L CLK
+ - {t: BACK SPACE, h: NUM}
- {t: RETURN, h: MOUSE}
- {t: SPACE, h: SYM}
NUM:
@@ -78,9 +78,9 @@ layers:
- {t: '3', h: F3}
- {t: '=', h: DEV TOOLS}
- ''
- - {type: held}
- ''
- - {t: ▽, type: trans}
+ - ''
+ - {type: held}
- '0'
- {t: ▽, type: trans}
NAV: