Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keymap/adjust trackball #7

Merged
merged 107 commits into from
Aug 17, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
98bca07
adjust trackball settings
280Zo Aug 13, 2024
0218c26
adjust trackball settings
280Zo Aug 13, 2024
57df3ac
adjust trackball settings
280Zo Aug 13, 2024
f9c883c
adjust trackball settings
280Zo Aug 13, 2024
2c4ee36
adjust trackball settings
280Zo Aug 13, 2024
689d77c
adjust trackball settings
280Zo Aug 13, 2024
6ee92f1
adjust trackball settings
280Zo Aug 13, 2024
b4a289a
adjust trackball settings
280Zo Aug 13, 2024
366295b
reduce REST sample time
280Zo Aug 13, 2024
159e57f
always awake
280Zo Aug 13, 2024
82e70ac
use software encodingt
280Zo Aug 13, 2024
1b46e0a
extend automous timeout
280Zo Aug 13, 2024
a744f7c
switch away from force awake and back to REST1 activation
280Zo Aug 13, 2024
212aa5f
switch away from force awake and back to REST1 activation
280Zo Aug 13, 2024
24a2f5d
Remove automouse
keymap-editor[bot] Aug 13, 2024
b713d63
fix back2base behavior assignment
keymap-editor[bot] Aug 13, 2024
fca8d6f
test removing the tapdance behavior
280Zo Aug 14, 2024
d71bb17
test removing the back2base behavior
280Zo Aug 14, 2024
f88f74c
test removing the back2base behavior
280Zo Aug 14, 2024
2e58bfe
test removing both new key mappings
280Zo Aug 14, 2024
9c5c57d
test removing both new key mappings
280Zo Aug 14, 2024
3d8e31c
keymap WIP
280Zo Aug 14, 2024
8b7acde
Merge branch 'keymap/adjust_trackball' of github.com:280Zo/charybdis-…
280Zo Aug 14, 2024
6f54b2e
keymap WIP
280Zo Aug 14, 2024
a05af13
keymap WIP
280Zo Aug 14, 2024
1d77e34
keymap WIP
280Zo Aug 14, 2024
c891283
Updated charybdis.keymap
keymap-editor[bot] Aug 14, 2024
3c3adf5
Updated charybdis.keymap
keymap-editor[bot] Aug 14, 2024
0429577
Updated charybdis.keymap
keymap-editor[bot] Aug 14, 2024
8885361
keymap WIP
280Zo Aug 14, 2024
602775f
keymap WIP
280Zo Aug 14, 2024
0a89a5c
keymap WIP
280Zo Aug 14, 2024
9e6f694
keymap WIP
280Zo Aug 14, 2024
d09d986
keymap WIP
280Zo Aug 14, 2024
36ec07b
keymap WIP
280Zo Aug 14, 2024
0918b2b
keymap WIP
280Zo Aug 14, 2024
024c5aa
keymap WIP
280Zo Aug 14, 2024
9af5cd6
revert tap dance settings
280Zo Aug 14, 2024
0b94007
revert tap dance settings
280Zo Aug 14, 2024
95c8c62
keymap WIP
280Zo Aug 14, 2024
9533564
Updated charybdis.keymap
keymap-editor[bot] Aug 14, 2024
c5223a6
Updated charybdis.keymap
keymap-editor[bot] Aug 14, 2024
8c711c8
move behavior around
280Zo Aug 14, 2024
fb12902
base layer wip
280Zo Aug 14, 2024
5a0f1aa
base layer wip
280Zo Aug 14, 2024
c73b747
base layer wip
280Zo Aug 14, 2024
e966a5c
add in tdtb
280Zo Aug 14, 2024
541affa
Merge branch 'keymap/adjust_trackball' of github.com:280Zo/charybdis-…
280Zo Aug 14, 2024
04c78a4
try &none instead of the tap dance
280Zo Aug 14, 2024
3b4675c
test tdtb on different layer
280Zo Aug 14, 2024
624f980
test tdtb on different layer
280Zo Aug 14, 2024
efca5f8
test tdtb on base layer with no indent
280Zo Aug 14, 2024
e90c988
test tdtb on base layer with no indent
280Zo Aug 14, 2024
103d5ba
empty base layer with thum set to tdtb
280Zo Aug 14, 2024
61f850a
empty base layer with thum set to tdtb
280Zo Aug 15, 2024
c01643a
empty base layer with thum set to tdtb
280Zo Aug 15, 2024
0e0c427
Updated charybdis.keymap
keymap-editor[bot] Aug 15, 2024
038b28c
add top row to base
280Zo Aug 15, 2024
8988376
add middle row to base
280Zo Aug 15, 2024
da82faf
add bottom row to base
280Zo Aug 15, 2024
d1bdc49
add next thumb key
280Zo Aug 15, 2024
b283d18
add forth thumb key
280Zo Aug 15, 2024
26be7bb
add forth thumb key
280Zo Aug 15, 2024
6b2036d
add fifth thumb key
280Zo Aug 15, 2024
d5a1fc7
remove commented base layer
280Zo Aug 15, 2024
c9ec761
remove gitignore
280Zo Aug 15, 2024
c770bf0
remove gitignore
280Zo Aug 15, 2024
0db81da
Merge branch 'keymap/adjust_trackball' of github.com:280Zo/charybdis-…
280Zo Aug 15, 2024
d69989c
update game & photo layers, change backspace to back space, and updat…
280Zo Aug 15, 2024
4fd1747
update game & photo layers, change backspace to back space, and updat…
280Zo Aug 15, 2024
2216f5b
change scroll layers to 1,2,3,9
280Zo Aug 15, 2024
86d35a3
Merge branch 'keymap/adjust_trackball' of github.com:280Zo/charybdis-…
280Zo Aug 15, 2024
ed54c8d
fix mouse layer references and update script
280Zo Aug 15, 2024
31acc17
update the regex for columns to handle ZMK commands better
280Zo Aug 15, 2024
5300b5b
Update manual mouse layers
keymap-editor[bot] Aug 15, 2024
2ba18c3
move mods to layers & update behaviors
280Zo Aug 15, 2024
32b5fb2
fix auto keymap drawing
280Zo Aug 15, 2024
aea818e
fix auto keymap drawing
280Zo Aug 15, 2024
11f6081
change backspace word on keymaps
280Zo Aug 15, 2024
0963b01
change backspace word on keymaps
280Zo Aug 15, 2024
f311fa2
Merge branch 'keymap/adjust_trackball' of github.com:280Zo/charybdis-…
280Zo Aug 15, 2024
0978194
change combo name
280Zo Aug 15, 2024
6948092
change combo name
280Zo Aug 15, 2024
af3a350
Merge branch 'keymap/adjust_trackball' of github.com:280Zo/charybdis-…
280Zo Aug 15, 2024
5120378
test multi-line string in yaml
280Zo Aug 16, 2024
be78b65
test multi-line string in yaml
280Zo Aug 16, 2024
48ccff2
update wording for base or extra combo
280Zo Aug 16, 2024
c2d6562
update wording for base or extra combo
280Zo Aug 16, 2024
cfc9a0a
update keymap words
280Zo Aug 16, 2024
815d23f
update keymap words
280Zo Aug 16, 2024
e2de80a
update keymap words
280Zo Aug 16, 2024
01f3cf1
update keymap words
280Zo Aug 16, 2024
dcfcfd3
update keymap words
280Zo Aug 16, 2024
5b7e24a
update keymap words
280Zo Aug 16, 2024
0cfcd79
update keymap names for photo layer
280Zo Aug 16, 2024
f434f4d
update keymap names for photo layer
280Zo Aug 16, 2024
cc1fc15
Merge branch 'keymap/adjust_trackball' of github.com:280Zo/charybdis-…
280Zo Aug 16, 2024
f703e90
Updated charybdis.keymap
keymap-editor[bot] Aug 16, 2024
5f7d7d2
Merge branch 'keymap/adjust_trackball' of github.com:280Zo/charybdis-…
280Zo Aug 16, 2024
3093013
fix layers and enable auto layer
280Zo Aug 17, 2024
fbcc88d
disable automouse
280Zo Aug 17, 2024
2cff19d
disable automouse
280Zo Aug 17, 2024
f052d2a
Merge branch 'keymap/adjust_trackball' of github.com:280Zo/charybdis-…
280Zo Aug 17, 2024
3f8a1da
add key description
280Zo Aug 17, 2024
10ce560
add key description
280Zo Aug 17, 2024
54993d4
Merge branch 'keymap/adjust_trackball' of github.com:280Zo/charybdis-…
280Zo Aug 17, 2024
7bb675d
enable automouse
280Zo Aug 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test removing the tapdance behavior
  • Loading branch information
280Zo committed Aug 14, 2024
commit fca8d6f95f6c54454d4658cc4073d3de2747a6c8
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# https://zmk.dev/docs/config/power#kconfig-2
# https://zmk.dev/docs/config/power#kconfig-2
CONFIG_ZMK_EXT_POWER=y

# https://github.com/inorichi/zmk-pmw3610-driver?tab=readme-ov-file
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
irq-gpios = <&gpio0 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
/* optional features */
snipe-layers = <8>;
scroll-layers = <1 2 5 6>;
automouse-layer = <4>;
scroll-layers = <1 2 5 6 9>;
// automouse-layer = <4>;
};
};

Expand Down
8 changes: 4 additions & 4 deletions config/charybdis.keymap
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
bindings = <&kp>, <&kp>;
};

td_trackball: td_trackball {
td0: td_trackball {
compatible = "zmk,behavior-tap-dance";
label = "TD_TRACKBALL";
#binding-cells = <0>;
bindings = <&two_layers 9 4>, <&tog 8>;
bindings = <&httl 9 4>, <&tog 8>;
};

two_layers: two_layers {
httl: two_layers {
compatible = "zmk,behavior-hold-tap";
label = "TWO_LAYERS";
bindings = <&mo>, <&tog>;
Expand Down Expand Up @@ -95,7 +95,7 @@
&kp C_AC_SEARCH &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &to 5
&hm LG(E) TAB &hm LEFT_GUI 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 LEFT_META SEMICOLON &kp DEL
&kp LA(LC(T)) &kp Z &mt LC(LA(LEFT_SHIFT)) X &mt LA(LC(LG(LEFT_SHIFT))) C &kp V &kp B &kp N &kp M &mt LA(LC(LG(LEFT_SHIFT))) COMMA &mt LC(LA(LEFT_SHIFT)) PERIOD &kp FSLH &back2base 0 6
&td_trackball &lt 1 BACKSPACE &lt 2 ESCAPE &lt 4 RETURN &lt 3 SPACE
&lt 1 BACKSPACE &lt 1 BACKSPACE &lt 2 ESCAPE &lt 4 RETURN &lt 3 SPACE
>;
};

Expand Down
1 change: 1 addition & 0 deletions keymap-drawer/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ parse_config:
C_AC_COPY: "COPY"
C_AC_PASTE: "PASTE"
C_AL_COFFEE: "LOCK"
PRINTSCREEN: "PRINT SCREEN"
zmk_combos: {}
zmk_preamble: "#define KEYMAP_DRAWER"
zmk_additional_includes: []
Loading