From f4dcce7e5975276ef41d882a15e6a459b6b3689d Mon Sep 17 00:00:00 2001
From: Ryan
Date: Sat, 20 Aug 2022 10:45:28 +1000
Subject: Move keyboard USB IDs and strings to data driven, pass 2: M-O
(#18090)
---
keyboards/marksard/rhymestone/info.json | 211 ------------------------
keyboards/marksard/rhymestone/rev1/config.h | 7 -
keyboards/marksard/rhymestone/rev1/info.json | 217 +++++++++++++++++++++++++
keyboards/marksard/treadstone32/info.json | 6 +-
keyboards/marksard/treadstone32/lite/config.h | 7 -
keyboards/marksard/treadstone32/lite/info.json | 6 +
keyboards/marksard/treadstone32/rev1/config.h | 7 -
keyboards/marksard/treadstone32/rev1/info.json | 6 +
8 files changed, 234 insertions(+), 233 deletions(-)
delete mode 100644 keyboards/marksard/rhymestone/info.json
create mode 100644 keyboards/marksard/rhymestone/rev1/info.json
create mode 100644 keyboards/marksard/treadstone32/lite/info.json
create mode 100644 keyboards/marksard/treadstone32/rev1/info.json
(limited to 'keyboards/marksard')
diff --git a/keyboards/marksard/rhymestone/info.json b/keyboards/marksard/rhymestone/info.json
deleted file mode 100644
index c10a45aa4b..0000000000
--- a/keyboards/marksard/rhymestone/info.json
+++ /dev/null
@@ -1,211 +0,0 @@
-{
- "keyboard_name": "Rhymestone",
- "url": "https://github.com/marksard/Keyboards",
- "maintainer": "marksard",
- "layouts": {
- "LAYOUT_ortho_4x10": {
- "layout": [
- {
- "label": "Q",
- "x": 0,
- "y": 0
- },
- {
- "label": "W",
- "x": 1,
- "y": 0
- },
- {
- "label": "E",
- "x": 2,
- "y": 0
- },
- {
- "label": "R",
- "x": 3,
- "y": 0
- },
- {
- "label": "T",
- "x": 4,
- "y": 0
- },
- {
- "label": "Y",
- "x": 6,
- "y": 0
- },
- {
- "label": "U",
- "x": 7,
- "y": 0
- },
- {
- "label": "I",
- "x": 8,
- "y": 0
- },
- {
- "label": "O",
- "x": 9,
- "y": 0
- },
- {
- "label": "P",
- "x": 10,
- "y": 0
- },
- {
- "label": "A",
- "x": 0,
- "y": 1
- },
- {
- "label": "S",
- "x": 1,
- "y": 1
- },
- {
- "label": "D",
- "x": 2,
- "y": 1
- },
- {
- "label": "F",
- "x": 3,
- "y": 1
- },
- {
- "label": "G",
- "x": 4,
- "y": 1
- },
- {
- "label": "H",
- "x": 6,
- "y": 1
- },
- {
- "label": "J",
- "x": 7,
- "y": 1
- },
- {
- "label": "K",
- "x": 8,
- "y": 1
- },
- {
- "label": "L",
- "x": 9,
- "y": 1
- },
- {
- "label": "Enter",
- "x": 10,
- "y": 1
- },
- {
- "label": "Z",
- "x": 0,
- "y": 2
- },
- {
- "label": "X",
- "x": 1,
- "y": 2
- },
- {
- "label": "C",
- "x": 2,
- "y": 2
- },
- {
- "label": "V",
- "x": 3,
- "y": 2
- },
- {
- "label": "B",
- "x": 4,
- "y": 2
- },
- {
- "label": "N",
- "x": 6,
- "y": 2
- },
- {
- "label": "M",
- "x": 7,
- "y": 2
- },
- {
- "label": ",",
- "x": 8,
- "y": 2
- },
- {
- "label": ".",
- "x": 9,
- "y": 2
- },
- {
- "label": "/",
- "x": 10,
- "y": 2
- },
- {
- "label": "Ctrl",
- "x": 0,
- "y": 3
- },
- {
- "label": "Win",
- "x": 1,
- "y": 3
- },
- {
- "label": "Alt",
- "x": 2,
- "y": 3
- },
- {
- "label": "Lower",
- "x": 3,
- "y": 3
- },
- {
- "label": "backspace",
- "x": 4,
- "y": 3
- },
- {
- "label": "space",
- "x": 6,
- "y": 3
- },
- {
- "label": "Upper",
- "x": 7,
- "y": 3
- },
- {
- "label": "Alt",
- "x": 8,
- "y": 3
- },
- {
- "label": "App",
- "x": 9,
- "y": 3
- },
- {
- "label": "Ctrl",
- "x": 10,
- "y": 3
- }
- ]
- }
- }
-}
diff --git a/keyboards/marksard/rhymestone/rev1/config.h b/keyboards/marksard/rhymestone/rev1/config.h
index 4448e51268..8dfeba8201 100644
--- a/keyboards/marksard/rhymestone/rev1/config.h
+++ b/keyboards/marksard/rhymestone/rev1/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0xDFA1
-#define DEVICE_VER 0x0020
-#define MANUFACTURER marksard
-#define PRODUCT Rhymestone
-
/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 5
diff --git a/keyboards/marksard/rhymestone/rev1/info.json b/keyboards/marksard/rhymestone/rev1/info.json
new file mode 100644
index 0000000000..ddce4923a4
--- /dev/null
+++ b/keyboards/marksard/rhymestone/rev1/info.json
@@ -0,0 +1,217 @@
+{
+ "keyboard_name": "Rhymestone",
+ "manufacturer": "marksard",
+ "url": "https://github.com/marksard/Keyboards",
+ "maintainer": "marksard",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0xDFA1",
+ "device_version": "0.2.0"
+ },
+ "layouts": {
+ "LAYOUT_ortho_4x10": {
+ "layout": [
+ {
+ "label": "Q",
+ "x": 0,
+ "y": 0
+ },
+ {
+ "label": "W",
+ "x": 1,
+ "y": 0
+ },
+ {
+ "label": "E",
+ "x": 2,
+ "y": 0
+ },
+ {
+ "label": "R",
+ "x": 3,
+ "y": 0
+ },
+ {
+ "label": "T",
+ "x": 4,
+ "y": 0
+ },
+ {
+ "label": "Y",
+ "x": 6,
+ "y": 0
+ },
+ {
+ "label": "U",
+ "x": 7,
+ "y": 0
+ },
+ {
+ "label": "I",
+ "x": 8,
+ "y": 0
+ },
+ {
+ "label": "O",
+ "x": 9,
+ "y": 0
+ },
+ {
+ "label": "P",
+ "x": 10,
+ "y": 0
+ },
+ {
+ "label": "A",
+ "x": 0,
+ "y": 1
+ },
+ {
+ "label": "S",
+ "x": 1,
+ "y": 1
+ },
+ {
+ "label": "D",
+ "x": 2,
+ "y": 1
+ },
+ {
+ "label": "F",
+ "x": 3,
+ "y": 1
+ },
+ {
+ "label": "G",
+ "x": 4,
+ "y": 1
+ },
+ {
+ "label": "H",
+ "x": 6,
+ "y": 1
+ },
+ {
+ "label": "J",
+ "x": 7,
+ "y": 1
+ },
+ {
+ "label": "K",
+ "x": 8,
+ "y": 1
+ },
+ {
+ "label": "L",
+ "x": 9,
+ "y": 1
+ },
+ {
+ "label": "Enter",
+ "x": 10,
+ "y": 1
+ },
+ {
+ "label": "Z",
+ "x": 0,
+ "y": 2
+ },
+ {
+ "label": "X",
+ "x": 1,
+ "y": 2
+ },
+ {
+ "label": "C",
+ "x": 2,
+ "y": 2
+ },
+ {
+ "label": "V",
+ "x": 3,
+ "y": 2
+ },
+ {
+ "label": "B",
+ "x": 4,
+ "y": 2
+ },
+ {
+ "label": "N",
+ "x": 6,
+ "y": 2
+ },
+ {
+ "label": "M",
+ "x": 7,
+ "y": 2
+ },
+ {
+ "label": ",",
+ "x": 8,
+ "y": 2
+ },
+ {
+ "label": ".",
+ "x": 9,
+ "y": 2
+ },
+ {
+ "label": "/",
+ "x": 10,
+ "y": 2
+ },
+ {
+ "label": "Ctrl",
+ "x": 0,
+ "y": 3
+ },
+ {
+ "label": "Win",
+ "x": 1,
+ "y": 3
+ },
+ {
+ "label": "Alt",
+ "x": 2,
+ "y": 3
+ },
+ {
+ "label": "Lower",
+ "x": 3,
+ "y": 3
+ },
+ {
+ "label": "backspace",
+ "x": 4,
+ "y": 3
+ },
+ {
+ "label": "space",
+ "x": 6,
+ "y": 3
+ },
+ {
+ "label": "Upper",
+ "x": 7,
+ "y": 3
+ },
+ {
+ "label": "Alt",
+ "x": 8,
+ "y": 3
+ },
+ {
+ "label": "App",
+ "x": 9,
+ "y": 3
+ },
+ {
+ "label": "Ctrl",
+ "x": 10,
+ "y": 3
+ }
+ ]
+ }
+ }
+}
diff --git a/keyboards/marksard/treadstone32/info.json b/keyboards/marksard/treadstone32/info.json
index d9c1069b38..81728e0957 100644
--- a/keyboards/marksard/treadstone32/info.json
+++ b/keyboards/marksard/treadstone32/info.json
@@ -1,7 +1,11 @@
{
- "keyboard_name": "Treadstone32",
+ "manufacturer": "marksard",
"url": "https://github.com/marksard/Keyboards",
"maintainer": "marksard",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0xDFA5"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/marksard/treadstone32/lite/config.h b/keyboards/marksard/treadstone32/lite/config.h
index 90db1a7895..59397c6ad6 100644
--- a/keyboards/marksard/treadstone32/lite/config.h
+++ b/keyboards/marksard/treadstone32/lite/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0xDFA5
-#define DEVICE_VER 0x0015
-#define MANUFACTURER marksard
-#define PRODUCT treadstone32 lite
-
/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 5
diff --git a/keyboards/marksard/treadstone32/lite/info.json b/keyboards/marksard/treadstone32/lite/info.json
new file mode 100644
index 0000000000..2d66455900
--- /dev/null
+++ b/keyboards/marksard/treadstone32/lite/info.json
@@ -0,0 +1,6 @@
+{
+ "keyboard_name": "treadstone32 lite",
+ "usb": {
+ "device_version": "0.1.5"
+ }
+}
diff --git a/keyboards/marksard/treadstone32/rev1/config.h b/keyboards/marksard/treadstone32/rev1/config.h
index 3f21ad59c5..c4ad276bf3 100644
--- a/keyboards/marksard/treadstone32/rev1/config.h
+++ b/keyboards/marksard/treadstone32/rev1/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0xDFA5
-#define DEVICE_VER 0x0010
-#define MANUFACTURER marksard
-#define PRODUCT treadstone32
-
/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 5
diff --git a/keyboards/marksard/treadstone32/rev1/info.json b/keyboards/marksard/treadstone32/rev1/info.json
new file mode 100644
index 0000000000..9a2ae10a50
--- /dev/null
+++ b/keyboards/marksard/treadstone32/rev1/info.json
@@ -0,0 +1,6 @@
+{
+ "keyboard_name": "treadstone32",
+ "usb": {
+ "device_version": "0.1.0"
+ }
+}
--
cgit v1.2.3