diff options
Diffstat (limited to 'keyboards/salicylic_acid3/7splus')
| -rw-r--r-- | keyboards/salicylic_acid3/7splus/7splus.h | 61 | ||||
| -rw-r--r-- | keyboards/salicylic_acid3/7splus/info.json | 184 |
2 files changed, 99 insertions, 146 deletions
diff --git a/keyboards/salicylic_acid3/7splus/7splus.h b/keyboards/salicylic_acid3/7splus/7splus.h deleted file mode 100644 index 55b9c24f9c..0000000000 --- a/keyboards/salicylic_acid3/7splus/7splus.h +++ /dev/null @@ -1,61 +0,0 @@ -/* -Copyright 2020 Salicylic_Acid - -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" - -/* - * ,-------------------------------------- ----------------------------------------------------------. - * | L00 | L01 | L02 | L03 | L04 | L05 | | R00 | R01 | R02 | R03 | R04 | R05 | R06 | R07 | R60 | - * |-------------------------------------- ------------------------------------------------------------+ - * | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 | R62 | - * |---------------------------------------------------------------------------------------------------+ - * | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R27 | R63 | - * |---------------------------------------- ---------------------------------------------------------+ - * | L30 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | R37 | - * |---------------------------------------------------------------------------------------------------+ - * | L40 | L41 | L42 | L43 | L44 | L45 | | R40 | R41 | R42 | R43 | R44 | R45 | R47 | R57 | - * |---------------------------------------------------------------------------------------------------+ - * | L50 | L51 | L52 | L53 | L54 | L55 | | R50 | R51 | R53 | R54 | R55 | R56 | R64 | - * |---------------------------------------- ------------------------------------------------------' - */ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, R60, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R62, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R27, R63, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, R37, \ - L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, R47, R57, \ - L50, L51, L52, L54, L55, R50, R51, R53, R54, R55, R56, R64 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, KC_NO, KC_NO }, \ - { L40, L41, L42, L43, L44, L45, KC_NO, KC_NO }, \ - { L50, L51, L52, KC_NO, L54, L55, KC_NO, KC_NO }, \ - {KC_NO,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37 }, \ - { R40, R41, R42, R43, R44, R45, KC_NO, R47 }, \ - { R50, R51, KC_NO, R53, R54, R55, R56, R57 }, \ - { R60, KC_NO, R62, R63, R64, KC_NO, KC_NO, KC_NO } \ - } diff --git a/keyboards/salicylic_acid3/7splus/info.json b/keyboards/salicylic_acid3/7splus/info.json index 47f3bcc5c2..40f449c126 100644 --- a/keyboards/salicylic_acid3/7splus/info.json +++ b/keyboards/salicylic_acid3/7splus/info.json @@ -24,91 +24,105 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":1.25, "y":0}, - {"label":"F2", "x":2.25, "y":0}, - {"label":"F3", "x":3.25, "y":0}, - {"label":"F4", "x":4.25, "y":0}, - {"label":"F5", "x":5.5, "y":0}, - {"label":"F6", "x":7.5, "y":0}, - {"label":"F7", "x":8.5, "y":0}, - {"label":"F8", "x":9.5, "y":0}, - {"label":"F9", "x":10.75, "y":0}, - {"label":"F10", "x":11.75, "y":0}, - {"label":"F11", "x":12.75, "y":0}, - {"label":"F12", "x":13.75, "y":0}, - {"label":"PrtScr", "x":15, "y":0}, - {"label":"Delete", "x":16, "y":0}, - {"label":"~", "x":0, "y":1.25}, - {"label":"1", "x":1, "y":1.25}, - {"label":"2", "x":2, "y":1.25}, - {"label":"3", "x":3, "y":1.25}, - {"label":"4", "x":4, "y":1.25}, - {"label":"5", "x":5, "y":1.25}, - {"label":"6", "x":7, "y":1.25}, - {"label":"7", "x":8, "y":1.25}, - {"label":"8", "x":9, "y":1.25}, - {"label":"9", "x":10, "y":1.25}, - {"label":"0", "x":11, "y":1.25}, - {"label":"-", "x":12, "y":1.25}, - {"label":"=", "x":13, "y":1.25}, - {"label":"Back Space", "x":14, "y":1.25, "w":2}, - {"label":"Home", "x":16, "y":1.25}, - {"label":"Tab", "x":0, "y":2.25, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.25}, - {"label":"W", "x":2.5, "y":2.25}, - {"label":"E", "x":3.5, "y":2.25}, - {"label":"R", "x":4.5, "y":2.25}, - {"label":"T", "x":5.5, "y":2.25}, - {"label":"Y", "x":7.5, "y":2.25}, - {"label":"U", "x":8.5, "y":2.25}, - {"label":"I", "x":9.5, "y":2.25}, - {"label":"O", "x":10.5, "y":2.25}, - {"label":"P", "x":11.5, "y":2.25}, - {"label":"[", "x":12.5, "y":2.25}, - {"label":"]", "x":13.5, "y":2.25}, - {"label":"\"", "x":14.5, "y":2.25, "w":1.5}, - {"label":"Page Up", "x":16, "y":2.25}, - {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, - {"label":"A", "x":1.75, "y":3.25}, - {"label":"S", "x":2.75, "y":3.25}, - {"label":"D", "x":3.75, "y":3.25}, - {"label":"F", "x":4.75, "y":3.25}, - {"label":"G", "x":5.75, "y":3.25}, - {"label":"H", "x":7.75, "y":3.25}, - {"label":"J", "x":8.75, "y":3.25}, - {"label":"K", "x":9.75, "y":3.25}, - {"label":"L", "x":10.75, "y":3.25}, - {"label":":", "x":11.75, "y":3.25}, - {"label":"'", "x":12.75, "y":3.25}, - {"label":"Enter", "x":13.75, "y":3.25, "w":2.25}, - {"label":"Page Down", "x":16, "y":3.25}, - {"label":"Shift", "x":0, "y":4.25, "w":2.25}, - {"label":"Z", "x":2.25, "y":4.25}, - {"label":"X", "x":3.25, "y":4.25}, - {"label":"C", "x":4.25, "y":4.25}, - {"label":"V", "x":5.25, "y":4.25}, - {"label":"B", "x":6.25, "y":4.25}, - {"label":"N", "x":8.25, "y":4.25}, - {"label":"M", "x":9.25, "y":4.25}, - {"label":"<", "x":10.25, "y":4.25}, - {"label":">", "x":11.25, "y":4.25}, - {"label":"?", "x":12.25, "y":4.25}, - {"label":"Shift","x":13.25, "y":4.25, "w":1.75}, - {"label":"Up", "x":15, "y":4.25}, - {"label":"End", "x":16, "y":4.25}, - {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, - {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, - {"x":3.75, "y":5.25, "w":2}, - {"x":5.75, "y":5.25}, - {"x":7.75, "y":5.25}, - {"x":8.75, "y":5.25, "w":2.75}, - {"label":"Alt", "x":11.5, "y":5.25, "w":1.25}, - {"label":"App", "x":12.75, "y":5.25, "w":1.25}, - {"label":"Left", "x":14, "y":5.25}, - {"label":"Down", "x":15, "y":5.25}, - {"label":"Right", "x":16, "y":5.25} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [7, 0], "x": 7.5, "y": 0}, + {"matrix": [7, 1], "x": 8.5, "y": 0}, + {"matrix": [7, 2], "x": 9.5, "y": 0}, + + {"matrix": [7, 3], "x": 10.75, "y": 0}, + {"matrix": [7, 4], "x": 11.75, "y": 0}, + {"matrix": [7, 5], "x": 12.75, "y": 0}, + {"matrix": [7, 6], "x": 13.75, "y": 0}, + + {"matrix": [7, 7], "x": 15, "y": 0}, + {"matrix": [13, 0], "x": 16, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [8, 0], "x": 7, "y": 1.25}, + {"matrix": [8, 1], "x": 8, "y": 1.25}, + {"matrix": [8, 2], "x": 9, "y": 1.25}, + {"matrix": [8, 3], "x": 10, "y": 1.25}, + {"matrix": [8, 4], "x": 11, "y": 1.25}, + {"matrix": [8, 5], "x": 12, "y": 1.25}, + {"matrix": [8, 6], "x": 13, "y": 1.25}, + {"matrix": [8, 7], "x": 14, "y": 1.25, "w": 2}, + {"matrix": [13, 2], "x": 16, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + + {"matrix": [9, 0], "x": 7.5, "y": 2.25}, + {"matrix": [9, 1], "x": 8.5, "y": 2.25}, + {"matrix": [9, 2], "x": 9.5, "y": 2.25}, + {"matrix": [9, 3], "x": 10.5, "y": 2.25}, + {"matrix": [9, 4], "x": 11.5, "y": 2.25}, + {"matrix": [9, 5], "x": 12.5, "y": 2.25}, + {"matrix": [9, 6], "x": 13.5, "y": 2.25}, + {"matrix": [9, 7], "x": 14.5, "y": 2.25, "w": 1.5}, + {"matrix": [13, 3], "x": 16, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + + {"matrix": [10, 0], "x": 7.75, "y": 3.25}, + {"matrix": [10, 1], "x": 8.75, "y": 3.25}, + {"matrix": [10, 2], "x": 9.75, "y": 3.25}, + {"matrix": [10, 3], "x": 10.75, "y": 3.25}, + {"matrix": [10, 4], "x": 11.75, "y": 3.25}, + {"matrix": [10, 5], "x": 12.75, "y": 3.25}, + {"matrix": [10, 6], "x": 13.75, "y": 3.25, "w": 2.25}, + {"matrix": [10, 7], "x": 16, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "x": 4.25, "y": 4.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"matrix": [4, 5], "x": 6.25, "y": 4.25}, + + {"matrix": [11, 0], "x": 8.25, "y": 4.25}, + {"matrix": [11, 1], "x": 9.25, "y": 4.25}, + {"matrix": [11, 2], "x": 10.25, "y": 4.25}, + {"matrix": [11, 3], "x": 11.25, "y": 4.25}, + {"matrix": [11, 4], "x": 12.25, "y": 4.25}, + {"matrix": [11, 5], "x": 13.25, "y": 4.25, "w": 1.75}, + {"matrix": [11, 7], "x": 15, "y": 4.25}, + {"matrix": [12, 7], "x": 16, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 2}, + {"matrix": [5, 5], "x": 5.75, "y": 5.25}, + + {"matrix": [12, 0], "x": 7.75, "y": 5.25}, + {"matrix": [12, 1], "x": 8.75, "y": 5.25, "w": 2.75}, + {"matrix": [12, 3], "x": 11.5, "y": 5.25, "w": 1.25}, + {"matrix": [12, 4], "x": 12.75, "y": 5.25, "w": 1.25}, + {"matrix": [12, 5], "x": 14, "y": 5.25}, + {"matrix": [12, 6], "x": 15, "y": 5.25}, + {"matrix": [13, 4], "x": 16, "y": 5.25} ] } } |