From 835c971f78b5d995bb58f0889fac00aac348de52 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 20 Aug 2022 10:39:35 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: J-L (#18080) --- keyboards/jorne/info.json | 240 ---------------------------------------- keyboards/jorne/rev1/config.h | 8 -- keyboards/jorne/rev1/info.json | 246 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 246 insertions(+), 248 deletions(-) delete mode 100644 keyboards/jorne/info.json create mode 100644 keyboards/jorne/rev1/info.json (limited to 'keyboards/jorne') diff --git a/keyboards/jorne/info.json b/keyboards/jorne/info.json deleted file mode 100644 index a28af0a320..0000000000 --- a/keyboards/jorne/info.json +++ /dev/null @@ -1,240 +0,0 @@ -{ - "keyboard_name": "Jorne", - "url": "https://github.com/joric/jorne/wiki", - "maintainer": "joric", - "layouts": { - "LAYOUT": { - "layout": [ - { - "label": "GUI", - "x": 0, - "y": 2.13 - }, - { - "label": "~", - "x": 1, - "y": 1.38 - }, - { - "label": "Q", - "x": 2, - "y": 1.38 - }, - { - "label": "W", - "x": 3, - "y": 1.13 - }, - { - "label": "E", - "x": 4, - "y": 1 - }, - { - "label": "R", - "x": 5, - "y": 1.13 - }, - { - "label": "T", - "x": 6, - "y": 1.25 - }, - - { - "label": "Y", - "x": 10.5, - "y": 1.25 - }, - { - "label": "U", - "x": 11.5, - "y": 1.125 - }, - { - "label": "I", - "x": 12.5, - "y": 1 - }, - { - "label": "O", - "x": 13.5, - "y": 1.125 - }, - { - "label": "P", - "x": 14.5, - "y": 1.375 - }, - { - "label": "{[", - "x": 15.5, - "y": 1.375 - }, - { - "label": "}]", - "x": 16.5, - "y": 2.13 - }, - - { - "label": "Ctrl", - "x": 1, - "y": 2.38 - }, - { - "label": "A", - "x": 2, - "y": 2.38 - }, - { - "label": "S", - "x": 3, - "y": 2.13 - }, - { - "label": "D", - "x": 4, - "y": 2 - }, - { - "label": "F", - "x": 5, - "y": 2.13 - }, - { - "label": "G", - "x": 6, - "y": 2.25 - }, - - { - "label": "H", - "x": 10.5, - "y": 2.25 - }, - { - "label": "J", - "x": 11.5, - "y": 2.13 - }, - { - "label": "K", - "x": 12.5, - "y": 2 - }, - { - "label": "L", - "x": 13.5, - "y": 2.125 - }, - { - "label": ":;", - "x": 14.5, - "y": 2.375 - }, - { - "label": "\"'", - "x": 15.5, - "y": 2.375 - }, - - { - "label": "Alt", - "x": 1, - "y": 3.38 - }, - { - "label": "Z", - "x": 2, - "y": 3.38 - }, - { - "label": "X", - "x": 3, - "y": 3.13 - }, - { - "label": "C", - "x": 4, - "y": 3 - }, - { - "label": "V", - "x": 5, - "y": 3.13 - }, - { - "label": "B", - "x": 6, - "y": 3.25 - }, - - { - "label": "N", - "x": 10.5, - "y": 3.25 - }, - { - "label": "M", - "x": 11.5, - "y": 3.13 - }, - { - "label": "<,", - "x": 12.5, - "y": 3 - }, - { - "label": ">.", - "x": 13.5, - "y": 3.13 - }, - { - "label": "?/", - "x": 14.5, - "y": 3.38 - }, - { - "label": "|\\", - "x": 15.5, - "y": 3.38 - }, - - { - "label": "Rise", - "x": 5, - "y": 5 - }, - { - "label": "Space", - "x": 6, - "y": 5 - }, - { - "label": "Lower", - "x": 7, - "y": 4.5, - "h": 1.5 - }, - - { - "label": "Lower", - "x": 9.5, - "y": 4.5, - "h": 1.5 - }, - { - "label": "Bcs", - "x": 10.5, - "y": 5 - }, - { - "label": "Rise", - "x": 11.5, - "y": 5 - } - ] - } - } -} \ No newline at end of file diff --git a/keyboards/jorne/rev1/config.h b/keyboards/jorne/rev1/config.h index 7144d9fe0a..c4bcaf2972 100644 --- a/keyboards/jorne/rev1/config.h +++ b/keyboards/jorne/rev1/config.h @@ -2,14 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4753 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER joric -#define PRODUCT Jorne Keyboard - /* key matrix size */ /* Rows are doubled up */ #define MATRIX_ROWS 8 diff --git a/keyboards/jorne/rev1/info.json b/keyboards/jorne/rev1/info.json new file mode 100644 index 0000000000..9e0cf7be41 --- /dev/null +++ b/keyboards/jorne/rev1/info.json @@ -0,0 +1,246 @@ +{ + "keyboard_name": "Jorne", + "manufacturer": "joric", + "url": "https://github.com/joric/jorne/wiki", + "maintainer": "joric", + "usb": { + "vid": "0x4753", + "pid": "0x0001", + "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT": { + "layout": [ + { + "label": "GUI", + "x": 0, + "y": 2.13 + }, + { + "label": "~", + "x": 1, + "y": 1.38 + }, + { + "label": "Q", + "x": 2, + "y": 1.38 + }, + { + "label": "W", + "x": 3, + "y": 1.13 + }, + { + "label": "E", + "x": 4, + "y": 1 + }, + { + "label": "R", + "x": 5, + "y": 1.13 + }, + { + "label": "T", + "x": 6, + "y": 1.25 + }, + + { + "label": "Y", + "x": 10.5, + "y": 1.25 + }, + { + "label": "U", + "x": 11.5, + "y": 1.125 + }, + { + "label": "I", + "x": 12.5, + "y": 1 + }, + { + "label": "O", + "x": 13.5, + "y": 1.125 + }, + { + "label": "P", + "x": 14.5, + "y": 1.375 + }, + { + "label": "{[", + "x": 15.5, + "y": 1.375 + }, + { + "label": "}]", + "x": 16.5, + "y": 2.13 + }, + + { + "label": "Ctrl", + "x": 1, + "y": 2.38 + }, + { + "label": "A", + "x": 2, + "y": 2.38 + }, + { + "label": "S", + "x": 3, + "y": 2.13 + }, + { + "label": "D", + "x": 4, + "y": 2 + }, + { + "label": "F", + "x": 5, + "y": 2.13 + }, + { + "label": "G", + "x": 6, + "y": 2.25 + }, + + { + "label": "H", + "x": 10.5, + "y": 2.25 + }, + { + "label": "J", + "x": 11.5, + "y": 2.13 + }, + { + "label": "K", + "x": 12.5, + "y": 2 + }, + { + "label": "L", + "x": 13.5, + "y": 2.125 + }, + { + "label": ":;", + "x": 14.5, + "y": 2.375 + }, + { + "label": "\"'", + "x": 15.5, + "y": 2.375 + }, + + { + "label": "Alt", + "x": 1, + "y": 3.38 + }, + { + "label": "Z", + "x": 2, + "y": 3.38 + }, + { + "label": "X", + "x": 3, + "y": 3.13 + }, + { + "label": "C", + "x": 4, + "y": 3 + }, + { + "label": "V", + "x": 5, + "y": 3.13 + }, + { + "label": "B", + "x": 6, + "y": 3.25 + }, + + { + "label": "N", + "x": 10.5, + "y": 3.25 + }, + { + "label": "M", + "x": 11.5, + "y": 3.13 + }, + { + "label": "<,", + "x": 12.5, + "y": 3 + }, + { + "label": ">.", + "x": 13.5, + "y": 3.13 + }, + { + "label": "?/", + "x": 14.5, + "y": 3.38 + }, + { + "label": "|\\", + "x": 15.5, + "y": 3.38 + }, + + { + "label": "Rise", + "x": 5, + "y": 5 + }, + { + "label": "Space", + "x": 6, + "y": 5 + }, + { + "label": "Lower", + "x": 7, + "y": 4.5, + "h": 1.5 + }, + + { + "label": "Lower", + "x": 9.5, + "y": 4.5, + "h": 1.5 + }, + { + "label": "Bcs", + "x": 10.5, + "y": 5 + }, + { + "label": "Rise", + "x": 11.5, + "y": 5 + } + ] + } + } +} \ No newline at end of file -- cgit v1.2.1