Skip to content

Commit

Permalink
add mouse pointers
Browse files Browse the repository at this point in the history
  • Loading branch information
@englmaxi
englmaxi committed Nov 26, 2023
1 parent 318762c commit 49cb193
Show file tree
Hide file tree
Showing 12 changed files with 3,300 additions and 3,260 deletions.
32 changes: 16 additions & 16 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
name: Build ZMK firmware
on:
workflow_dispatch:
pull_request:
push:
paths:
- "config/*.conf"
- "config/*.dtsi"
- "config/*.h"
- "config/*.keymap"
- "config/boards/**"
- "build.yaml"

jobs:
build:
uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main
name: Build ZMK firmware
on:
workflow_dispatch:
pull_request:
push:
paths:
- "config/*.conf"
- "config/*.dtsi"
- "config/*.h"
- "config/*.keymap"
- "config/boards/**"
- "build.yaml"

jobs:
build:
uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main
50 changes: 25 additions & 25 deletions .github/workflows/draw-keymaps.yml
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
name: Draw ZMK keymaps
on:
workflow_dispatch:
push:
paths:
- ".github/workflows/draw-keymaps.yml"
- "config/*.dtsi"
- "config/*.keymap"
- "config/boards/*/*/*.keymap"
- "keymap-drawer/config.yaml"

jobs:
draw:
uses: caksoylar/keymap-drawer/.github/workflows/draw-zmk.yml@main
permissions:
contents: write
with:
# commit_message: "[Draw] ${{ github.event.head_commit.message }}"
# amend_commit: true
install_branch: "main"
keymap_patterns: "config/*.keymap"
config_path: "keymap-drawer/config.yaml"
output_folder: "keymap-drawer"
parse_args: "" # map of extra args to pass to `keymap parse`, e.g. "corne:'-l Def Lwr Rse' cradio:''"
draw_args: "" # map of extra args to pass to `keymap draw`, e.g. "corne:'-k corne_rotated' cradio:'-k paroxysm'"
name: Draw ZMK keymaps
on:
workflow_dispatch:
push:
paths:
- ".github/workflows/draw-keymaps.yml"
- "config/*.dtsi"
- "config/*.keymap"
- "config/boards/*/*/*.keymap"
- "keymap-drawer/config.yaml"

jobs:
draw:
uses: caksoylar/keymap-drawer/.github/workflows/draw-zmk.yml@main
permissions:
contents: write
with:
# commit_message: "[Draw] ${{ github.event.head_commit.message }}"
# amend_commit: true
install_branch: "main"
keymap_patterns: "config/*.keymap"
config_path: "keymap-drawer/config.yaml"
output_folder: "keymap-drawer"
parse_args: "" # map of extra args to pass to `keymap parse`, e.g. "corne:'-l Def Lwr Rse' cradio:''"
draw_args: "" # map of extra args to pass to `keymap draw`, e.g. "corne:'-k corne_rotated' cradio:'-k paroxysm'"
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# zmk-config
![SVG file of the keymap](keymap-drawer/cradio.svg)
# zmk-config
![SVG file of the keymap](keymap-drawer/cradio.svg)
18 changes: 9 additions & 9 deletions build.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# This file generates the GitHub Actions matrix
---
include:
- board: nice_nano_v2
shield: cradio_left
- board: nice_nano_v2
shield: cradio_right
- board: nice_nano_v2
shield: settings_reset
# This file generates the GitHub Actions matrix
---
include:
- board: nice_nano_v2
shield: cradio_left
- board: nice_nano_v2
shield: cradio_right
- board: nice_nano_v2
shield: settings_reset
150 changes: 75 additions & 75 deletions config/combos.dtsi
View file
Original file line number Diff line number Diff line change
@@ -1,76 +1,76 @@
/* KEY POSITIONS
34 keys:

╭────────────────────╮ ╭────────────────────╮
│ 0 1 2 3 4 │ │ 5 6 7 8 9 │
│ 10 11 12 13 14 │ │ 15 16 17 18 19 │
│ 20 21 22 23 24 │ │ 25 26 27 28 29 │
╰───────────╮ 30 31 │ │ 32 33 ╭───────────╯
╰────────╯ ╰────────╯
*/

#define COMBO(NAME, BINDINGS, KEYPOS, LAYERS, TIMEOUT, ...) \
combo_##NAME { \
timeout-ms = <TIMEOUT>; \
bindings = <BINDINGS>; \
key-positions = <KEYPOS>; \
layers = <LAYERS>; \
require-prior-idle-ms = <150>; \
__VA_ARGS__ \
};

#define COMBO_TERM_FAST 30
#define COMBO_TERM_SLOW 40

