1
0
Fork 0
forked from forks/qmk_firmware

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

This commit is contained in:
QMK Bot 2021-01-09 18:15:49 +00:00
commit e9eaf416b8
9 changed files with 380 additions and 2 deletions

View file

@ -0,0 +1,43 @@
/* Copyright 2021 QMK
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
*
* EscF1 F2 F3 F4 F5 F6 F7 F8 F9 F10F11F12PScScrPseVo-Vo+Mut
*
*  `  1  2  3  4  5  6  7  8  9  0  -  =  BackspNum /  *  - 
*
*  Tab  Q  W  E  R  T  Y  U  I  O  P  [  ]   \   7  8  9    
*  + 
*  Caps  A  S  D  F  G  H  J  K  L  ;  '   Enter  4  5  6    
*
*  Shift   Z  X  C  V  B  N  M  ,  .  / Shift    1  2  3    
* Ent
* CtrlGUI Alt          Space          AltGUICtl       0  .    
*
*/
[0] = LAYOUT_96_ansi(
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, KC_VOLD, KC_VOLU, KC_MUTE,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT
)
};

View file

@ -0,0 +1,118 @@
{
"keyboard_name": "96% ANSI layout",
"url": "",
"maintainer": "qmk",
"width": 19,
"height": 6,
"layouts": {
"LAYOUT_96_ansi": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":3, "y":0},
{"x":4, "y":0},
{"x":5, "y":0},
{"x":6, "y":0},
{"x":7, "y":0},
{"x":8, "y":0},
{"x":9, "y":0},
{"x":10, "y":0},
{"x":11, "y":0},
{"x":12, "y":0},
{"x":13, "y":0},
{"x":14, "y":0},
{"x":15, "y":0},
{"x":16, "y":0},
{"x":17, "y":0},
{"x":18, "y":0},
{"x":0, "y":1},
{"x":1, "y":1},
{"x":2, "y":1},
{"x":3, "y":1},
{"x":4, "y":1},
{"x":5, "y":1},
{"x":6, "y":1},
{"x":7, "y":1},
{"x":8, "y":1},
{"x":9, "y":1},
{"x":10, "y":1},
{"x":11, "y":1},
{"x":12, "y":1},
{"x":13, "y":1, "w":2},
{"x":15, "y":1},
{"x":16, "y":1},
{"x":17, "y":1},
{"x":18, "y":1},
{"x":0, "y":2, "w":1.5},
{"x":1.5, "y":2},
{"x":2.5, "y":2},
{"x":3.5, "y":2},
{"x":4.5, "y":2},
{"x":5.5, "y":2},
{"x":6.5, "y":2},
{"x":7.5, "y":2},
{"x":8.5, "y":2},
{"x":9.5, "y":2},
{"x":10.5, "y":2},
{"x":11.5, "y":2},
{"x":12.5, "y":2},
{"x":13.5, "y":2, "w":1.5},
{"x":15, "y":2},
{"x":16, "y":2},
{"x":17, "y":2},
{"x":18, "y":2, "h":2},
{"x":0, "y":3, "w":1.75},
{"x":1.75, "y":3},
{"x":2.75, "y":3},
{"x":3.75, "y":3},
{"x":4.75, "y":3},
{"x":5.75, "y":3},
{"x":6.75, "y":3},
{"x":7.75, "y":3},
{"x":8.75, "y":3},
{"x":9.75, "y":3},
{"x":10.75, "y":3},
{"x":11.75, "y":3},
{"x":12.75, "y":3, "w":2.25},
{"x":15, "y":3},
{"x":16, "y":3},
{"x":17, "y":3},
{"x":0, "y":4, "w":2.25},
{"x":2.25, "y":4},
{"x":3.25, "y":4},
{"x":4.25, "y":4},
{"x":5.25, "y":4},
{"x":6.25, "y":4},
{"x":7.25, "y":4},
{"x":8.25, "y":4},
{"x":9.25, "y":4},
{"x":10.25, "y":4},
{"x":11.25, "y":4},
{"x":12.25, "y":4, "w":1.75},
{"x":14, "y":4},
{"x":15, "y":4},
{"x":16, "y":4},
{"x":17, "y":4},
{"x":18, "y":4, "h":2},
{"x":0, "y":5, "w":1.25},
{"x":1.25, "y":5, "w":1.25},
{"x":2.5, "y":5, "w":1.25},
{"x":3.75, "y":5, "w":6.25},
{"x":10, "y":5},
{"x":11, "y":5},
{"x":12, "y":5},
{"x":13, "y":5},
{"x":14, "y":5},
{"x":15, "y":5},
{"x":16, "y":5},
{"x":17, "y":5}
]
}
}
}

