gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-03-01 02:33:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Drashna Jael're 2023-05-08 13:28:59 -07:00
commit 5048473f71
No known key found for this signature in database
GPG Key ID: DBA1FD3A860D1B11
29 changed files with 913 additions and 406 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/feature_led_matrix.md
View File

@ -378,13 +378,7 @@ For inspiration and examples, check out the built-in effects under `quantum/led_
## EEPROM storage :id=eeprom-storage
The EEPROM for it is currently shared with the RGB Matrix system (it's generally assumed only one feature would be used at a time), but could be configured to use its own 32bit address with:
```c
#define EECONFIG_LED_MATRIX (uint32_t *)28
```
Where `28` is an unused index from `eeconfig.h`.
The EEPROM for it is currently shared with the RGB Matrix system (it's generally assumed only one feature would be used at a time).
### Direct Operation :id=direct-operation
|Function |Description |

8
docs/feature_rgb_matrix.md
View File

@ -893,13 +893,7 @@ These are defined in [`color.h`](https://github.com/qmk/qmk_firmware/blob/master
## EEPROM storage :id=eeprom-storage
The EEPROM for it is currently shared with the LED Matrix system (it's generally assumed only one feature would be used at a time), but could be configured to use its own 32bit address with:
```c
#define EECONFIG_RGB_MATRIX (uint32_t *)28
```
Where `28` is an unused index from `eeconfig.h`.
The EEPROM for it is currently shared with the LED Matrix system (it's generally assumed only one feature would be used at a time).
## Functions :id=functions

209
keyboards/peej/rosaline/staggered/info.json
View File

@ -22,60 +22,167 @@
"layouts": {
"LAYOUT_all": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
{"matrix": [1, 0], "x": 1.5, "y": 0},
{"matrix": [0, 1], "x": 2.5, "y": 0},
{"matrix": [0, 2], "x": 3.5, "y": 0},
{"matrix": [1, 2], "x": 4.5, "y": 0},
{"matrix": [0, 3], "x": 5.5, "y": 0},
{"matrix": [1, 3], "x": 6.5, "y": 0},
{"matrix": [0, 4], "x": 7.5, "y": 0},
{"matrix": [1, 4], "x": 8.5, "y": 0},
{"matrix": [0, 5], "x": 9.5, "y": 0},
{"matrix": [0, 6], "x": 10.5, "y": 0},
{"matrix": [1, 6], "x": 11.5, "y": 0},
{"matrix": [0, 7], "x": 12.5, "y": 0},
{"matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5},
{"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
{"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0},
{"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0},
{"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0},
{"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0},
{"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0},
{"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0},
{"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0},
{"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0},
{"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0},
{"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0},
{"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0},
{"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0},
{"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5},
{"matrix": [2, 0], "x": 0, "y": 1, "w": 1.75},
{"matrix": [1, 1], "x": 1.75, "y": 1},
{"matrix": [2, 1], "x": 2.75, "y": 1},
{"matrix": [2, 2], "x": 3.75, "y": 1},
{"matrix": [3, 2], "x": 4.75, "y": 1},
{"matrix": [2, 3], "x": 5.75, "y": 1},
{"matrix": [3, 3], "x": 6.75, "y": 1},
{"matrix": [2, 4], "x": 7.75, "y": 1},
{"matrix": [1, 5], "x": 8.75, "y": 1},
{"matrix": [2, 5], "x": 9.75, "y": 1},
{"matrix": [2, 6], "x": 10.75, "y": 1},
{"matrix": [3, 6], "x": 11.75, "y": 1},
{"matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25},
{"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75},
{"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1},
{"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1},
{"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1},
{"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1},
{"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1},
{"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1},
{"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1},
{"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1},
{"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1},
{"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1},
{"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1},
{"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25},
{"matrix": [3, 0], "x": 0, "y": 2, "w": 2.25},
{"matrix": [3, 1], "x": 2.25, "y": 2},
{"matrix": [4, 1], "x": 3.25, "y": 2},
{"matrix": [4, 2], "x": 4.25, "y": 2},
{"matrix": [4, 3], "x": 5.25, "y": 2},
{"matrix": [5, 3], "x": 6.25, "y": 2},
{"matrix": [3, 4], "x": 7.25, "y": 2},
{"matrix": [4, 4], "x": 8.25, "y": 2},
{"matrix": [3, 5], "x": 9.25, "y": 2},
{"matrix": [4, 5], "x": 10.25, "y": 2},
{"matrix": [4, 6], "x": 11.25, "y": 2},
{"matrix": [3, 7], "x": 12.25, "y": 2, "w": 1.75},
{"matrix": [4, 7], "x": 14, "y": 2},
{"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25},
{"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2},
{"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2},
{"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2},
{"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2},
{"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2},
{"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2},
{"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2},
{"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2},
{"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2},
{"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2},
{"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 1.75},
{"label": "Fn", "matrix": [4, 7], "x": 14, "y": 2},
{"matrix": [4, 0], "x": 0, "y": 3, "w": 1.5},
{"matrix": [5, 0], "x": 1.5, "y": 3},
{"matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5},
{"matrix": [5, 2], "x": 4, "y": 3, "w": 2.75},
{"matrix": [5, 4], "x": 6.75, "y": 3},
{"matrix": [5, 5], "x": 7.75, "y": 3, "w": 2.25},
{"matrix": [6, 5], "x": 10, "y": 3},
{"matrix": [5, 6], "x": 11, "y": 3},
{"matrix": [6, 6], "x": 12, "y": 3},
{"matrix": [5, 7], "x": 13, "y": 3},
{"matrix": [6, 7], "x": 14, "y": 3}
{"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5},
{"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3},
{"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5},
{"label": "Space", "matrix": [5, 2], "x": 4, "y": 3, "w": 2.75},
{"label": "Space", "matrix": [5, 4], "x": 6.75, "y": 3},
{"label": "Alt", "matrix": [5, 5], "x": 7.75, "y": 3, "w": 2.25},
{"label": "Ctrl", "matrix": [6, 5], "x": 10, "y": 3},
{"label": "\u2190", "matrix": [5, 6], "x": 11, "y": 3},
{"label": "\u2193", "matrix": [6, 6], "x": 12, "y": 3},
{"label": "\u2191", "matrix": [5, 7], "x": 13, "y": 3},
{"label": "\u2192", "matrix": [6, 7], "x": 14, "y": 3}
]
},
"LAYOUT_tsangan": {
"layout": [
{"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
{"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0},
{"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0},
{"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0},
{"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0},
{"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0},
{"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0},
{"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0},
{"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0},
{"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0},
{"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0},
{"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0},
{"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0},
{"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5},
{"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75},
{"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1},
{"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1},
{"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1},
{"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1},
{"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1},
{"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1},
{"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1},
{"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1},
{"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1},
{"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1},
{"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1},
{"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25},
{"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25},
{"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2},
{"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2},
{"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2},
{"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2},
{"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2},
{"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2},
{"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2},
{"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2},
{"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2},
{"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2},
{"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 2.75},
{"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5},
{"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3},
{"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5},
{"label": "Space", "matrix": [5, 4], "x": 4, "y": 3, "w":7},
{"label": "Alt", "matrix": [5, 6], "x": 11, "y": 3, "w": 1.5},
{"label": "Fn", "matrix": [6, 6], "x": 12.5, "y": 3},
{"label": "Ctrl", "matrix": [5, 7], "x": 13.5, "y": 3, "w": 1.5}
]
},
"LAYOUT_tsangan_split_rshift": {
"layout": [
{"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
{"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0},
{"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0},
{"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0},
{"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0},
{"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0},
{"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0},
{"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0},
{"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0},
{"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0},
{"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0},
{"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0},
{"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0},
{"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5},
{"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75},
{"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1},
{"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1},
{"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1},
{"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1},
{"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1},
{"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1},
{"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1},
{"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1},
{"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1},
{"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1},
{"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1},
{"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25},
{"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25},
{"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2},
{"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2},
{"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2},
{"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2},
{"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2},
{"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2},
{"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2},
{"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2},
{"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2},
{"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2},
{"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 1.75},
{"label": "Fn", "matrix": [4, 7], "x": 14, "y": 2},
{"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5},
{"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3},
{"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5},
{"label": "Space", "matrix": [5, 4], "x": 4, "y": 3, "w":7},
{"label": "Alt", "matrix": [5, 6], "x": 11, "y": 3, "w": 1.5},
{"label": "Fn", "matrix": [6, 6], "x": 12.5, "y": 3},
{"label": "Ctrl", "matrix": [5, 7], "x": 13.5, "y": 3, "w": 1.5}
]
}
}

33
keyboards/peej/rosaline/staggered/matrix_diagram.md Normal file
View File

@ -0,0 +1,33 @@
# Matrix Diagram for Peej Rosaline Staggered
```
┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
│00 │10 │01 │02 │12 │03 │13 │04 │14 │05 │06 │16 │07 │17 │
├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
│20 │11 │21 │22 │32 │23 │33 │24 │15 │25 │26 │36 │27 │
└──────┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴────────┘
─ Shift Row ─────────────────────────────────────────────────
┌────────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬──────────────┐ ┌───┬──────┬───┐
│30 │31 │41 │42 │43 │53 │34 │44 │35 │45 │ [RShift]──── │ ─┬─ │46 │37 │47 │ 1u/1.75u/1u
└────────┴───┴───┴───┴───┴───┴───┴───┴───┴───┴──────────────┘ │ └───┴──────┴───┘
│ ┌──────┬───┬───┐
├─ │46 │37 │47 │ 1.75u/1u/1u
│ └──────┴───┴───┘
│ ┌───┬──────────┐
└─ │46 │37 │ 1u/2.75u
└───┴──────────┘
─ Bottom Row ────────────────────────────────────────────────
┌─────┬───┬─────┬───────────────────────────┬───────────────┐ ┌───┬───┬───┬───┐
│40 │50 │51 │ [Spacebar]─┐ │ [Bot. Right]─ │ ─┬─ │56 │66 │57 │67 │ 1u
└─────┴───┴─────┴───────────────────────────┴───────────────┘ │ └───┴───┴───┴───┘
┌────────────┴──────────────┐ │ ┌─────┬───┬─────┐
┌──────────┬────────┬───┬───┐ └─ │56 │66 │57 │ Tsangan
Split │52 │54 │55 │65 │ └─────┴───┴─────┘
└──────────┴────────┴───┴───┘
┌──────────┬───┬────────┬───┐
Split Fn │52 │54 │55 │65 │
└──────────┴───┴────────┴───┘
┌───────────────────────────┐
7u Spacebar │54 │
└───────────────────────────┘
```

222
keyboards/plywrks/lune/info.json
View File

@ -18,87 +18,175 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {
"LAYOUT_all": "LAYOUT_alice_split_bs"
},
"community_layouts": [
"alice",
"alice_split_bs"
],
"layouts": {
"LAYOUT_all": {
"LAYOUT_alice": {
"layout": [
{"matrix": [0, 0], "x": 0.5, "y": 0},
{"label": "Delete", "matrix": [0, 0], "x": 0.5, "y": 0},
{"matrix": [1, 0], "x": 1.75, "y": 0},
{"matrix": [0, 1], "x": 2.75, "y": 0},
{"matrix": [1, 1], "x": 3.75, "y": 0},
{"matrix": [0, 2], "x": 4.75, "y": 0},
{"matrix": [1, 2], "x": 5.75, "y": 0},
{"matrix": [0, 3], "x": 6.75, "y": 0},
{"matrix": [1, 3], "x": 7.75, "y": 0},
{"label": "Esc", "matrix": [1, 0], "x": 1.75, "y": 0},
{"label": "1", "matrix": [0, 1], "x": 2.75, "y": 0},
{"label": "2", "matrix": [1, 1], "x": 3.75, "y": 0},
{"label": "3", "matrix": [0, 2], "x": 4.75, "y": 0},
{"label": "4", "matrix": [1, 2], "x": 5.75, "y": 0},
{"label": "5", "matrix": [0, 3], "x": 6.75, "y": 0},
{"label": "6", "matrix": [1, 3], "x": 7.75, "y": 0},
{"matrix": [0, 4], "x": 10, "y": 0},
{"matrix": [1, 4], "x": 11, "y": 0},
{"matrix": [0, 5], "x": 12, "y": 0},
{"matrix": [1, 5], "x": 13, "y": 0},
{"matrix": [0, 6], "x": 14, "y": 0},
{"matrix": [1, 6], "x": 15, "y": 0},
{"matrix": [0, 7], "x": 16, "y": 0},
{"matrix": [1, 7], "x": 17, "y": 0},
{"label": "7", "matrix": [0, 4], "x": 10, "y": 0},
{"label": "8", "matrix": [1, 4], "x": 11, "y": 0},
{"label": "9", "matrix": [0, 5], "x": 12, "y": 0},
{"label": "0", "matrix": [1, 5], "x": 13, "y": 0},
{"label": "-", "matrix": [0, 6], "x": 14, "y": 0},
{"label": "=", "matrix": [1, 6], "x": 15, "y": 0},
{"label": "Backspace", "matrix": [1, 7], "x": 16, "y": 0, "w": 2},
{"matrix": [2, 0], "x": 0.25, "y": 1},
{"label": "Page Up", "matrix": [2, 0], "x": 0.25, "y": 1},
{"matrix": [3, 0], "x": 1.5, "y": 1, "w": 1.5},
{"matrix": [2, 1], "x": 3, "y": 1},
{"matrix": [3, 1], "x": 4, "y": 1},
{"matrix": [2, 2], "x": 5, "y": 1},
{"matrix": [3, 2], "x": 6, "y": 1},
{"matrix": [2, 3], "x": 7, "y": 1},
{"label": "Tab", "matrix": [3, 0], "x": 1.5, "y": 1, "w": 1.5},
{"label": "Q", "matrix": [2, 1], "x": 3, "y": 1},
{"label": "W", "matrix": [3, 1], "x": 4, "y": 1},
{"label": "E", "matrix": [2, 2], "x": 5, "y": 1},
{"label": "R", "matrix": [3, 2], "x": 6, "y": 1},
{"label": "T", "matrix": [2, 3], "x": 7, "y": 1},
{"matrix": [2, 4], "x": 9.5, "y": 1},
{"matrix": [3, 4], "x": 10.5, "y": 1},
{"matrix": [2, 5], "x": 11.5, "y": 1},
{"matrix": [3, 5], "x": 12.5, "y": 1},
{"matrix": [2, 6], "x": 13.5, "y": 1},
{"matrix": [3, 6], "x": 14.5, "y": 1},
{"matrix": [2, 7], "x": 15.5, "y": 1},
{"matrix": [3, 7], "x": 16.5, "y": 1, "w": 1.5},
{"label": "Y", "matrix": [2, 4], "x": 9.5, "y": 1},
{"label": "U", "matrix": [3, 4], "x": 10.5, "y": 1},
{"label": "I", "matrix": [2, 5], "x": 11.5, "y": 1},
{"label": "O", "matrix": [3, 5], "x": 12.5, "y": 1},
{"label": "P", "matrix": [2, 6], "x": 13.5, "y": 1},
{"label": "[", "matrix": [3, 6], "x": 14.5, "y": 1},
{"label": "]", "matrix": [2, 7], "x": 15.5, "y": 1},
{"label": "\\", "matrix": [3, 7], "x": 16.5, "y": 1, "w": 1.5},
{"matrix": [4, 0], "x": 0, "y": 2},
{"label": "Page Down", "matrix": [4, 0], "x": 0, "y": 2},
{"matrix": [5, 0], "x": 1.5, "y": 2, "w": 1.75},
{"matrix": [4, 1], "x": 3.25, "y": 2},
{"matrix": [5, 1], "x": 4.25, "y": 2},
{"matrix": [4, 2], "x": 5.25, "y": 2},
{"matrix": [5, 2], "x": 6.25, "y": 2},
{"matrix": [4, 3], "x": 7.25, "y": 2},
{"label": "Caps Lock", "matrix": [5, 0], "x": 1.5, "y": 2, "w": 1.75},
{"label": "A", "matrix": [4, 1], "x": 3.25, "y": 2},
{"label": "S", "matrix": [5, 1], "x": 4.25, "y": 2},
{"label": "D", "matrix": [4, 2], "x": 5.25, "y": 2},
{"label": "F", "matrix": [5, 2], "x": 6.25, "y": 2},
{"label": "G", "matrix": [4, 3], "x": 7.25, "y": 2},
{"matrix": [4, 4], "x": 9.75, "y": 2},
{"matrix": [5, 4], "x": 10.75, "y": 2},
{"matrix": [4, 5], "x": 11.75, "y": 2},
{"matrix": [5, 5], "x": 12.75, "y": 2},
{"matrix": [4, 6], "x": 13.75, "y": 2},
{"matrix": [5, 6], "x": 14.75, "y": 2},
{"matrix": [5, 7], "x": 15.75, "y": 2, "w": 2.25},
{"label": "H", "matrix": [4, 4], "x": 9.75, "y": 2},
{"label": "J", "matrix": [5, 4], "x": 10.75, "y": 2},
{"label": "K", "matrix": [4, 5], "x": 11.75, "y": 2},
{"label": "L", "matrix": [5, 5], "x": 12.75, "y": 2},
{"label": ";", "matrix": [4, 6], "x": 13.75, "y": 2},
{"label": "'", "matrix": [5, 6], "x": 14.75, "y": 2},
{"label": "Enter", "matrix": [5, 7], "x": 15.75, "y": 2, "w": 2.25},
{"matrix": [7, 0], "x": 1.5, "y": 3, "w": 2.25},
{"matrix": [6, 1], "x": 3.75, "y": 3},
{"matrix": [7, 1], "x": 4.75, "y": 3},
{"matrix": [6, 2], "x": 5.75, "y": 3},
{"matrix": [7, 2], "x": 6.75, "y": 3},
{"matrix": [6, 3], "x": 7.75, "y": 3},
{"label": "Shift", "matrix": [7, 0], "x": 1.5, "y": 3, "w": 2.25},
{"label": "Z", "matrix": [6, 1], "x": 3.75, "y": 3},
{"label": "X", "matrix": [7, 1], "x": 4.75, "y": 3},
{"label": "C", "matrix": [6, 2], "x": 5.75, "y": 3},
{"label": "V", "matrix": [7, 2], "x": 6.75, "y": 3},
{"label": "B", "matrix": [6, 3], "x": 7.75, "y": 3},
{"matrix": [6, 4], "x": 9.25, "y": 3},
{"matrix": [7, 4], "x": 10.25, "y": 3},
{"matrix": [6, 5], "x": 11.25, "y": 3},
{"matrix": [7, 5], "x": 12.25, "y": 3},
{"matrix": [6, 6], "x": 13.25, "y": 3},
{"matrix": [7, 6], "x": 14.25, "y": 3},
{"matrix": [6, 7], "x": 15.25, "y": 3, "w": 1.75},
{"matrix": [7, 7], "x": 17, "y": 3},
{"label": "B", "matrix": [6, 4], "x": 9.25, "y": 3},
{"label": "N", "matrix": [7, 4], "x": 10.25, "y": 3},
{"label": "M", "matrix": [6, 5], "x": 11.25, "y": 3},
{"label": ",", "matrix": [7, 5], "x": 12.25, "y": 3},
{"label": ".", "matrix": [6, 6], "x": 13.25, "y": 3},
{"label": "/", "matrix": [7, 6], "x": 14.25, "y": 3},
{"label": "Shift", "matrix": [6, 7], "x": 15.25, "y": 3, "w": 1.75},
{"label": "Fn", "matrix": [7, 7], "x": 17, "y": 3},
{"matrix": [8, 0], "x": 1.5, "y": 4, "w": 1.5},
{"matrix": [8, 1], "x": 4, "y": 4, "w": 1.5},
{"matrix": [8, 2], "x": 5.5, "y": 4, "w": 2},
{"matrix": [8, 3], "x": 7.5, "y": 4, "w": 1.25},
{"label": "Ctrl", "matrix": [8, 0], "x": 1.5, "y": 4, "w": 1.5},
{"label": "Alt", "matrix": [8, 1], "x": 4, "y": 4, "w": 1.5},
{"label": "Space", "matrix": [8, 2], "x": 5.5, "y": 4, "w": 2},
{"label": "Fn", "matrix": [8, 3], "x": 7.5, "y": 4, "w": 1.25},
{"matrix": [8, 4], "x": 9.25, "y": 4, "w": 2.75},
{"matrix": [8, 5], "x": 12, "y": 4, "w": 1.5},
{"matrix": [8, 7], "x": 16.5, "y": 4, "w": 1.5}
{"label": "Space", "matrix": [8, 4], "x": 9.25, "y": 4, "w": 2.75},
{"label": "Alt", "matrix": [8, 5], "x": 12, "y": 4, "w": 1.5},
{"label": "Ctrl", "matrix": [8, 7], "x": 16.5, "y": 4, "w": 1.5}
]
},
"LAYOUT_alice_split_bs": {
"layout": [
{"label": "Delete", "matrix": [0, 0], "x": 0.5, "y": 0},
{"label": "Esc", "matrix": [1, 0], "x": 1.75, "y": 0},
{"label": "1", "matrix": [0, 1], "x": 2.75, "y": 0},
{"label": "2", "matrix": [1, 1], "x": 3.75, "y": 0},
{"label": "3", "matrix": [0, 2], "x": 4.75, "y": 0},
{"label": "4", "matrix": [1, 2], "x": 5.75, "y": 0},
{"label": "5", "matrix": [0, 3], "x": 6.75, "y": 0},
{"label": "6", "matrix": [1, 3], "x": 7.75, "y": 0},
{"label": "7", "matrix": [0, 4], "x": 10, "y": 0},
{"label": "8", "matrix": [1, 4], "x": 11, "y": 0},
{"label": "9", "matrix": [0, 5], "x": 12, "y": 0},
{"label": "0", "matrix": [1, 5], "x": 13, "y": 0},
{"label": "-", "matrix": [0, 6], "x": 14, "y": 0},
{"label": "=", "matrix": [1, 6], "x": 15, "y": 0},
{"label": "Backspace", "matrix": [0, 7], "x": 16, "y": 0},
{"label": "Backspace", "matrix": [1, 7], "x": 17, "y": 0},
{"label": "Page Up", "matrix": [2, 0], "x": 0.25, "y": 1},
{"label": "Tab", "matrix": [3, 0], "x": 1.5, "y": 1, "w": 1.5},
{"label": "Q", "matrix": [2, 1], "x": 3, "y": 1},
{"label": "W", "matrix": [3, 1], "x": 4, "y": 1},
{"label": "E", "matrix": [2, 2], "x": 5, "y": 1},
{"label": "R", "matrix": [3, 2], "x": 6, "y": 1},
{"label": "T", "matrix": [2, 3], "x": 7, "y": 1},
{"label": "Y", "matrix": [2, 4], "x": 9.5, "y": 1},
{"label": "U", "matrix": [3, 4], "x": 10.5, "y": 1},
{"label": "I", "matrix": [2, 5], "x": 11.5, "y": 1},
{"label": "O", "matrix": [3, 5], "x": 12.5, "y": 1},
{"label": "P", "matrix": [2, 6], "x": 13.5, "y": 1},
{"label": "[", "matrix": [3, 6], "x": 14.5, "y": 1},
{"label": "]", "matrix": [2, 7], "x": 15.5, "y": 1},
{"label": "\\", "matrix": [3, 7], "x": 16.5, "y": 1, "w": 1.5},
{"label": "Page Down", "matrix": [4, 0], "x": 0, "y": 2},
{"label": "Caps Lock", "matrix": [5, 0], "x": 1.5, "y": 2, "w": 1.75},
{"label": "A", "matrix": [4, 1], "x": 3.25, "y": 2},
{"label": "S", "matrix": [5, 1], "x": 4.25, "y": 2},
{"label": "D", "matrix": [4, 2], "x": 5.25, "y": 2},
{"label": "F", "matrix": [5, 2], "x": 6.25, "y": 2},
{"label": "G", "matrix": [4, 3], "x": 7.25, "y": 2},
{"label": "H", "matrix": [4, 4], "x": 9.75, "y": 2},
{"label": "J", "matrix": [5, 4], "x": 10.75, "y": 2},
{"label": "K", "matrix": [4, 5], "x": 11.75, "y": 2},
{"label": "L", "matrix": [5, 5], "x": 12.75, "y": 2},
{"label": ";", "matrix": [4, 6], "x": 13.75, "y": 2},
{"label": "'", "matrix": [5, 6], "x": 14.75, "y": 2},
{"label": "Enter", "matrix": [5, 7], "x": 15.75, "y": 2, "w": 2.25},
{"label": "Shift", "matrix": [7, 0], "x": 1.5, "y": 3, "w": 2.25},
{"label": "Z", "matrix": [6, 1], "x": 3.75, "y": 3},
{"label": "X", "matrix": [7, 1], "x": 4.75, "y": 3},
{"label": "C", "matrix": [6, 2], "x": 5.75, "y": 3},
{"label": "V", "matrix": [7, 2], "x": 6.75, "y": 3},
{"label": "B", "matrix": [6, 3], "x": 7.75, "y": 3},
{"label": "B", "matrix": [6, 4], "x": 9.25, "y": 3},
{"label": "N", "matrix": [7, 4], "x": 10.25, "y": 3},
{"label": "M", "matrix": [6, 5], "x": 11.25, "y": 3},
{"label": ",", "matrix": [7, 5], "x": 12.25, "y": 3},
{"label": ".", "matrix": [6, 6], "x": 13.25, "y": 3},
{"label": "/", "matrix": [7, 6], "x": 14.25, "y": 3},
{"label": "Shift", "matrix": [6, 7], "x": 15.25, "y": 3, "w": 1.75},
{"label": "Fn", "matrix": [7, 7], "x": 17, "y": 3},
{"label": "Ctrl", "matrix": [8, 0], "x": 1.5, "y": 4, "w": 1.5},
{"label": "Alt", "matrix": [8, 1], "x": 4, "y": 4, "w": 1.5},
{"label": "Space", "matrix": [8, 2], "x": 5.5, "y": 4, "w": 2},
{"label": "Fn", "matrix": [8, 3], "x": 7.5, "y": 4, "w": 1.25},
{"label": "Space", "matrix": [8, 4], "x": 9.25, "y": 4, "w": 2.75},
{"label": "Alt", "matrix": [8, 5], "x": 12, "y": 4, "w": 1.5},
{"label": "Ctrl", "matrix": [8, 7], "x": 16.5, "y": 4, "w": 1.5}
]
}
}

4
keyboards/plywrks/lune/keymaps/default/keymap.c
View File

@ -16,14 +16,14 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all(
[0] = LAYOUT_alice_split_bs(
KC_DEL, KC_ESC, 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_BSPC,
KC_PGUP, 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_PGDN, 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL
),
[1] = LAYOUT_all(
[1] = LAYOUT_alice_split_bs(
QK_BOOT, _______, 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_DEL, KC_DEL,
KC_HOME, _______, _______, KC_UP, _______, _______, _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_VAD, RGB_VAI, _______, _______, _______,
KC_END, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,

8
keyboards/plywrks/lune/keymaps/via/keymap.c
View File

@ -16,28 +16,28 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all(
[0] = LAYOUT_alice_split_bs(
KC_DEL, KC_ESC, 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_BSPC,
KC_PGUP, 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_PGDN, 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL
),
[1] = LAYOUT_all(
[1] = LAYOUT_alice_split_bs(
QK_BOOT, _______, 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_DEL, KC_DEL,
KC_HOME, _______, _______, KC_UP, _______, _______, _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_VAD, RGB_VAI, _______, _______, _______,
KC_END, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______
),
[2] = LAYOUT_all(
[2] = LAYOUT_alice_split_bs(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______
),
[3] = LAYOUT_all(
[3] = LAYOUT_alice_split_bs(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,

15
keyboards/plywrks/lune/matrix_diagram.md Normal file
View File

@ -0,0 +1,15 @@
# Matrix Diagram for plywrks Lune
```
┌───┐┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐
│00 ││10 │01 │11 │02 │12 │03 │13 │ │04 │14 │05 │15 │06 │16 │07 │17 │ │17 │ 2u Backspace
┌┴──┬┼┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ └───────┘
│20 ││30 │21 │31 │22 │32 │23 │ │24 │34 │25 │35 │26 │36 │27 │37 │
┌┴──┬┼┴─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
│40 ││50 │41 │51 │42 │52 │43 │ │44 │54 │45 │55 │46 │56 │57 │
└───┘├───────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌──────────┐
│70 │61 │71 │62 │72 │63 │ │64 │74 │65 │75 │66 │76 │67 │77 │ │67 │ 2.75u RShift
├─────┬───┴──┬┴───┴┬──┴───┴┬──┴─┐ ├───┴───┴──┬┴───┴┬──┴───┴──┬───┴─┬─┘ └──────────┘
│80 │ │81 │82 │83 │ │84 │85 │ │87 │
└─────┘ └─────┴───────┴────┘ └──────────┴─────┘ └─────┘
```

374
keyboards/projectkb/signature65/info.json
View File

@ -15,82 +15,318 @@
"diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layout_aliases": {
"LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs"
},
"community_layouts": [
"65_ansi_blocker",
"65_ansi_blocker_split_bs",
"65_ansi_blocker_tsangan",
"65_ansi_blocker_tsangan_split_bs"
],
"layouts": {
"LAYOUT_all": {
"LAYOUT_65_ansi_blocker": {
"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": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 5, "y": 0},
{"matrix": [0, 6], "x": 6, "y": 0},
{"matrix": [0, 7], "x": 7, "y": 0},
{"matrix": [0, 8], "x": 8, "y": 0},
{"matrix": [0, 9], "x": 9, "y": 0},
{"matrix": [0, 10], "x": 10, "y": 0},
{"matrix": [0, 11], "x": 11, "y": 0},
{"matrix": [0, 12], "x": 12, "y": 0},
{"matrix": [0, 13], "x": 13, "y": 0},
{"matrix": [0, 14], "x": 14, "y": 0},
{"matrix": [0, 15], "x": 15, "y": 0},
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
{"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
{"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
{"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
{"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
{"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
{"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
{"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
{"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
{"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
{"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
{"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
{"label": "Home", "matrix": [0, 15], "x": 15, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"matrix": [1, 1], "x": 1.5, "y": 1},
{"matrix": [1, 2], "x": 2.5, "y": 1},
{"matrix": [1, 3], "x": 3.5, "y": 1},
{"matrix": [1, 4], "x": 4.5, "y": 1},
{"matrix": [1, 5], "x": 5.5, "y": 1},
{"matrix": [1, 6], "x": 6.5, "y": 1},
{"matrix": [1, 7], "x": 7.5, "y": 1},
{"matrix": [1, 8], "x": 8.5, "y": 1},
{"matrix": [1, 9], "x": 9.5, "y": 1},
{"matrix": [1, 10], "x": 10.5, "y": 1},
{"matrix": [1, 11], "x": 11.5, "y": 1},
{"matrix": [1, 12], "x": 12.5, "y": 1},
{"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
{"matrix": [1, 15], "x": 15, "y": 1},
{"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
{"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
{"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
{"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
{"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
{"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
{"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
{"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
{"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
{"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
{"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
{"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
{"label": "\\", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
{"label": "Page Up", "matrix": [1, 15], "x": 15, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"matrix": [2, 1], "x": 1.75, "y": 2},
{"matrix": [2, 2], "x": 2.75, "y": 2},
{"matrix": [2, 3], "x": 3.75, "y": 2},
{"matrix": [2, 4], "x": 4.75, "y": 2},
{"matrix": [2, 5], "x": 5.75, "y": 2},
{"matrix": [2, 6], "x": 6.75, "y": 2},
{"matrix": [2, 7], "x": 7.75, "y": 2},
{"matrix": [2, 8], "x": 8.75, "y": 2},
{"matrix": [2, 9], "x": 9.75, "y": 2},
{"matrix": [2, 10], "x": 10.75, "y": 2},
{"matrix": [2, 11], "x": 11.75, "y": 2},
{"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
{"matrix": [2, 15], "x": 15, "y": 2},
{"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
{"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
{"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
{"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
{"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
{"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
{"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
{"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
{"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
{"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
{"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
{"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
{"label": "Page Down", "matrix": [2, 15], "x": 15, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
{"matrix": [3, 1], "x": 2.25, "y": 3},
{"matrix": [3, 2], "x": 3.25, "y": 3},
{"matrix": [3, 3], "x": 4.25, "y": 3},
{"matrix": [3, 4], "x": 5.25, "y": 3},
{"matrix": [3, 5], "x": 6.25, "y": 3},
{"matrix": [3, 6], "x": 7.25, "y": 3},
{"matrix": [3, 7], "x": 8.25, "y": 3},
{"matrix": [3, 8], "x": 9.25, "y": 3},
{"matrix": [3, 9], "x": 10.25, "y": 3},
{"matrix": [3, 10], "x": 11.25, "y": 3},
{"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
{"matrix": [3, 13], "x": 14, "y": 3},
{"matrix": [3, 15], "x": 15, "y": 3},
{"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
{"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
{"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
{"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
{"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
{"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
{"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
{"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
{"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
{"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
{"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
{"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
{"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
{"label": "Fn", "matrix": [3, 15], "x": 15, "y": 3},
{"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
{"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
{"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
{"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
{"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
{"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
{"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
{"label": "GUI", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
{"matrix": [4, 12], "x": 13, "y": 4},
{"matrix": [4, 13], "x": 14, "y": 4},
{"matrix": [4, 15], "x": 15, "y": 4}
{"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
{"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
{"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 4}
]
},
"LAYOUT_65_ansi_blocker_split_bs": {
"layout": [
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
{"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
{"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
{"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
{"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
{"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
{"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
{"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
{"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
{"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
{"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
{"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
{"label": "`", "matrix": [0, 14], "x": 14, "y": 0},
{"label": "Home", "matrix": [0, 15], "x": 15, "y": 0},
{"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
{"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
{"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
{"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
{"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
{"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
{"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
{"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
{"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
{"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
{"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
{"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
{"label": "Backspace", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
{"label": "Page Up", "matrix": [1, 15], "x": 15, "y": 1},
{"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
{"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
{"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
{"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
{"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
{"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
{"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
{"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
{"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
{"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
{"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
{"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
{"label": "Page Down", "matrix": [2, 15], "x": 15, "y": 2},
{"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
{"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
{"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
{"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
{"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
{"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
{"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
{"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
{"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
{"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
{"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
{"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
{"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
{"label": "Fn", "matrix": [3, 15], "x": 15, "y": 3},
{"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
{"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
{"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
{"label": "GUI", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
{"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
{"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
{"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 4}
]
},
"LAYOUT_65_ansi_blocker_tsangan": {
"layout": [
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
{"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
{"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
{"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
{"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
{"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
{"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
{"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
{"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
{"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
{"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
{"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
{"label": "Home", "matrix": [0, 15], "x": 15, "y": 0},
{"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
{"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
{"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
{"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
{"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
{"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
{"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
{"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
{"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
{"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
{"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
{"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
{"label": "\\", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
{"label": "Page Up", "matrix": [1, 15], "x": 15, "y": 1},
{"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
{"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
{"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
{"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
{"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
{"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
{"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
{"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
{"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
{"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
{"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
{"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
{"label": "Page Down", "matrix": [2, 15], "x": 15, "y": 2},
{"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
{"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
{"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
{"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
{"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
{"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
{"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
{"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
{"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
{"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
{"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
{"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
{"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
{"label": "Fn", "matrix": [3, 15], "x": 15, "y": 3},
{"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
{"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
{"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
{"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
{"label": "GUI", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
{"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
{"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
{"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 4}
]
},
"LAYOUT_65_ansi_blocker_tsangan_split_bs": {
"layout": [
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
{"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
{"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
{"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
{"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
{"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
{"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
{"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
{"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
{"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
{"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
{"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
{"label": "`", "matrix": [0, 14], "x": 14, "y": 0},
{"label": "Home", "matrix": [0, 15], "x": 15, "y": 0},
{"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
{"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
{"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
{"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
{"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
{"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
{"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
{"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
{"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
{"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
{"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
{"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
{"label": "Backspace", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
{"label": "Page Up", "matrix": [1, 15], "x": 15, "y": 1},
{"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
{"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
{"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
{"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
{"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
{"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
{"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
{"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
{"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
{"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
{"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
{"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
{"label": "Page Down", "matrix": [2, 15], "x": 15, "y": 2},
{"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
{"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
{"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
{"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
{"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
{"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
{"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
{"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
{"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
{"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
{"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
{"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
{"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
{"label": "Fn", "matrix": [3, 15], "x": 15, "y": 3},
{"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
{"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
{"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
{"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
{"label": "GUI", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
{"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
{"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
{"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 4}
]
}
}

4
keyboards/projectkb/signature65/keymaps/default/keymap.c
View File

@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// entirely and just use numbers.
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all(
[0] = LAYOUT_65_ansi_blocker_split_bs(
KC_ESC, 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_BSLS, KC_GRV, KC_DEL,
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_BSPC, KC_PGUP,
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_PGDN,
@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_all(
[1] = LAYOUT_65_ansi_blocker_split_bs(
KC_GRV, 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_DEL, KC_DEL, KC_PSCR,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,

8
keyboards/projectkb/signature65/keymaps/via/keymap.c
View File

@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// entirely and just use numbers.
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all(
[0] = LAYOUT_65_ansi_blocker_split_bs(
KC_ESC, 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_BSLS, KC_GRV, KC_DEL,
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_BSPC, KC_PGUP,
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_PGDN,
@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_all(
[1] = LAYOUT_65_ansi_blocker_split_bs(
KC_GRV, 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_DEL, KC_DEL, KC_PSCR,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
[2] = LAYOUT_all(
[2] = LAYOUT_65_ansi_blocker_split_bs(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
[3] = LAYOUT_all(
[3] = LAYOUT_65_ansi_blocker_split_bs(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,

21
keyboards/projectkb/signature65/matrix_diagram.md Normal file
View File

@ -0,0 +1,21 @@
# Matrix Diagram for Project Keyboard Signature65
```
┌───────┐
2u Backspace │0D │
└───────┘
┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │
├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1E │1F │
├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │2F │
├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3C │3D │3F │
├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
│40 │41 │42 │45 │49 │4A │ │4C │4D │4F │
└────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
┌─────┬───┬─────┬───────────────────────────┬─────┐
│40 │41 │42 │45 │4A │ Blocker Tsangan
└─────┴───┴─────┴───────────────────────────┴─────┘
```

139
keyboards/rart/rartlice/info.json
View File

@ -25,90 +25,93 @@
},
"processor": "STM32F103",
"bootloader": "stm32duino",
"layout_aliases": {
"LAYOUT_all": "LAYOUT"
},
"layouts": {
"LAYOUT_all": {
"LAYOUT": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1.25, "y": 0},
{"matrix": [0, 2], "x": 2.25, "y": 0},
{"matrix": [0, 3], "x": 3.25, "y": 0},
{"matrix": [0, 4], "x": 4.25, "y": 0},
{"matrix": [1, 4], "x": 5.25, "y": 0},
{"matrix": [0, 5], "x": 6.25, "y": 0},
{"matrix": [0, 6], "x": 7.25, "y": 0},
{"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
{"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
{"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
{"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
{"label": "4", "matrix": [1, 4], "x": 5.25, "y": 0},
{"label": "5", "matrix": [0, 5], "x": 6.25, "y": 0},
{"label": "6", "matrix": [0, 6], "x": 7.25, "y": 0},
{"matrix": [0, 7], "x": 9.25, "y": 0},
{"matrix": [0, 8], "x": 10.25, "y": 0},
{"matrix": [0, 9], "x": 11.25, "y": 0},
{"matrix": [0, 10], "x": 12.25, "y": 0},
{"matrix": [0, 11], "x": 13.25, "y": 0},
{"matrix": [0, 12], "x": 14.25, "y": 0},
{"matrix": [0, 13], "x": 15.25, "y": 0},
{"matrix": [0, 14], "x": 16.25, "y": 0},
{"label": "7", "matrix": [0, 7], "x": 9.25, "y": 0},
{"label": "8", "matrix": [0, 8], "x": 10.25, "y": 0},
{"label": "9", "matrix": [0, 9], "x": 11.25, "y": 0},
{"label": "0", "matrix": [0, 10], "x": 12.25, "y": 0},
{"label": "-", "matrix": [0, 11], "x": 13.25, "y": 0},
{"label": "=", "matrix": [0, 12], "x": 14.25, "y": 0},
{"label": "`", "matrix": [0, 13], "x": 15.25, "y": 0},
{"label": "Delete", "matrix": [0, 14], "x": 16.25, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1},
{"label": "Page Up", "matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
{"matrix": [1, 2], "x": 2.75, "y": 1},
{"matrix": [1, 3], "x": 3.75, "y": 1},
{"matrix": [2, 4], "x": 4.75, "y": 1},
{"matrix": [1, 5], "x": 5.75, "y": 1},
{"matrix": [1, 6], "x": 6.75, "y": 1},
{"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
{"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1},
{"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1},
{"label": "E", "matrix": [2, 4], "x": 4.75, "y": 1},
{"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1},
{"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1},
{"matrix": [1, 7], "x": 8.75, "y": 1},
{"matrix": [1, 8], "x": 9.75, "y": 1},
{"matrix": [1, 9], "x": 10.75, "y": 1},
{"matrix": [1, 10], "x": 11.75, "y": 1},
{"matrix": [1, 11], "x": 12.75, "y": 1},
{"matrix": [1, 12], "x": 13.75, "y": 1},
{"matrix": [1, 13], "x": 14.75, "y": 1},
{"matrix": [1, 14], "x": 15.75, "y": 1, "w": 1.5},
{"label": "Y", "matrix": [1, 7], "x": 8.75, "y": 1},
{"label": "U", "matrix": [1, 8], "x": 9.75, "y": 1},
{"label": "I", "matrix": [1, 9], "x": 10.75, "y": 1},
{"label": "O", "matrix": [1, 10], "x": 11.75, "y": 1},
{"label": "P", "matrix": [1, 11], "x": 12.75, "y": 1},
{"label": "[", "matrix": [1, 12], "x": 13.75, "y": 1},
{"label": "]", "matrix": [1, 13], "x": 14.75, "y": 1},
{"label": "Backspace", "matrix": [1, 14], "x": 15.75, "y": 1, "w": 1.5},
{"matrix": [2, 0], "x": 0, "y": 2},
{"label": "Page Down", "matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
{"matrix": [2, 2], "x": 3, "y": 2},
{"matrix": [2, 3], "x": 4, "y": 2},
{"matrix": [3, 4], "x": 5, "y": 2},
{"matrix": [2, 5], "x": 6, "y": 2},
{"matrix": [2, 6], "x": 7, "y": 2},
{"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
{"label": "A", "matrix": [2, 2], "x": 3, "y": 2},
{"label": "S", "matrix": [2, 3], "x": 4, "y": 2},
{"label": "D", "matrix": [3, 4], "x": 5, "y": 2},
{"label": "F", "matrix": [2, 5], "x": 6, "y": 2},
{"label": "G", "matrix": [2, 6], "x": 7, "y": 2},
{"matrix": [2, 7], "x": 9, "y": 2},
{"matrix": [2, 8], "x": 10, "y": 2},
{"matrix": [2, 9], "x": 11, "y": 2},
{"matrix": [2, 10], "x": 12, "y": 2},
{"matrix": [2, 11], "x": 13, "y": 2},
{"matrix": [2, 12], "x": 14, "y": 2},
{"matrix": [2, 13], "x": 15, "y": 2, "w": 2.25},
{"label": "H", "matrix": [2, 7], "x": 9, "y": 2},
{"label": "J", "matrix": [2, 8], "x": 10, "y": 2},
{"label": "K", "matrix": [2, 9], "x": 11, "y": 2},
{"label": "L", "matrix": [2, 10], "x": 12, "y": 2},
{"label": ";", "matrix": [2, 11], "x": 13, "y": 2},
{"label": "'", "matrix": [2, 12], "x": 14, "y": 2},
{"label": "Enter", "matrix": [2, 13], "x": 15, "y": 2, "w": 2.25},
{"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
{"matrix": [3, 2], "x": 3.5, "y": 3},
{"matrix": [3, 3], "x": 4.5, "y": 3},
{"matrix": [4, 4], "x": 5.5, "y": 3},
{"matrix": [3, 5], "x": 6.5, "y": 3},
{"matrix": [3, 6], "x": 7.5, "y": 3},
{"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
{"label": "Z", "matrix": [3, 2], "x": 3.5, "y": 3},
{"label": "X", "matrix": [3, 3], "x": 4.5, "y": 3},
{"label": "C", "matrix": [4, 4], "x": 5.5, "y": 3},
{"label": "V", "matrix": [3, 5], "x": 6.5, "y": 3},
{"label": "B", "matrix": [3, 6], "x": 7.5, "y": 3},
{"matrix": [3, 7], "x": 9.5, "y": 3},
{"matrix": [3, 8], "x": 10.5, "y": 3},
{"matrix": [3, 9], "x": 11.5, "y": 3},
{"matrix": [3, 10], "x": 12.5, "y": 3},
{"matrix": [3, 11], "x": 13.5, "y": 3},
{"matrix": [3, 12], "x": 14.5, "y": 3, "w": 1.75},
{"label": "N", "matrix": [3, 7], "x": 9.5, "y": 3},
{"label": "M", "matrix": [3, 8], "x": 10.5, "y": 3},
{"label": ",", "matrix": [3, 9], "x": 11.5, "y": 3},
{"label": ".", "matrix": [3, 10], "x": 12.5, "y": 3},
{"label": "/", "matrix": [3, 11], "x": 13.5, "y": 3},
{"label": "Shift", "matrix": [3, 12], "x": 14.5, "y": 3, "w": 1.75},
{"matrix": [3, 14], "x": 16.5, "y": 3.25},
{"label": "\u2191", "matrix": [3, 14], "x": 16.5, "y": 3.25},
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25},
{"matrix": [4, 5], "x": 5.5, "y": 4, "w": 2},
{"matrix": [4, 6], "x": 7.5, "y": 4},
{"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"label": "Alt", "matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25},
{"label": "Space", "matrix": [4, 5], "x": 5.5, "y": 4, "w": 2},
{"label": "Fn", "matrix": [4, 6], "x": 7.5, "y": 4},
{"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
{"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
{"label": "Space", "matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
{"label": "Alt", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
{"matrix": [4, 12], "x": 15.5, "y": 4.25},
{"matrix": [4, 13], "x": 16.5, "y": 4.25},
{"matrix": [4, 14], "x": 17.5, "y": 4.25}
{"label": "\u2190", "matrix": [4, 12], "x": 15.5, "y": 4.25},
{"label": "\u2193", "matrix": [4, 13], "x": 16.5, "y": 4.25},
{"label": "\u2192", "matrix": [4, 14], "x": 17.5, "y": 4.25}
]
}
}

4
keyboards/rart/rartlice/keymaps/default/keymap.c
View File

@ -17,14 +17,14 @@ 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] = {
[0] = LAYOUT_all(
[0] = LAYOUT(
QK_GESC, KC_ESC, 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_GRV, KC_DEL,
KC_PGUP, 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_BSPC,
KC_PGDN, 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_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_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_all(
[1] = LAYOUT(
KC_NUM, RGB_TOG, 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_SCRL, _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, KC_P7, KC_P8, KC_P9, KC_P0, _______, _______, _______, _______,
_______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, KC_P4, KC_P5, KC_P6, _______, _______, _______, _______,

8
keyboards/rart/rartlice/keymaps/via/keymap.c
View File

@ -17,28 +17,28 @@ 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] = {
[0] = LAYOUT_all(
[0] = LAYOUT(
QK_GESC, KC_ESC, 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_GRV, KC_DEL,
KC_PGUP, 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_BSPC,
KC_PGDN, 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_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_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_all(
[1] = LAYOUT(
KC_NUM, RGB_TOG, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT, _______,
KC_SCRL, _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, KC_P7, KC_P8, KC_P9, KC_P0, _______, _______, _______, _______,
_______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, KC_P4, KC_P5, KC_P6, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
[2] = LAYOUT_all(
[2] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
[3] = LAYOUT_all(
[3] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,

4
keyboards/rationalist/ratio65_hotswap/keymaps/default/keymap.c
View File

@ -18,14 +18,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// main layer
[0] = LAYOUT_all(
[0] = LAYOUT_65_ansi_blocker(
KC_ESC, 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_DEL,
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_INSERT,
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_PGUP,
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_PGDN,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT ),
// basic function layer
[1] = LAYOUT_all(
[1] = LAYOUT_65_ansi_blocker(
KC_GRV, 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_TRNS, QK_BOOT,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,

8
keyboards/rationalist/ratio65_hotswap/keymaps/via/keymap.c
View File

@ -18,28 +18,28 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// main layer
[0] = LAYOUT_all(
[0] = LAYOUT_65_ansi_blocker(
KC_ESC, 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_DEL,
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_INSERT,
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_PGUP,
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_PGDN,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT ),
// basic function layer 1
[1] = LAYOUT_all(
[1] = LAYOUT_65_ansi_blocker(
KC_GRV, 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_TRNS, QK_BOOT,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
// basic function layer 2
[2] = LAYOUT_all(
[2] = LAYOUT_65_ansi_blocker(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
// basic function layer 3
[3] = LAYOUT_all(
[3] = LAYOUT_65_ansi_blocker(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,

139
keyboards/rationalist/ratio65_hotswap/rev_a/info.json
View File

@ -22,81 +22,84 @@
},
"processor": "atmega32u2",
"bootloader": "atmel-dfu",
"layout_aliases": {
"LAYOUT_all": "LAYOUT_65_ansi_blocker"
},
"layouts": {
"LAYOUT_all": {
"LAYOUT_65_ansi_blocker": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [1, 0], "x": 1, "y": 0},
{"matrix": [0, 1], "x": 2, "y": 0},
{"matrix": [1, 1], "x": 3, "y": 0},
{"matrix": [0, 2], "x": 4, "y": 0},
{"matrix": [1, 2], "x": 5, "y": 0},
{"matrix": [0, 3], "x": 6, "y": 0},
{"matrix": [1, 3], "x": 7, "y": 0},
{"matrix": [0, 4], "x": 8, "y": 0},
{"matrix": [1, 4], "x": 9, "y": 0},
{"matrix": [0, 5], "x": 10, "y": 0},
{"matrix": [1, 5], "x": 11, "y": 0},
{"matrix": [0, 6], "x": 12, "y": 0},
{"matrix": [0, 7], "x": 13, "y": 0, "w": 2},
{"matrix": [1, 7], "x": 15, "y": 0},
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
{"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
{"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
{"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
{"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
{"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
{"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
{"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
{"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
{"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
{"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
{"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
{"label": "Backspace", "matrix": [0, 7], "x": 13, "y": 0, "w": 2},
{"label": "Delete", "matrix": [1, 7], "x": 15, "y": 0},
{"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
{"matrix": [2, 1], "x": 1.5, "y": 1},
{"matrix": [3, 1], "x": 2.5, "y": 1},
{"matrix": [2, 2], "x": 3.5, "y": 1},
{"matrix": [3, 2], "x": 4.5, "y": 1},
{"matrix": [2, 3], "x": 5.5, "y": 1},
{"matrix": [3, 3], "x": 6.5, "y": 1},
{"matrix": [2, 4], "x": 7.5, "y": 1},
{"matrix": [3, 4], "x": 8.5, "y": 1},
{"matrix": [2, 5], "x": 9.5, "y": 1},
{"matrix": [3, 5], "x": 10.5, "y": 1},
{"matrix": [2, 6], "x": 11.5, "y": 1},
{"matrix": [3, 6], "x": 12.5, "y": 1},
{"matrix": [2, 7], "x": 13.5, "y": 1, "w": 1.5},
{"matrix": [3, 7], "x": 15, "y": 1},
{"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
{"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 1},
{"label": "W", "matrix": [3, 1], "x": 2.5, "y": 1},
{"label": "E", "matrix": [2, 2], "x": 3.5, "y": 1},
{"label": "R", "matrix": [3, 2], "x": 4.5, "y": 1},
{"label": "T", "matrix": [2, 3], "x": 5.5, "y": 1},
{"label": "Y", "matrix": [3, 3], "x": 6.5, "y": 1},
{"label": "U", "matrix": [2, 4], "x": 7.5, "y": 1},
{"label": "I", "matrix": [3, 4], "x": 8.5, "y": 1},
{"label": "O", "matrix": [2, 5], "x": 9.5, "y": 1},
{"label": "P", "matrix": [3, 5], "x": 10.5, "y": 1},
{"label": "[", "matrix": [2, 6], "x": 11.5, "y": 1},
{"label": "]", "matrix": [3, 6], "x": 12.5, "y": 1},
{"label": "\\", "matrix": [2, 7], "x": 13.5, "y": 1, "w": 1.5},
{"label": "Insert", "matrix": [3, 7], "x": 15, "y": 1},
{"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
{"matrix": [4, 1], "x": 1.75, "y": 2},
{"matrix": [5, 1], "x": 2.75, "y": 2},
{"matrix": [4, 2], "x": 3.75, "y": 2},
{"matrix": [5, 2], "x": 4.75, "y": 2},
{"matrix": [4, 3], "x": 5.75, "y": 2},
{"matrix": [5, 3], "x": 6.75, "y": 2},
{"matrix": [4, 4], "x": 7.75, "y": 2},
{"matrix": [5, 4], "x": 8.75, "y": 2},
{"matrix": [4, 5], "x": 9.75, "y": 2},
{"matrix": [5, 5], "x": 10.75, "y": 2},
{"matrix": [4, 6], "x": 11.75, "y": 2},
{"matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25},
{"matrix": [5, 7], "x": 15, "y": 2},
{"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
{"label": "A", "matrix": [4, 1], "x": 1.75, "y": 2},
{"label": "S", "matrix": [5, 1], "x": 2.75, "y": 2},
{"label": "D", "matrix": [4, 2], "x": 3.75, "y": 2},
{"label": "F", "matrix": [5, 2], "x": 4.75, "y": 2},
{"label": "G", "matrix": [4, 3], "x": 5.75, "y": 2},
{"label": "H", "matrix": [5, 3], "x": 6.75, "y": 2},
{"label": "J", "matrix": [4, 4], "x": 7.75, "y": 2},
{"label": "K", "matrix": [5, 4], "x": 8.75, "y": 2},
{"label": "L", "matrix": [4, 5], "x": 9.75, "y": 2},
{"label": ";", "matrix": [5, 5], "x": 10.75, "y": 2},
{"label": "'", "matrix": [4, 6], "x": 11.75, "y": 2},
{"label": "Enter", "matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25},
{"label": "Page Up", "matrix": [5, 7], "x": 15, "y": 2},
{"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
{"matrix": [6, 1], "x": 2.25, "y": 3},
{"matrix": [7, 1], "x": 3.25, "y": 3},
{"matrix": [6, 2], "x": 4.25, "y": 3},
{"matrix": [7, 2], "x": 5.25, "y": 3},
{"matrix": [6, 3], "x": 6.25, "y": 3},
{"matrix": [7, 3], "x": 7.25, "y": 3},
{"matrix": [6, 4], "x": 8.25, "y": 3},
{"matrix": [7, 4], "x": 9.25, "y": 3},
{"matrix": [6, 5], "x": 10.25, "y": 3},
{"matrix": [7, 5], "x": 11.25, "y": 3},
{"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
{"matrix": [6, 7], "x": 14, "y": 3},
{"matrix": [7, 7], "x": 15, "y": 3},
{"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
{"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
{"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
{"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
{"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
{"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
{"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
{"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
{"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
{"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
{"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
{"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
{"label": "\u2191", "matrix": [6, 7], "x": 14, "y": 3},
{"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 3},
{"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
{"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
{"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
{"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
{"matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
{"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
{"label": "GUI", "matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
{"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
{"label": "Space", "matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
{"label": "GUI", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
{"label": "Fn", "matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
{"matrix": [9, 6], "x": 13, "y": 4},
{"matrix": [8, 7], "x": 14, "y": 4},
{"matrix": [9, 7], "x": 15, "y": 4}
{"label": "\u2190", "matrix": [9, 6], "x": 13, "y": 4},
{"label": "\u2193", "matrix": [8, 7], "x": 14, "y": 4},
{"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4}
]
}
}

2
quantum/audio/audio.h
View File

@ -43,6 +43,8 @@ typedef union {
};
} audio_config_t;
_Static_assert(sizeof(audio_config_t) == sizeof(uint8_t), "Audio EECONFIG out of spec.");
/*
* a 'musical note' is represented by pitch and duration; a 'musical tone' adds intensity and timbre
* https://en.wikipedia.org/wiki/Musical_tone

2
quantum/backlight/backlight.h
View File

@ -44,6 +44,8 @@ typedef union {
};
} backlight_config_t;
_Static_assert(sizeof(backlight_config_t) == sizeof(uint8_t), "Backlight EECONFIG out of spec.");
void backlight_init(void);
void backlight_toggle(void);
void backlight_enable(void);

17
quantum/eeconfig.c
View File

@ -50,6 +50,7 @@ void eeconfig_init_quantum(void) {
#if defined(EEPROM_DRIVER)
eeprom_driver_erase();
#endif
eeprom_update_word(EECONFIG_MAGIC, EECONFIG_MAGIC_NUMBER);
eeprom_update_byte(EECONFIG_DEBUG, 0);
eeprom_update_byte(EECONFIG_DEFAULT_LAYER, 0);
@ -59,19 +60,15 @@ void eeconfig_init_quantum(void) {
eeprom_update_byte(EECONFIG_BACKLIGHT, 0);
eeprom_update_byte(EECONFIG_AUDIO, 0xFF); // On by default
eeprom_update_dword(EECONFIG_RGBLIGHT, 0);
eeprom_update_byte(EECONFIG_STENOMODE, 0);
eeprom_update_dword(EECONFIG_HAPTIC, 0);
eeprom_update_byte(EECONFIG_RGBLIGHT_EXTENDED, 0);
eeprom_update_byte(EECONFIG_VELOCIKEY, 0);
eeprom_update_dword(EECONFIG_RGB_MATRIX, 0);
eeprom_update_word(EECONFIG_RGB_MATRIX_EXTENDED, 0);
eeprom_update_byte(EECONFIG_UNICODEMODE, 0);
eeprom_update_byte(EECONFIG_STENOMODE, 0);
uint64_t dummy = 0;
eeprom_update_block(&dummy, EECONFIG_RGB_MATRIX, sizeof(uint64_t));
eeprom_update_dword(EECONFIG_HAPTIC, 0);
#if defined(HAPTIC_ENABLE)
haptic_reset();
#else
// this is used in case haptic is disabled, but we still want sane defaults
// in the haptic configuration eeprom. All zero will trigger a haptic_reset
// when a haptic-enabled firmware is loaded onto the keyboard.
eeprom_update_dword(EECONFIG_HAPTIC, 0);
#endif
#if (EECONFIG_KB_DATA_SIZE) > 0

19
quantum/eeconfig.h
View File

@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdbool.h>
#ifndef EECONFIG_MAGIC_NUMBER
# define EECONFIG_MAGIC_NUMBER (uint16_t)0xFEE7 // When changing, decrement this value to avoid future re-init issues
# define EECONFIG_MAGIC_NUMBER (uint16_t)0xFEE6 // When changing, decrement this value to avoid future re-init issues
#endif
#define EECONFIG_MAGIC_NUMBER_OFF (uint16_t)0xFFFF
@ -40,20 +40,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define EECONFIG_KEYBOARD (uint32_t *)15
#define EECONFIG_USER (uint32_t *)19
#define EECONFIG_VELOCIKEY (uint8_t *)23
#define EECONFIG_HAPTIC (uint32_t *)24
// Mutually exclusive
#define EECONFIG_LED_MATRIX (uint32_t *)28
#define EECONFIG_RGB_MATRIX (uint32_t *)28
// Speed & Flags
#define EECONFIG_LED_MATRIX_EXTENDED (uint16_t *)32
#define EECONFIG_RGB_MATRIX_EXTENDED (uint16_t *)32
#define EECONFIG_LED_MATRIX (uint32_t *)24
#define EECONFIG_RGB_MATRIX (uint64_t *)24
#define EECONFIG_KEYMAP_HASH (uint32_t *)34
#define EECONFIG_HAPTIC (uint32_t *)32
#define EECONFIG_RGBLIGHT_EXTENDED (uint8_t *)36
#define EECONFIG_KEYMAP_HASH (uint32_t *)37
// Size of EEPROM being used for core data storage
#define EECONFIG_BASE_SIZE 38
#define EECONFIG_BASE_SIZE 41
// Size of EEPROM dedicated to keyboard- and user-specific data
#ifndef EECONFIG_KB_DATA_SIZE

6
quantum/haptic.h
View File

@ -31,16 +31,18 @@ typedef union {
uint32_t raw;
struct {
bool enable : 1;
uint8_t feedback : 2;
uint8_t mode : 7;
bool buzz : 1;
uint8_t dwell : 7;
bool cont : 1;
uint8_t amplitude : 8;
uint8_t feedback : 2;
bool cont : 1;
uint8_t reserved : 5;
};
} haptic_config_t;
_Static_assert(sizeof(haptic_config_t) == sizeof(uint32_t), "Haptic EECONFIG out of spec.");
typedef enum HAPTIC_FEEDBACK {
KEY_PRESS,
KEY_PRESS_RELEASE,

6
quantum/keycode_config.h
View File

@ -16,6 +16,10 @@
#pragma once
#ifdef __cplusplus
# define _Static_assert static_assert
#endif
#include "eeconfig.h"
#include "keycode.h"
#include "action_code.h"
@ -43,4 +47,6 @@ typedef union {
};
} keymap_config_t;
_Static_assert(sizeof(keymap_config_t) == sizeof(uint16_t), "Keycode (magic) EECONFIG out of spec.");
extern keymap_config_t keymap_config;

5
quantum/led_matrix/led_matrix_types.h
View File

@ -85,13 +85,14 @@ typedef union {
struct PACKED {
uint8_t enable : 2;
uint8_t mode : 6;
uint16_t reserved;
uint8_t val;
uint8_t speed; // EECONFIG needs to be increased to support this
uint8_t speed;
led_flags_t flags;
};
} led_eeconfig_t;
_Static_assert(sizeof(led_eeconfig_t) == sizeof(uint32_t), "LED Matrix EECONFIG out of spec.");
#if defined(_MSC_VER)
# pragma pack(pop)
#endif

6
quantum/rgb_matrix/rgb_matrix_types.h
View File

@ -83,16 +83,18 @@ typedef struct PACKED {
} led_config_t;
typedef union {
uint32_t raw;
uint64_t raw;
struct PACKED {
uint8_t enable : 2;
uint8_t mode : 6;
HSV hsv;
uint8_t speed; // EECONFIG needs to be increased to support this
uint8_t speed;
led_flags_t flags;
};
} rgb_config_t;
_Static_assert(sizeof(rgb_config_t) == sizeof(uint64_t), "RGB Matrix EECONFIG out of spec.");
#if defined(_MSC_VER)
# pragma pack(pop)
#endif

21
quantum/rgblight/rgblight.c
View File

@ -177,18 +177,19 @@ void rgblight_check_config(void) {
}
}
uint32_t eeconfig_read_rgblight(void) {
uint64_t eeconfig_read_rgblight(void) {
#ifdef EEPROM_ENABLE
return eeprom_read_dword(EECONFIG_RGBLIGHT);
return (uint64_t)((eeprom_read_dword(EECONFIG_RGBLIGHT)) | ((uint64_t)eeprom_read_byte(EECONFIG_RGBLIGHT_EXTENDED) << 32));
#else
return 0;
#endif
}
void eeconfig_update_rgblight(uint32_t val) {
void eeconfig_update_rgblight(uint64_t val) {
#ifdef EEPROM_ENABLE
rgblight_check_config();
eeprom_update_dword(EECONFIG_RGBLIGHT, val);
eeprom_update_dword(EECONFIG_RGBLIGHT, val & 0xFFFFFFFF);
eeprom_update_byte(EECONFIG_RGBLIGHT_EXTENDED, (val >> 32) & 0xFF);
#endif
}
@ -263,13 +264,13 @@ void rgblight_reload_from_eeprom(void) {
}
}
uint32_t rgblight_read_dword(void) {
uint64_t rgblight_read_qword(void) {
return rgblight_config.raw;
}
void rgblight_update_dword(uint32_t dword) {
void rgblight_update_qword(uint64_t qword) {
RGBLIGHT_SPLIT_SET_CHANGE_MODEHSVS;
rgblight_config.raw = dword;
rgblight_config.raw = qword;
if (rgblight_config.enable)
rgblight_mode_noeeprom(rgblight_config.mode);
else {
@ -489,7 +490,7 @@ void rgblight_increase_speed_helper(bool write_to_eeprom) {
if (rgblight_config.speed < 3) rgblight_config.speed++;
// RGBLIGHT_SPLIT_SET_CHANGE_HSVS; // NEED?
if (write_to_eeprom) {
eeconfig_update_rgblight(rgblight_config.raw); // EECONFIG needs to be increased to support this
eeconfig_update_rgblight(rgblight_config.raw);
}
}
void rgblight_increase_speed(void) {
@ -503,7 +504,7 @@ void rgblight_decrease_speed_helper(bool write_to_eeprom) {
if (rgblight_config.speed > 0) rgblight_config.speed--;
// RGBLIGHT_SPLIT_SET_CHANGE_HSVS; // NEED??
if (write_to_eeprom) {
eeconfig_update_rgblight(rgblight_config.raw); // EECONFIG needs to be increased to support this
eeconfig_update_rgblight(rgblight_config.raw);
}
}
void rgblight_decrease_speed(void) {
@ -612,7 +613,7 @@ uint8_t rgblight_get_speed(void) {
void rgblight_set_speed_eeprom_helper(uint8_t speed, bool write_to_eeprom) {
rgblight_config.speed = speed;
if (write_to_eeprom) {
eeconfig_update_rgblight(rgblight_config.raw); // EECONFIG needs to be increased to support this
eeconfig_update_rgblight(rgblight_config.raw);
dprintf("rgblight set speed [EEPROM]: %u\n", rgblight_config.speed);
} else {
dprintf("rgblight set speed [NOEEPROM]: %u\n", rgblight_config.speed);

15
quantum/rgblight/rgblight.h
View File

@ -244,19 +244,20 @@ extern const uint16_t RGBLED_RGBTEST_INTERVALS[1] PROGMEM;
extern const uint8_t RGBLED_TWINKLE_INTERVALS[3] PROGMEM;
extern bool is_rgblight_initialized;
// Should stay in sycn with rgb matrix config as we reuse eeprom storage for both (for now)
typedef union {
uint32_t raw;
uint64_t raw;
struct {
bool enable : 1;
uint8_t mode : 7;
uint8_t hue : 8;
uint8_t sat : 8;
uint8_t val : 8;
uint8_t speed : 8; // EECONFIG needs to be increased to support this
uint8_t speed : 8;
};
} rgblight_config_t;
_Static_assert(sizeof(rgblight_config_t) == sizeof(uint64_t), "RGB Light EECONFIG out of spec.");
typedef struct _rgblight_status_t {
uint8_t base_mode;
bool timer_enabled;
@ -367,10 +368,10 @@ HSV rgblight_get_hsv(void);
void rgblight_init(void);
void rgblight_suspend(void);
void rgblight_wakeup(void);
uint32_t rgblight_read_dword(void);
void rgblight_update_dword(uint32_t dword);
uint32_t eeconfig_read_rgblight(void);
void eeconfig_update_rgblight(uint32_t val);
uint64_t rgblight_read_qword(void);
void rgblight_update_qword(uint64_t qword);
uint64_t eeconfig_read_rgblight(void);
void eeconfig_update_rgblight(uint64_t val);
void eeconfig_update_rgblight_current(void);
void eeconfig_update_rgblight_default(void);
void eeconfig_debug_rgblight(void);

4
quantum/unicode/unicode.h
View File

@ -21,12 +21,14 @@
#include "quantum.h"
typedef union {
uint32_t raw;
uint8_t raw;
struct {
uint8_t input_mode : 8;
};
} unicode_config_t;
_Static_assert(sizeof(unicode_config_t) == sizeof(uint8_t), "Unicode EECONFIG out of spec.");
extern unicode_config_t unicode_config;
enum unicode_input_modes {