summaryrefslogtreecommitdiff
path: root/keyboards/marksard
diff options
context:
space:
mode:
authorfauxpark <fauxpark@gmail.com>2022-08-20 10:55:40 +1000
committerfauxpark <fauxpark@gmail.com>2022-08-20 10:55:40 +1000
commit61689ae6096f55148fdc4d333c6a74a79486eba3 (patch)
tree1258cf3619698326cbbd4f28bd3ee502517821fb /keyboards/marksard
parenteceed6c50bb2a6a85da992c206b95be8cf9d3d49 (diff)
parent201f1a8f47570c83569d1b0f4851b2fddf996fe7 (diff)
downloadqmk_firmware-61689ae6096f55148fdc4d333c6a74a79486eba3.tar.gz
qmk_firmware-61689ae6096f55148fdc4d333c6a74a79486eba3.zip
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/marksard')
-rw-r--r--keyboards/marksard/rhymestone/rev1/config.h7
-rw-r--r--keyboards/marksard/rhymestone/rev1/info.json (renamed from keyboards/marksard/rhymestone/info.json)6
-rw-r--r--keyboards/marksard/treadstone32/info.json6
-rw-r--r--keyboards/marksard/treadstone32/lite/config.h7
-rw-r--r--keyboards/marksard/treadstone32/lite/info.json6
-rw-r--r--keyboards/marksard/treadstone32/rev1/config.h7
-rw-r--r--keyboards/marksard/treadstone32/rev1/info.json6
7 files changed, 23 insertions, 22 deletions
diff --git a/keyboards/marksard/rhymestone/rev1/config.h b/keyboards/marksard/rhymestone/rev1/config.h
index dcb27a0a3e..6cee7a9a92 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 <http://www.gnu.org/licenses/>.
#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/info.json b/keyboards/marksard/rhymestone/rev1/info.json
index c10a45aa4b..ddce4923a4 100644
--- a/keyboards/marksard/rhymestone/info.json
+++ b/keyboards/marksard/rhymestone/rev1/info.json
@@ -1,7 +1,13 @@
{
"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": [
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 d1afa59beb..e640fdb3c1 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 <http://www.gnu.org/licenses/>.
#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 b844b874dd..ae27cdaf9e 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 <http://www.gnu.org/licenses/>.
#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"
+ }
+}