From 3ba7f7931b632bf43d84629a37f35b2ee252c881 Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Sat, 15 Oct 2022 16:24:26 -0600 Subject: [PATCH 1/2] Fixup latinpadble (#18736) --- .../latinpadble/keymaps/via/keymap.c | 68 ++++++------------- .../latinpadble/keymaps/via/rules.mk | 1 - 2 files changed, 21 insertions(+), 48 deletions(-) diff --git a/keyboards/latincompass/latinpadble/keymaps/via/keymap.c b/keyboards/latincompass/latinpadble/keymaps/via/keymap.c index 2c4cc5f4..a9b1bd92 100644 --- a/keyboards/latincompass/latinpadble/keymaps/via/keymap.c +++ b/keyboards/latincompass/latinpadble/keymaps/via/keymap.c @@ -13,49 +13,37 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -/* Keymap _0: (Base Layer) Default Layer - - * .----. - * |PGUP| - * |-----------------------. - * | 7 | 8 | 9 | MO1 | - * |-----|-----|-----|-----| - * | 4 | 5 | 6 | + | - * |-----|-----|-----|-----| - * | 1 | 2 | 3 | — | - * |-----|-----|-----|-----| - * | 0 | . | DEL |Enter| - * .-----------------------. - */ - /* Keymap _1: (Second Layer) second Layer - - * .--------. - * |NUMLOCK| - * |--------------------------------. - * |RGB_TOG|RGB_MOD|RGB_M_K|RGB_M_X | - * |-------|-------|-------|--------| - * |RGB_SAI|RGB_SAD|RGB_HUI|RGB_HUD | - * |-------|-------|-------|--------| - * |RGB_VAI|RGB_VAD|RGB_SPI|RGB_SPD | - * |-------|-------|-------|--------| - * |RGB_SPI|RGB_SPD|RGB_TOG|KC_TRNS | - * .--------------------------------. -*/ - #include QMK_KEYBOARD_H + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_pad( KC_PGUP, - KC_KP_7, KC_KP_8, KC_KP_9, MO(1), + KC_KP_7, KC_KP_8, KC_KP_9, MO(1), KC_P4, KC_P5, KC_P6, KC_KP_PLUS, KC_P1, KC_P2, KC_P3, KC_KP_MINUS, - KC_P0, KC_PDOT,KC_DELETE, KC_KP_ENTER), + KC_P0, KC_PDOT,KC_DELETE, KC_KP_ENTER + ), [1] = LAYOUT_pad( KC_NUMLOCK, - RGB_TOG, RGB_MOD, RGB_M_K, RGB_M_X, + RGB_TOG, RGB_MOD, RGB_M_K, RGB_M_X, RGB_SAI, RGB_SAD, RGB_HUI, RGB_HUD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, - RGB_SPI, RGB_SPD, RGB_TOG, KC_TRNS), + RGB_SPI, RGB_SPD, RGB_TOG, KC_TRNS + ), + [2] = LAYOUT_pad( + _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______ + ), + [3] = LAYOUT_pad( + _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______ + ) }; static void render_logo(void) { @@ -69,17 +57,3 @@ bool oled_task_user(void) { return false; } #endif - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { /* First encoder */ - if (clockwise) { - tap_code(KC_PGDN); - } else { - tap_code(KC_PGUP); - } - } - return true; -} - - -void matrix_init_user(void) { render_logo(); } diff --git a/keyboards/latincompass/latinpadble/keymaps/via/rules.mk b/keyboards/latincompass/latinpadble/keymaps/via/rules.mk index 36b7ba9c..1e5b9980 100644 --- a/keyboards/latincompass/latinpadble/keymaps/via/rules.mk +++ b/keyboards/latincompass/latinpadble/keymaps/via/rules.mk @@ -1,2 +1 @@ VIA_ENABLE = yes -LTO_ENABLE = yes From 6af82187d8e2f9c129db5c476288718ffdbf1e64 Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Sat, 15 Oct 2022 17:16:17 -0600 Subject: [PATCH 2/2] Fixup work_louder/micro VIA keymap (#18738) Co-authored-by: Drashna Jaelre --- keyboards/work_louder/micro/keymaps/via/config.h | 5 +++++ keyboards/work_louder/micro/keymaps/via/rules.mk | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 keyboards/work_louder/micro/keymaps/via/config.h diff --git a/keyboards/work_louder/micro/keymaps/via/config.h b/keyboards/work_louder/micro/keymaps/via/config.h new file mode 100644 index 00000000..4a393338 --- /dev/null +++ b/keyboards/work_louder/micro/keymaps/via/config.h @@ -0,0 +1,5 @@ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once +#undef RGBLIGHT_EFFECT_TWINKLE diff --git a/keyboards/work_louder/micro/keymaps/via/rules.mk b/keyboards/work_louder/micro/keymaps/via/rules.mk index 70cf4224..f1adcab0 100644 --- a/keyboards/work_louder/micro/keymaps/via/rules.mk +++ b/keyboards/work_louder/micro/keymaps/via/rules.mk @@ -1,3 +1,2 @@ VIA_ENABLE = yes ENCODER_MAP_ENABLE = yes -LTO_ENABLE = yes