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

This commit is contained in:
QMK Bot 2023-09-20 06:36:13 +00:00
commit c2c7b7af7a
4 changed files with 68 additions and 17 deletions

View File

@ -31,28 +31,61 @@
"vid": "0x414B"
},
"community_layouts": [
"ortho_5x4",
"numpad_5x4"
],
"layouts": {
"LAYOUT_ortho_5x4": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1, "y": 3},
{"matrix": [3, 2], "x": 2, "y": 3},
{"matrix": [3, 3], "x": 3, "y": 3},
{"matrix": [4, 0], "x": 0, "y": 4},
{"matrix": [4, 1], "x": 1, "y": 4},
{"matrix": [4, 2], "x": 2, "y": 4},
{"matrix": [4, 3], "x": 3, "y": 4}
]
},
"LAYOUT_numpad_5x4": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2},
{"h": 2, "matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1, "y": 3},
{"matrix": [3, 2], "x": 2, "y": 3},
{"matrix": [4, 0], "w": 2, "x": 0, "y": 4},
{"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
{"matrix": [4, 2], "x": 2, "y": 4},
{"h": 2, "matrix": [3, 3], "x": 3, "y": 3}
{"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
]
}
}

View File

@ -6,7 +6,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
*
* TG1 / * -
* NUM / * -
*
* 7 8 9
* +
@ -27,16 +27,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
*
* TG1 / * -
*
* NUM / * -
*
* Hom PgU
* +
*
*
*
* End PgD
* Ent
* Insert Del
*
*
*/
[1] = LAYOUT_numpad_5x4(
_______, _______, _______, _______,

View File

@ -27,16 +27,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
*
* / * -
*
* NUM / * -
*
* Hom PgU
* +
*
*
*
* End PgD
* Ent
* Insert Del
*
*
*/
[1] = LAYOUT_numpad_5x4(
_______, _______, _______, _______,

View File

@ -0,0 +1,18 @@
# Matrix Diagram for Alchemist Keyboards OGRN
```
┌───┬───┬───┬───┐
│00 │01 │02 │03 │
┌───┐ ├───┼───┼───┼───┤ ┌───┐
│ │ │10 │11 │12 │13 │ │ │
│10 │ ├───┼───┼───┼───┤ │13 │ 2u Numpad Plus
│ │ │20 │21 │22 │23 │ │ │
├───┤ ├───┼───┼───┼───┤ ├───┤
│ │ │30 │31 │32 │33 │ │ │
│30 │ ├───┼───┼───┼───┤ │33 │ 2u Numpad Enter
│ │ │40 │41 │42 │43 │ │ │
└───┘ └───┴───┴───┴───┘ └───┘
┌───────┬───────┐
│41 │42 │
└───────┴───────┘
```