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

This commit is contained in:
QMK Bot 2024-10-19 12:26:03 +00:00
commit e14f861803
10 changed files with 31 additions and 25 deletions

View File

@ -1365,6 +1365,12 @@
"runner3680/5x8": {
"target": "omkbd/runner3680/5x8"
},
"saevus/cor": {
"target": "concreteflowers/cor"
},
"saevus/cor_tkl": {
"target": "concreteflowers/cor_tkl"
},
"scarletbandana": {
"target": "woodkeys/scarletbandana"
},

View File

@ -1,5 +1,5 @@
{
"manufacturer": "saevus",
"manufacturer": "concreteflowers",
"keyboard_name": "cor",
"maintainer": "ramonimbao",
"bootloader": "atmel-dfu",
@ -45,7 +45,7 @@
{"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
{"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
{"label": "Delete", "matrix": [0, 16], "x": 16.75, "y": 0},
{"label": "F2", "matrix": [1, 0], "x": 0, "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},
@ -62,7 +62,7 @@
{"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
{"label": "\\", "matrix": [1, 15], "x": 14.75, "y": 1, "w": 1.5},
{"label": "Page Up", "matrix": [1, 16], "x": 16.75, "y": 1},
{"label": "F3", "matrix": [2, 0], "x": 0, "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},
@ -78,7 +78,7 @@
{"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
{"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
{"label": "Page Down", "matrix": [2, 16], "x": 16.75, "y": 2},
{"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
{"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
{"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
@ -94,7 +94,7 @@
{"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
{"label": "\u2191", "matrix": [3, 15], "x": 15.5, "y": 3.25},
{"label": "Fn", "matrix": [3, 16], "x": 16.75, "y": 3},
{"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
{"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
@ -126,7 +126,7 @@
{"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
{"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0},
{"label": "Delete", "matrix": [0, 16], "x": 16.75, "y": 0},
{"label": "F2", "matrix": [1, 0], "x": 0, "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},
@ -143,7 +143,7 @@
{"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
{"label": "\\", "matrix": [1, 15], "x": 14.75, "y": 1, "w": 1.5},
{"label": "Page Up", "matrix": [1, 16], "x": 16.75, "y": 1},
{"label": "F3", "matrix": [2, 0], "x": 0, "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},
@ -159,7 +159,7 @@
{"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
{"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
{"label": "Page Down", "matrix": [2, 16], "x": 16.75, "y": 2},
{"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
{"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
{"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
@ -175,7 +175,7 @@
{"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
{"label": "\u2191", "matrix": [3, 15], "x": 15.5, "y": 3.25},
{"label": "Fn", "matrix": [3, 16], "x": 16.75, "y": 3},
{"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
{"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
@ -206,7 +206,7 @@
{"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0},
{"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
{"label": "Delete", "matrix": [0, 16], "x": 16.75, "y": 0},
{"label": "F2", "matrix": [1, 0], "x": 0, "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},
@ -223,7 +223,7 @@
{"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
{"label": "\\", "matrix": [1, 15], "x": 14.75, "y": 1, "w": 1.5},
{"label": "Page Up", "matrix": [1, 16], "x": 16.75, "y": 1},
{"label": "F3", "matrix": [2, 0], "x": 0, "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},
@ -239,7 +239,7 @@
{"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
{"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
{"label": "Page Down", "matrix": [2, 16], "x": 16.75, "y": 2},
{"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
{"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
{"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
@ -255,7 +255,7 @@
{"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
{"label": "\u2191", "matrix": [3, 15], "x": 15.5, "y": 3.25},
{"label": "Fn", "matrix": [3, 16], "x": 16.75, "y": 3},
{"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
{"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
{"label": "GUI", "matrix": [4, 2], "x": 2.75, "y": 4},
@ -286,7 +286,7 @@
{"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0},
{"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0},
{"label": "Delete", "matrix": [0, 16], "x": 16.75, "y": 0},
{"label": "F2", "matrix": [1, 0], "x": 0, "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},
@ -303,7 +303,7 @@
{"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1},
{"label": "\\", "matrix": [1, 15], "x": 14.75, "y": 1, "w": 1.5},
{"label": "Page Up", "matrix": [1, 16], "x": 16.75, "y": 1},
{"label": "F3", "matrix": [2, 0], "x": 0, "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},
@ -319,7 +319,7 @@
{"label": "'", "matrix": [2, 12], "x": 13, "y": 2},
{"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
{"label": "Page Down", "matrix": [2, 16], "x": 16.75, "y": 2},
{"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
{"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
{"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
@ -335,7 +335,7 @@
{"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
{"label": "\u2191", "matrix": [3, 15], "x": 15.5, "y": 3.25},
{"label": "Fn", "matrix": [3, 16], "x": 16.75, "y": 3},
{"label": "F5", "matrix": [4, 0], "x": 0, "y": 4},
{"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
{"label": "GUI", "matrix": [4, 2], "x": 2.75, "y": 4},

View File

@ -1,6 +1,6 @@
# saevus cor
# concrete flowers cor
![saevus cor](https://i.imgur.com/AOT6mmMl.jpg)
![concrete flowers cor](https://i.imgur.com/AOT6mmMl.jpg)
An exploded 65% with a macro column.
@ -9,11 +9,11 @@ An exploded 65% with a macro column.
Make example for this keyboard (after setting up your build environment):
make saevus/cor:via
make concreteflowers/cor:default
Flashing example for this keyboard:
make saevus/cor:via:flash
make concrete flowers/cor:default:flash
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

View File

@ -1,6 +1,6 @@
{
"keyboard_name": "Cor TKL",
"manufacturer": "saevus",
"manufacturer": "concreteflowers",
"url": "",
"maintainer": "ramonimbao",
"community_layouts": [

View File

@ -1,4 +1,4 @@
# saevus cor TKL
# concrete flowers cor TKL
![Cor TKL](https://i.imgur.com/RGctsaVl.png)
@ -7,12 +7,12 @@
Make example for this keyboard (after setting up your build environment):
make saevus/cor_tkl:via
make concreteflowers/cor_tkl:default
To get to the bootloader, simply press the reset button located at the back of the PCB. You can then flash new firmware onto it.
Flashing example for this keyboard:
make saevus/cor_tkl:via:flash
make concreteflowers/cor_tkl:default:flash
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).