diff options
Diffstat (limited to 'keyboards/yandrstudio')
-rw-r--r-- | keyboards/yandrstudio/yr6095/info.json | 813 | ||||
-rw-r--r-- | keyboards/yandrstudio/yr6095/yr6095.c | 2 | ||||
-rw-r--r-- | keyboards/yandrstudio/yr6095/yr6095.h | 59 |
3 files changed, 140 insertions, 734 deletions
diff --git a/keyboards/yandrstudio/yr6095/info.json b/keyboards/yandrstudio/yr6095/info.json index 023f71fc14..3ec826052c 100644 --- a/keyboards/yandrstudio/yr6095/info.json +++ b/keyboards/yandrstudio/yr6095/info.json @@ -18,684 +18,149 @@ "layouts": { "LAYOUT_60_tsangan_split_rshift": { "layout": [ - { - "label": "0,0", - "x": 0, - "y": 0 - }, - { - "label": "0,1", - "x": 1, - "y": 0 - }, - { - "label": "0,2", - "x": 2, - "y": 0 - }, - { - "label": "0,3", - "x": 3, - "y": 0 - }, - { - "label": "0,4", - "x": 4, - "y": 0 - }, - { - "label": "0,5", - "x": 5, - "y": 0 - }, - { - "label": "0,6", - "x": 6, - "y": 0 - }, - { - "label": "0,7", - "x": 7, - "y": 0 - }, - { - "label": "0,8", - "x": 8, - "y": 0 - }, - { - "label": "0,9", - "x": 9, - "y": 0 - }, - { - "label": "0,10", - "x": 10, - "y": 0 - }, - { - "label": "0,11", - "x": 11, - "y": 0 - }, - { - "label": "0,12", - "x": 12, - "y": 0 - }, - { - "label": "4,7", - "x": 13, - "y": 0, - "w": 2 - }, - { - "label": "1,0", - "x": 0, - "y": 1, - "w": 1.5 - }, - { - "label": "1,1", - "x": 1.5, - "y": 1 - }, - { - "label": "1,2", - "x": 2.5, - "y": 1 - }, - { - "label": "1,3", - "x": 3.5, - "y": 1 - }, - { - "label": "1,4", - "x": 4.5, - "y": 1 - }, - { - "label": "1,5", - "x": 5.5, - "y": 1 - }, - { - "label": "1,6", - "x": 6.5, - "y": 1 - }, - { - "label": "1,7", - "x": 7.5, - "y": 1 - }, - { - "label": "1,8", - "x": 8.5, - "y": 1 - }, - { - "label": "1,9", - "x": 9.5, - "y": 1 - }, - { - "label": "1,10", - "x": 10.5, - "y": 1 - }, - { - "label": "1,11", - "x": 11.5, - "y": 1 - }, - { - "label": "1,12", - "x": 12.5, - "y": 1 - }, - { - "label": "1,13", - "x": 13.5, - "y": 1, - "w": 1.5 - }, - { - "label": "2,0", - "x": 0, - "y": 2, - "w": 1.75 - }, - { - "label": "2,1", - "x": 1.75, - "y": 2 - }, - { - "label": "2,2", - "x": 2.75, - "y": 2 - }, - { - "label": "2,3", - "x": 3.75, - "y": 2 - }, - { - "label": "2,4", - "x": 4.75, - "y": 2 - }, - { - "label": "2,5", - "x": 5.75, - "y": 2 - }, - { - "label": "2,6", - "x": 6.75, - "y": 2 - }, - { - "label": "2,7", - "x": 7.75, - "y": 2 - }, - { - "label": "2,8", - "x": 8.75, - "y": 2 - }, - { - "label": "2,9", - "x": 9.75, - "y": 2 - }, - { - "label": "2,10", - "x": 10.75, - "y": 2 - }, - { - "label": "2,11", - "x": 11.75, - "y": 2 - }, - { - "label": "2,13", - "x": 12.75, - "y": 2, - "w": 2.25 - }, - { - "label": "3,0", - "x": 0, - "y": 3, - "w": 2.25 - }, - { - "label": "3,1", - "x": 2.25, - "y": 3 - }, - { - "label": "3,2", - "x": 3.25, - "y": 3 - }, - { - "label": "3,3", - "x": 4.25, - "y": 3 - }, - { - "label": "3,4", - "x": 5.25, - "y": 3 - }, - { - "label": "3,5", - "x": 6.25, - "y": 3 - }, - { - "label": "3,6", - "x": 7.25, - "y": 3 - }, - { - "label": "3,7", - "x": 8.25, - "y": 3 - }, - { - "label": "3,8", - "x": 9.25, - "y": 3 - }, - { - "label": "3,9", - "x": 10.25, - "y": 3 - }, - { - "label": "3,10", - "x": 11.25, - "y": 3 - }, - { - "label": "3,12", - "x": 12.25, - "y": 3, - "w": 1.75 - }, - { - "label": "3,13", - "x": 14, - "y": 3 - }, - { - "label": "4,0", - "x": 0, - "y": 4, - "w": 1.5 - }, - { - "label": "4,1", - "x": 1.5, - "y": 4 - }, - { - "label": "4,2", - "x": 2.5, - "y": 4, - "w": 1.5 - }, - { - "label": "4,5", - "x": 4, - "y": 4, - "w": 7 - }, - { - "label": "4,10", - "x": 11, - "y": 4, - "w": 1.5 - }, - { - "label": "4,12", - "x": 12.5, - "y": 4 - }, - { - "label": "4,13", - "x": 13.5, - "y": 4, - "w": 1.5 - } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [4, 7], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} ] }, "LAYOUT_all": { "layout": [ - { - "label": "0,0", - "x": 0, - "y": 0 - }, - { - "label": "0,1", - "x": 1, - "y": 0 - }, - { - "label": "0,2", - "x": 2, - "y": 0 - }, - { - "label": "0,3", - "x": 3, - "y": 0 - }, - { - "label": "0,4", - "x": 4, - "y": 0 - }, - { - "label": "0,5", - "x": 5, - "y": 0 - }, - { - "label": "0,6", - "x": 6, - "y": 0 - }, - { - "label": "0,7", - "x": 7, - "y": 0 - }, - { - "label": "0,8", - "x": 8, - "y": 0 - }, - { - "label": "0,9", - "x": 9, - "y": 0 - }, - { - "label": "0,10", - "x": 10, - "y": 0 - }, - { - "label": "0,11", - "x": 11, - "y": 0 - }, - { - "label": "0,12", - "x": 12, - "y": 0 - }, - { - "label": "0,13", - "x": 13, - "y": 0 - }, - { - "label": "4,7", - "x": 14, - "y": 0 - }, - { - "label": "1,0", - "x": 0, - "y": 1, - "w": 1.5 - }, - { - "label": "1,1", - "x": 1.5, - "y": 1 - }, - { - "label": "1,2", - "x": 2.5, - "y": 1 - }, - { - "label": "1,3", - "x": 3.5, - "y": 1 - }, - { - "label": "1,4", - "x": 4.5, - "y": 1 - }, - { - "label": "1,5", - "x": 5.5, - "y": 1 - }, - { - "label": "1,6", - "x": 6.5, - "y": 1 - }, - { - "label": "1,7", - "x": 7.5, - "y": 1 - }, - { - "label": "1,8", - "x": 8.5, - "y": 1 - }, - { - "label": "1,9", - "x": 9.5, - "y": 1 - }, - { - "label": "1,10", - "x": 10.5, - "y": 1 - }, - { - "label": "1,11", - "x": 11.5, - "y": 1 - }, - { - "label": "1,12", - "x": 12.5, - "y": 1 - }, - { - "label": "1,13", - "x": 13.5, - "y": 1, - "w": 1.5 - }, - { - "label": "2,0", - "x": 0, - "y": 2, - "w": 1.75 - }, - { - "label": "2,1", - "x": 1.75, - "y": 2 - }, - { - "label": "2,2", - "x": 2.75, - "y": 2 - }, - { - "label": "2,3", - "x": 3.75, - "y": 2 - }, - { - "label": "2,4", - "x": 4.75, - "y": 2 - }, - { - "label": "2,5", - "x": 5.75, - "y": 2 - }, - { - "label": "2,6", - "x": 6.75, - "y": 2 - }, - { - "label": "2,7", - "x": 7.75, - "y": 2 - }, - { - "label": "2,8", - "x": 8.75, - "y": 2 - }, - { - "label": "2,9", - "x": 9.75, - "y": 2 - }, - { - "label": "2,10", - "x": 10.75, - "y": 2 - }, - { - "label": "2,11", - "x": 11.75, - "y": 2 - }, - { - "label": "2,12", - "x": 12.75, - "y": 2 - }, - { - "label": "2,13", - "x": 13.75, - "y": 2, - "w": 2.25 - }, - { - "label": "3,0", - "x": 0, - "y": 3, - "w": 2 - }, - { - "label": "3,1", - "x": 2, - "y": 3 - }, - { - "label": "3,2", - "x": 3, - "y": 3 - }, - { - "label": "3,3", - "x": 4, - "y": 3 - }, - { - "label": "3,4", - "x": 5, - "y": 3 - }, - { - "label": "3,5", - "x": 6, - "y": 3 - }, - { - "label": "3,6", - "x": 7, - "y": 3 - }, - { - "label": "3,7", - "x": 8, - "y": 3 - }, - { - "label": "3,8", - "x": 9, - "y": 3 - }, - { - "label": "3,9", - "x": 10, - "y": 3 - }, - { - "label": "3,10", - "x": 11, - "y": 3 - }, - { - "label": "3,11", - "x": 12, - "y": 3 - }, - { - "label": "3,12", - "x": 13, - "y": 3 - }, - { - "label": "3,13", - "x": 14, - "y": 3 - }, - { - "label": "4,0", - "x": 0, - "y": 4, - "w": 1.25 - }, - { - "label": "4,1", - "x": 1.25, - "y": 4, - "w": 1.25 - }, - { - "label": "4,2", - "x": 2.5, - "y": 4, - "w": 1.25 - }, - { - "label": "4,3", - "x": 3.75, - "y": 4, - "w": 2.25 - }, - { - "label": "4,4", - "x": 6, - "y": 4, - "w": 1.25 - }, - { - "label": "4,8", - "x": 7.25, - "y": 4, - "w": 2.75 - }, - { - "label": "4,9", - "x": 10, - "y": 4 - }, - { - "label": "4,10", - "x": 11, - "y": 4 - }, - { - "label": "4,11", - "x": 12, - "y": 4 - }, - { - "label": "4,12", - "x": 13, - "y": 4 - }, - { - "label": "4,13", - "x": 14, - "y": 4 - }, - { - "label": "4,5", - "x": 4, - "y": 5, - "w": 7 - } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [4, 7], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 7, "y": 3}, + {"matrix": [3, 7], "x": 8, "y": 3}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 10], "x": 11, "y": 3}, + {"matrix": [3, 11], "x": 12, "y": 3}, + {"matrix": [3, 12], "x": 13, "y": 3}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [4, 8], "x": 10, "y": 4}, + {"matrix": [4, 9], "x": 11, "y": 4}, + {"matrix": [4, 10], "x": 12, "y": 4}, + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 12], "x": 14, "y": 4}, + + {"matrix": [4, 13], "x": 4, "y": 5, "w": 7} ] } } diff --git a/keyboards/yandrstudio/yr6095/yr6095.c b/keyboards/yandrstudio/yr6095/yr6095.c index b4168279a7..ed70e5e577 100644 --- a/keyboards/yandrstudio/yr6095/yr6095.c +++ b/keyboards/yandrstudio/yr6095/yr6095.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "yr6095.h" +#include "quantum.h" void board_init(void) { AFIO->MAPR |= AFIO_MAPR_TIM3_REMAP_PARTIALREMAP; diff --git a/keyboards/yandrstudio/yr6095/yr6095.h b/keyboards/yandrstudio/yr6095/yr6095.h deleted file mode 100644 index f09b65bdfa..0000000000 --- a/keyboards/yandrstudio/yr6095/yr6095.h +++ /dev/null @@ -1,59 +0,0 @@ -/* Copyright 2022 JasonRen(biu) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -#pragma once - -#include "quantum.h" - -/* -┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ -│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ -│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ -│ │ │ │ │ │ │ │ │ │ │ │ │ │ -├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ -│ │ │ │ │ │ │ │ │ │ │ │ │ │ -├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ -│ │ │ │ │ │ │ │ -└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ -*/ -#define LAYOUT_60_tsangan_split_rshift( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K407, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, \ - K400, K401, K402, K405, K410, K412, K413 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, K213 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, KC_NO, K312, K313 }, \ - { K400, K401, K402, KC_NO, KC_NO, K405, KC_NO, K407, KC_NO, KC_NO, K410, KC_NO, K412, K413 } \ -} - -#define LAYOUT_all( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K407, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \ - K400, K401, K402, K403, K404, K405, K408, K409, K410, K411, K412, K413 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \ - { K400, K401, K402, K403, K404, K405, KC_NO, K407, K408, K409, K410, K411, K412, K413 } \ -} |