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

This commit is contained in:
QMK Bot 2022-05-30 14:34:54 +00:00
commit 9a2943d221
4 changed files with 30 additions and 4 deletions

View file

@ -0,0 +1,26 @@
// Copyright 2022 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
*
* Q W E R T Y U I O P
*
* A S D F G H J K L ;
*
* Z X C V B N M , . /
*
*
* GUI Alt
* Bsp Ent
*
*
*/
[0] = LAYOUT_split_3x5_3(
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
KC_LGUI, KC_BSPC, KC_SPC, KC_SPC, KC_ENT, KC_RALT
)
};

View file

@ -10,12 +10,12 @@ BOOTLOADER = caterina
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = yes # Console for debug CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = yes # Audio output # AUDIO_ENABLE = yes # Audio output
RGB_MATRIX_ENABLE = yes # Enable WS2812 RGB matrix RGB_MATRIX_ENABLE = yes # Enable WS2812 RGB matrix
RGB_MATRIX_DRIVER = WS2812 RGB_MATRIX_DRIVER = WS2812

View file

@ -1 +0,0 @@
LTO_ENABLE = yes

View file

@ -17,5 +17,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = yes # Audio output AUDIO_ENABLE = yes # Audio output
ENCODER_ENABLE = yes ENCODER_ENABLE = yes
LTO_ENABLE = yes
SRC += encoder_actions.c SRC += encoder_actions.c