From 201f1a8f47570c83569d1b0f4851b2fddf996fe7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 20 Aug 2022 10:48:38 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: S-Y (#18093) --- keyboards/salicylic_acid3/7skb/info.json | 74 ------ keyboards/salicylic_acid3/7skb/rev1/config.h | 7 - keyboards/salicylic_acid3/7skb/rev1/info.json | 80 +++++++ keyboards/salicylic_acid3/getta25/info.json | 36 --- keyboards/salicylic_acid3/getta25/rev1/config.h | 7 - keyboards/salicylic_acid3/getta25/rev1/info.json | 42 ++++ keyboards/salicylic_acid3/jisplit89/info.json | 100 -------- keyboards/salicylic_acid3/jisplit89/rev1/config.h | 7 - keyboards/salicylic_acid3/jisplit89/rev1/info.json | 106 +++++++++ keyboards/salicylic_acid3/naked48/info.json | 249 -------------------- keyboards/salicylic_acid3/naked48/rev1/config.h | 7 - keyboards/salicylic_acid3/naked48/rev1/info.json | 255 +++++++++++++++++++++ keyboards/salicylic_acid3/naked60/info.json | 71 ------ keyboards/salicylic_acid3/naked60/rev1/config.h | 7 - keyboards/salicylic_acid3/naked60/rev1/info.json | 77 +++++++ keyboards/salicylic_acid3/naked64/info.json | 174 -------------- keyboards/salicylic_acid3/naked64/rev1/config.h | 7 - keyboards/salicylic_acid3/naked64/rev1/info.json | 180 +++++++++++++++ keyboards/salicylic_acid3/setta21/info.json | 37 --- keyboards/salicylic_acid3/setta21/rev1/config.h | 7 - keyboards/salicylic_acid3/setta21/rev1/info.json | 43 ++++ 21 files changed, 783 insertions(+), 790 deletions(-) delete mode 100644 keyboards/salicylic_acid3/7skb/info.json create mode 100644 keyboards/salicylic_acid3/7skb/rev1/info.json delete mode 100644 keyboards/salicylic_acid3/getta25/info.json create mode 100644 keyboards/salicylic_acid3/getta25/rev1/info.json delete mode 100644 keyboards/salicylic_acid3/jisplit89/info.json create mode 100644 keyboards/salicylic_acid3/jisplit89/rev1/info.json delete mode 100644 keyboards/salicylic_acid3/naked48/info.json create mode 100644 keyboards/salicylic_acid3/naked48/rev1/info.json delete mode 100644 keyboards/salicylic_acid3/naked60/info.json create mode 100644 keyboards/salicylic_acid3/naked60/rev1/info.json delete mode 100644 keyboards/salicylic_acid3/naked64/info.json create mode 100644 keyboards/salicylic_acid3/naked64/rev1/info.json delete mode 100644 keyboards/salicylic_acid3/setta21/info.json create mode 100644 keyboards/salicylic_acid3/setta21/rev1/info.json (limited to 'keyboards/salicylic_acid3') diff --git a/keyboards/salicylic_acid3/7skb/info.json b/keyboards/salicylic_acid3/7skb/info.json deleted file mode 100644 index f85f32cb6d..0000000000 --- a/keyboards/salicylic_acid3/7skb/info.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "keyboard_name": "7skb", - "url": "https://salicylic-acid3.hatenablog.com/", - "maintainer": "Salicylic_acid3", - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":7, "y":0}, - {"label":"7", "x":8, "y":0}, - {"label":"8", "x":9, "y":0}, - {"label":"9", "x":10, "y":0}, - {"label":"0", "x":11, "y":0}, - {"label":"-", "x":12, "y":0}, - {"label":"=", "x":13, "y":0}, - {"label":"\\", "x":14, "y":0}, - {"label":"`", "x":15, "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":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":"Delete", "x":14.5, "y":1, "w":1.5}, - {"label":"Control", "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.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":8.25, "y":3}, - {"label":"M", "x":9.25, "y":3}, - {"label":",", "x":10.25, "y":3}, - {"label":".", "x":11.25, "y":3}, - {"label":"/", "x":12.25, "y":3}, - {"label":"Shift", "x":13.25, "y":3, "w":1.75}, - {"label":"Fn", "x":15, "y":3}, - {"label":"Alt", "x":1.5, "y":4}, - {"label":"GUI", "x":2.5, "y":4, "w":1.5}, - {"x":4, "y":4, "w":1.5}, - {"x":5.5, "y":4, "w":1.25}, - {"x":7.75, "y":4, "w":1.25}, - {"x":9, "y":4, "w":2}, - {"label":"GUI", "x":11, "y":4, "w":1.5}, - {"label":"Alt", "x":12.5, "y":4} - ] - } - } -} diff --git a/keyboards/salicylic_acid3/7skb/rev1/config.h b/keyboards/salicylic_acid3/7skb/rev1/config.h index a74cd25c29..e6cddb0a5b 100644 --- a/keyboards/salicylic_acid3/7skb/rev1/config.h +++ b/keyboards/salicylic_acid3/7skb/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEB5F -#define DEVICE_VER 0x0007 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT 7skb - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/salicylic_acid3/7skb/rev1/info.json b/keyboards/salicylic_acid3/7skb/rev1/info.json new file mode 100644 index 0000000000..7bd508ed7f --- /dev/null +++ b/keyboards/salicylic_acid3/7skb/rev1/info.json @@ -0,0 +1,80 @@ +{ + "keyboard_name": "7skb", + "manufacturer": "Salicylic_Acid", + "url": "https://salicylic-acid3.hatenablog.com/", + "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0x04D8", + "pid": "0xEB5F", + "device_version": "0.0.7" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"Esc", "x":0, "y":0}, + {"label":"1", "x":1, "y":0}, + {"label":"2", "x":2, "y":0}, + {"label":"3", "x":3, "y":0}, + {"label":"4", "x":4, "y":0}, + {"label":"5", "x":5, "y":0}, + {"label":"6", "x":7, "y":0}, + {"label":"7", "x":8, "y":0}, + {"label":"8", "x":9, "y":0}, + {"label":"9", "x":10, "y":0}, + {"label":"0", "x":11, "y":0}, + {"label":"-", "x":12, "y":0}, + {"label":"=", "x":13, "y":0}, + {"label":"\\", "x":14, "y":0}, + {"label":"`", "x":15, "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":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":"Delete", "x":14.5, "y":1, "w":1.5}, + {"label":"Control", "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.25}, + {"label":"Z", "x":2.25, "y":3}, + {"label":"X", "x":3.25, "y":3}, + {"label":"C", "x":4.25, "y":3}, + {"label":"V", "x":5.25, "y":3}, + {"label":"B", "x":6.25, "y":3}, + {"label":"N", "x":8.25, "y":3}, + {"label":"M", "x":9.25, "y":3}, + {"label":",", "x":10.25, "y":3}, + {"label":".", "x":11.25, "y":3}, + {"label":"/", "x":12.25, "y":3}, + {"label":"Shift", "x":13.25, "y":3, "w":1.75}, + {"label":"Fn", "x":15, "y":3}, + {"label":"Alt", "x":1.5, "y":4}, + {"label":"GUI", "x":2.5, "y":4, "w":1.5}, + {"x":4, "y":4, "w":1.5}, + {"x":5.5, "y":4, "w":1.25}, + {"x":7.75, "y":4, "w":1.25}, + {"x":9, "y":4, "w":2}, + {"label":"GUI", "x":11, "y":4, "w":1.5}, + {"label":"Alt", "x":12.5, "y":4} + ] + } + } +} diff --git a/keyboards/salicylic_acid3/getta25/info.json b/keyboards/salicylic_acid3/getta25/info.json deleted file mode 100644 index 980b5142db..0000000000 --- a/keyboards/salicylic_acid3/getta25/info.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "keyboard_name": "Getta25", - "url": "https://salicylic-acid3.hatenablog.com/", - "maintainer": "Salicylic_acid3", - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"ESC", "x":0, "y":0}, - {"label":"F2", "x":1, "y":0}, - {"label":"=", "x":2, "y":0}, - {"label":"DEL", "x":3, "y":0}, - {"label":"Num Lock", "x":0, "y":1.25}, - {"label":"/", "x":1, "y":1.25}, - {"label":"*", "x":2, "y":1.25}, - {"label":"-", "x":3, "y":1.25}, - {"label":"7", "x":0, "y":2.25}, - {"label":"8", "x":1, "y":2.25}, - {"label":"9", "x":2, "y":2.25}, - {"label":"ESC", "x":4.25, "y":2.25}, - {"label":"4", "x":0, "y":3.25}, - {"label":"5", "x":1, "y":3.25}, - {"label":"6", "x":2, "y":3.25}, - {"label":"+", "x":3, "y":2.25, "h":2}, - {"label":"F2", "x":4.25, "y":3.25}, - {"label":"1", "x":0, "y":4.25}, - {"label":"2", "x":1, "y":4.25}, - {"label":"3", "x":2, "y":4.25}, - {"label":"DEL", "x":4.25, "y":4.25}, - {"label":"0", "x":0, "y":5.25, "w":2}, - {"label":".", "x":2, "y":5.25}, - {"label":"Enter", "x":3, "y":4.25, "h":2}, - {"label":"BSPC", "x":4.25, "y":5.25} - ] - } - } -} diff --git a/keyboards/salicylic_acid3/getta25/rev1/config.h b/keyboards/salicylic_acid3/getta25/rev1/config.h index 740a9f3fbd..a039848af9 100644 --- a/keyboards/salicylic_acid3/getta25/rev1/config.h +++ b/keyboards/salicylic_acid3/getta25/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define DEVICE_VER 0x0013 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT getta25 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 6 diff --git a/keyboards/salicylic_acid3/getta25/rev1/info.json b/keyboards/salicylic_acid3/getta25/rev1/info.json new file mode 100644 index 0000000000..23354552ea --- /dev/null +++ b/keyboards/salicylic_acid3/getta25/rev1/info.json @@ -0,0 +1,42 @@ +{ + "keyboard_name": "getta25", + "manufacturer": "Salicylic_Acid", + "url": "https://salicylic-acid3.hatenablog.com/", + "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.1.3" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"ESC", "x":0, "y":0}, + {"label":"F2", "x":1, "y":0}, + {"label":"=", "x":2, "y":0}, + {"label":"DEL", "x":3, "y":0}, + {"label":"Num Lock", "x":0, "y":1.25}, + {"label":"/", "x":1, "y":1.25}, + {"label":"*", "x":2, "y":1.25}, + {"label":"-", "x":3, "y":1.25}, + {"label":"7", "x":0, "y":2.25}, + {"label":"8", "x":1, "y":2.25}, + {"label":"9", "x":2, "y":2.25}, + {"label":"ESC", "x":4.25, "y":2.25}, + {"label":"4", "x":0, "y":3.25}, + {"label":"5", "x":1, "y":3.25}, + {"label":"6", "x":2, "y":3.25}, + {"label":"+", "x":3, "y":2.25, "h":2}, + {"label":"F2", "x":4.25, "y":3.25}, + {"label":"1", "x":0, "y":4.25}, + {"label":"2", "x":1, "y":4.25}, + {"label":"3", "x":2, "y":4.25}, + {"label":"DEL", "x":4.25, "y":4.25}, + {"label":"0", "x":0, "y":5.25, "w":2}, + {"label":".", "x":2, "y":5.25}, + {"label":"Enter", "x":3, "y":4.25, "h":2}, + {"label":"BSPC", "x":4.25, "y":5.25} + ] + } + } +} diff --git a/keyboards/salicylic_acid3/jisplit89/info.json b/keyboards/salicylic_acid3/jisplit89/info.json deleted file mode 100644 index 4f138a5262..0000000000 --- a/keyboards/salicylic_acid3/jisplit89/info.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "keyboard_name": "jisplit89", - "url": "https://salicylic-acid3.hatenablog.com/", - "maintainer": "Salicylic_acid3", - "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":"Insert", "x":15, "y":0}, - {"label":"Print Screen", "x":16, "y":0}, - {"label":"Hankaku/Zenkaku", "x":0, "y":1.25}, - {"label":"!", "x":1, "y":1.25}, - {"label":"\"", "x":2, "y":1.25}, - {"label":"#", "x":3, "y":1.25}, - {"label":"$", "x":4, "y":1.25}, - {"label":"%", "x":5, "y":1.25}, - {"label":"&", "x":7, "y":1.25}, - {"label":"'", "x":8, "y":1.25}, - {"label":"(", "x":9, "y":1.25}, - {"label":")", "x":10, "y":1.25}, - {"label":"", "x":11, "y":1.25}, - {"label":"=", "x":12, "y":1.25}, - {"label":"~", "x":13, "y":1.25}, - {"label":"|", "x":14, "y":1.25}, - {"label":"Back", "x":15, "y":1.25}, - {"label":"Del", "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":"Return", "x":14.75, "y":2.25, "w":1.25, "h":2}, - {"label":"Home", "x":16, "y":2.25}, - {"label":"Caps", "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":"}", "x":13.75, "y":3.25}, - {"label":"End", "x":16, "y":3.25}, - {"label":"Shift", "x":0, "y":4.25, "w":2}, - {"label":"Z", "x":2, "y":4.25}, - {"label":"X", "x":3, "y":4.25}, - {"label":"C", "x":4, "y":4.25}, - {"label":"V", "x":5, "y":4.25}, - {"label":"B", "x":6, "y":4.25}, - {"label":"N", "x":8, "y":4.25}, - {"label":"M", "x":9, "y":4.25}, - {"label":"<", "x":10, "y":4.25}, - {"label":">", "x":11, "y":4.25}, - {"label":"?", "x":12, "y":4.25}, - {"label":"_", "x":13, "y":4.25}, - {"label":"PgDwn", "x":14, "y":4.25}, - {"label":"Up", "x":15, "y":4.25}, - {"label":"PgUp", "x":16, "y":4.25}, - {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, - {"label":"Win", "x":1.25, "y":5.25}, - {"label":"Alt", "x":2.25, "y":5.25, "w":1.25}, - {"label":"Muhenkan", "x":3.5, "y":5.25}, - {"label":"Alt", "x":4.5, "y":5.25, "w":1.25}, - {"label":"1", "x":5.75, "y":5.25}, - {"label":"2", "x":7.75, "y":5.25}, - {"label":"Ctrl", "x":8.75, "y":5.25, "w":1.25}, - {"label":"Henkan", "x":10, "y":5.25, "w":1.25}, - {"label":"Kana", "x":11.25, "y":5.25, "w":1.25}, - {"label":"App", "x":12.5, "y":5.25}, - {"label":"Left", "x":14, "y":5.25}, - {"label":"Down", "x":15, "y":5.25}, - {"label":"Right", "x":16, "y":5.25} - ] - } - } -} diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/config.h b/keyboards/salicylic_acid3/jisplit89/rev1/config.h index ee5f2ca0bc..9b30c9a242 100644 --- a/keyboards/salicylic_acid3/jisplit89/rev1/config.h +++ b/keyboards/salicylic_acid3/jisplit89/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEB4F -#define DEVICE_VER 0x0001 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT jisplit89 - /* key matrix size */ #define MATRIX_ROWS 14 #define MATRIX_COLS 8 diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/info.json b/keyboards/salicylic_acid3/jisplit89/rev1/info.json new file mode 100644 index 0000000000..1279d2475e --- /dev/null +++ b/keyboards/salicylic_acid3/jisplit89/rev1/info.json @@ -0,0 +1,106 @@ +{ + "keyboard_name": "jisplit89", + "manufacturer": "Salicylic_Acid", + "url": "https://salicylic-acid3.hatenablog.com/", + "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0x04D8", + "pid": "0xEB4F", + "device_version": "0.0.1" + }, + "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":"Insert", "x":15, "y":0}, + {"label":"Print Screen", "x":16, "y":0}, + {"label":"Hankaku/Zenkaku", "x":0, "y":1.25}, + {"label":"!", "x":1, "y":1.25}, + {"label":"\"", "x":2, "y":1.25}, + {"label":"#", "x":3, "y":1.25}, + {"label":"$", "x":4, "y":1.25}, + {"label":"%", "x":5, "y":1.25}, + {"label":"&", "x":7, "y":1.25}, + {"label":"'", "x":8, "y":1.25}, + {"label":"(", "x":9, "y":1.25}, + {"label":")", "x":10, "y":1.25}, + {"label":"", "x":11, "y":1.25}, + {"label":"=", "x":12, "y":1.25}, + {"label":"~", "x":13, "y":1.25}, + {"label":"|", "x":14, "y":1.25}, + {"label":"Back", "x":15, "y":1.25}, + {"label":"Del", "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":"Return", "x":14.75, "y":2.25, "w":1.25, "h":2}, + {"label":"Home", "x":16, "y":2.25}, + {"label":"Caps", "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":"}", "x":13.75, "y":3.25}, + {"label":"End", "x":16, "y":3.25}, + {"label":"Shift", "x":0, "y":4.25, "w":2}, + {"label":"Z", "x":2, "y":4.25}, + {"label":"X", "x":3, "y":4.25}, + {"label":"C", "x":4, "y":4.25}, + {"label":"V", "x":5, "y":4.25}, + {"label":"B", "x":6, "y":4.25}, + {"label":"N", "x":8, "y":4.25}, + {"label":"M", "x":9, "y":4.25}, + {"label":"<", "x":10, "y":4.25}, + {"label":">", "x":11, "y":4.25}, + {"label":"?", "x":12, "y":4.25}, + {"label":"_", "x":13, "y":4.25}, + {"label":"PgDwn", "x":14, "y":4.25}, + {"label":"Up", "x":15, "y":4.25}, + {"label":"PgUp", "x":16, "y":4.25}, + {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, + {"label":"Win", "x":1.25, "y":5.25}, + {"label":"Alt", "x":2.25, "y":5.25, "w":1.25}, + {"label":"Muhenkan", "x":3.5, "y":5.25}, + {"label":"Alt", "x":4.5, "y":5.25, "w":1.25}, + {"label":"1", "x":5.75, "y":5.25}, + {"label":"2", "x":7.75, "y":5.25}, + {"label":"Ctrl", "x":8.75, "y":5.25, "w":1.25}, + {"label":"Henkan", "x":10, "y":5.25, "w":1.25}, + {"label":"Kana", "x":11.25, "y":5.25, "w":1.25}, + {"label":"App", "x":12.5, "y":5.25}, + {"label":"Left", "x":14, "y":5.25}, + {"label":"Down", "x":15, "y":5.25}, + {"label":"Right", "x":16, "y":5.25} + ] + } + } +} diff --git a/keyboards/salicylic_acid3/naked48/info.json b/keyboards/salicylic_acid3/naked48/info.json deleted file mode 100644 index 8186a6ba5b..0000000000 --- a/keyboards/salicylic_acid3/naked48/info.json +++ /dev/null @@ -1,249 +0,0 @@ -{ - "keyboard_name": "Naked48", - "url": "https://salicylic-acid3.hatenablog.com/", - "maintainer": "Salicylic_acid3", - "layouts": { - "LAYOUT": { - "layout": [ - { - "label":"Tab", - "x":0, - "y":0 - }, - { - "label":"Q", - "x":1, - "y":0 - }, - { - "label":"W", - "x":2, - "y":0 - }, - { - "label":"E", - "x":3, - "y":0 - }, - { - "label":"R", - "x":4, - "y":0 - }, - { - "label":"T", - "x":5, - "y":0 - }, - { - "label":"Y", - "x":8, - "y":0 - }, - { - "label":"U", - "x":9, - "y":0 - }, - { - "label":"I", - "x":10, - "y":0 - }, - { - "label":"O", - "x":11, - "y":0 - }, - { - "label":"P", - "x":12, - "y":0 - }, - { - "label":"Back Space", - "x":13, - "y":0 - }, - { - "label":"Esc", - "x":0, - "y":1 - }, - { - "label":"A", - "x":1, - "y":1 - }, - { - "label":"S", - "x":2, - "y":1 - }, - { - "label":"D", - "x":3, - "y":1 - }, - { - "label":"F", - "x":4, - "y":1 - }, - { - "label":"G", - "x":5, - "y":1 - }, - { - "label":"H", - "x":8, - "y":1 - }, - { - "label":"J", - "x":9, - "y":1 - }, - { - "label":"K", - "x":10, - "y":1 - }, - { - "label":"L", - "x":11, - "y":1 - }, - { - "label":";", - "x":12, - "y":1 - }, - { - "label":"'", - "x":13, - "y":1 - }, - { - "label":"Shift", - "x":0, - "y":2 - }, - { - "label":"Z", - "x":1, - "y":2 - }, - { - "label":"X", - "x":2, - "y":2 - }, - { - "label":"C", - "x":3, - "y":2 - }, - { - "label":"V", - "x":4, - "y":2 - }, - { - "label":"B", - "x":5, - "y":2 - }, - { - "label":"N", - "x":8, - "y":2 - }, - { - "label":"M", - "x":9, - "y":2 - }, - { - "label":",", - "x":10, - "y":2 - }, - { - "label":".", - "x":11, - "y":2 - }, - { - "label":"/", - "x":12, - "y":2 - }, - { - "label":"Enter", - "x":13, - "y":2 - }, - { - "label":"Adjust", - "x":1, - "y":3 - }, - { - "label":"Ctrl", - "x":2, - "y":3 - }, - { - "label":"Alt", - "x":3, - "y":3 - }, - { - "label":"GUI", - "x":4, - "y":3 - }, - { - "label":"⇓", - "x":5, - "y":3 - }, - { - "x":6, - "y":3 - }, - { - "x":7, - "y":3 - }, - { - "label":"⇑", - "x":8, - "y":3 - }, - { - "label":"←", - "x":9, - "y":3 - }, - { - "label":"↓", - "x":10, - "y":3 - }, - { - "label":"↑", - "x":11, - "y":3 - }, - { - "label":"→", - "x":12, - "y":3 - } - ] - } - } -} diff --git a/keyboards/salicylic_acid3/naked48/rev1/config.h b/keyboards/salicylic_acid3/naked48/rev1/config.h index faeb719019..2cc4a46674 100644 --- a/keyboards/salicylic_acid3/naked48/rev1/config.h +++ b/keyboards/salicylic_acid3/naked48/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xE8BA -#define DEVICE_VER 0x0001 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT naked48 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 12 diff --git a/keyboards/salicylic_acid3/naked48/rev1/info.json b/keyboards/salicylic_acid3/naked48/rev1/info.json new file mode 100644 index 0000000000..fd4639c5cc --- /dev/null +++ b/keyboards/salicylic_acid3/naked48/rev1/info.json @@ -0,0 +1,255 @@ +{ + "keyboard_name": "naked48", + "manufacturer": "Salicylic_Acid", + "url": "https://salicylic-acid3.hatenablog.com/", + "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0x04D8", + "pid": "0xE8BA", + "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT": { + "layout": [ + { + "label":"Tab", + "x":0, + "y":0 + }, + { + "label":"Q", + "x":1, + "y":0 + }, + { + "label":"W", + "x":2, + "y":0 + }, + { + "label":"E", + "x":3, + "y":0 + }, + { + "label":"R", + "x":4, + "y":0 + }, + { + "label":"T", + "x":5, + "y":0 + }, + { + "label":"Y", + "x":8, + "y":0 + }, + { + "label":"U", + "x":9, + "y":0 + }, + { + "label":"I", + "x":10, + "y":0 + }, + { + "label":"O", + "x":11, + "y":0 + }, + { + "label":"P", + "x":12, + "y":0 + }, + { + "label":"Back Space", + "x":13, + "y":0 + }, + { + "label":"Esc", + "x":0, + "y":1 + }, + { + "label":"A", + "x":1, + "y":1 + }, + { + "label":"S", + "x":2, + "y":1 + }, + { + "label":"D", + "x":3, + "y":1 + }, + { + "label":"F", + "x":4, + "y":1 + }, + { + "label":"G", + "x":5, + "y":1 + }, + { + "label":"H", + "x":8, + "y":1 + }, + { + "label":"J", + "x":9, + "y":1 + }, + { + "label":"K", + "x":10, + "y":1 + }, + { + "label":"L", + "x":11, + "y":1 + }, + { + "label":";", + "x":12, + "y":1 + }, + { + "label":"'", + "x":13, + "y":1 + }, + { + "label":"Shift", + "x":0, + "y":2 + }, + { + "label":"Z", + "x":1, + "y":2 + }, + { + "label":"X", + "x":2, + "y":2 + }, + { + "label":"C", + "x":3, + "y":2 + }, + { + "label":"V", + "x":4, + "y":2 + }, + { + "label":"B", + "x":5, + "y":2 + }, + { + "label":"N", + "x":8, + "y":2 + }, + { + "label":"M", + "x":9, + "y":2 + }, + { + "label":",", + "x":10, + "y":2 + }, + { + "label":".", + "x":11, + "y":2 + }, + { + "label":"/", + "x":12, + "y":2 + }, + { + "label":"Enter", + "x":13, + "y":2 + }, + { + "label":"Adjust", + "x":1, + "y":3 + }, + { + "label":"Ctrl", + "x":2, + "y":3 + }, + { + "label":"Alt", + "x":3, + "y":3 + }, + { + "label":"GUI", + "x":4, + "y":3 + }, + { + "label":"⇓", + "x":5, + "y":3 + }, + { + "x":6, + "y":3 + }, + { + "x":7, + "y":3 + }, + { + "label":"⇑", + "x":8, + "y":3 + }, + { + "label":"←", + "x":9, + "y":3 + }, + { + "label":"↓", + "x":10, + "y":3 + }, + { + "label":"↑", + "x":11, + "y":3 + }, + { + "label":"→", + "x":12, + "y":3 + } + ] + } + } +} diff --git a/keyboards/salicylic_acid3/naked60/info.json b/keyboards/salicylic_acid3/naked60/info.json deleted file mode 100644 index 8ec020ae72..0000000000 --- a/keyboards/salicylic_acid3/naked60/info.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "keyboard_name": "Naked60", - "url": "https://salicylic-acid3.hatenablog.com/", - "maintainer": "Salicylic_acid3", - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"ESC", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":8, "y":0}, - {"label":"7", "x":9, "y":0}, - {"label":"8", "x":10, "y":0}, - {"label":"9", "x":11, "y":0}, - {"label":"0", "x":12, "y":0}, - {"label":"Back Space", "x":13, "y":0}, - {"label":"Tab", "x":0, "y":1}, - {"label":"Q", "x":1, "y":1}, - {"label":"W", "x":2, "y":1}, - {"label":"E", "x":3, "y":1}, - {"label":"R", "x":4, "y":1}, - {"label":"T", "x":5, "y":1}, - {"label":"Y", "x":8, "y":1}, - {"label":"U", "x":9, "y":1}, - {"label":"I", "x":10, "y":1}, - {"label":"O", "x":11, "y":1}, - {"label":"P", "x":12, "y":1}, - {"label":"\\", "x":13, "y":1}, - {"label":"Esc", "x":0, "y":2}, - {"label":"A", "x":1, "y":2}, - {"label":"S", "x":2, "y":2}, - {"label":"D", "x":3, "y":2}, - {"label":"F", "x":4, "y":2}, - {"label":"G", "x":5, "y":2}, - {"label":"H", "x":8, "y":2}, - {"label":"J", "x":9, "y":2}, - {"label":"K", "x":10, "y":2}, - {"label":"L", "x":11, "y":2}, - {"label":";", "x":12, "y":2}, - {"label":"'", "x":13, "y":2}, - {"label":"Shift", "x":0, "y":3}, - {"label":"Z", "x":1, "y":3}, - {"label":"X", "x":2, "y":3}, - {"label":"C", "x":3, "y":3}, - {"label":"V", "x":4, "y":3}, - {"label":"B", "x":5, "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":"Enter", "x":13, "y":3}, - {"label":"Adjust", "x":1, "y":4}, - {"label":"Ctrl", "x":2, "y":4}, - {"label":"Alt", "x":3, "y":4}, - {"label":"GUI", "x":4, "y":4}, - {"label":"⇓", "x":5, "y":4}, - {"x":6, "y":4}, - {"x":7, "y":4}, - {"label":"⇑", "x":8, "y":4}, - {"label":"←", "x":9, "y":4}, - {"label":"↓", "x":10, "y":4}, - {"label":"↑", "x":11, "y":4}, - {"label":"→", "x":12, "y":4} - ] - } - } -} diff --git a/keyboards/salicylic_acid3/naked60/rev1/config.h b/keyboards/salicylic_acid3/naked60/rev1/config.h index b754095011..3f4e663b2d 100644 --- a/keyboards/salicylic_acid3/naked60/rev1/config.h +++ b/keyboards/salicylic_acid3/naked60/rev1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x04D8 -#define PRODUCT_ID 0xEB5C -#define DEVICE_VER 0x0001 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT naked60 - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 12 diff --git a/keyboards/salicylic_acid3/naked60/rev1/info.json b/keyboards/salicylic_acid3/naked60/rev1/info.json new file mode 100644 index 0000000000..30b1def9aa --- /dev/null +++ b/keyboards/salicylic_acid3/naked60/rev1/info.json @@ -0,0 +1,77 @@ +{ + "keyboard_name": "naked60", + "manufacturer": "Salicylic_Acid", + "url": "https://salicylic-acid3.hatenablog.com/", + "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0x04D8", + "pid": "0xEB5C", + "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"ESC", "x":0, "y":0}, + {"label":"1", "x":1, "y":0}, + {"label":"2", "x":2, "y":0}, + {"label":"3", "x":3, "y":0}, + {"label":"4", "x":4, "y":0}, + {"label":"5", "x":5, "y":0}, + {"label":"6", "x":8, "y":0}, + {"label":"7", "x":9, "y":0}, + {"label":"8", "x":10, "y":0}, + {"label":"9", "x":11, "y":0}, + {"label":"0", "x":12, "y":0}, + {"label":"Back Space", "x":13, "y":0}, + {"label":"Tab", "x":0, "y":1}, + {"label":"Q", "x":1, "y":1}, + {"label":"W", "x":2, "y":1}, + {"label":"E", "x":3, "y":1}, + {"label":"R", "x":4, "y":1}, + {"label":"T", "x":5, "y":1}, + {"label":"Y", "x":8, "y":1}, + {"label":"U", "x":9, "y":1}, + {"label":"I", "x":10, "y":1}, + {"label":"O", "x":11, "y":1}, + {"label":"P", "x":12, "y":1}, + {"label":"\\", "x":13, "y":1}, + {"label":"Esc", "x":0, "y":2}, + {"label":"A", "x":1, "y":2}, + {"label":"S", "x":2, "y":2}, + {"label":"D", "x":3, "y":2}, + {"label":"F", "x":4, "y":2}, + {"label":"G", "x":5, "y":2}, + {"label":"H", "x":8, "y":2}, + {"label":"J", "x":9, "y":2}, + {"label":"K", "x":10, "y":2}, + {"label":"L", "x":11, "y":2}, + {"label":";", "x":12, "y":2}, + {"label":"'", "x":13, "y":2}, + {"label":"Shift", "x":0, "y":3}, + {"label":"Z", "x":1, "y":3}, + {"label":"X", "x":2, "y":3}, + {"label":"C", "x":3, "y":3}, + {"label":"V", "x":4, "y":3}, + {"label":"B", "x":5, "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":"Enter", "x":13, "y":3}, + {"label":"Adjust", "x":1, "y":4}, + {"label":"Ctrl", "x":2, "y":4}, + {"label":"Alt", "x":3, "y":4}, + {"label":"GUI", "x":4, "y":4}, + {"label":"⇓", "x":5, "y":4}, + {"x":6, "y":4}, + {"x":7, "y":4}, + {"label":"⇑", "x":8, "y":4}, + {"label":"←", "x":9, "y":4}, + {"label":"↓", "x":10, "y":4}, + {"label":"↑", "x":11, "y":4}, + {"label":"→", "x":12, "y":4} + ] + } + } +} diff --git a/keyboards/salicylic_acid3/naked64/info.json b/keyboards/salicylic_acid3/naked64/info.json deleted file mode 100644 index 887f43b087..0000000000 --- a/keyboards/salicylic_acid3/naked64/info.json +++ /dev/null @@ -1,174 +0,0 @@ -{ - "keyboard_name": "Naked64", - "url": "https://salicylic-acid3.hatenablog.com/", - "maintainer": "Salicylic_acid3", - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"pgup", "x":0.25, "y":0}, - {"label":"ESC", "x":1.75, "y":0}, - {"label":"1", "x":2.75, "y":0}, - {"label":"2", "x":4, "y":0}, - {"label":"3", "x":5, "y":0}, - {"label":"4", "x":6, "y":0}, - {"label":"5", "x":7, "y":0}, - {"label":"6", "x":9.25, "y":0}, - {"label":"7", "x":10.25, "y":0}, - {"label":"8", "x":11.25, "y":0}, - {"label":"9", "x":12.25, "y":0}, - {"label":"0", "x":13.5, "y":0}, - {"label":"-", "x":14.5, "y":0}, - {"label":"Back Space", "x":15.5, "y":0}, - {"label":"pgdn", "x":0, "y":1}, - {"label":"Tab", "x":1.25, "y":1, "w":1.5}, - {"label":"Q", "x":2.75, "y":1}, - {"label":"W", "x":4, "y":1}, - {"label":"E", "x":5, "y":1}, - {"label":"R", "x":6, "y":1}, - {"label":"T", "x":7, "y":1}, - {"label":"Y", "x":9.25, "y":1}, - {"label":"U", "x":10.25, "y":1}, - {"label":"I", "x":11.25, "y":1}, - {"label":"O", "x":12.25, "y":1}, - {"label":"P", "x":13.5, "y":1}, - {"label":"[", "x":14.5, "y":1}, - {"label":"]", "x":15.5, "y":1}, - {"label":"Control", "x":1, "y":2, "w":1.75}, - {"label":"A", "x":2.75, "y":2}, - {"label":"S", "x":4, "y":2}, - {"label":"D", "x":5, "y":2}, - {"label":"F", "x":6, "y":2}, - {"label":"G", "x":7, "y":2}, - {"label":"H", "x":9.25, "y":2}, - {"label":"J", "x":10.25, "y":2}, - {"label":"K", "x":11.25, "y":2}, - {"label":"L", "x":12.25, "y":2}, - {"label":";", "x":13.5, "y":2}, - {"label":"'", "x":14.5, "y":2}, - {"label":"Return", "x":15.5, "y":2}, - {"label":"Shift", "x":0.5, "y":3, "w":2.25}, - {"label":"Z", "x":2.75, "y":3}, - {"label":"X", "x":4, "y":3}, - {"label":"C", "x":5, "y":3}, - {"label":"V", "x":6, "y":3}, - {"label":"B", "x":7, "y":3}, - {"label":"N", "x":9.25, "y":3}, - {"label":"M", "x":10.25, "y":3}, - {"label":",", "x":11.25, "y":3}, - {"label":".", "x":12.25, "y":3}, - {"label":"/", "x":13.5, "y":3}, - {"label":"↑", "x":14.5, "y":3}, - {"label":"Shift", "x":15.5, "y":3}, - {"label":"Adjust", "x":1.25, "y":4, "w":1.75}, - {"label":"Alt", "x":3.75, "y":4.25}, - {"x":4.75, "y":4.25, "w":2.25}, - {"label":"⇓", "x":7, "y":4.25}, - {"label":"⇑", "x":9.25, "y":4.25}, - {"x":10.25, "y":4.25, "w":2}, - {"label":"GUI", "x":12.25, "y":4.25}, - {"label":"←", "x":13.5, "y":4}, - {"label":"↓", "x":14.5, "y":4}, - {"label":"→", "x":15.5, "y":4} - ] - }, - "LAYOUT_with_setta21": { - "layout": [ - {"label":"pgup", "x":0.25, "y":0}, - {"label":"ESC", "x":1.75, "y":0}, - {"label":"1", "x":2.75, "y":0}, - {"label":"2", "x":4, "y":0}, - {"label":"3", "x":5, "y":0}, - {"label":"4", "x":6, "y":0}, - {"label":"5", "x":7, "y":0}, - {"label":"6", "x":9.25, "y":0}, - {"label":"7", "x":10.25, "y":0}, - {"label":"8", "x":11.25, "y":0}, - {"label":"9", "x":12.25, "y":0}, - {"label":"0", "x":13.5, "y":0}, - {"label":"-", "x":14.5, "y":0}, - {"label":"Back Space", "x":15.5, "y":0}, - - {"label":"Esc", "x": 17.5, "y":0}, - {"label":"F2", "x": 18.5, "y":0}, - {"label":"=", "x": 19.5, "y":0}, - {"label":"Delete", "x": 20.5, "y":0}, - - {"label":"pgdn", "x":0, "y":1}, - {"label":"Tab", "x":1.25, "y":1, "w":1.5}, - {"label":"Q", "x":2.75, "y":1}, - {"label":"W", "x":4, "y":1}, - {"label":"E", "x":5, "y":1}, - {"label":"R", "x":6, "y":1}, - {"label":"T", "x":7, "y":1}, - {"label":"Y", "x":9.25, "y":1}, - {"label":"U", "x":10.25, "y":1}, - {"label":"I", "x":11.25, "y":1}, - {"label":"O", "x":12.25, "y":1}, - {"label":"P", "x":13.5, "y":1}, - {"label":"[", "x":14.5, "y":1}, - {"label":"]", "x":15.5, "y":1}, - - {"label":"Num Lock", "x": 17.5, "y":1.25}, - {"label":"/", "x": 18.5, "y":1.25}, - {"label":"*", "x": 19.5, "y":1.25}, - {"label":"-", "x": 20.5, "y":1.25}, - - {"label":"Control", "x":1, "y":2, "w":1.75}, - {"label":"A", "x":2.75, "y":2}, - {"label":"S", "x":4, "y":2}, - {"label":"D", "x":5, "y":2}, - {"label":"F", "x":6, "y":2}, - {"label":"G", "x":7, "y":2}, - {"label":"H", "x":9.25, "y":2}, - {"label":"J", "x":10.25, "y":2}, - {"label":"K", "x":11.25, "y":2}, - {"label":"L", "x":12.25, "y":2}, - {"label":";", "x":13.5, "y":2}, - {"label":"'", "x":14.5, "y":2}, - {"label":"Return", "x":15.5, "y":2}, - - {"label":"7", "x": 17.5, "y":2.25}, - {"label":"8", "x": 18.5, "y":2.25}, - {"label":"9", "x": 19.5, "y":2.25}, - - {"label":"Shift", "x":0.5, "y":3, "w":2.25}, - {"label":"Z", "x":2.75, "y":3}, - {"label":"X", "x":4, "y":3}, - {"label":"C", "x":5, "y":3}, - {"label":"V", "x":6, "y":3}, - {"label":"B", "x":7, "y":3}, - {"label":"N", "x":9.25, "y":3}, - {"label":"M", "x":10.25, "y":3}, - {"label":",", "x":11.25, "y":3}, - {"label":".", "x":12.25, "y":3}, - {"label":"/", "x":13.5, "y":3}, - {"label":"↑", "x":14.5, "y":3}, - {"label":"Shift", "x":15.5, "y":3}, - - {"label":"4", "x": 17.5, "y":3.25}, - {"label":"5", "x": 18.5, "y":3.25}, - {"label":"6", "x": 19.5, "y":3.25}, - {"label":"+", "x": 20.5, "y":2.25, "h":2}, - - {"label":"Adjust", "x":1.25, "y":4, "w":1.75}, - {"label":"Alt", "x":3.75, "y":4.25}, - {"x":4.75, "y":4.25, "w":2.25}, - {"label":"⇓", "x":7, "y":4.25}, - {"label":"⇑", "x":9.25, "y":4.25}, - {"x":10.25, "y":4.25, "w":2}, - {"label":"GUI", "x":12.25, "y":4.25}, - {"label":"←", "x":13.5, "y":4}, - {"label":"↓", "x":14.5, "y":4}, - {"label":"→", "x":15.5, "y":4}, - - {"label":"1", "x": 17.5, "y":4.25}, - {"label":"2", "x": 18.5, "y":4.25}, - {"label":"3", "x": 19.5, "y":4.25}, - - {"label":"Lower / 0", "x": 17.5, "y":5.25, "w":2}, - {"label":"Raise / .", "x": 19.5, "y":5.25}, - {"label":"Enter", "x": 20.5, "y":4.25, "h":2} - ] - } - } -} diff --git a/keyboards/salicylic_acid3/naked64/rev1/config.h b/keyboards/salicylic_acid3/naked64/rev1/config.h index b4699a9ca2..0bc5656fea 100644 --- a/keyboards/salicylic_acid3/naked64/rev1/config.h +++ b/keyboards/salicylic_acid3/naked64/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define DEVICE_VER 0x0003 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT naked64 - /* key matrix size */ #define MATRIX_ROWS 16 #define MATRIX_COLS 8 diff --git a/keyboards/salicylic_acid3/naked64/rev1/info.json b/keyboards/salicylic_acid3/naked64/rev1/info.json new file mode 100644 index 0000000000..c8fe578271 --- /dev/null +++ b/keyboards/salicylic_acid3/naked64/rev1/info.json @@ -0,0 +1,180 @@ +{ + "keyboard_name": "naked64", + "manufacturer": "Salicylic_Acid", + "url": "https://salicylic-acid3.hatenablog.com/", + "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.0.3" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"pgup", "x":0.25, "y":0}, + {"label":"ESC", "x":1.75, "y":0}, + {"label":"1", "x":2.75, "y":0}, + {"label":"2", "x":4, "y":0}, + {"label":"3", "x":5, "y":0}, + {"label":"4", "x":6, "y":0}, + {"label":"5", "x":7, "y":0}, + {"label":"6", "x":9.25, "y":0}, + {"label":"7", "x":10.25, "y":0}, + {"label":"8", "x":11.25, "y":0}, + {"label":"9", "x":12.25, "y":0}, + {"label":"0", "x":13.5, "y":0}, + {"label":"-", "x":14.5, "y":0}, + {"label":"Back Space", "x":15.5, "y":0}, + {"label":"pgdn", "x":0, "y":1}, + {"label":"Tab", "x":1.25, "y":1, "w":1.5}, + {"label":"Q", "x":2.75, "y":1}, + {"label":"W", "x":4, "y":1}, + {"label":"E", "x":5, "y":1}, + {"label":"R", "x":6, "y":1}, + {"label":"T", "x":7, "y":1}, + {"label":"Y", "x":9.25, "y":1}, + {"label":"U", "x":10.25, "y":1}, + {"label":"I", "x":11.25, "y":1}, + {"label":"O", "x":12.25, "y":1}, + {"label":"P", "x":13.5, "y":1}, + {"label":"[", "x":14.5, "y":1}, + {"label":"]", "x":15.5, "y":1}, + {"label":"Control", "x":1, "y":2, "w":1.75}, + {"label":"A", "x":2.75, "y":2}, + {"label":"S", "x":4, "y":2}, + {"label":"D", "x":5, "y":2}, + {"label":"F", "x":6, "y":2}, + {"label":"G", "x":7, "y":2}, + {"label":"H", "x":9.25, "y":2}, + {"label":"J", "x":10.25, "y":2}, + {"label":"K", "x":11.25, "y":2}, + {"label":"L", "x":12.25, "y":2}, + {"label":";", "x":13.5, "y":2}, + {"label":"'", "x":14.5, "y":2}, + {"label":"Return", "x":15.5, "y":2}, + {"label":"Shift", "x":0.5, "y":3, "w":2.25}, + {"label":"Z", "x":2.75, "y":3}, + {"label":"X", "x":4, "y":3}, + {"label":"C", "x":5, "y":3}, + {"label":"V", "x":6, "y":3}, + {"label":"B", "x":7, "y":3}, + {"label":"N", "x":9.25, "y":3}, + {"label":"M", "x":10.25, "y":3}, + {"label":",", "x":11.25, "y":3}, + {"label":".", "x":12.25, "y":3}, + {"label":"/", "x":13.5, "y":3}, + {"label":"↑", "x":14.5, "y":3}, + {"label":"Shift", "x":15.5, "y":3}, + {"label":"Adjust", "x":1.25, "y":4, "w":1.75}, + {"label":"Alt", "x":3.75, "y":4.25}, + {"x":4.75, "y":4.25, "w":2.25}, + {"label":"⇓", "x":7, "y":4.25}, + {"label":"⇑", "x":9.25, "y":4.25}, + {"x":10.25, "y":4.25, "w":2}, + {"label":"GUI", "x":12.25, "y":4.25}, + {"label":"←", "x":13.5, "y":4}, + {"label":"↓", "x":14.5, "y":4}, + {"label":"→", "x":15.5, "y":4} + ] + }, + "LAYOUT_with_setta21": { + "layout": [ + {"label":"pgup", "x":0.25, "y":0}, + {"label":"ESC", "x":1.75, "y":0}, + {"label":"1", "x":2.75, "y":0}, + {"label":"2", "x":4, "y":0}, + {"label":"3", "x":5, "y":0}, + {"label":"4", "x":6, "y":0}, + {"label":"5", "x":7, "y":0}, + {"label":"6", "x":9.25, "y":0}, + {"label":"7", "x":10.25, "y":0}, + {"label":"8", "x":11.25, "y":0}, + {"label":"9", "x":12.25, "y":0}, + {"label":"0", "x":13.5, "y":0}, + {"label":"-", "x":14.5, "y":0}, + {"label":"Back Space", "x":15.5, "y":0}, + + {"label":"Esc", "x": 17.5, "y":0}, + {"label":"F2", "x": 18.5, "y":0}, + {"label":"=", "x": 19.5, "y":0}, + {"label":"Delete", "x": 20.5, "y":0}, + + {"label":"pgdn", "x":0, "y":1}, + {"label":"Tab", "x":1.25, "y":1, "w":1.5}, + {"label":"Q", "x":2.75, "y":1}, + {"label":"W", "x":4, "y":1}, + {"label":"E", "x":5, "y":1}, + {"label":"R", "x":6, "y":1}, + {"label":"T", "x":7, "y":1}, + {"label":"Y", "x":9.25, "y":1}, + {"label":"U", "x":10.25, "y":1}, + {"label":"I", "x":11.25, "y":1}, + {"label":"O", "x":12.25, "y":1}, + {"label":"P", "x":13.5, "y":1}, + {"label":"[", "x":14.5, "y":1}, + {"label":"]", "x":15.5, "y":1}, + + {"label":"Num Lock", "x": 17.5, "y":1.25}, + {"label":"/", "x": 18.5, "y":1.25}, + {"label":"*", "x": 19.5, "y":1.25}, + {"label":"-", "x": 20.5, "y":1.25}, + + {"label":"Control", "x":1, "y":2, "w":1.75}, + {"label":"A", "x":2.75, "y":2}, + {"label":"S", "x":4, "y":2}, + {"label":"D", "x":5, "y":2}, + {"label":"F", "x":6, "y":2}, + {"label":"G", "x":7, "y":2}, + {"label":"H", "x":9.25, "y":2}, + {"label":"J", "x":10.25, "y":2}, + {"label":"K", "x":11.25, "y":2}, + {"label":"L", "x":12.25, "y":2}, + {"label":";", "x":13.5, "y":2}, + {"label":"'", "x":14.5, "y":2}, + {"label":"Return", "x":15.5, "y":2}, + + {"label":"7", "x": 17.5, "y":2.25}, + {"label":"8", "x": 18.5, "y":2.25}, + {"label":"9", "x": 19.5, "y":2.25}, + + {"label":"Shift", "x":0.5, "y":3, "w":2.25}, + {"label":"Z", "x":2.75, "y":3}, + {"label":"X", "x":4, "y":3}, + {"label":"C", "x":5, "y":3}, + {"label":"V", "x":6, "y":3}, + {"label":"B", "x":7, "y":3}, + {"label":"N", "x":9.25, "y":3}, + {"label":"M", "x":10.25, "y":3}, + {"label":",", "x":11.25, "y":3}, + {"label":".", "x":12.25, "y":3}, + {"label":"/", "x":13.5, "y":3}, + {"label":"↑", "x":14.5, "y":3}, + {"label":"Shift", "x":15.5, "y":3}, + + {"label":"4", "x": 17.5, "y":3.25}, + {"label":"5", "x": 18.5, "y":3.25}, + {"label":"6", "x": 19.5, "y":3.25}, + {"label":"+", "x": 20.5, "y":2.25, "h":2}, + + {"label":"Adjust", "x":1.25, "y":4, "w":1.75}, + {"label":"Alt", "x":3.75, "y":4.25}, + {"x":4.75, "y":4.25, "w":2.25}, + {"label":"⇓", "x":7, "y":4.25}, + {"label":"⇑", "x":9.25, "y":4.25}, + {"x":10.25, "y":4.25, "w":2}, + {"label":"GUI", "x":12.25, "y":4.25}, + {"label":"←", "x":13.5, "y":4}, + {"label":"↓", "x":14.5, "y":4}, + {"label":"→", "x":15.5, "y":4}, + + {"label":"1", "x": 17.5, "y":4.25}, + {"label":"2", "x": 18.5, "y":4.25}, + {"label":"3", "x": 19.5, "y":4.25}, + + {"label":"Lower / 0", "x": 17.5, "y":5.25, "w":2}, + {"label":"Raise / .", "x": 19.5, "y":5.25}, + {"label":"Enter", "x": 20.5, "y":4.25, "h":2} + ] + } + } +} diff --git a/keyboards/salicylic_acid3/setta21/info.json b/keyboards/salicylic_acid3/setta21/info.json deleted file mode 100644 index 46c06613a8..0000000000 --- a/keyboards/salicylic_acid3/setta21/info.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "keyboard_name": "setta21", - "url": "https://salicylic-acid3.hatenablog.com/", - "maintainer": "Salicylic_acid3", - "layouts": { - "LAYOUT_numpad_6x4": { - "layout": [ - {"label":"ESC", "x":0, "y":0}, - {"label":"F2", "x":1, "y":0}, - {"label":"\uff1d", "x":2, "y":0}, - {"label":"Del", "x":3, "y":0}, - - {"label":"Num Lock", "x":0, "y":1.25}, - {"label":"/", "x":1, "y":1.25}, - {"label":"*", "x":2, "y":1.25}, - {"label":"-", "x":3, "y":1.25}, - - {"label":"7", "x":0, "y":2.25}, - {"label":"8", "x":1, "y":2.25}, - {"label":"9", "x":2, "y":2.25}, - - {"label":"4", "x":0, "y":3.25}, - {"label":"5", "x":1, "y":3.25}, - {"label":"6", "x":2, "y":3.25}, - {"label":"+", "x":3, "y":2.25, "h":2}, - - {"label":"1", "x":0, "y":4.25}, - {"label":"2", "x":1, "y":4.25}, - {"label":"3", "x":2, "y":4.25}, - - {"label":"0", "x":0, "y":5.25, "w":2}, - {"label":".", "x":2, "y":5.25}, - {"label":"Enter", "x":3, "y":4.25, "h":2} - ] - } - } -} diff --git a/keyboards/salicylic_acid3/setta21/rev1/config.h b/keyboards/salicylic_acid3/setta21/rev1/config.h index 742a8d73d0..697e7a7d49 100644 --- a/keyboards/salicylic_acid3/setta21/rev1/config.h +++ b/keyboards/salicylic_acid3/setta21/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define DEVICE_VER 0x0011 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT setta21 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 6 diff --git a/keyboards/salicylic_acid3/setta21/rev1/info.json b/keyboards/salicylic_acid3/setta21/rev1/info.json new file mode 100644 index 0000000000..aa101e7a13 --- /dev/null +++ b/keyboards/salicylic_acid3/setta21/rev1/info.json @@ -0,0 +1,43 @@ +{ + "keyboard_name": "setta21", + "manufacturer": "Salicylic_Acid", + "url": "https://salicylic-acid3.hatenablog.com/", + "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.1.1" + }, + "layouts": { + "LAYOUT_numpad_6x4": { + "layout": [ + {"label":"ESC", "x":0, "y":0}, + {"label":"F2", "x":1, "y":0}, + {"label":"\uff1d", "x":2, "y":0}, + {"label":"Del", "x":3, "y":0}, + + {"label":"Num Lock", "x":0, "y":1.25}, + {"label":"/", "x":1, "y":1.25}, + {"label":"*", "x":2, "y":1.25}, + {"label":"-", "x":3, "y":1.25}, + + {"label":"7", "x":0, "y":2.25}, + {"label":"8", "x":1, "y":2.25}, + {"label":"9", "x":2, "y":2.25}, + + {"label":"4", "x":0, "y":3.25}, + {"label":"5", "x":1, "y":3.25}, + {"label":"6", "x":2, "y":3.25}, + {"label":"+", "x":3, "y":2.25, "h":2}, + + {"label":"1", "x":0, "y":4.25}, + {"label":"2", "x":1, "y":4.25}, + {"label":"3", "x":2, "y":4.25}, + + {"label":"0", "x":0, "y":5.25, "w":2}, + {"label":".", "x":2, "y":5.25}, + {"label":"Enter", "x":3, "y":4.25, "h":2} + ] + } + } +} -- cgit v1.2.3