diff options
| author | Nick Brassel <nick@tzarc.org> | 2022-10-16 16:08:34 +1100 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2022-10-16 16:08:34 +1100 |
| commit | 39c22f5cf5011427ece26c510d0b1ab42edf34db (patch) | |
| tree | a7b13639f9d5d4049d86eb7336b5e10ff4c09046 /keyboards/latincompass/latinpadble/keymaps | |
| parent | d089af87030821e7bdd12c7187c5a583a8bf813d (diff) | |
| parent | 81988cc0326d4983bc9167dedfd1aed303a816e8 (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/latincompass/latinpadble/keymaps')
3 files changed, 22 insertions, 62 deletions
diff --git a/keyboards/latincompass/latinpadble/keymaps/default/keymap.c b/keyboards/latincompass/latinpadble/keymaps/default/keymap.c index 3b7189ffa0..20984c5172 100644 --- a/keyboards/latincompass/latinpadble/keymaps/default/keymap.c +++ b/keyboards/latincompass/latinpadble/keymaps/default/keymap.c @@ -14,10 +14,11 @@ * 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), @@ -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 193c024cf6..4032d48e03 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_NUM, 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 |