mirror of
https://github.com/qmk/qmk_userspace.git
synced 2025-05-04 22:54:16 -04:00
fixing bugs in the rollow configuration
- enabling extra keys by default to rollow - forcing extrqa keys to be on in the userspace rules.mk
This commit is contained in:
Victor
parent
efed5396ba
commit
64f90da9c6
2 changed files with 100 additions and 88 deletions
|
|
@ -15,9 +15,13 @@
|
||||||
"diode_direction": "COL2ROW",
|
"diode_direction": "COL2ROW",
|
||||||
"features": {
|
"features": {
|
||||||
"bootmagic": true,
|
"bootmagic": true,
|
||||||
|
"extrakey": true,
|
||||||
"encoder": true,
|
"encoder": true,
|
||||||
"oled": true
|
"oled": true
|
||||||
},
|
},
|
||||||
|
"build": {
|
||||||
|
"lto": true
|
||||||
|
},
|
||||||
"encoder": {
|
"encoder": {
|
||||||
"rotary": [
|
"rotary": [
|
||||||
{
|
{
|
||||||
|
|
@ -40,111 +44,116 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"transport": {
|
||||||
|
"sync": {
|
||||||
|
"matrix_state": true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"processor": "atmega32u4",
|
"processor": "atmega32u4",
|
||||||
"bootloader": "caterina",
|
"bootloader": "caterina",
|
||||||
"community_layouts": [ "split_3x5_3", "split_3x6_3" ],
|
"community_layouts": [ "split_3x5_3", "split_3x6_3" ],
|
||||||
"layouts": {
|
"layouts": {
|
||||||
"LAYOUT_split_3x5_3": {
|
"LAYOUT_split_3x5_3": {
|
||||||
"layout": [
|
"layout": [
|
||||||
{"matrix": [0, 1], "x": 0, "y": 0.3},
|
{"matrix": [0, 1], "x": 0, "y": 0.3},
|
||||||
{"matrix": [0, 2], "x": 1, "y": 0.1},
|
{"matrix": [0, 2], "x": 1, "y": 0.1},
|
||||||
{"matrix": [0, 3], "x": 2, "y": 0},
|
{"matrix": [0, 3], "x": 2, "y": 0},
|
||||||
{"matrix": [0, 4], "x": 3, "y": 0.1},
|
{"matrix": [0, 4], "x": 3, "y": 0.1},
|
||||||
{"matrix": [0, 5], "x": 4, "y": 0.2},
|
{"matrix": [0, 5], "x": 4, "y": 0.2},
|
||||||
|
|
||||||
{"matrix": [4, 5], "x": 8, "y": 0.2},
|
{"matrix": [4, 5], "x": 8, "y": 0.2},
|
||||||
{"matrix": [4, 4], "x": 9, "y": 0.1},
|
{"matrix": [4, 4], "x": 9, "y": 0.1},
|
||||||
{"matrix": [4, 3], "x": 10, "y": 0},
|
{"matrix": [4, 3], "x": 10, "y": 0},
|
||||||
{"matrix": [4, 2], "x": 11, "y": 0.1},
|
{"matrix": [4, 2], "x": 11, "y": 0.1},
|
||||||
{"matrix": [4, 1], "x": 12, "y": 0.3},
|
{"matrix": [4, 1], "x": 12, "y": 0.3},
|
||||||
|
|
||||||
{"matrix": [1, 1], "x": 0, "y": 1.3},
|
{"matrix": [1, 1], "x": 0, "y": 1.3},
|
||||||
{"matrix": [1, 2], "x": 1, "y": 1.1},
|
{"matrix": [1, 2], "x": 1, "y": 1.1},
|
||||||
{"matrix": [1, 3], "x": 2, "y": 1},
|
{"matrix": [1, 3], "x": 2, "y": 1},
|
||||||
{"matrix": [1, 4], "x": 3, "y": 1.1},
|
{"matrix": [1, 4], "x": 3, "y": 1.1},
|
||||||
{"matrix": [1, 5], "x": 4, "y": 1.2},
|
{"matrix": [1, 5], "x": 4, "y": 1.2},
|
||||||
|
|
||||||
{"matrix": [5, 5], "x": 8, "y": 1.2},
|
{"matrix": [5, 5], "x": 8, "y": 1.2},
|
||||||
{"matrix": [5, 4], "x": 9, "y": 1.1},
|
{"matrix": [5, 4], "x": 9, "y": 1.1},
|
||||||
{"matrix": [5, 3], "x": 10, "y": 1},
|
{"matrix": [5, 3], "x": 10, "y": 1},
|
||||||
{"matrix": [5, 2], "x": 11, "y": 1.1},
|
{"matrix": [5, 2], "x": 11, "y": 1.1},
|
||||||
{"matrix": [5, 1], "x": 12, "y": 1.3},
|
{"matrix": [5, 1], "x": 12, "y": 1.3},
|
||||||
|
|
||||||
{"matrix": [2, 1], "x": 0, "y": 2.3},
|
{"matrix": [2, 1], "x": 0, "y": 2.3},
|
||||||
{"matrix": [2, 2], "x": 1, "y": 2.1},
|
{"matrix": [2, 2], "x": 1, "y": 2.1},
|
||||||
{"matrix": [2, 3], "x": 2, "y": 2},
|
{"matrix": [2, 3], "x": 2, "y": 2},
|
||||||
{"matrix": [2, 4], "x": 3, "y": 2.1},
|
{"matrix": [2, 4], "x": 3, "y": 2.1},
|
||||||
{"matrix": [2, 5], "x": 4, "y": 2.2},
|
{"matrix": [2, 5], "x": 4, "y": 2.2},
|
||||||
|
|
||||||
{"matrix": [6, 5], "x": 8, "y": 2.2},
|
{"matrix": [6, 5], "x": 8, "y": 2.2},
|
||||||
{"matrix": [6, 4], "x": 9, "y": 2.1},
|
{"matrix": [6, 4], "x": 9, "y": 2.1},
|
||||||
{"matrix": [6, 3], "x": 10, "y": 2},
|
{"matrix": [6, 3], "x": 10, "y": 2},
|
||||||
{"matrix": [6, 2], "x": 11, "y": 2.1},
|
{"matrix": [6, 2], "x": 11, "y": 2.1},
|
||||||
{"matrix": [6, 1], "x": 12, "y": 2.3},
|
{"matrix": [6, 1], "x": 12, "y": 2.3},
|
||||||
|
|
||||||
{"matrix": [3, 3], "x": 3, "y": 3.7},
|
{"matrix": [3, 3], "x": 3, "y": 3.7},
|
||||||
{"matrix": [3, 4], "x": 4, "y": 3.7},
|
{"matrix": [3, 4], "x": 4, "y": 3.7},
|
||||||
{"matrix": [3, 5], "x": 5, "y": 3.2, "h": 1.5},
|
{"matrix": [3, 5], "x": 5, "y": 3.2, "h": 1.5},
|
||||||
|
|
||||||
{"matrix": [7, 5], "x": 7, "y": 3.2, "h": 1.5},
|
{"matrix": [7, 5], "x": 7, "y": 3.2, "h": 1.5},
|
||||||
{"matrix": [7, 4], "x": 8, "y": 3.7},
|
{"matrix": [7, 4], "x": 8, "y": 3.7},
|
||||||
{"matrix": [7, 3], "x": 9, "y": 3.7}
|
{"matrix": [7, 3], "x": 9, "y": 3.7}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"LAYOUT_split_3x6_3": {
|
"LAYOUT_split_3x6_3": {
|
||||||
"layout": [
|
"layout": [
|
||||||
{"matrix": [0, 0], "x": 0, "y": 0.3},
|
{"matrix": [0, 0], "x": 0, "y": 0.3},
|
||||||
{"matrix": [0, 1], "x": 1, "y": 0.3},
|
{"matrix": [0, 1], "x": 1, "y": 0.3},
|
||||||
{"matrix": [0, 2], "x": 2, "y": 0.1},
|
{"matrix": [0, 2], "x": 2, "y": 0.1},
|
||||||
{"matrix": [0, 3], "x": 3, "y": 0},
|
{"matrix": [0, 3], "x": 3, "y": 0},
|
||||||
{"matrix": [0, 4], "x": 4, "y": 0.1},
|
{"matrix": [0, 4], "x": 4, "y": 0.1},
|
||||||
{"matrix": [0, 5], "x": 5, "y": 0.2},
|
{"matrix": [0, 5], "x": 5, "y": 0.2},
|
||||||
|
|
||||||
{"matrix": [4, 5], "x": 9, "y": 0.2},
|
{"matrix": [4, 5], "x": 9, "y": 0.2},
|
||||||
{"matrix": [4, 4], "x": 10, "y": 0.1},
|
{"matrix": [4, 4], "x": 10, "y": 0.1},
|
||||||
{"matrix": [4, 3], "x": 11, "y": 0},
|
{"matrix": [4, 3], "x": 11, "y": 0},
|
||||||
{"matrix": [4, 2], "x": 12, "y": 0.1},
|
{"matrix": [4, 2], "x": 12, "y": 0.1},
|
||||||
{"matrix": [4, 1], "x": 13, "y": 0.3},
|
{"matrix": [4, 1], "x": 13, "y": 0.3},
|
||||||
{"matrix": [4, 0], "x": 14, "y": 0.3},
|
{"matrix": [4, 0], "x": 14, "y": 0.3},
|
||||||
|
|
||||||
{"matrix": [1, 0], "x": 0, "y": 1.3},
|
{"matrix": [1, 0], "x": 0, "y": 1.3},
|
||||||
{"matrix": [1, 1], "x": 1, "y": 1.3},
|
{"matrix": [1, 1], "x": 1, "y": 1.3},
|
||||||
{"matrix": [1, 2], "x": 2, "y": 1.1},
|
{"matrix": [1, 2], "x": 2, "y": 1.1},
|
||||||
{"matrix": [1, 3], "x": 3, "y": 1},
|
{"matrix": [1, 3], "x": 3, "y": 1},
|
||||||
{"matrix": [1, 4], "x": 4, "y": 1.1},
|
{"matrix": [1, 4], "x": 4, "y": 1.1},
|
||||||
{"matrix": [1, 5], "x": 5, "y": 1.2},
|
{"matrix": [1, 5], "x": 5, "y": 1.2},
|
||||||
|
|
||||||
{"matrix": [5, 5], "x": 9, "y": 1.2},
|
{"matrix": [5, 5], "x": 9, "y": 1.2},
|
||||||
{"matrix": [5, 4], "x": 10, "y": 1.1},
|
{"matrix": [5, 4], "x": 10, "y": 1.1},
|
||||||
{"matrix": [5, 3], "x": 11, "y": 1},
|
{"matrix": [5, 3], "x": 11, "y": 1},
|
||||||
{"matrix": [5, 2], "x": 12, "y": 1.1},
|
{"matrix": [5, 2], "x": 12, "y": 1.1},
|
||||||
{"matrix": [5, 1], "x": 13, "y": 1.3},
|
{"matrix": [5, 1], "x": 13, "y": 1.3},
|
||||||
{"matrix": [5, 0], "x": 14, "y": 1.3},
|
{"matrix": [5, 0], "x": 14, "y": 1.3},
|
||||||
|
|
||||||
{"matrix": [2, 0], "x": 0, "y": 2.3},
|
{"matrix": [2, 0], "x": 0, "y": 2.3},
|
||||||
{"matrix": [2, 1], "x": 1, "y": 2.3},
|
{"matrix": [2, 1], "x": 1, "y": 2.3},
|
||||||
{"matrix": [2, 2], "x": 2, "y": 2.1},
|
{"matrix": [2, 2], "x": 2, "y": 2.1},
|
||||||
{"matrix": [2, 3], "x": 3, "y": 2},
|
{"matrix": [2, 3], "x": 3, "y": 2},
|
||||||
{"matrix": [2, 4], "x": 4, "y": 2.1},
|
{"matrix": [2, 4], "x": 4, "y": 2.1},
|
||||||
{"matrix": [2, 5], "x": 5, "y": 2.2},
|
{"matrix": [2, 5], "x": 5, "y": 2.2},
|
||||||
|
|
||||||
{"matrix": [6, 5], "x": 9, "y": 2.2},
|
{"matrix": [6, 5], "x": 9, "y": 2.2},
|
||||||
{"matrix": [6, 4], "x": 10, "y": 2.1},
|
{"matrix": [6, 4], "x": 10, "y": 2.1},
|
||||||
{"matrix": [6, 3], "x": 11, "y": 2},
|
{"matrix": [6, 3], "x": 11, "y": 2},
|
||||||
{"matrix": [6, 2], "x": 12, "y": 2.1},
|
{"matrix": [6, 2], "x": 12, "y": 2.1},
|
||||||
{"matrix": [6, 1], "x": 13, "y": 2.3},
|
{"matrix": [6, 1], "x": 13, "y": 2.3},
|
||||||
{"matrix": [6, 0], "x": 14, "y": 2.3},
|
{"matrix": [6, 0], "x": 14, "y": 2.3},
|
||||||
|
|
||||||
{"matrix": [3, 3], "x": 4, "y": 3.7},
|
{"matrix": [3, 3], "x": 4, "y": 3.7},
|
||||||
{"matrix": [3, 4], "x": 5, "y": 3.7},
|
{"matrix": [3, 4], "x": 5, "y": 3.7},
|
||||||
{"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5},
|
{"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5},
|
||||||
|
|
||||||
{"matrix": [7, 5], "x": 8, "y": 3.2, "h": 1.5},
|
{"matrix": [7, 5], "x": 8, "y": 3.2, "h": 1.5},
|
||||||
{"matrix": [7, 4], "x": 9, "y": 3.7},
|
{"matrix": [7, 4], "x": 9, "y": 3.7},
|
||||||
{"matrix": [7, 3], "x": 10, "y": 3.7}
|
{"matrix": [7, 3], "x": 10, "y": 3.7}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -9,6 +9,8 @@
|
||||||
#
|
#
|
||||||
# ?= means set the value if its not defined elsewhere
|
# ?= means set the value if its not defined elsewhere
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
LTO_ENABLE ?= yes
|
LTO_ENABLE ?= yes
|
||||||
MAGIC_ENABLE ?= no
|
MAGIC_ENABLE ?= no
|
||||||
CONSOLE_ENABLE ?= no
|
CONSOLE_ENABLE ?= no
|
||||||
|
|
@ -26,6 +28,7 @@ ENCODER_ENABLE ?= no
|
||||||
ENCODER_MAP_ENABLE ?= no
|
ENCODER_MAP_ENABLE ?= no
|
||||||
|
|
||||||
# qmk features we will force
|
# qmk features we will force
|
||||||
|
EXTRAKEY_ENABLE = yes
|
||||||
AUDIO_ENABLE = no
|
AUDIO_ENABLE = no
|
||||||
CAPS_WORD_ENABLE = yes
|
CAPS_WORD_ENABLE = yes
|
||||||
MOUSEKEY_ENABLE = yes
|
MOUSEKEY_ENABLE = yes
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue