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

This commit is contained in:
QMK Bot 2022-01-31 11:16:45 +00:00
commit 8116b2a15c
3 changed files with 74 additions and 73 deletions

View File

@ -36,8 +36,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{ KC_NO , K71 , K72 , K73 , K74 , K75 , K76 , K77 }, \ { KC_NO , K71 , K72 , K73 , K74 , K75 , K76 , K77 }, \
{ K80 , K81 , K82 , KC_NO, KC_NO, KC_NO, KC_NO, KC_NO} \ { K80 , K81 , K82 , KC_NO, KC_NO, KC_NO, KC_NO, KC_NO} \
} }
#define LAYOUT_all LAYOUT_alice_split_bs

View File

@ -3,75 +3,79 @@
"url": "https://kapcave.com/products/arya", "url": "https://kapcave.com/products/arya",
"maintainer": "nachie", "maintainer": "nachie",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT_alice_split_bs": {
"layout": [ "layout": [
{"label":"Esc", "x":2.75, "y":5.9}, {"x":0.4, "y":0},
{"label":"\u00ac", "x":4, "y":6.0}, {"x":1.55, "y":0.1},
{"label":"!", "x":5, "y":6.0}, {"x":2.55, "y":0.1},
{"label":"\"", "x":6, "y":6.0}, {"x":3.55, "y":0},
{"label":"_", "x":15.25, "y":6.0}, {"x":4.55, "y":0.1},
{"label":"+", "x":16.25, "y":6.0}, {"x":5.55, "y":0.1},
{"label":"", "x":17.25, "y":6.0}, {"x":6.55, "y":0.1},
{"label":"", "x":18.25, "y":6.0}, {"x":7.55, "y":0.1},
{"label":"Pg Up", "x":2.5, "y":6.9}, {"x":9.75, "y":0.1},
{"label":"Tab", "x":3.75, "y":7.0, "w":1.5}, {"x":10.75, "y":0.1},
{"label":"Q", "x":5.25, "y":7.0}, {"x":11.75, "y":0.1},
{"label":"P", "x":15, "y":7.0}, {"x":12.75, "y":0.1},
{"label":"{", "x":16, "y":7.0}, {"x":13.75, "y":0},
{"label":"}", "x":17, "y":7.0}, {"x":14.75, "y":0.1},
{"label":"|", "x":18, "y":7.0, "w":1.5}, {"x":15.75, "y":0.1},
{"label":"Pg Dn", "x":2.25, "y":7.9}, {"x":16.75, "y":0.1},
{"label":"Caps Lock", "x":3.5, "y":8.0, "w":1.75},
{"label":"A", "x":5.25, "y":8.0}, {"x":0.2, "y":1.0},
{"label":":", "x":15.5, "y":8.0}, {"x":1.35, "y":1.1, "w":1.5},
{"label":"\"", "x":16.5, "y":8.0}, {"x":2.85, "y":1.1},
{"label":"Enter", "x":17.5, "y":8.0, "w":2.25}, {"x":3.85, "y":1.1},
{"label":"Shift", "x":3.25, "y":9.0, "w":2.25}, {"x":4.85, "y":1.1},
{"label":"Z", "x":5.5, "y":9.0}, {"x":5.85, "y":1.1},
{"label":">", "x":15.25, "y":9.0}, {"x":6.85, "y":1.1},
{"label":"?", "x":16.25, "y":9.0}, {"x":9.45, "y":1.1},
{"label":"Shift", "x":17.25, "y":9.0, "w":1.75}, {"x":10.45, "y":1.1},
{"label":"Fn", "x":19, "y":9.0}, {"x":11.45, "y":1.1},
{"label":"Ctrl", "x":3.25, "y":10.0, "w":1.5}, {"x":12.45, "y":1.1},
{"label":"Ctrl", "x":18.25, "y":10.0, "w":1.5}, {"x":13.45, "y":1.1},
{"label":"\u00a3", "x":8.25, "y":4.5}, {"x":14.45, "y":1.1},
{"label":"$", "x":9.25, "y":4.5}, {"x":15.45, "y":1.1},
{"label":"%", "x":10.25, "y":4.5}, {"x":16.45, "y":1.1, "w":1.5},
{"label":"^", "x":11.25, "y":4.5},
{"label":"W", "x":7.75, "y":5.5}, {"x":0, "y":2.0},
{"label":"E", "x":8.75, "y":5.5}, {"x":1.15, "y":2.1, "w":1.75},
{"label":"R", "x":9.75, "y":5.5}, {"x":2.9, "y":2.1},
{"label":"T", "x":10.75, "y":5.5}, {"x":3.9, "y":2.1},
{"label":"S", "x":8, "y":6.5}, {"x":4.9, "y":2.1},
{"label":"D", "x":9, "y":6.5}, {"x":5.9, "y":2.1},
{"label":"F", "x":10, "y":6.5}, {"x":6.9, "y":2.1},
{"label":"G", "x":11, "y":6.5}, {"x":9.9, "y":2.1},
{"label":"X", "x":8.5, "y":7.5}, {"x":10.9, "y":2.1},
{"label":"C", "x":9.5, "y":7.5}, {"x":11.9, "y":2.1},
{"label":"V", "x":10.5, "y":7.5}, {"x":12.9, "y":2.1},
{"label":"B", "x":11.5, "y":7.5}, {"x":13.9, "y":2.1},
{"label":"Alt", "x":8.25, "y":8.5, "w":1.5}, {"x":14.9, "y":2.1},
{"label":"", "x":9.75, "y":8.5, "w":2}, {"x":15.9, "y":2.1, "w":2.25},
{"label":"Fn", "x":11.75, "y":8.5, "w":1.25},
{"label":"&", "x":9.5, "y":9.0}, {"x":0.95, "y":3.1, "w":2.25},
{"label":"*", "x":10.5, "y":9.0}, {"x":3.2, "y":3.1},
{"label":"(", "x":11.5, "y":9.0}, {"x":4.2, "y":3.1},
{"label":")", "x":12.5, "y":9.0}, {"x":5.2, "y":3.1},
{"label":"Y", "x":9, "y":10.0}, {"x":6.2, "y":3.1},
{"label":"U", "x":10, "y":10.0}, {"x":7.2, "y":3.1},
{"label":"I", "x":11, "y":10.0}, {"x":9.6, "y":3.1},
{"label":"O", "x":12, "y":10.0}, {"x":10.6, "y":3.1},
{"label":"H", "x":9.25, "y":11.0}, {"x":11.6, "y":3.1},
{"label":"J", "x":10.25, "y":11.0}, {"x":12.6, "y":3.1},
{"label":"K", "x":11.25, "y":11.0}, {"x":13.6, "y":3.1},
{"label":"L", "x":12.25, "y":11.0}, {"x":14.6, "y":3.1},
{"label":"Fn", "x":8.75, "y":12.0}, {"x":15.6, "y":3.1, "w":1.75},
{"label":"N", "x":9.75, "y":12.0}, {"x":17.35, "y":3.1},
{"label":"M", "x":10.75, "y":12.0},
{"label":"<", "x":11.75, "y":12.0}, {"x":0.95, "y":4.1, "w":1.5},
{"label":"Shift", "x":8.75, "y":13.0, "w":2.75}, {"x":3.85, "y":4.1, "w":1.5},
{"label":"Alt", "x":11.5, "y":13.0, "w":1.5} {"x":5.35, "y":4.1, "w":2},
{"x":7.35, "y":4.1, "w":1.25},
{"x":9.6, "y":4.1, "w":2.75},
{"x":12.35, "y":4.1, "w":1.5},
{"x":16.65, "y":4.1, "w":1.5}
] ]
} }
} }
} }

View File

@ -20,3 +20,5 @@ ENCODER_ENABLE = yes
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
LAYOUTS = alice_split_bs