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

This commit is contained in:
QMK Bot 2021-12-21 17:20:45 +00:00
commit b6bd01aa8b

View file

@ -35,7 +35,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* | | | | | TD ]} | | TD ; | | | | TD : | * | | | | | TD ]} | | TD ; | | | | TD : |
* `-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------. * `-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------.
* | | | | | | * | | | | | |
* | ESC | SPC | | E | INTRO | * | TAB | SPC | | E | INTRO |
* | num | nav | | sym | fn | * | num | nav | | sym | fn |
* `---------------' `---------------' * `---------------' `---------------'
* *
@ -43,7 +43,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define _STENAI_L1 KC_GRV, KC_W, KC_D, KC_P, KC_F #define _STENAI_L1 KC_GRV, KC_W, KC_D, KC_P, KC_F
#define _STENAI_L2 LALT_T(KC_H), LCTL_T(KC_R), LSFT_T(KC_S), LGUI_T(KC_T), KC_G #define _STENAI_L2 LALT_T(KC_H), LCTL_T(KC_R), LSFT_T(KC_S), LGUI_T(KC_T), KC_G
#define _STENAI_L3 KC_B, KC_X, KC_C, KC_V, ZK_BRC #define _STENAI_L3 KC_B, KC_X, KC_C, KC_V, ZK_BRC
#define _STENAI_LT LT(_NUM, KC_ESC), LT(_NAV, KC_SPC) #define _STENAI_LT LT(_NUM, KC_TAB), LT(_NAV, KC_SPC)
#define _STENAI_R1 KC_K, KC_Y, KC_U, KC_Q, KC_QUOT #define _STENAI_R1 KC_K, KC_Y, KC_U, KC_Q, KC_QUOT
#define _STENAI_R2 KC_M, RGUI_T(KC_N), RSFT_T(KC_A), RCTL_T(KC_I), RALT_T(KC_O) #define _STENAI_R2 KC_M, RGUI_T(KC_N), RSFT_T(KC_A), RCTL_T(KC_I), RALT_T(KC_O)
@ -147,14 +147,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* | | | | | | | | | | | | * | | | | | | | | | | | |
* `-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------. * `-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------.
* | | | |:::::::| | * | | | |:::::::| |
* | | TAB | |:::::::| | * | | ESC | |:::::::| |
* | | | |:::::::| | * | | | |:::::::| |
* `---------------' `---------------' * `---------------' `---------------'
*/ */
#define ____SYM_L1 KC_PERC, KC_AMPR, KC_QUES, KC_PIPE, KC_EXLM #define ____SYM_L1 KC_PERC, KC_AMPR, KC_QUES, KC_PIPE, KC_EXLM
#define ____SYM_L2 KC_HASH, KC_AT, KC_COLN, KC_SCLN, KC_DLR #define ____SYM_L2 KC_HASH, KC_AT, KC_COLN, KC_SCLN, KC_DLR
#define ____SYM_L3 ZK_PRN, KC_TILD, KC_SLSH, KC_BSLS, KC_CIRC #define ____SYM_L3 ZK_PRN, KC_TILD, KC_SLSH, KC_BSLS, KC_CIRC
#define ____SYM_LT _______, KC_TAB #define ____SYM_LT _______, KC_ESC
#define ____SYM_R1 _BLANK_ROW #define ____SYM_R1 _BLANK_ROW
#define ____SYM_R2 _BLANK_ROW #define ____SYM_R2 _BLANK_ROW
@ -178,14 +178,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* | | | | | | | | | | | | * | | | | | | | | | | | |
* `-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------. * `-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------.
* | | | | |:::::::| * | | | | |:::::::|
* | | TAB | | |:::::::| * | | ESC | | |:::::::|
* | | | | |:::::::| * | | | | |:::::::|
* `---------------' `---------------' * `---------------' `---------------'
*/ */
#define ____FN_L1 _BLANK_ROW #define ____FN_L1 _BLANK_ROW
#define ____FN_L2 _BLANK_ROW #define ____FN_L2 _BLANK_ROW
#define ____FN_L3 _BLANK_ROW #define ____FN_L3 _BLANK_ROW
#define ____FN_LT _______, KC_TAB #define ____FN_LT _______, KC_ESC
#define ____FN_R1 _______, KC_F7, KC_F8, KC_F9, KC_F10 #define ____FN_R1 _______, KC_F7, KC_F8, KC_F9, KC_F10
#define ____FN_R2 _______, KC_F1, KC_F2, KC_F3, KC_F11 #define ____FN_R2 _______, KC_F1, KC_F2, KC_F3, KC_F11