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

This commit is contained in:
QMK Bot 2022-09-30 02:57:15 +00:00
commit c490584961
2 changed files with 3 additions and 23 deletions

View File

@ -1,20 +0,0 @@
// Copyright 2022 Zicodia (@Zicodia)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/
/* disable debug print */
//#define NO_DEBUG
/* disable print */
//#define NO_PRINT
/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT

View File

@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
SFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_UP, SFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_UP,
KC_LCTL, KC_LALT, KC_SPC, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RGHT KC_LCTL, KC_LALT, KC_SPC, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
) ),
/* /*
* *
* 1 | 2 3 4 | 5 6 7 | 8 9 0 * 1 | 2 3 4 | 5 6 7 | 8 9 0
@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_BSPC, KC_LBRC, KC_RBRC, KC_BSLS, KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_BSPC, KC_LBRC, KC_RBRC, KC_BSLS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCLN, KC_QUOT, KC_RSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCLN, KC_QUOT, KC_RSFT,
KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_COMM, KC_DOT, KC_SLSH KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_COMM, KC_DOT, KC_SLSH
) ),
/* /*
* *
* ESC|F1 F2 F3 |F4 F5 F6 |F7 F8 F9 * ESC|F1 F2 F3 |F4 F5 F6 |F7 F8 F9
@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F10, KC_F11, KC_F12,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
) ),
/* /*
* *
* | | | * | | |