View file

@ -0,0 +1,6 @@
[{a:7},"","","","","","","","","","","","","","","","","","",""],
["","","","","","","","","","","","","",{w:2},"","","","",""],
[{w:1.5},"","","","","","","","","","","","","",{w:1.5},"","","","",{h:2},""],
[{w:1.75},"","","","","","","","","","","","",{w:2.25},"","","",""],
[{w:2.25},"","","","","","","","","","","",{w:1.75},"","","","","",{h:2},""],
[{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"","","","","","","","",""]

View file

@ -0,0 +1,3 @@
# 96_ansi
LAYOUT_96_ansi

View file

@ -0,0 +1,43 @@
/* Copyright 2021 QMK
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
*
* EscF1 F2 F3 F4 F5 F6 F7 F8 F9 F10F11F12PScScrPseVo-Vo+Mut
*
*  `  1  2  3  4  5  6  7  8  9  0  -  =  BackspNum /  *  - 
*
*  Tab  Q  W  E  R  T  Y  U  I  O  P  [  ]       7  8  9    
*  Ent + 
*  Caps  A  S  D  F  G  H  J  K  L  ;  '  #      4  5  6    
*
* Sft  \  Z  X  C  V  B  N  M  ,  .  / Shift    1  2  3    
* Ent
* CtrlGUI Alt          Space          AltGUICtl       0  .    
*
*/
[0] = LAYOUT_96_iso(
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, KC_VOLD, KC_VOLU, KC_MUTE,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6,
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT
)
};

View file

