Skip to content

Commit

Permalink
update AXN and STG layers
Browse files Browse the repository at this point in the history
  • Loading branch information
@equiman
equiman committed Mar 31, 2023
1 parent 4cebf63 commit 6c82808
Show file tree
Hide file tree
Showing 9 changed files with 84 additions and 93 deletions.
Binary file modified .github/images/layers/android/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/android/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.
Binary file modified .github/images/layers/windows/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/windows/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.
65 changes: 32 additions & 33 deletions config/os/android/keymap.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,29 +49,29 @@
};

android_act_num_layer {
#define AA01 &kp LG(LS(C)) // tap: color picker
#define AA05 &kp LC(F) // tap: find
#define AA13 &hm LCMD LG(LS(S)) // tap: printscreen
#define AA14 &hm LCTRL LEFT
#define AA15 &hm LALT DOWN
#define AA16 &hm LSHFT RIGHT
#define AA17 &kp LG(E) // tap: file explorer

#define AA19 &hm RSHFT N4
#define AA20 &hm RALT N5
#define AA21 &hm RCTRL N6
#define AA22 &hm RCMD EQUAL
#define AA01 &kp LA(LS(RIGHT)) // tap: expand selection
#define AA05 &kp LC(F) // tap: find
#define AA13 &hm LCMD LA(LS(LEFT)) // tap: shrink selection
#define AA14 &hm LCTRL LEFT
#define AA15 &hm LALT DOWN
#define AA16 &hm LSHFT RIGHT
#define AA17 &kp LC(H) // tap: replace

#define AA19 &hm RSHFT N4
#define AA20 &hm RALT N5
#define AA21 &hm RCTRL N6
#define AA22 &hm RCMD EQUAL

#define AA35 &mo_aFNKaAXN_to_aFNK 0 0

#define AA38 &to_aBAS
#define AA39 &to_aDEV

#define KEY_UNDO &kp LC(Z) // tap: undo
#define KEY_REDO &kp LC(LS(Z)) // tap: redo
#define KEY_CUT &kp LC(X) // tap: cut
#define KEY_COPY &kp LC(C) // tap: copy
#define KEY_PASTE &kp LC(V) // tap: paste
#define KEY_UNDO &kp LC(Z) // tap: undo
#define KEY_REDO &kp LC(LS(Z)) // tap: redo
#define KEY_CUT &kp LC(X) // tap: cut
#define KEY_COPY &kp LC(C) // tap: copy
#define KEY_PASTE &kp LC(V) // tap: paste

label = "aAXN";
bindings = <
Expand Down Expand Up @@ -106,28 +106,27 @@
};

android_settings_layer {
#define AS10 &kp LG(LS(GRAVE)) // tap: fancy zones
#define AS11 &kp LC(LS(ESC)) // tap: task manager
#define AS12 &kp LG(K) // tap: connect quick action
#define AS10 &kp LG(N) // tap: notifications
#define AS11 &kp LA(TAB) // tap: recents
#define AS12 &kp LG(K) // tap: shortcuts
#define AS24 &bt BT_CLR // tap: clear Bluetooth

#define AS22 &kp RG(PAUSE_BREAK) // tap: system info
#define AS23 &kp RG(I) // tap: windows settings
#define AS34 &kp LC(LA(DEL)) // tap: windows security
#define AS22 &kp LG(BSPC) // tap: back
#define AS23 &kp LG(FSLH) // tap: keyboard shortcuts
#define AS34 &kp LG(RET) // tap: home

#define AS05 &kp RC(PLUS) // tap: zoom in
#define AS17 &kp RC(N0) // tap: zoom reset
#define AS29 &kp RC(MINUS) // tap: zoom out

#define AS07 &kp RG(EQUAL) // tap: magnifier in
#define AS18 &kp RG(ESC) // tap: magnifier reset
#define AS30 &kp RG(MINUS) // tap: magnifier out
#define AS04 &kp LG(B) // tap: browser
#define AS05 &kp LCMD // tap: assist
#define AS16 &kp LG(L) // tap: calendar
#define AS17 &kp LG(P) // tap: music
#define AS28 &kp LG(E) // tap: mail
#define AS29 &kp LG(C) // tap: contacts

label = "aSTG";
bindings = <
AKY_ESC &m_s_b1 &m_s_b2 &none &none AS05 AS07 &kp K_VOL_DN &kp K_MUTE &kp K_VOL_UP AS10 AS11
AS12 &m_s_b3 &m_s_b4 &none &none AS17 AS18 &kp K_PREV &kp K_PP &kp K_NEXT AS22 AS23
AS24 &m_s_b5 &m_s_b6 &none &none AS29 AS30 &none &kp K_STOP &none AS34 &none
AKY_ESC &m_s_b1 &m_s_b2 &none AS04 AS05 &none &kp K_VOL_DN &kp K_MUTE &kp K_VOL_UP AS10 AS11
AS12 &m_s_b3 &m_s_b4 &none AS16 AS17 &none &kp K_PREV &kp K_PP &kp K_NEXT AS22 AS23
AS24 &m_s_b5 &m_s_b6 &none AS28 AS29 &none &none &kp K_STOP &none AS34 &none
&kp C_BRI_DN KEY_SPC &to_aBAS &to_aDEV AKY_RET &kp C_BRI_UP
>;
};
Expand Down
44 changes: 23 additions & 21 deletions config/os/windows/keymap.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,29 +49,29 @@
};

