g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
QMK Bot 2022-07-02 13:08:54 +00:00
parent 414a387f22 7e926f5c93
commit c1d9f9911c
5 changed files with 852 additions and 583 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1033
keyboards/ktec/ergodone/keymaps/vega/keymap.c
View File

File diff suppressed because it is too large Load Diff

132
keyboards/nightly_boards/alter_lite/info.json
View File

@ -2,76 +2,74 @@
"keyboard_name": "Alter",
"url": "",
"maintainer": "DeskDaily",
"width": 20,
"height": 5.25,
"layouts": {
"LAYOUT": {
"layout": [
{"x":0.5, "y":0.15},
{"x":1.75, "y":0.24999999999999997},
{"x":2.75, "y":0.24999999999999997},
{"x":3.75, "y":0.24999999999999997},
{"x":4.75, "y":0.24999999999999997},
{"x":5.75, "y":0.24999999999999997},
{"x":6.75, "y":0.24999999999999997},
{"x":7.75, "y":0.24999999999999997},
{"x":11.25, "y":0.24999999999999997},
{"x":12.25, "y":0.24999999999999997},
{"x":13.25, "y":0.24999999999999997},
{"x":14.25, "y":0.24999999999999997},
{"x":15.25, "y":0.24999999999999997},
{"x":16.25, "y":0.24999999999999997},
{"x":17.25, "y":0.24999999999999997},
{"x":18.25, "y":0.24999999999999997},
{"x":0.25, "y":1.15},
{"x":1.5, "y":1.25, "w":1.5},
{"x":3, "y":1.25},
{"x":4.25, "y":1.25},
{"x":5.25, "y":1.25},
{"x":6.25, "y":1.25},
{"x":7.25, "y":1.25},
{"x":10.75, "y":1.25},
{"x":11.75, "y":1.25},
{"x":12.75, "y":1.25},
{"x":13.75, "y":1.25},
{"x":15, "y":1.25},
{"x":16, "y":1.25},
{"x":17, "y":1.25},
{"x":18, "y":1.25, "w":1.5},
{"x":0, "y":2.15},
{"x":1.25, "y":2.25, "w":1.75},
{"x":3, "y":2.25},
{"x":4.5, "y":2.25},
{"x":5.5, "y":2.25},
{"x":6.5, "y":2.25},
{"x":7.5, "y":2.25},
{"x":11, "y":2.25},
{"x":12, "y":2.25},
{"x":13, "y":2.25},
{"x":14, "y":2.25},
{"x":15.5, "y":2.25},
{"x":16.5, "y":2.25},
{"x":17.5, "y":2.25, "w":2.25},
{"x":1, "y":3.25, "w":2.25},
{"x":3.25, "y":3.25},
{"x":5, "y":3.25},
{"x":6, "y":3.25},
{"x":7, "y":3.25},
{"x":8, "y":3.25},
{"x":10.5, "y":3.25},
{"x":11.5, "y":3.25},
{"x":12.5, "y":3.25},
{"x":13.5, "y":3.25},
{"x":15.25, "y":3.25},
{"x":16.25, "y":3.25},
{"x":17.25, "y":3.25, "w":1.75},
{"x":19, "y":3.25},
{"x":1, "y":4.25, "w":1.5},
{"x":4.75, "y":4.25, "w":1.5},
{"x":6.25, "y":4.25, "w":2},
{"x":8.25, "y":4.25, "w":1.25},
{"x":10.5, "y":4.25, "w":2.75},
{"x":13.25, "y":4.25, "w":1.5},
{"x":0.5, "y":0.15},
{"x":1.75, "y":0.25},
{"x":2.75, "y":0.25},
{"x":3.75, "y":0.25},
{"x":4.75, "y":0.25},
{"x":5.75, "y":0.25},
{"x":6.75, "y":0.25},
{"x":7.75, "y":0.25},
{"x":11.25, "y":0.25},
{"x":12.25, "y":0.25},
{"x":13.25, "y":0.25},
{"x":14.25, "y":0.25},
{"x":15.25, "y":0.25},
{"x":16.25, "y":0.25},
{"x":17.25, "y":0.25},
{"x":18.25, "y":0.25},
{"x":0.25, "y":1.15},
{"x":1.5, "y":1.25, "w":1.5},
{"x":3, "y":1.25},
{"x":4.25, "y":1.25},
{"x":5.25, "y":1.25},
{"x":6.25, "y":1.25},
{"x":7.25, "y":1.25},
{"x":10.75, "y":1.25},
{"x":11.75, "y":1.25},
{"x":12.75, "y":1.25},
{"x":13.75, "y":1.25},
{"x":15, "y":1.25},
{"x":16, "y":1.25},
{"x":17, "y":1.25},
{"x":18, "y":1.25, "w":1.5},
{"x":0, "y":2.15},
{"x":1.25, "y":2.25, "w":1.75},
{"x":3, "y":2.25},
{"x":4.5, "y":2.25},
{"x":5.5, "y":2.25},
{"x":6.5, "y":2.25},
{"x":7.5, "y":2.25},
{"x":11, "y":2.25},
{"x":12, "y":2.25},
{"x":13, "y":2.25},
{"x":14, "y":2.25},
{"x":15.5, "y":2.25},
{"x":16.5, "y":2.25},
{"x":17.5, "y":2.25, "w":2.25},
{"x":1, "y":3.25, "w":2.25},
{"x":3.25, "y":3.25},
{"x":5, "y":3.25},
{"x":6, "y":3.25},
{"x":7, "y":3.25},
{"x":8, "y":3.25},
{"x":10.5, "y":3.25},
{"x":11.5, "y":3.25},
{"x":12.5, "y":3.25},
{"x":13.5, "y":3.25},
{"x":15.25, "y":3.25},
{"x":16.25, "y":3.25},
{"x":17.25, "y":3.25, "w":1.75},
{"x":19, "y":3.25},
{"x":1, "y":4.25, "w":1.5},
{"x":4.75, "y":4.25, "w":1.5},
{"x":6.25, "y":4.25, "w":2},
{"x":8.25, "y":4.25, "w":1.25},
{"x":10.5, "y":4.25, "w":2.75},
{"x":13.25, "y":4.25, "w":1.5},
{"x":18.25, "y":4.25, "w":1.5}]
}
}