#define HRC_TAB &hml LA(LCTRL) TAB
#define HRC_REPEAT &hml_repeat LS(LCTRL) 0
#define HRC_LPAR &hmr_lpar_lt LS(LCTRL) 0
#define HRC_RPAR &hmr_rpar_gt LA(LCTRL) 0
#define HRC_PAR &hmr_par_lgt LS(LALT) 0

/ {
combos {
compatible = "zmk,combos";

COMBO(esc, &kp ESC, 1 2, DEF, COMBO_TERM_SLOW)
COMBO(enter, &kp RET, 2 3, DEF, COMBO_TERM_SLOW)
COMBO(ger, &sl GER, 1 3, DEF, COMBO_TERM_SLOW)

COMBO(tab, HRC_TAB, 11 12, DEF, COMBO_TERM_SLOW)
COMBO(repeat, HRC_REPEAT, 12 13, DEF, COMBO_TERM_SLOW)

COMBO(lbkt, &lbkt_lbrc, 6 7, DEF, COMBO_TERM_SLOW)
COMBO(rbkt, &rbkt_rbrc, 7 8, DEF, COMBO_TERM_SLOW)
COMBO(bkt, &bkt_brc, 6 8, DEF, COMBO_TERM_SLOW)

COMBO(lpar, HRC_LPAR, 16 17, DEF, COMBO_TERM_SLOW)
COMBO(rpar, HRC_RPAR, 17 18, DEF, COMBO_TERM_SLOW)
COMBO(par, HRC_PAR, 16 18, DEF, COMBO_TERM_SLOW)

COMBO(bspc, &kp BSPC, 26 27, DEF NUM, COMBO_TERM_SLOW)
COMBO(del, &kp DEL, 27 28, DEF NUM, COMBO_TERM_SLOW)

COMBO(prcnt, &kp DE_PRCNT, 4 14, DEF, COMBO_TERM_FAST)
COMBO(dllr, &kp DE_DLLR, 3 13, DEF, COMBO_TERM_FAST)
COMBO(hash, &kp DE_HASH, 2 12, DEF, COMBO_TERM_FAST)
COMBO(at, &kp DE_AT, 1 11, DEF, COMBO_TERM_FAST)

COMBO(tilde, &kp DE_TILDE, 14 24, DEF, COMBO_TERM_FAST)
COMBO(equal, &kp DE_EQUAL, 13 23, DEF, COMBO_TERM_FAST)
COMBO(bslh, &kp DE_BSLH, 12 22, DEF, COMBO_TERM_FAST)
COMBO(euro, &kp DE_EURO, 11 21, DEF, COMBO_TERM_FAST)

COMBO(caret, &kp DE_CARET, 5 15, DEF, COMBO_TERM_FAST)
COMBO(plus, &kp DE_PLUS, 6 16, DEF, COMBO_TERM_FAST)
COMBO(star, &kp DE_STAR, 7 17, DEF, COMBO_TERM_FAST)
COMBO(amps, &kp DE_AMPS, 8 18, DEF, COMBO_TERM_FAST)
COMBO(sect, &kp DE_SECT, 9 19, DEF, COMBO_TERM_FAST)

COMBO(under, &kp DE_UNDER, 15 25, DEF, COMBO_TERM_FAST)
COMBO(minus, &kp DE_MINUS, 16 26, DEF, COMBO_TERM_FAST)
COMBO(fslh, &kp DE_FSLH, 17 27, DEF, COMBO_TERM_FAST)
COMBO(pipe, &kp DE_PIPE, 18 28, DEF, COMBO_TERM_FAST)
COMBO(deg, &kp DE_DEG, 19 29, DEF, COMBO_TERM_FAST)

};
/* KEY POSITIONS
34 keys:
╭────────────────────╮ ╭────────────────────╮
│ 0 1 2 3 4 │ │ 5 6 7 8 9 │
│ 10 11 12 13 14 │ │ 15 16 17 18 19 │
│ 20 21 22 23 24 │ │ 25 26 27 28 29 │
╰───────────╮ 30 31 │ │ 32 33 ╭───────────╯
╰────────╯ ╰────────╯
*/
#define COMBO(NAME, BINDINGS, KEYPOS, LAYERS, TIMEOUT, ...) \
combo_##NAME { \
timeout-ms = <TIMEOUT>; \
bindings = <BINDINGS>; \
key-positions = <KEYPOS>; \
layers = <LAYERS>; \
require-prior-idle-ms = <150>; \
__VA_ARGS__ \
};
#define COMBO_TERM_FAST 30
#define COMBO_TERM_SLOW 40
#define HRC_TAB &hml LA(LCTRL) TAB
#define HRC_REPEAT &hml_repeat LS(LCTRL) 0
#define HRC_LPAR &hmr_lpar_lt LS(LCTRL) 0
#define HRC_RPAR &hmr_rpar_gt LA(LCTRL) 0
#define HRC_PAR &hmr_par_lgt LS(LALT) 0
/ {
combos {
compatible = "zmk,combos";
COMBO(esc, &kp ESC, 1 2, DEF, COMBO_TERM_SLOW)
COMBO(enter, &kp RET, 2 3, DEF, COMBO_TERM_SLOW)
COMBO(ger, &sl GER, 1 3, DEF, COMBO_TERM_SLOW)
COMBO(tab, HRC_TAB, 11 12, DEF, COMBO_TERM_SLOW)
COMBO(repeat, HRC_REPEAT, 12 13, DEF, COMBO_TERM_SLOW)
COMBO(lbkt, &lbkt_lbrc, 6 7, DEF, COMBO_TERM_SLOW)
COMBO(rbkt, &rbkt_rbrc, 7 8, DEF, COMBO_TERM_SLOW)
COMBO(bkt, &bkt_brc, 6 8, DEF, COMBO_TERM_SLOW)
COMBO(lpar, HRC_LPAR, 16 17, DEF, COMBO_TERM_SLOW)
COMBO(rpar, HRC_RPAR, 17 18, DEF, COMBO_TERM_SLOW)
COMBO(par, HRC_PAR, 16 18, DEF, COMBO_TERM_SLOW)
COMBO(bspc, &kp BSPC, 26 27, DEF NUM, COMBO_TERM_SLOW)
COMBO(del, &kp DEL, 27 28, DEF NUM, COMBO_TERM_SLOW)
COMBO(prcnt, &kp DE_PRCNT, 4 14, DEF, COMBO_TERM_FAST)
COMBO(dllr, &kp DE_DLLR, 3 13, DEF, COMBO_TERM_FAST)
COMBO(hash, &kp DE_HASH, 2 12, DEF, COMBO_TERM_FAST)
COMBO(at, &kp DE_AT, 1 11, DEF, COMBO_TERM_FAST)
COMBO(tilde, &kp DE_TILDE, 14 24, DEF, COMBO_TERM_FAST)
COMBO(equal, &kp DE_EQUAL, 13 23, DEF, COMBO_TERM_FAST)
COMBO(bslh, &kp DE_BSLH, 12 22, DEF, COMBO_TERM_FAST)
COMBO(euro, &kp DE_EURO, 11 21, DEF, COMBO_TERM_FAST)
COMBO(caret, &kp DE_CARET, 5 15, DEF, COMBO_TERM_FAST)
COMBO(plus, &kp DE_PLUS, 6 16, DEF, COMBO_TERM_FAST)
COMBO(star, &kp DE_STAR, 7 17, DEF, COMBO_TERM_FAST)
COMBO(amps, &kp DE_AMPS, 8 18, DEF, COMBO_TERM_FAST)
COMBO(sect, &kp DE_SECT, 9 19, DEF, COMBO_TERM_FAST)
COMBO(under, &kp DE_UNDER, 15 25, DEF, COMBO_TERM_FAST)
COMBO(minus, &kp DE_MINUS, 16 26, DEF, COMBO_TERM_FAST)
COMBO(fslh, &kp DE_FSLH, 17 27, DEF, COMBO_TERM_FAST)
COMBO(pipe, &kp DE_PIPE, 18 28, DEF, COMBO_TERM_FAST)
COMBO(deg, &kp DE_DEG, 19 29, DEF, COMBO_TERM_FAST)
};
};
100 changes: 50 additions & 50 deletions config/cradio.json
View file
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
{
"id": "sweep",
"name": "ferris sweep",
"layouts": {
"LAYOUT": {
"autoGenerated": "false",
"description": "The layout for the ferris sweep.",
"layout": [
{ "row": 0, "col": 0, "x": 0, "y": 1.1 },
{ "row": 0, "col": 1, "x": 1, "y": 0.4 },
{ "row": 0, "col": 2, "x": 2, "y": 0 },
{ "row": 0, "col": 3, "x": 3, "y": 0.3 },
{ "row": 0, "col": 4, "x": 4, "y": 0.5 },
{ "row": 0, "col": 5, "x": 7, "y": 0.5 },
{ "row": 0, "col": 6, "x": 8, "y": 0.3 },
{ "row": 0, "col": 7, "x": 9, "y": 0 },
{ "row": 0, "col": 8, "x": 10, "y": 0.4 },
{ "row": 0, "col": 9, "x": 11, "y": 1.1 },

{ "row": 1, "col": 0, "x": 0, "y": 2.1 },
{ "row": 1, "col": 1, "x": 1, "y": 1.4 },
{ "row": 1, "col": 2, "x": 2, "y": 1 },
{ "row": 1, "col": 3, "x": 3, "y": 1.3 },
{ "row": 1, "col": 4, "x": 4, "y": 1.5 },
{ "row": 1, "col": 5, "x": 7, "y": 1.5 },
{ "row": 1, "col": 6, "x": 8, "y": 1.3 },
{ "row": 1, "col": 7, "x": 9, "y": 1 },
{ "row": 1, "col": 8, "x": 10, "y": 1.4 },
{ "row": 1, "col": 9, "x": 11, "y": 2.1 },

{ "row": 2, "col": 0, "x": 0, "y": 3.1 },
{ "row": 2, "col": 1, "x": 1, "y": 2.4 },
{ "row": 2, "col": 2, "x": 2, "y": 2 },
{ "row": 2, "col": 3, "x": 3, "y": 2.3 },
{ "row": 2, "col": 4, "x": 4, "y": 2.5 },
{ "row": 2, "col": 5, "x": 7, "y": 2.5 },
{ "row": 2, "col": 6, "x": 8, "y": 2.3 },
{ "row": 2, "col": 7, "x": 9, "y": 2 },
{ "row": 2, "col": 8, "x": 10, "y": 2.4 },
{ "row": 2, "col": 9, "x": 11, "y": 3.1 },

{ "row": 3, "col": 3, "x": 2.5, "y": 3.3, "r": 15, "rx": 2.8, "ry": 7.9 },
{ "row": 3, "col": 4, "x": 2.5, "y": 3.3, "r": 30, "rx": 2.9, "ry": 7.9 },
{ "row": 3, "col": 5, "x": 8.5, "y": 3.3, "r": -30, "rx": 9.1, "ry": 7.9 },
{ "row": 3, "col": 6, "x": 8.5, "y": 3.3, "r": -15, "rx": 9.2, "ry": 7.9 }
]
}
},
"sensors": []
}
{
"id": "sweep",
"name": "ferris sweep",
"layouts": {
"LAYOUT": {
"autoGenerated": "false",
"description": "The layout for the ferris sweep.",
"layout": [
{ "row": 0, "col": 0, "x": 0, "y": 1.1 },
{ "row": 0, "col": 1, "x": 1, "y": 0.4 },
{ "row": 0, "col": 2, "x": 2, "y": 0 },
{ "row": 0, "col": 3, "x": 3, "y": 0.3 },
{ "row": 0, "col": 4, "x": 4, "y": 0.5 },
{ "row": 0, "col": 5, "x": 7, "y": 0.5 },
{ "row": 0, "col": 6, "x": 8, "y": 0.3 },
{ "row": 0, "col": 7, "x": 9, "y": 0 },
{ "row": 0, "col": 8, "x": 10, "y": 0.4 },
{ "row": 0, "col": 9, "x": 11, "y": 1.1 },

{ "row": 1, "col": 0, "x": 0, "y": 2.1 },
{ "row": 1, "col": 1, "x": 1, "y": 1.4 },
{ "row": 1, "col": 2, "x": 2, "y": 1 },
{ "row": 1, "col": 3, "x": 3, "y": 1.3 },
{ "row": 1, "col": 4, "x": 4, "y": 1.5 },
{ "row": 1, "col": 5, "x": 7, "y": 1.5 },
{ "row": 1, "col": 6, "x": 8, "y": 1.3 },
{ "row": 1, "col": 7, "x": 9, "y": 1 },
{ "row": 1, "col": 8, "x": 10, "y": 1.4 },
{ "row": 1, "col": 9, "x": 11, "y": 2.1 },

{ "row": 2, "col": 0, "x": 0, "y": 3.1 },
{ "row": 2, "col": 1, "x": 1, "y": 2.4 },
{ "row": 2, "col": 2, "x": 2, "y": 2 },
{ "row": 2, "col": 3, "x": 3, "y": 2.3 },
{ "row": 2, "col": 4, "x": 4, "y": 2.5 },
{ "row": 2, "col": 5, "x": 7, "y": 2.5 },
{ "row": 2, "col": 6, "x": 8, "y": 2.3 },
{ "row": 2, "col": 7, "x": 9, "y": 2 },
{ "row": 2, "col": 8, "x": 10, "y": 2.4 },
{ "row": 2, "col": 9, "x": 11, "y": 3.1 },

{ "row": 3, "col": 3, "x": 2.5, "y": 3.3, "r": 15, "rx": 2.8, "ry": 7.9 },
{ "row": 3, "col": 4, "x": 2.5, "y": 3.3, "r": 30, "rx": 2.9, "ry": 7.9 },
{ "row": 3, "col": 5, "x": 8.5, "y": 3.3, "r": -30, "rx": 9.1, "ry": 7.9 },
{ "row": 3, "col": 6, "x": 8.5, "y": 3.3, "r": -15, "rx": 9.2, "ry": 7.9 }
]
}
},
"sensors": []
}
Loading

0 comments on commit 49cb193

Please sign in to comment.