ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
QMK Bot 2021-07-20 00:30:40 +00:00
commit f9332747e3
39 changed files with 335 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
layouts/community/ortho_1x4/readme.md Normal file
View file

@ -0,0 +1,3 @@
# ortho_1x4
LAYOUT_ortho_1x4

2
layouts/community/ortho_2x3/layout.json Normal file
View file

@ -0,0 +1,2 @@
["","",""],
["","",""]

3
layouts/community/ortho_2x3/readme.md Normal file
View file

@ -0,0 +1,3 @@
# ortho_2x3
LAYOUT_ortho_2x3

2
layouts/community/ortho_2x6/layout.json Normal file
View file

@ -0,0 +1,2 @@
["","","","","",""],
["","","","","",""]

3
layouts/community/ortho_2x6/readme.md Normal file
View file

@ -0,0 +1,3 @@
# ortho_2x6
LAYOUT_ortho_2x6

6
layouts/community/ortho_5x5/layout.json
View file

@ -1 +1,5 @@
["","","","",""],["","","","",""],["","","","",""],["","","","",""],["","","","",""]
["","","","",""],
["","","","",""],
["","","","",""],
["","","","",""],
["","","","",""]

15
layouts/default/ortho_2x3/default_ortho_2x3/keymap.c Normal file
View file

@ -0,0 +1,15 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
* ┌───┬───┬───┐
* │ A │ B │ C │
* ├───┼───┼───┤
* │ D │ E │ F │
* └───┴───┴───┘
*/
[0] = LAYOUT_ortho_2x3(
KC_A, KC_B, KC_C,
KC_D, KC_E, KC_F
)
};

20
layouts/default/ortho_2x3/info.json Normal file
View file

@ -0,0 +1,20 @@
{
"keyboard_name": "2x3 ortholinear layout",
"url": "",
"maintainer": "qmk",
"width": 3,
"height": 2,
"layouts": {
"LAYOUT_ortho_2x3": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":0, "y":1},
{"x":1, "y":1},
{"x":2, "y":1}
]
}
}
}

2
layouts/default/ortho_2x3/layout.json Normal file
View file

@ -0,0 +1,2 @@
["","",""],
["","",""]

3
layouts/default/ortho_2x3/readme.md Normal file
View file

@ -0,0 +1,3 @@
# ortho_2x3
LAYOUT_ortho_2x3

15
layouts/default/ortho_2x6/default_ortho_2x6/keymap.c Normal file
View file

@ -0,0 +1,15 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
* ┌───┬───┬───┬───┬───┬───┐
* │ A │ B │ C │ D │ E │ F │
* ├───┼───┼───┼───┼───┼───┤
* │ G │ H │ I │ J │ K │ L │
* └───┴───┴───┴───┴───┴───┘
*/
[0] = LAYOUT_ortho_2x6(
KC_A, KC_B, KC_C, KC_D, KC_E, KC_F,
KC_G, KC_H, KC_I, KC_J, KC_K, KC_L
)
};

26
layouts/default/ortho_2x6/info.json Normal file
View file

@ -0,0 +1,26 @@
{
"keyboard_name": "2x6 ortholinear layout",
"url": "",
"maintainer": "qmk",
"width": 6,
"height": 2,
"layouts": {
"LAYOUT_ortho_2x6": {
"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":0, "y":1},
{"x":1, "y":1},
{"x":2, "y":1},
{"x":3, "y":1},
{"x":4, "y":1},
{"x":5, "y":1}
]
}
}
}

2
layouts/default/ortho_2x6/layout.json Normal file
View file

@ -0,0 +1,2 @@
["","","","","",""],
["","","","","",""]

3
layouts/default/ortho_2x6/readme.md Normal file
View file

@ -0,0 +1,3 @@
# ortho_2x6
LAYOUT_ortho_2x6

24
layouts/default/ortho_5x10/default_ortho_5x10/keymap.c Normal file
View file

@ -0,0 +1,24 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
* │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │
* ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
* │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │
* ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
* │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │
* ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
* │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │
* ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
* │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │
* └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
*/
[0] = LAYOUT_ortho_5x10(
KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J,
KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J,
KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J,
KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J,
KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J
)
};

67
layouts/default/ortho_5x10/info.json Normal file
View file

@ -0,0 +1,67 @@
{
"keyboard_name": "5x10 ortholinear layout",
"url": "",
"maintainer": "qmk",
"width": 10,
"height": 5,
"layouts": {
"LAYOUT_ortho_5x10": {
"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":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":0, "y":2},
{"x":1, "y":2},
{"x":2, "y":2},
{"x":3, "y":2},
{"x":4, "y":2},
{"x":5, "y":2},
{"x":6, "y":2},
{"x":7, "y":2},
{"x":8, "y":2},
{"x":9, "y":2},
{"x":0, "y":3},
{"x":1, "y":3},
{"x":2, "y":3},
{"x":3, "y":3},
{"x":4, "y":3},
{"x":5, "y":3},
{"x":6, "y":3},
{"x":7, "y":3},
{"x":8, "y":3},
{"x":9, "y":3},
{"x":0, "y":4},
{"x":1, "y":4},
{"x":2, "y":4},
{"x":3, "y":4},
{"x":4, "y":4},
{"x":5, "y":4},
{"x":6, "y":4},
{"x":7, "y":4},
{"x":8, "y":4},
{"x":9, "y":4},
]
}
}
}

5
layouts/default/ortho_5x10/layout.json Normal file
View file

@ -0,0 +1,5 @@
[{a:7},"","","","","","","","","",""],
["","","","","","","","","",""],
["","","","","","","","","",""],
["","","","","","","","","",""],
["","","","","","","","","",""]

3
layouts/default/ortho_5x10/readme.md Normal file
View file

@ -0,0 +1,3 @@
# ortho_5x10
LAYOUT_ortho_5x10

42
layouts/default/ortho_5x5/info.json Normal file
View file

@ -0,0 +1,42 @@
{
"keyboard_name": "5x5 ortholinear layout",
"url": "",
"maintainer": "qmk",
"width": 5,
"height": 5,
"layouts": {
"LAYOUT_ortho_5x5": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":3, "y":0},
{"x":4, "y":0},
{"x":0, "y":1},
{"x":1, "y":1},
{"x":2, "y":1},
{"x":3, "y":1},
{"x":4, "y":1},
{"x":0, "y":2},
{"x":1, "y":2},
{"x":2, "y":2},
{"x":3, "y":2},
{"x":4, "y":2},
{"x":0, "y":3},
{"x":1, "y":3},
{"x":2, "y":3},
{"x":3, "y":3},
{"x":4, "y":3},
{"x":0, "y":4},
{"x":1, "y":4},
{"x":2, "y":4},
{"x":3, "y":4},
{"x":4, "y":4}
]
}
}
}

5
layouts/default/ortho_5x5/layout.json Normal file
View file

@ -0,0 +1,5 @@
["","","","",""],
["","","","",""],
["","","","",""],
["","","","",""],
["","","","",""]

3
layouts/default/ortho_5x5/readme.md Normal file
View file

@ -0,0 +1,3 @@
# ortho_5x5
LAYOUT_ortho_5x5

48
layouts/default/readme.md
View file

@ -660,6 +660,24 @@ LAYOUT_numpad_6x4
### Ortholinear Layouts
```
LAYOUT_ortho_2x3
┌───┬───┬───┐
│ │ │ │
├───┼───┼───┤
│ │ │ │
└───┴───┴───┘
```
```
LAYOUT_ortho_2x6
┌───┬───┬───┬───┬───┬───┐
│ │ │ │ │ │ │
├───┼───┼───┼───┼───┼───┤
│ │ │ │ │ │ │
└───┴───┴───┴───┴───┴───┘
```
```
LAYOUT_ortho_3x10
┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
@ -710,6 +728,36 @@ LAYOUT_ortho_4x4
└───┴───┴───┴───┘
```
```
LAYOUT_ortho_5x5
┌───┬───┬───┬───┬───┐
│ │ │ │ │ │
├───┼───┼───┼───┼───┤
│ │ │ │ │ │
├───┼───┼───┼───┼───┤
│ │ │ │ │ │
├───┼───┼───┼───┼───┤
│ │ │ │ │ │
├───┼───┼───┼───┼───┤
│ │ │ │ │ │
└───┴───┴───┴───┴───┘
```
```
LAYOUT_ortho_5x10
┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
│ │ │ │ │ │ │ │ │ │ │
├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
│ │ │ │ │ │ │ │ │ │ │
├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
│ │ │ │ │ │ │ │ │ │ │
├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
│ │ │ │ │ │ │ │ │ │ │
├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
│ │ │ │ │ │ │ │ │ │ │
└───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
```
```
LAYOUT_ortho_5x12
┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