windows_act_num_layer {
#define WA01 &kp LG(LS(C)) // tap: color picker
#define WA05 &kp LC(F) // tap: find
#define WA13 &hm LCMD LG(LS(S)) // tap: printscreen
#define WA14 &hm LCTRL LEFT
#define WA15 &hm LALT DOWN
#define WA16 &hm LSHFT RIGHT
#define WA17 &kp LG(E) // tap: file explorer

#define WA19 &hm LSHFT N4
#define WA20 &hm LALT N5
#define WA21 &hm LCTRL N6
#define WA22 &hm LCMD EQUAL
#define WA01 &kp LA(LS(RIGHT)) // tap: expand selection
#define WA05 &kp LC(F) // tap: find
#define WA13 &hm LCMD LA(LS(LEFT)) // tap: shrink selection
#define WA14 &hm LCTRL LEFT
#define WA15 &hm LALT DOWN
#define WA16 &hm LSHFT RIGHT
#define WA17 &kp LC(H) // tap: replace

#define WA19 &hm LSHFT N4
#define WA20 &hm LALT N5
#define WA21 &hm LCTRL N6
#define WA22 &hm LCMD EQUAL

#define WA35 &mo_wFNKwAXN_to_wFNK 0 0

#define WA38 &to_wBAS
#define WA39 &to_wDEV

#define KEY_UNDO &kp RC(Z) // tap: undo
#define KEY_REDO &kp RC(Y) // tap: redo
#define KEY_CUT &kp RC(X) // tap: cut
#define KEY_COPY &kp RC(C) // tap: copy
#define KEY_PASTE &kp RC(V) // tap: paste | shift: paste without format
#define KEY_UNDO &kp RC(Z) // tap: undo
#define KEY_REDO &kp RC(Y) // tap: redo
#define KEY_CUT &kp RC(X) // tap: cut
#define KEY_COPY &kp RC(C) // tap: copy
#define KEY_PASTE &kp RC(V) // tap: paste | shift: paste without format

label = "wAXN";
bindings = <
Expand Down Expand Up @@ -107,15 +107,17 @@
windows_settings_layer {
#define WS10 &kp LG(LS(GRAVE)) // tap: fancy zones
#define WS11 &kp LC(LS(ESC)) // tap: task manager
#define WS12 &kp LG(K) // tap: connect quick action
#define WS24 &bt BT_CLR // tap: clear Bluetooth

#define WS22 &kp RG(PAUSE_BREAK) // tap: system info
#define WS23 &kp RG(I) // tap: windows settings
#define WS34 &kp LC(LA(DEL)) // tap: windows security

#define WS04 &kp LG(LS(C)) // tap: color picker
#define WS05 &kp RC(PLUS) // tap: zoom in
#define WA16 &kp LG(LS(S)) // tap: printscreen
#define WS17 &kp RC(N0) // tap: zoom reset
#define WS28 &kp LG(E) // tap: file explorer
#define WS29 &kp RC(MINUS) // tap: zoom out

#define WS07 &kp RG(EQUAL) // tap: magnifier in
Expand All @@ -124,9 +126,9 @@

label = "wSTG";
bindings = <
WKY_ESC &m_s_b1 &m_s_b2 &none &none WS05 WS07 &kp C_VOL_DN &kp C_MUTE &kp C_VOL_UP WS10 WS11
WS12 &m_s_b3 &m_s_b4 &none &none WS17 WS18 &kp C_PREV &kp C_PP &kp C_NEXT WS22 WS23
WS24 &m_s_b5 &m_s_b6 &none &none WS29 WS30 &kp C_RW &kp C_STOP &kp C_FF WS34 &none
WKY_ESC &m_s_b1 &m_s_b2 &none WS04 WS05 WS07 &kp C_VOL_DN &kp C_MUTE &kp C_VOL_UP WS10 WS11
&none &m_s_b3 &m_s_b4 &none WS16 WS17 WS18 &kp C_PREV &kp C_PP &kp C_NEXT WS22 WS23
WS24 &m_s_b5 &m_s_b6 &none WS28 WS29 WS30 &kp C_RW &kp C_STOP &kp C_FF WS34 &none
&kp C_BRI_DN KEY_SPC &to_wBAS &to_wDEV WKY_RET &kp C_BRI_UP
>;
};
Expand Down
42 changes: 17 additions & 25 deletions docs/android.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,17 +169,15 @@ Quick navigation actions and numbers. Function keys works independently as a sub

| Label | Shortcut | Action |
| ------------: | -------------------------- | -------------------- |
| <kbd>▣</kbd> | | Print Screen |
| <kbd>⛢</kbd> | | Color Picker |
| <kbd>⎎</kbd> | | File Explorer |
| <kbd><|</kbd> | | Expand selection |
| <kbd>|></kbd> | | Shrink selection |
| <kbd>↶</kbd> | | Undo |
| <kbd>↷</kbd> | | Redo |
| <kbd>⬚</kbd> | | Cut |
| <kbd>⿻</kbd> | | Copy |
| <kbd>⏍</kbd> | | Paste |
| <kbd>⛶</kbd> | <kbd>⇧</kbd>+<kbd>⏍</kbd> | Paste without format |
| <kbd>☉</kbd> | | Find |
| <kbd>☊</kbd> | <kbd>⇧</kbd>+<kbd>☉</kbd> | Replace |
| <kbd>☊</kbd> | | Replace |

⇧ [Back to menu](#menu)

Expand All @@ -195,35 +193,29 @@ Dedicated to Bluetooth and media controls.
| --------------: | ----------------------- |
| <kbd>B#️⃣</kbd> | Jump to #️⃣ device |
| <kbd>B❌</kbd> | Clear current device |
| <kbd>Z+</kbd> | Zoom in |
| <kbd>ZR</kbd> | Zoom reset |
| <kbd>Z-</kbd> | Zoom out |
| <kbd>M+</kbd> | Magnifier in |
| <kbd>MR</kbd> | Magnifier reset |
| <kbd>M-</kbd> | Magnifier out |
| <kbd>🔊</kbd> | Volume up |
| <kbd>🔇</kbd> | Mute |
| <kbd>🔉</kbd> | Volume down |
| <kbd>🔅</kbd> | Bright down |
| <kbd>🔆</kbd> | Bright up |
| <kbd>⎉</kbd> | Connect Quick Action |
| <kbd>⎚</kbd> | Fancy Zones |
| <kbd>▤</kbd> | Task Manager |
| <kbd>ⓘ</kbd> | System Info |
| <kbd>⛨</kbd> | Windows Security |
| <kbd>⎈</kbd> | Windows Settings |
| <kbd>🌐</kbd> | Browser |
| <kbd>🎤</kbd> | Assist |
| <kbd>📅</kbd> | Calendar |
| <kbd>🎼</kbd> | Music |
| <kbd>📧</kbd> | Mail |
| <kbd>📞</kbd> | Contacts |
| <kbd>⌂</kbd> | Home |
| <kbd>⇦</kbd> | Back |
| <kbd>⛬</kbd> | Notifications |
| <kbd>▤</kbd> | Recents |
| <kbd>⍰</kbd> | Shortcuts |

#### Media

| Label | Action |
| ------------: | ----------- |
| <kbd>🔊</kbd> | Volume up |
| <kbd>🔇</kbd> | Mute |
| <kbd>🔉</kbd> | Volume down |
| <kbd>⏹️</kbd> | Stop |
| <kbd>⏪</kbd> | Fast reverse |
| <kbd>⏮️</kbd> | Prev |
| <kbd>⏯️</kbd> | Play/Pause |
| <kbd>⏭️</kbd> | Next |
| <kbd>⏩</kbd> | Fast Forward |
| <kbd>🔀</kbd> | Shuffle |

⇧ [Back to menu](#menu)

Expand Down
22 changes: 12 additions & 10 deletions docs/windows.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,17 +180,16 @@ Quick navigation actions and numbers. Function keys works independently as a sub

| Label | Shortcut | Action |
| ------------: | -------------------------- | -------------------- |
| <kbd>▣</kbd> | | Print Screen |
| <kbd>⛢</kbd> | | Color Picker |
| <kbd>⎎</kbd> | | File Explorer |
| <kbd><|</kbd> | | Expand selection |
| <kbd>|></kbd> | | Shrink selection |
| <kbd>↶</kbd> | | Undo |
| <kbd>↷</kbd> | | Redo |
| <kbd>⬚</kbd> | | Cut |
| <kbd>⿻</kbd> | | Copy |
| <kbd>⏍</kbd> | | Paste |
| <kbd>⛶</kbd> | <kbd>⇧</kbd>+<kbd>⏍</kbd> | Paste without format |
| <kbd>☉</kbd> | | Find |
| <kbd>☊</kbd> | <kbd>⇧</kbd>+<kbd>☉</kbd> | Replace |
| <kbd>☊</kbd> | | Replace |

⇧ [Back to menu](#menu)

Expand All @@ -202,22 +201,22 @@ Dedicated to Bluetooth and media controls.

#### Actions

| Label | Action |
| --------------: | ----------------------- |
| Label | Action |
| --------------: | ---------------------- |
| <kbd>B#️⃣</kbd> | Jump to #️⃣ device |
| <kbd>⎉</kbd> | Connect Quick Action |
| <kbd>B❌</kbd> | Clear current device |
| <kbd>▣</kbd> | Print Screen |
| <kbd>⛢</kbd> | Color Picker |
| <kbd>🖿</kbd> | File Explorer |
| <kbd>Z+</kbd> | Zoom in |
| <kbd>ZR</kbd> | Zoom reset |
| <kbd>Z-</kbd> | Zoom out |
| <kbd>M+</kbd> | Magnifier in |
| <kbd>MR</kbd> | Magnifier reset |
| <kbd>M-</kbd> | Magnifier out |
| <kbd>🔊</kbd> | Volume up |
| <kbd>🔇</kbd> | Mute |
| <kbd>🔉</kbd> | Volume down |
| <kbd>🔅</kbd> | Bright down |
| <kbd>🔆</kbd> | Bright up |
| <kbd>⎉</kbd> | Connect Quick Action |
| <kbd>⎚</kbd> | Fancy Zones |
| <kbd>▤</kbd> | Task Manager |
| <kbd>ⓘ</kbd> | System Info |
Expand All @@ -228,6 +227,9 @@ Dedicated to Bluetooth and media controls.

| Label | Action |
| ------------: | ----------- |
| <kbd>🔊</kbd> | Volume up |
| <kbd>🔇</kbd> | Mute |
| <kbd>🔉</kbd> | Volume down |
| <kbd>⏹️</kbd> | Stop |
| <kbd>⏪</kbd> | Fast reverse |
| <kbd>⏮️</kbd> | Prev |
Expand Down
4 changes: 0 additions & 4 deletions host/windows/ahk/keys.ahk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
; + Shift
; # Win

; Actions
!^f::Send("^{h}") ; Alt+☉ ☊
+!^f::Send("^+{h}") ; Shift+Alt+☉ ☊ (global)

; Settings
#HotIf WinActive("ahk_exe code.exe")
^0::Send("^{Numpad0}") ; Zoom Reset
Expand Down

0 comments on commit 6c82808

Please sign in to comment.