diff options
Diffstat (limited to 'keyboards/ymdk')
| -rw-r--r-- | keyboards/ymdk/sp64/info.json | 143 | ||||
| -rw-r--r-- | keyboards/ymdk/sp64/sp64.h | 42 | ||||
| -rw-r--r-- | keyboards/ymdk/ymd67/info.json | 138 | ||||
| -rw-r--r-- | keyboards/ymdk/ymd67/ymd67.h | 17 |
4 files changed, 147 insertions, 193 deletions
diff --git a/keyboards/ymdk/sp64/info.json b/keyboards/ymdk/sp64/info.json index 46f533b14d..95dee3f0a9 100644 --- a/keyboards/ymdk/sp64/info.json +++ b/keyboards/ymdk/sp64/info.json @@ -18,75 +18,84 @@ }, "processor": "atmega32a", "bootloader": "bootloadhid", - "layouts": { + "layouts": { "LAYOUT": { "layout": [ - {"label":"~", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"@", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"^", "x":6, "y":0}, - {"label":"&", "x":8, "y":0}, - {"label":"*", "x":9, "y":0}, - {"label":"(", "x":10, "y":0}, - {"label":")", "x":11, "y":0}, - {"label":"_", "x":12, "y":0}, - {"label":"+", "x":13, "y":0}, - {"label":"Backspace", "x":14, "y":0, "w":2}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":7.5, "y":1}, - {"label":"U", "x":8.5, "y":1}, - {"label":"I", "x":9.5, "y":1}, - {"label":"O", "x":10.5, "y":1}, - {"label":"P", "x":11.5, "y":1}, - {"label":"{ ", "x":12.5, "y":1}, - {"label":"}", "x":13.5, "y":1}, - {"label":"|", "x":14.5, "y":1, "w":1.5}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":7.75, "y":2}, - {"label":"J", "x":8.75, "y":2}, - {"label":"K", "x":9.75, "y":2}, - {"label":"L", "x":10.75, "y":2}, - {"label":":", "x":11.75, "y":2}, - {"label":"\"", "x":12.75, "y":2}, - {"label":"Enter", "x":13.75, "y":2, "w":2.25}, - {"label":"Shift", "x":0, "y":3, "w":2}, - {"label":"Z", "x":2, "y":3}, - {"label":"X", "x":3, "y":3}, - {"label":"C", "x":4, "y":3}, - {"label":"V", "x":5, "y":3}, - {"label":"B", "x":6, "y":3}, - {"label":"N", "x":8, "y":3}, - {"label":"M", "x":9, "y":3}, - {"label":"<", "x":10, "y":3}, - {"label":">", "x":11, "y":3}, - {"label":"?", "x":12, "y":3}, - {"label":"Shift", "x":13, "y":3}, - {"label":"Up", "x":14, "y":3}, - {"label":"F3", "x":15, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4}, - {"label":"Alt", "x":2.25, "y":4, "w":1.25}, - {"label":"Space", "x":3.5, "y":4, "w":2.25}, - {"label":"Fn", "x":5.75, "y":4}, - {"label":"Space", "x":7.75, "y":4, "w":2.75}, - {"label":"Alt", "x":10.5, "y":4, "w":1.25}, - {"label":"Win", "x":11.75, "y":4, "w":1.25}, - {"label":"Left", "x":13, "y":4}, - {"label":"Down", "x":14, "y":4}, - {"label":"Right", "x":15, "y":4} + {"matrix": [5, 0], "x": 0, "y": 0}, + {"matrix": [5, 1], "x": 1, "y": 0}, + {"matrix": [5, 2], "x": 2, "y": 0}, + {"matrix": [5, 3], "x": 3, "y": 0}, + {"matrix": [5, 4], "x": 4, "y": 0}, + {"matrix": [5, 5], "x": 5, "y": 0}, + {"matrix": [1, 5], "x": 6, "y": 0}, + + {"matrix": [4, 7], "x": 8, "y": 0}, + {"matrix": [4, 8], "x": 9, "y": 0}, + {"matrix": [4, 9], "x": 10, "y": 0}, + {"matrix": [4, 10], "x": 11, "y": 0}, + {"matrix": [4, 11], "x": 12, "y": 0}, + {"matrix": [4, 12], "x": 13, "y": 0}, + {"matrix": [4, 13], "x": 14, "y": 0, "w": 2}, + + {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 1}, + {"matrix": [4, 2], "x": 2.5, "y": 1}, + {"matrix": [4, 3], "x": 3.5, "y": 1}, + {"matrix": [4, 4], "x": 4.5, "y": 1}, + {"matrix": [4, 5], "x": 5.5, "y": 1}, + + {"matrix": [5, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 7], "x": 8.5, "y": 1}, + {"matrix": [3, 8], "x": 9.5, "y": 1}, + {"matrix": [3, 9], "x": 10.5, "y": 1}, + {"matrix": [3, 10], "x": 11.5, "y": 1}, + {"matrix": [3, 11], "x": 12.5, "y": 1}, + {"matrix": [3, 12], "x": 13.5, "y": 1}, + {"matrix": [3, 13], "x": 14.5, "y": 1, "w": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 2}, + {"matrix": [3, 2], "x": 2.75, "y": 2}, + {"matrix": [3, 3], "x": 3.75, "y": 2}, + {"matrix": [3, 4], "x": 4.75, "y": 2}, + {"matrix": [3, 5], "x": 5.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": [2, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [2, 1], "x": 2, "y": 3}, + {"matrix": [2, 2], "x": 3, "y": 3}, + {"matrix": [2, 3], "x": 4, "y": 3}, + {"matrix": [2, 4], "x": 5, "y": 3}, + {"matrix": [2, 5], "x": 6, "y": 3}, + + {"matrix": [1, 7], "x": 8, "y": 3}, + {"matrix": [1, 8], "x": 9, "y": 3}, + {"matrix": [1, 9], "x": 10, "y": 3}, + {"matrix": [1, 10], "x": 11, "y": 3}, + {"matrix": [1, 11], "x": 12, "y": 3}, + {"matrix": [1, 12], "x": 13, "y": 3}, + {"matrix": [1, 13], "x": 14, "y": 3}, + {"matrix": [0, 13], "x": 15, "y": 3}, + + {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 4}, + {"matrix": [1, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [1, 3], "x": 3.5, "y": 4, "w": 2.25}, + {"matrix": [1, 4], "x": 5.75, "y": 4}, + + {"matrix": [0, 7], "x": 7.75, "y": 4, "w": 2.75}, + {"matrix": [0, 8], "x": 10.5, "y": 4, "w": 1.25}, + {"matrix": [0, 9], "x": 11.75, "y": 4, "w": 1.25}, + {"matrix": [0, 10], "x": 13, "y": 4}, + {"matrix": [0, 11], "x": 14, "y": 4}, + {"matrix": [0, 12], "x": 15, "y": 4} ] } } diff --git a/keyboards/ymdk/sp64/sp64.h b/keyboards/ymdk/sp64/sp64.h index 63620f0c3c..afad36ee9a 100644 --- a/keyboards/ymdk/sp64/sp64.h +++ b/keyboards/ymdk/sp64/sp64.h @@ -40,45 +40,3 @@ extern i2c_status_t mcp23018_status; uint8_t init_mcp23018(void); #endif - -#define ___ KC_NO -#define XXX KC_NO - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - * - * LEFT HAND RIGHT HAND - * ┌-----┬-----┬-----┬-----┬-----┬-----┬-----┐ ┌-----┬-----┬-----┬-----┬-----┬-----┬----------┐ - * │ L00 │ L01 │ L02 │ L03 │ L04 │ L05 │ L06 │ │ R07 │ R08 │ R09 │ R0A │ R0B │ R0C │ R0D │ - * ├-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┘ ┌--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬-------┤ - * │ L10 │ L11 │ L12 │ L13 │ L14 │ L15 │ │ R16 │ R17 │ R18 │ R19 │ R1A │ R1B │ R1C │ R1D │ - * ├--------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐ └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴-------┤ - * │ L20 │ L21 │ L22 │ L23 │ L24 │ L25 │ │ R26 │ R27 │ R28 │ R29 │ R2A │ R2B │ R2C │ - * ├---------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐ └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬-----┬-----┤ - * │ L30 │ L31 │ L32 │ L33 │ L34 │ L35 │ │ R36 │ R37 │ R38 │ R39 │ R3A │ R3B │ R3C │ R3D │ - * ├------┬---┴-┬---┴--┬--┴-----┴----┬┴----┬┘ ┌┴-----┴-----┴--┬--┴----┬┴-----┼-----┼-----┼-----┤ - * │ L40 │ L41 │ L42 │ L43 │ L45 │ │ R46 │ R48 │ R4A │ R4B │ R4C │ R4D │ - * └------┴-----┴------┴-------------┴-----┘ └---------------┴-------┴------┴-----┴-----┴-----┘ - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R07, R08, R09, R0A, R0B, R0C, R0D, \ - L10, L11, L12, L13, L14, L15, R16, R17, R18, R19, R1A, R1B, R1C, R1D, \ - L20, L21, L22, L23, L24, L25, R26, R27, R28, R29, R2A, R2B, R2C, \ - L30, L31, L32, L33, L34, L35, R36, R37, R38, R39, R3A, R3B, R3C, R3D, \ - L40, L41, L42, L43, L45, R46, R48, R4A, R4B, R4C, R4D \ - ) \ - /* matrix positions */ \ - { \ - { ___, ___, ___, ___, ___, ___, ___, R46, R48, R4A, R4B, R4C, R4D, R3D }, \ - { L40, L41, L42, L43, L45, L06, ___, R36, R37, R38, R39, R3A, R3B, R3C }, \ - { L30, L31, L32, L33, L34, L35, ___, R26, R27, R28, R29, R2A, R2B, R2C }, \ - { L20, L21, L22, L23, L24, L25, ___, R17, R18, R19, R1A, R1B, R1C, R1D }, \ - { L10, L11, L12, L13, L14, L15, ___, R07, R08, R09, R0A, R0B, R0C, R0D }, \ - { L00, L01, L02, L03, L04, L05, ___, R16, ___, ___, ___, ___, ___, ___ } \ - } - diff --git a/keyboards/ymdk/ymd67/info.json b/keyboards/ymdk/ymd67/info.json index cc83eb82ac..39801fe04e 100644 --- a/keyboards/ymdk/ymd67/info.json +++ b/keyboards/ymdk/ymd67/info.json @@ -25,73 +25,77 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "Esc", "x": 0, "y": 0}, - {"label": "!", "x": 1, "y": 0}, - {"label": "@", "x": 2, "y": 0}, - {"label": "#", "x": 3, "y": 0}, - {"label": "$", "x": 4, "y": 0}, - {"label": "%", "x": 5, "y": 0}, - {"label": "^", "x": 6, "y": 0}, - {"label": "&", "x": 7, "y": 0}, - {"label": "*", "x": 8, "y": 0}, - {"label": "(", "x": 9, "y": 0}, - {"label": ")", "x": 10, "y": 0}, - {"label": "_", "x": 11, "y": 0}, - {"label": "+", "x": 12, "y": 0}, - {"label": "~", "x": 13, "y": 0}, - {"label": "Bs", "x": 14, "y": 0}, - {"label": "Tab", "x": 0, "y": 1, "w": 1.5}, - {"label": "Q", "x": 1.5, "y": 1}, - {"label": "W", "x": 2.5, "y": 1}, - {"label": "E", "x": 3.5, "y": 1}, - {"label": "R", "x": 4.5, "y": 1}, - {"label": "T", "x": 5.5, "y": 1}, - {"label": "Y", "x": 6.5, "y": 1}, - {"label": "U", "x": 7.5, "y": 1}, - {"label": "I", "x": 8.5, "y": 1}, - {"label": "O", "x": 9.5, "y": 1}, - {"label": "P", "x": 10.5, "y": 1}, - {"label": "{", "x": 11.5, "y": 1}, - {"label": "}", "x": 12.5, "y": 1}, - {"label": "|", "x": 13.5, "y": 1, "w": 1.5}, - {"label": "Caps Lock", "x": 0, "y": 2, "w": 1.75}, - {"label": "A", "x": 1.75, "y": 2}, - {"label": "S", "x": 2.75, "y": 2}, - {"label": "D", "x": 3.75, "y": 2}, - {"label": "F", "x": 4.75, "y": 2}, - {"label": "G", "x": 5.75, "y": 2}, - {"label": "H", "x": 6.75, "y": 2}, - {"label": "J", "x": 7.75, "y": 2}, - {"label": "K", "x": 8.75, "y": 2}, - {"label": "L", "x": 9.75, "y": 2}, - {"label": ":", "x": 10.75, "y": 2}, - {"label": "\"", "x": 11.75, "y": 2}, - {"label": "Enter", "x": 12.75, "y": 2, "w": 2.25}, - {"label": "Shift", "x": 0, "y": 3, "w": 2}, - {"label": "Z", "x": 2, "y": 3}, - {"label": "X", "x": 3, "y": 3}, - {"label": "C", "x": 4, "y": 3}, - {"label": "V", "x": 5, "y": 3}, - {"label": "B", "x": 6, "y": 3}, - {"label": "N", "x": 7, "y": 3}, - {"label": "M", "x": 8, "y": 3}, - {"label": "<", "x": 9, "y": 3}, - {"label": ">", "x": 10, "y": 3}, - {"label": "?", "x": 11, "y": 3}, - {"label": "Shift", "x": 12, "y": 3}, - {"label": "Up", "x": 13, "y": 3}, - {"label": "Del", "x": 14, "y": 3}, - {"label": "Ctrl", "x": 0, "y": 4, "w": 1.75}, - {"label": "Win", "x": 1.75, "y": 4, "w": 1.25}, - {"label": "Alt", "x": 3, "y": 4, "w": 1.25}, - {"x": 4.25, "y": 4, "w": 1.25}, - {"x": 5.5, "y": 4, "w": 3}, - {"label": "Alt", "x": 8.5, "y": 4, "w": 1.25}, - {"label": "Ctrl", "x": 9.75, "y": 4, "w": 1.25}, - {"x": 11, "y": 4}, - {"label": "Left", "x": 12, "y": 4}, - {"label": "Down", "x": 13, "y": 4}, - {"label": "Right", "x": 14, "y": 4} + {"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": [0, 14], "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, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.75}, + {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 5.5, "y": 4, "w": 3}, + {"matrix": [4, 8], "x": 8.5, "y": 4, "w": 1.25}, + {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11, "y": 4}, + {"matrix": [4, 11], "x": 12, "y": 4}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4} ] } } diff --git a/keyboards/ymdk/ymd67/ymd67.h b/keyboards/ymdk/ymd67/ymd67.h deleted file mode 100644 index 5e7d846694..0000000000 --- a/keyboards/ymdk/ymd67/ymd67.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K43, K47, K48, K49, K4A, K4B, K4C, K4D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \ - { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, K43, KC_NO, KC_NO, KC_NO, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO } \ -} |