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

This commit is contained in:
QMK Bot 2021-06-25 03:52:10 +00:00
commit 05edf7cab8
3 changed files with 62 additions and 62 deletions

View file

@ -30,13 +30,13 @@ enum layer_names {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base Layer
*
* Esc Q  W  E  R  T  Y  U  I  O  P  \ 
* Esc Q W E R T Y U I O P \
*
* Tab  A  S  D  F  G  H  J  K  L  Enter
* Tab A S D F G H J K L Enter
*
* Shift  Z  X  C  V  B  N  M  ,  .   / 
* Shift Z X C V B N M , . /
*
* CtrlGUIAlt          BackspaceLowrRse Alt
* CtrlGUIAlt BackspaceLowrRse Alt
*
*/
[_BL] = LAYOUT(
@ -48,13 +48,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Function Layer 1 (Lower)
*
*  `  1  2  3  4  5  6  7  8  9  0  - 
* ` 1 2 3 4 5 6 7 8 9 0 -
*
*      =             [  ]  ;  '       
* = [ ] ; '
*
*                                   
*
*
*                       Delete            
* Delete
*
*/
[_LW] = LAYOUT(
@ -66,13 +66,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Function Layer 2 (Raise)
*
* RstF1 F2 F3 F4 F5 F6    HomPgU      
* RstF1 F2 F3 F4 F5 F6 HomPgU
*
*     F7 F8 F9 F10F11F12    ;  '       
* F7 F8 F9 F10F11F12 ; '
*
*       RGBModHuDHuIVaDVaISaDSaIBLS    
* RGBModHuDHuIVaDVaISaDSaIBLS
*
*                                         
*
*
*/
[_RS] = LAYOUT(
@ -86,11 +86,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*
* | | | | | | | | | | | | |
*
*                           
*
*
*            
*
*
*                                         
*
*
*/
[_EM] = LAYOUT(

View file

@ -17,20 +17,20 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
*       
* Esc   F1 F2 F3 F4  F5 F6 F7 F8  F9 F10F11F12 PScSlkPse
*       
*   
*  `  1  2  3  4  5  6  7  8  9  0  -  =  Backsp InsHomPgU Num /  *  - 
*   
*  Tab  Q  W  E  R  T  Y  U  I  O  P  [  ]   \   DelEndPgD  7  8  9    
*    + 
*  Caps  A  S  D  F  G  H  J  K  L  ;  '   Enter                 4  5  6    
*           
* Shft <  Z  X  C  V  B  N  M  ,  .  /     Shift              1  2  3    
*   Ent
* CtrlGUI Alt                          Alt GUIFnMnCtrl           0    .    
*   
*
* Esc F1 F2 F3 F4 F5 F6 F7 F8 F9 F10F11F12 PScSlkPse
*
*
* ` 1 2 3 4 5 6 7 8 9 0 - = Backsp InsHomPgU Num / * -
*
* Tab Q W E R T Y U I O P [ ] \ DelEndPgD 7 8 9
* +
* Caps A S D F G H J K L ; ' Enter 4 5 6
*
* Shft < Z X C V B N M , . / Shift 1 2 3
* Ent
* CtrlGUI Alt Alt GUIFnMnCtrl 0 .
*
*/
LAYOUT_all(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS,
@ -43,20 +43,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
/*
*       
* Rst                                                   
*       
*   
*                                                                      
*   
*                                                                      
*      
*                                                                           
*           
*                                                                         
*      
*                                                                             
*   
*
* Rst
*
*
*
*
*
*
*
*
*
*
*
*
*/
LAYOUT_all(
RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@ -69,20 +69,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
/*
*       
*                                                       
*       
*   
*                                                                      
*   
*                                                                      
*      
*                                                                           
*           
*                                                                         
*      
*                                                                             
*   
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*/
LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,

View file

@ -18,15 +18,15 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
*
* Esc 1  2  3  4  5  6  7  8  9  0  -  = Bspcdel
* Esc 1 2 3 4 5 6 7 8 9 0 - = Bspcdel
*
*  Tab  Q  W  E  R  T  Y  U  I  O  P  [  ]   \   
* Tab Q W E R T Y U I O P [ ] \
*
*  Caps  A  S  D  F  G  H  J  K  L  ;  '   Enter 
* Caps A S D F G H J K L ; ' Enter
*
* LSft \  Z  X  C  V  B  N  M  ,  .  / RSft fn
* LSft \ Z X C V B N M , . / RSft fn
*
* CtrlGUI Alt                          Alt GUIMenuCtrl
* CtrlGUI Alt Alt GUIMenuCtrl
*
*/