diff options
author | jack <0x6A73@pm.me> | 2022-10-15 16:24:26 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-15 23:24:26 +0100 |
commit | 4b5ebb7248bfe8cd860fe952d6ad24c42b74ca69 (patch) | |
tree | 6ea1d8a86a974d4c6fde57d86be7b5d1a17a66da | |
parent | b5e26ccb9401c5d5393110620fde9d67b7787634 (diff) |
Fixup latinpadble (#18736)
6 files changed, 36 insertions, 105 deletions
diff --git a/keyboards/latincompass/latinpadble/config.h b/keyboards/latincompass/latinpadble/config.h index 09198df612..a9a8dc7f1a 100644 --- a/keyboards/latincompass/latinpadble/config.h +++ b/keyboards/latincompass/latinpadble/config.h @@ -30,56 +30,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/ #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 3fed6c0cb4..5bdbe6db10 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 <http://www.gnu.org/licenses/>. */ #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 2c4cc5f409..a9b1bd920f 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 <http://www.gnu.org/licenses/>. */ -/* 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 36b7ba9cbc..1e5b99807c 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 c40c3ff734..cce96241b6 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 06816c2ef8..2afef0b777 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 |