@ -0,0 +1,119 @@
{
"keyboard_name": "96% ISO layout",
"url": "",
"maintainer": "qmk",
"width": 19,
"height": 6,
"layouts": {
"LAYOUT_96_iso": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":3, "y":0},
{"x":4, "y":0},
{"x":5, "y":0},
{"x":6, "y":0},
{"x":7, "y":0},
{"x":8, "y":0},
{"x":9, "y":0},
{"x":10, "y":0},
{"x":11, "y":0},
{"x":12, "y":0},
{"x":13, "y":0},
{"x":14, "y":0},
{"x":15, "y":0},
{"x":16, "y":0},
{"x":17, "y":0},
{"x":18, "y":0},
{"x":0, "y":1},
{"x":1, "y":1},
{"x":2, "y":1},
{"x":3, "y":1},
{"x":4, "y":1},
{"x":5, "y":1},
{"x":6, "y":1},
{"x":7, "y":1},
{"x":8, "y":1},
{"x":9, "y":1},
{"x":10, "y":1},
{"x":11, "y":1},
{"x":12, "y":1},
{"x":13, "y":1, "w":2},
{"x":15, "y":1},
{"x":16, "y":1},
{"x":17, "y":1},
{"x":18, "y":1},
{"x":0, "y":2, "w":1.5},
{"x":1.5, "y":2},
{"x":2.5, "y":2},
{"x":3.5, "y":2},
{"x":4.5, "y":2},
{"x":5.5, "y":2},
{"x":6.5, "y":2},
{"x":7.5, "y":2},
{"x":8.5, "y":2},
{"x":9.5, "y":2},
{"x":10.5, "y":2},
{"x":11.5, "y":2},
{"x":12.5, "y":2},
{"x":15, "y":2},
{"x":16, "y":2},
{"x":17, "y":2},
{"x":18, "y":2, "h":2},
{"x":0, "y":3, "w":1.75},
{"x":1.75, "y":3},
{"x":2.75, "y":3},
{"x":3.75, "y":3},
{"x":4.75, "y":3},
{"x":5.75, "y":3},
{"x":6.75, "y":3},
{"x":7.75, "y":3},
{"x":8.75, "y":3},
{"x":9.75, "y":3},
{"x":10.75, "y":3},
{"x":11.75, "y":3},
{"x":12.75, "y":3},
{"x":13.75, "y":2, "w":1.25, "h":2},
{"x":15, "y":3},
{"x":16, "y":3},
{"x":17, "y":3},
{"x":0, "y":4, "w":1.25},
{"x":1.25, "y":4},
{"x":2.25, "y":4},
{"x":3.25, "y":4},
{"x":4.25, "y":4},
{"x":5.25, "y":4},
{"x":6.25, "y":4},
{"x":7.25, "y":4},
{"x":8.25, "y":4},
{"x":9.25, "y":4},
{"x":10.25, "y":4},
{"x":11.25, "y":4},
{"x":12.25, "y":4, "w":1.75},
{"x":14, "y":4},
{"x":15, "y":4},
{"x":16, "y":4},
{"x":17, "y":4},
{"x":18, "y":4, "h":2},
{"x":0, "y":5, "w":1.25},
{"x":1.25, "y":5, "w":1.25},
{"x":2.5, "y":5, "w":1.25},
{"x":3.75, "y":5, "w":6.25},
{"x":10, "y":5},
{"x":11, "y":5},
{"x":12, "y":5},
{"x":13, "y":5},
{"x":14, "y":5},
{"x":15, "y":5},
{"x":16, "y":5},
{"x":17, "y":5}
]
}
}
}

View file

@ -0,0 +1,6 @@
[{a:7},"","","","","","","","","","","","","","","","","","",""],
["","","","","","","","","","","","","",{w:2},"","","","",""],
[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},"","","","",{h:2},""],
[{w:1.75},"","","","","","","","","","","","","",{x:1.25},"","",""],
[{w:1.25},"","","","","","","","","","","","",{w:1.75},"","","","","",{h:2},""],
[{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"","","","","","","","",""]

View file

@ -0,0 +1,3 @@
# 96_iso
LAYOUT_96_iso

View file

@ -440,6 +440,43 @@ LAYOUT_tkl_iso
└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
``` ```
### 96% Form Factor
```
LAYOUT_96_ansi
┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┼───┼───┼───┤
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┼───┼───┼───┤
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┼───┼───┤ │
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┼───┼───┼───┤
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┼───┼───┤ │
│ │ │ │ │ │ │ │ │ │ │ │ │ │
└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
```
```
LAYOUT_96_iso
┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┼───┼───┼───┤
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┼───┼───┼───┤
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ ├───┼───┼───┤ │
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┼───┼───┼───┤
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┼───┼───┤ │
│ │ │ │ │ │ │ │ │ │ │ │ │ │
└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
```
### Fullsize Form Factor ### Fullsize Form Factor
``` ```
@ -483,7 +520,7 @@ LAYOUT_fullsize_iso
``` ```
LAYOUT_alice LAYOUT_alice
┌───┐  ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───────┐ ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───────┐
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
┌┴──┬┘ ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┴┐ ┌┴──┬┘ ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┴┐
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
@ -498,7 +535,7 @@ LAYOUT_alice
``` ```
LAYOUT_alice_split_bs LAYOUT_alice_split_bs
┌───┐  ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
┌┴──┬┘ ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┐ ┌┴──┬┘ ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┐
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │