Merge remote-tracking branch 'upstream/master' into develop

This commit is contained in:
Nick Brassel 2022-10-16 16:08:34 +11:00
commit be7403427d
4 changed files with 25 additions and 48 deletions

View file

@ -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(); }

View file

@ -1,2 +1 @@
VIA_ENABLE = yes
LTO_ENABLE = yes

View file

@ -0,0 +1,5 @@
// Copyright 2022 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#undef RGBLIGHT_EFFECT_TWINKLE

View file

@ -1,3 +1,2 @@
VIA_ENABLE = yes
ENCODER_MAP_ENABLE = yes
LTO_ENABLE = yes