gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-04-05 13:25:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
QMK Bot 2022-07-02 13:08:54 +00:00
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

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

@ -2,27 +2,25 @@
"keyboard_name": "Alter", "keyboard_name": "Alter",
"url": "", "url": "",
"maintainer": "DeskDaily", "maintainer": "DeskDaily",
"width": 20,
"height": 5.25,
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [
{"x":0.5, "y":0.15}, {"x":0.5, "y":0.15},
{"x":1.75, "y":0.24999999999999997}, {"x":1.75, "y":0.25},
{"x":2.75, "y":0.24999999999999997}, {"x":2.75, "y":0.25},
{"x":3.75, "y":0.24999999999999997}, {"x":3.75, "y":0.25},
{"x":4.75, "y":0.24999999999999997}, {"x":4.75, "y":0.25},
{"x":5.75, "y":0.24999999999999997}, {"x":5.75, "y":0.25},
{"x":6.75, "y":0.24999999999999997}, {"x":6.75, "y":0.25},
{"x":7.75, "y":0.24999999999999997}, {"x":7.75, "y":0.25},
{"x":11.25, "y":0.24999999999999997}, {"x":11.25, "y":0.25},
{"x":12.25, "y":0.24999999999999997}, {"x":12.25, "y":0.25},
{"x":13.25, "y":0.24999999999999997}, {"x":13.25, "y":0.25},
{"x":14.25, "y":0.24999999999999997}, {"x":14.25, "y":0.25},
{"x":15.25, "y":0.24999999999999997}, {"x":15.25, "y":0.25},
{"x":16.25, "y":0.24999999999999997}, {"x":16.25, "y":0.25},
{"x":17.25, "y":0.24999999999999997}, {"x":17.25, "y":0.25},
{"x":18.25, "y":0.24999999999999997}, {"x":18.25, "y":0.25},
{"x":0.25, "y":1.15}, {"x":0.25, "y":1.15},
{"x":1.5, "y":1.25, "w":1.5}, {"x":1.5, "y":1.25, "w":1.5},
{"x":3, "y":1.25}, {"x":3, "y":1.25},

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

@ -1,6 +1,6 @@
#DeskDaily Alter #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 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 # 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 A single layout 60% pcb with a Tsangan bottom row and split spacabars

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

@ -2,8 +2,6 @@
"keyboard_name": "Paraluman", "keyboard_name": "Paraluman",
"url": "", "url": "",
"maintainer": "DeskDaily", "maintainer": "DeskDaily",
"width": 17.25,
"height": 5,
"layouts": { "layouts": {
"LAYOUT_60_ansi_split_bs_rshift": { "LAYOUT_60_ansi_split_bs_rshift": {
"layout": [ "layout": [