From 4b5ebb7248bfe8cd860fe952d6ad24c42b74ca69 Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Sat, 15 Oct 2022 16:24:26 -0600 Subject: [PATCH 1/3] Fixup latinpadble (#18736) --- keyboards/latincompass/latinpadble/config.h | 43 +----------- .../latinpadble/keymaps/default/keymap.c | 19 +----- .../latinpadble/keymaps/via/keymap.c | 68 ++++++------------- .../latinpadble/keymaps/via/rules.mk | 1 - .../latincompass/latinpadble/latinpadble.c | 9 +++ keyboards/latincompass/latinpadble/rules.mk | 1 + 6 files changed, 36 insertions(+), 105 deletions(-) diff --git a/keyboards/latincompass/latinpadble/config.h b/keyboards/latincompass/latinpadble/config.h index 09198df612b..a9a8dc7f1ab 100644 --- a/keyboards/latincompass/latinpadble/config.h +++ b/keyboards/latincompass/latinpadble/config.h @@ -30,56 +30,17 @@ along with this program. If not, see .*/ #define DIODE_DIRECTION ROW2COL -#define SSD1306OLED #define RGB_DI_PIN B7 #define RGBLED_NUM 4 -#define DRIVER_LED_TOTAL RGBLED_NUM /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 - #define RGBLIGHT_VAL_STEP 25 -#define RGBLIGHT_LIMIT_VAL 255 +#define RGBLIGHT_EFFECT_KNIGHT #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 20 -//#define RGBLIGHT_ANIMATIONS // Run RGB animations -#undef ENABLE_RGB_MATRIX_ALPHAS_MODS -#undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -#undef ENABLE_RGB_MATRIX_BREATHING -#undef ENABLE_RGB_MATRIX_BAND_SAT -#undef ENABLE_RGB_MATRIX_BAND_VAL -#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL -#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -#undef ENABLE_RGB_MATRIX_CYCLE_ALL -#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN -#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL -#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -#undef ENABLE_RGB_MATRIX_DUAL_BEACON -#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL -#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON -#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS -#undef ENABLE_RGB_MATRIX_RAINDROPS -#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP -#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN -#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE -#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -#undef ENABLE_RGB_MATRIX_SPLASH -#undef ENABLE_RGB_MATRIX_MULTISPLASH -#undef ENABLE_RGB_MATRIX_SOLID_SPLASH -#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +#define RGBLIGHT_EFFECT_STATIC_GRADIENT #define OLED_FONT_H "./lib/glcdfont.c" diff --git a/keyboards/latincompass/latinpadble/keymaps/default/keymap.c b/keyboards/latincompass/latinpadble/keymaps/default/keymap.c index 3fed6c0cb48..5bdbe6db10a 100644 --- a/keyboards/latincompass/latinpadble/keymaps/default/keymap.c +++ b/keyboards/latincompass/latinpadble/keymaps/default/keymap.c @@ -14,16 +14,17 @@ * along with this program. If not, see . */ #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), [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), @@ -40,17 +41,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/keymap.c b/keyboards/latincompass/latinpadble/keymaps/via/keymap.c index 2c4cc5f4097..a9b1bd920ff 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 36b7ba9cbc9..1e5b99807cb 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 diff --git a/keyboards/latincompass/latinpadble/latinpadble.c b/keyboards/latincompass/latinpadble/latinpadble.c index c40c3ff7347..cce96241b6d 100644 --- a/keyboards/latincompass/latinpadble/latinpadble.c +++ b/keyboards/latincompass/latinpadble/latinpadble.c @@ -15,3 +15,12 @@ */ #include "latinpadble.h" +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { return false; } + if (clockwise) { + tap_code(KC_PGDN); + } else { + tap_code(KC_PGUP); + } + return true; +} diff --git a/keyboards/latincompass/latinpadble/rules.mk b/keyboards/latincompass/latinpadble/rules.mk index 06816c2ef8c..2afef0b777f 100644 --- a/keyboards/latincompass/latinpadble/rules.mk +++ b/keyboards/latincompass/latinpadble/rules.mk @@ -19,6 +19,7 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output +LTO_ENABLE = yes BLUETOOTH_ENABLE = yes BLUETOOTH_DRIVER = BluefruitLE From 8464bb91e2a5eb3b1c467810be1cc55748211232 Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Sat, 15 Oct 2022 17:16:17 -0600 Subject: [PATCH 2/3] 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 00000000000..4a393338839 --- /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 70cf4224c01..f1adcab005e 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 From 81988cc0326d4983bc9167dedfd1aed303a816e8 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sun, 16 Oct 2022 15:58:42 +1100 Subject: [PATCH 3/3] Slipped through the cracks. (#18742) --- keyboards/sofle/keymaps/keyhive_via/readme.md | 4 ++-- keyboards/wavtype/p01_ultra/readme.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/sofle/keymaps/keyhive_via/readme.md b/keyboards/sofle/keymaps/keyhive_via/readme.md index e7a2beebcf0..f50b12fdd96 100644 --- a/keyboards/sofle/keymaps/keyhive_via/readme.md +++ b/keyboards/sofle/keymaps/keyhive_via/readme.md @@ -2,7 +2,7 @@ ![SofleKeyboard version 2.1 RGB Keyhive](https://i.imgur.com/Oa6spvZ.png) -# Configuring VIA / Vial App +# Configuring VIA This firmware will not auto-recognize until [PR #1060](https://github.com/the-via/keyboards/pull/1060) is accepted to the VIA keyboard database. For now you must install the new layout: @@ -10,7 +10,7 @@ This firmware will not auto-recognize until [PR #1060](https://github.com/the-vi 2. In the VIA app, select `File > Import Keymap` from the menu. 3. Open the file you just downloaded. -**You'll have to do this every time you use VIA or Vial until the PR is accepted.** +**You'll have to do this every time you use VIA until the PR is accepted.** # Using with VIA * The default layouts should be loaded automatically. diff --git a/keyboards/wavtype/p01_ultra/readme.md b/keyboards/wavtype/p01_ultra/readme.md index bb903892279..9d8f3201e8f 100644 --- a/keyboards/wavtype/p01_ultra/readme.md +++ b/keyboards/wavtype/p01_ultra/readme.md @@ -20,4 +20,4 @@ Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead -* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available (this can be set in vial!) +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available