From 9fff3dc603997f0931845b84de75e0313c23d19c Mon Sep 17 00:00:00 2001 From: Jose Gisbert Date: Tue, 23 Apr 2024 14:50:38 +0200 Subject: [PATCH 1/2] Use encoder map for encoder configuration --- .../kyria/rev1/keymaps/lejouson/keymap.c | 26 ++++++------------- keyboards/splitkb/kyria/rev1/rules.mk | 1 + 2 files changed, 9 insertions(+), 18 deletions(-) create mode 100644 keyboards/splitkb/kyria/rev1/rules.mk diff --git a/keyboards/splitkb/kyria/rev1/keymaps/lejouson/keymap.c b/keyboards/splitkb/kyria/rev1/keymaps/lejouson/keymap.c index 3f6c117b..a70c4249 100644 --- a/keyboards/splitkb/kyria/rev1/keymaps/lejouson/keymap.c +++ b/keyboards/splitkb/kyria/rev1/keymaps/lejouson/keymap.c @@ -253,22 +253,12 @@ bool oled_task_user(void) { #endif #ifdef ENCODER_ENABLE -bool encoder_update_user(uint8_t index, bool clockwise) { - switch (get_highest_layer(layer_state)) { - case _NAVI: - if (clockwise) { - tap_code16(C(KC_LEFT)); - } else { - tap_code16(C(KC_RGHT)); - } - break; - default: - if (clockwise) { - tap_code16(S(KC_TAB)); - } else { - tap_code16(KC_TAB); - } - } - return true; -} +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [_DEFAULT ] = { ENCODER_CCW_CW(XXXXXXX, XXXXXXX), ENCODER_CCW_CW(S(KC_TAB), KC_TAB ) }, + [ _NAVI ] = { ENCODER_CCW_CW(XXXXXXX, XXXXXXX), ENCODER_CCW_CW(C(KC_LEFT), C(KC_RGHT)) }, + [_SYMBOLS ] = { ENCODER_CCW_CW(XXXXXXX, XXXXXXX), ENCODER_CCW_CW(_______, _______ ) }, + [_FUNCTION] = { ENCODER_CCW_CW(XXXXXXX, XXXXXXX), ENCODER_CCW_CW(_______, _______ ) }, + [_NUMERIC ] = { ENCODER_CCW_CW(XXXXXXX, XXXXXXX), ENCODER_CCW_CW(_______, _______ ) }, + [ _CONFIG ] = { ENCODER_CCW_CW(XXXXXXX, XXXXXXX), ENCODER_CCW_CW(_______, _______ ) }, +}; #endif diff --git a/keyboards/splitkb/kyria/rev1/rules.mk b/keyboards/splitkb/kyria/rev1/rules.mk new file mode 100644 index 00000000..a40474b4 --- /dev/null +++ b/keyboards/splitkb/kyria/rev1/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes \ No newline at end of file From f0f59e3a51a53d267164426a113c92aae8c7063d Mon Sep 17 00:00:00 2001 From: Jose Gisbert Date: Tue, 23 Apr 2024 15:16:05 +0200 Subject: [PATCH 2/2] Build when pushing except to main --- .github/workflows/build_binaries.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_binaries.yaml b/.github/workflows/build_binaries.yaml index 1e08c2b1..0a69e1be 100755 --- a/.github/workflows/build_binaries.yaml +++ b/.github/workflows/build_binaries.yaml @@ -2,8 +2,8 @@ name: Build QMK firmware on: push: - branches: - - 'lejouson/**' + branches-ignore: + - main workflow_dispatch: permissions: