diff options
author | dakkar <dakkar@thenautilus.net> | 2022-10-07 14:38:36 +0100 |
---|---|---|
committer | dakkar <dakkar@thenautilus.net> | 2022-10-07 14:38:36 +0100 |
commit | 0c6a8235fb7726b8ccec0b0f1f29ecd2c39d6ace (patch) | |
tree | b40539ea9985eca7c6b08da00630358450829c03 | |
parent | nicer white/grays for model100 (diff) | |
download | keyboardio-model01-0c6a8235fb7726b8ccec0b0f1f29ecd2c39d6ace.tar.gz keyboardio-model01-0c6a8235fb7726b8ccec0b0f1f29ecd2c39d6ace.tar.bz2 keyboardio-model01-0c6a8235fb7726b8ccec0b0f1f29ecd2c39d6ace.zip |
use ModLayer keys instead of custom macro
-rw-r--r-- | keymaps.h | 2 | ||||
-rw-r--r-- | macros.h | 14 |
2 files changed, 1 insertions, 15 deletions
@@ -9,7 +9,7 @@ ColorKeymaps( CK(Key_PageUp,Base), CK(Key_A,Base), CK(Key_O,Base), CK(Key_E,Base), CK(Key_U,Base), CK(Key_I,Base), CK(Key_PageDown,Base), CK(Key_Semicolon,Base), CK(Key_Q,Base), CK(Key_J,Base), CK(Key_K,Base), CK(Key_X,Base), CK(Key_Escape,Base), CK(Key_LeftControl,Base), CK(Key_Backspace,Base), CK(Key_LeftGui,Base), CK(Key_LeftShift,Base), - CK(M(MACRO_FVWM),Base), + CK(ML(LeftAlt,FVWM),Base), CK(M(MACRO_ANY),Base), CK(Key_6,Base), CK(Key_7,Base), CK(Key_8,Base), CK(Key_9,Base), CK(Key_0,Base), CK(___,Base), CK(Key_Enter,Base), CK(Key_F,Base), CK(Key_G,Base), CK(Key_C,Base), CK(Key_R,Base), CK(Key_L,Base), CK(Key_Slash,Base), @@ -6,7 +6,6 @@ enum { MACRO_VERSION_INFO, MACRO_ANY, - MACRO_FVWM, }; #ifndef BUILD_INFORMATION @@ -27,16 +26,6 @@ static void anyKeyMacro(KeyEvent &event) { } } -static const macro_t *fvwmMacro(KeyEvent &event) { - if (keyToggledOn(event.state)) { - return MACRO(D(LeftAlt),Dr(ShiftToLayer(FVWM))); - } - else if (keyToggledOff(event.state)) { - return MACRO(Ur(ShiftToLayer(FVWM)),U(LeftAlt)); - } - return MACRO_NONE; -} - const macro_t *macroAction(uint8_t macroIndex, KeyEvent &event) { switch (macroIndex) { @@ -48,9 +37,6 @@ const macro_t *macroAction(uint8_t macroIndex, KeyEvent &event) { anyKeyMacro(event); break; - case MACRO_FVWM: - return fvwmMacro(event); - break; } return MACRO_NONE; } |