Skip to content

Commit

Permalink
Merge pull request #3 from deinsoftware/swept
Browse files Browse the repository at this point in the history 
reordering layer buttons
  • Loading branch information
@equiman
equiman authored Feb 5, 2023
2 parents 42c5123 + 5f4da08 commit 3f3a50d
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 31 deletions.
Binary file modified .github/images/layers/AXN.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/images/layers/BAS.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/images/layers/STG.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 5.2.0

- Reorganizing the layers buttons

## 5.1.0

- Add momentary `DEV` layer on `BAS`
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,9 @@ Dedicated to Bluetooth and media controls.
| <kbd>🔎+</kbd> | Zoom in |
| <kbd>🔎R</kbd> | Zoom reset |
| <kbd>🔎-</kbd> | Zoom out |
| <kbd>🔊+</kbd> | Volume up |
| <kbd>🔈M</kbd> | Mute |
| <kbd>🔉-</kbd> | Volume down |
| <kbd>🔊</kbd> | Volume up |
| <kbd>🔇</kbd> | Mute |
| <kbd>🔉</kbd> | Volume down |
| <kbd>🔅</kbd> | Bright down |
| <kbd>🔆</kbd> | Bright up |

Expand Down
30 changes: 15 additions & 15 deletions config/hold/shared.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ to_BAS_kp: behavior_to_kp {
bindings = <&to_BAS>, <&kp>;
};