2
keyboards/nightly_boards/alter_lite/readme.md
View File

@ -1,6 +1,6 @@
#DeskDaily Alter
![Alter Lite](https://media.discordapp.net/attachments/946989936941346857/946992282576519279/PXL_20220226_044706997.PORTRAIT2.jpg?width=704&height=396)
![Alter Lite](https://i.imgur.com/dYVwbD0.jpg)
An Alice layout keyboard. This Lite version have no underglow

2
keyboards/nightly_boards/conde60/readme.md
View File

@ -1,6 +1,6 @@
# DeskDaily Conde60
![Conde60](https://media.discordapp.net/attachments/755074685862936686/982918555882360852/unknown.png?width=853&height=396)
![Conde60](https://i.imgur.com/5L7Cw44.png)
A single layout 60% pcb with a Tsangan bottom row and split spacabars

266
keyboards/nightly_boards/paraluman/info.json
View File

@ -1,148 +1,146 @@
{
"keyboard_name": "Paraluman",
"url": "",
"maintainer": "DeskDaily",
"width": 17.25,
"height": 5,
"keyboard_name": "Paraluman",
"url": "",
"maintainer": "DeskDaily",
"layouts": {
"LAYOUT_60_ansi_split_bs_rshift": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":3, "y":0},
{"x":4, "y":0},
{"x":5, "y":0},
{"x":6, "y":0},
{"x":7, "y":0},
{"x":8, "y":0},
{"x":9, "y":0},
{"x":10, "y":0},
{"x":11, "y":0},
{"x":12, "y":0},
{"x":13, "y":0},
{"x":14, "y":0},
{"x":0, "y":1, "w":1.5},
{"x":1.5, "y":1},
{"x":2.5, "y":1},
{"x":3.5, "y":1},
{"x":4.5, "y":1},
{"x":5.5, "y":1},
{"x":6.5, "y":1},
{"x":7.5, "y":1},
{"x":8.5, "y":1},
{"x":9.5, "y":1},
{"x":10.5, "y":1},
{"x":11.5, "y":1},
{"x":12.5, "y":1},
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":3, "y":0},
{"x":4, "y":0},
{"x":5, "y":0},
{"x":6, "y":0},
{"x":7, "y":0},
{"x":8, "y":0},
{"x":9, "y":0},
{"x":10, "y":0},
{"x":11, "y":0},
{"x":12, "y":0},
{"x":13, "y":0},
{"x":14, "y":0},
{"x":0, "y":1, "w":1.5},
{"x":1.5, "y":1},
{"x":2.5, "y":1},
{"x":3.5, "y":1},
{"x":4.5, "y":1},
{"x":5.5, "y":1},
{"x":6.5, "y":1},
{"x":7.5, "y":1},
{"x":8.5, "y":1},
{"x":9.5, "y":1},
{"x":10.5, "y":1},
{"x":11.5, "y":1},
{"x":12.5, "y":1},
{"x":13.5, "y":1, "w":1.5},
{"x":0, "y":2, "w":1.75},
{"x":1.75, "y":2},
{"x":2.75, "y":2},
{"x":3.75, "y":2},
{"x":4.75, "y":2},
{"x":5.75, "y":2},
{"x":6.75, "y":2},
{"x":7.75, "y":2},
{"x":8.75, "y":2},
{"x":9.75, "y":2},
{"x":10.75, "y":2},
{"x":11.75, "y":2},
{"x":12.75, "y":2, "w":2.25},
{"x":0, "y":3, "w":2.25},
{"x":2.25, "y":3},
{"x":3.25, "y":3},
{"x":4.25, "y":3},
{"x":5.25, "y":3},
{"x":6.25, "y":3},
{"x":7.25, "y":3},
{"x":8.25, "y":3},
{"x":9.25, "y":3},
{"x":10.25, "y":3},
{"x":11.25, "y":3},
{"x":12.25, "y":3, "w":1.75},
{"x":14, "y":3},
{"x":0, "y":4, "w":1.25},
{"x":1.25, "y":4, "w":1.25},
{"x":2.5, "y":4, "w":1.25},
{"x":3.75, "y":4, "w":6.25},
{"x":10, "y":4, "w":1.25},
{"x":11.25, "y":4, "w":1.25},
{"x":12.5, "y":4, "w":1.25},
{"x":0, "y":2, "w":1.75},
{"x":1.75, "y":2},
{"x":2.75, "y":2},
{"x":3.75, "y":2},
{"x":4.75, "y":2},
{"x":5.75, "y":2},
{"x":6.75, "y":2},
{"x":7.75, "y":2},
{"x":8.75, "y":2},
{"x":9.75, "y":2},
{"x":10.75, "y":2},
{"x":11.75, "y":2},
{"x":12.75, "y":2, "w":2.25},
{"x":0, "y":3, "w":2.25},
{"x":2.25, "y":3},
{"x":3.25, "y":3},
{"x":4.25, "y":3},
{"x":5.25, "y":3},
{"x":6.25, "y":3},
{"x":7.25, "y":3},
{"x":8.25, "y":3},
{"x":9.25, "y":3},
{"x":10.25, "y":3},
{"x":11.25, "y":3},
{"x":12.25, "y":3, "w":1.75},
{"x":14, "y":3},
{"x":0, "y":4, "w":1.25},
{"x":1.25, "y":4, "w":1.25},
{"x":2.5, "y":4, "w":1.25},
{"x":3.75, "y":4, "w":6.25},
{"x":10, "y":4, "w":1.25},
{"x":11.25, "y":4, "w":1.25},
{"x":12.5, "y":4, "w":1.25},
{"x":13.75, "y":4, "w":1.25}
]
},
"LAYOUT_60_ansi_split_bs_rshift_tsangan": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":3, "y":0},
{"x":4, "y":0},
{"x":5, "y":0},
{"x":6, "y":0},
{"x":7, "y":0},
{"x":8, "y":0},
{"x":9, "y":0},
{"x":10, "y":0},
{"x":11, "y":0},
{"x":12, "y":0},
{"x":13, "y":0},
{"x":14, "y":0},
{"x":0, "y":1, "w":1.5},
{"x":1.5, "y":1},
{"x":2.5, "y":1},
{"x":3.5, "y":1},
{"x":4.5, "y":1},
{"x":5.5, "y":1},
{"x":6.5, "y":1},
{"x":7.5, "y":1},
{"x":8.5, "y":1},
{"x":9.5, "y":1},
{"x":10.5, "y":1},
{"x":11.5, "y":1},
{"x":12.5, "y":1},
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":3, "y":0},
{"x":4, "y":0},
{"x":5, "y":0},
{"x":6, "y":0},
{"x":7, "y":0},
{"x":8, "y":0},
{"x":9, "y":0},
{"x":10, "y":0},
{"x":11, "y":0},
{"x":12, "y":0},
{"x":13, "y":0},
{"x":14, "y":0},
{"x":0, "y":1, "w":1.5},
{"x":1.5, "y":1},
{"x":2.5, "y":1},
{"x":3.5, "y":1},
{"x":4.5, "y":1},
{"x":5.5, "y":1},
{"x":6.5, "y":1},
{"x":7.5, "y":1},
{"x":8.5, "y":1},
{"x":9.5, "y":1},
{"x":10.5, "y":1},
{"x":11.5, "y":1},
{"x":12.5, "y":1},
{"x":13.5, "y":1, "w":1.5},
{"x":0, "y":2, "w":1.75},
{"x":1.75, "y":2},
{"x":2.75, "y":2},
{"x":3.75, "y":2},
{"x":4.75, "y":2},
{"x":5.75, "y":2},
{"x":6.75, "y":2},
{"x":7.75, "y":2},
{"x":8.75, "y":2},
{"x":9.75, "y":2},
{"x":10.75, "y":2},
{"x":11.75, "y":2},
{"x":12.75, "y":2, "w":2.25},
{"x":0, "y":3, "w":2.25},
{"x":2.25, "y":3},
{"x":3.25, "y":3},
{"x":4.25, "y":3},
{"x":5.25, "y":3},
{"x":6.25, "y":3},
{"x":7.25, "y":3},
{"x":8.25, "y":3},
{"x":9.25, "y":3},
{"x":10.25, "y":3},
{"x":11.25, "y":3},
{"x":12.25, "y":3, "w":1.75},
{"x":14, "y":3},
{"x":0, "y":4, "w":1.5},
{"x":1.5, "y":4},
{"x":2.5, "y":4, "w":1.5},
{"x":4, "y":4, "w":7},
{"x":11, "y":4, "w":1.5},
{"x":12.5, "y":4},
{"x":0, "y":2, "w":1.75},
{"x":1.75, "y":2},
{"x":2.75, "y":2},
{"x":3.75, "y":2},
{"x":4.75, "y":2},
{"x":5.75, "y":2},
{"x":6.75, "y":2},
{"x":7.75, "y":2},
{"x":8.75, "y":2},
{"x":9.75, "y":2},
{"x":10.75, "y":2},
{"x":11.75, "y":2},
{"x":12.75, "y":2, "w":2.25},
{"x":0, "y":3, "w":2.25},
{"x":2.25, "y":3},
{"x":3.25, "y":3},
{"x":4.25, "y":3},
{"x":5.25, "y":3},
{"x":6.25, "y":3},
{"x":7.25, "y":3},
{"x":8.25, "y":3},
{"x":9.25, "y":3},
{"x":10.25, "y":3},
{"x":11.25, "y":3},
{"x":12.25, "y":3, "w":1.75},
{"x":14, "y":3},
{"x":0, "y":4, "w":1.5},
{"x":1.5, "y":4},
{"x":2.5, "y":4, "w":1.5},
{"x":4, "y":4, "w":7},
{"x":11, "y":4, "w":1.5},
{"x":12.5, "y":4},
{"x":13.5, "y":4, "w":1.5}
]
}