mo_AXNBAS_to_DEV: hold_mo_AXNBAS_to_DEV {
mo_AXNBAS_to_FNK: hold_mo_AXNBAS_to_FNK {
compatible = "zmk,behavior-hold-tap";
label = "mo_AXNBAS_to_DEV";
label = "mo_AXNBAS_to_FNK";
#binding-cells = <2>;
flavor = "hold-preferred";
tapping-term-ms = <200>;
bindings = <&mo_AXN_to_BAS>, <&to_DEV>;
bindings = <&mo_AXN_to_BAS>, <&to_FNK>;
};

mo_AXNBAS_to_AXN: hold_mo_AXNBAS_to_AXN {
Expand All @@ -25,13 +25,22 @@ mo_AXNBAS_to_AXN: hold_mo_AXNBAS_to_AXN {
bindings = <&mo_AXN_to_BAS>, <&to_AXN>;
};

mo_DEVBAS_to_STG: hold_mo_DEVBAS_to_STG {
mo_STGBAS_to_STG: hold_mo_STGBAS_to_STG {
compatible = "zmk,behavior-hold-tap";
label = "mo_DEVBAS_to_STG";
label = "mo_STGBAS_to_STG";
#binding-cells = <2>;
flavor = "hold-preferred";
tapping-term-ms = <200>;
bindings = <&mo_DEV_to_BAS>, <&to_STG>;
bindings = <&mo_STG_to_BAS>, <&to_STG>;
};

mo_DEVBAS_to_DEV: hold_mo_DEVBAS_to_DEV {
compatible = "zmk,behavior-hold-tap";
label = "mo_DEVBAS_to_DEV";
#binding-cells = <2>;
flavor = "hold-preferred";
tapping-term-ms = <200>;
bindings = <&mo_DEV_to_BAS>, <&to_DEV>;
};

mo_AXNDEV_to_BAS: hold_mo_AXNDEV_to_BAS {
Expand Down Expand Up @@ -60,12 +69,3 @@ mo_FNKAXN_to_FNK: hold_mo_FNKAXN_to_FNK {
tapping-term-ms = <200>;
bindings = <&mo_FNK_to_AXN>, <&to_FNK>;
};

mo_DEVBAS_mp_kq: hold_mo_DEVBAS_mp_kq {
compatible = "zmk,behavior-hold-tap";
label = "mo_DEVBAS_mp_kq";
#binding-cells = <2>;
flavor = "hold-preferred";
tapping-term-ms = <200>;
bindings = <&mo_DEV_to_BAS>, <&mp_kq>;
};
14 changes: 14 additions & 0 deletions config/macros/shared.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,20 @@ mo_AXN_to_DEV: momentary_AXN_to_DEV {
, <&macro_tap &kp F_DEV>;
};

mo_STG_to_BAS: momentary_STG_to_BAS {
compatible = "zmk,behavior-macro";
label = "mo_STG_to_BAS";
#binding-cells = <0>;
wait-ms = <0>;
tap-ms = <0>;
bindings
= <&macro_press &mo STG>
, <&macro_tap &kp F_STG>
, <&macro_pause_for_release>
, <&macro_release &mo STG>
, <&macro_tap &kp F_BAS>;
};

mo_DEV_to_BAS: momentary_DEV_to_BAS {
compatible = "zmk,behavior-macro";
label = "mo_DEV_to_BAS";
Expand Down
29 changes: 16 additions & 13 deletions config/swept.keymap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,18 @@
#define B21 &hm RCTRL I
#define B22 &hm RCMD O

#define B36 &mo_DEVBAS_to_STG 0 0
#define B38 &mo_AXNBAS_to_DEV 0 0
#define B35 &mo_STGBAS_to_STG 0 0

#define B36 &mo_DEVBAS_to_DEV 0 0
#define B38 &mo_AXNBAS_to_FNK 0 0
#define B39 &mo_AXNBAS_to_AXN 0 0
#define B41 &mo_DEVBAS_mp_kq 0 0
#define B41 &mo_DEVBAS_to_DEV 0 0

label = "BAS";
bindings = <
KEY_ESC &kp Q &kp W &kp F &kp P &kp B &kp J &kp L &kp U &kp Y &mp_k_m NAV_DEL
&mp_bc B13 B14 B15 B16 &kp G &kp M B19 B20 B21 B22 NAV_BSPC
KEY_TAB &kp Z &kp X &kp C &kp D &kp V &kp K &kp H &mp_cs &mp_dc &kp FSLH &kp EQUAL
KEY_ESC &kp Q &kp W &kp F &kp P &kp B &kp J &kp L &kp U &kp Y &mp_k_m NAV_DEL
&mp_bc B13 B14 B15 B16 &kp G &kp M B19 B20 B21 B22 NAV_BSPC
KEY_TAB &kp Z &kp X &kp C &kp D &kp V &kp K &kp H &mp_cs &mp_dc &mp_kq B35
B36 KEY_SPC B38 B39 KEY_RET B41
>;
};
Expand Down Expand Up @@ -136,7 +138,8 @@
#define A21 &hm RCTRL N6
#define A22 &hm RCMD EQUAL

#define A36 &mo_FNKAXN_to_FNK 0 0
#define A35 &mo_FNKAXN_to_FNK 0 0

#define A38 &to_BAS
#define A39 &to_DEV

Expand All @@ -150,8 +153,8 @@
bindings = <
KEY_ESC A01 &mp_a_prev &kp UP &mp_a_next A05 &kp KP_PLUS &kp N7 &kp N8 &kp N9 &kp KP_MULTIPLY NAV_DEL
&mp_bc A13 A14 A15 A16 A17 &kp N0 A19 A20 A21 A22 NAV_BSPC
KEY_TAB KEY_UNDO KEY_CUT KEY_COPY KEY_PASTE KEY_REDO &mp_k_m &kp N1 &kp N2 &kp N3 &kp KP_DIVIDE &mp_cs
A36 KEY_SPC A38 A39 KEY_RET &mp_dc
KEY_TAB KEY_UNDO KEY_CUT KEY_COPY KEY_PASTE KEY_REDO &mp_k_m &kp N1 &kp N2 &kp N3 &kp KP_DIVIDE A35
&mp_cs KEY_SPC A38 A39 KEY_RET &mp_dc
>;
};

Expand Down Expand Up @@ -186,10 +189,10 @@

label = "STG";
bindings = <
KEY_ESC &none &bt BT_PRV &bt BT_CLR &bt BT_NXT ZOOM_IN &kp C_VOL_UP &none &kp C_STOP &none &none &none
&none &none &m_s_b1 &m_s_b2 &m_s_b3 ZOOM_RST &kp C_MUTE &kp C_PREV &kp C_PP &kp C_NEXT &none &none
&none &none &m_s_b4 &m_s_b5 &m_s_b6 ZOOM_OUT &kp C_VOL_DN &kp C_RW &kp C_SHUFFLE &kp C_FF &none &none
&kp C_BRI_DN KEY_SPC &to_BAS &to_DEV KEY_RET &kp C_BRI_UP
KEY_ESC &none &bt BT_PRV &bt BT_CLR &bt BT_NXT ZOOM_IN &kp C_VOL_UP &kp C_BRI_DN &kp C_STOP &kp C_BRI_UP &none &none
&none &none &m_s_b1 &m_s_b2 &m_s_b3 ZOOM_RST &kp C_MUTE &kp C_PREV &kp C_PP &kp C_NEXT &none &none
&none &none &m_s_b4 &m_s_b5 &m_s_b6 ZOOM_OUT &kp C_VOL_DN &kp C_RW &kp C_SHUFFLE &kp C_FF &none &none
&none KEY_SPC &to_BAS &to_DEV KEY_RET &none
>;
};
};
Expand Down

0 comments on commit 3f3a50d

Please sign in to comment.