summaryrefslogtreecommitdiff
path: root/keyboards/maple_computing
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-08-03 07:16:28 +0000
committerQMK Bot <hello@qmk.fm>2022-08-03 07:16:28 +0000
commitd4f9eb5225feb7f2aad01d252b33401e3a80b870 (patch)
treef3b1f76a8d715e7c4f63d18f9fc3ae65141eb1fb /keyboards/maple_computing
parentbce4fb45748bacc8cb21cb61687d9bfd9faa4494 (diff)
parent3da6575e2480d46399be01c21270c57420e0f16d (diff)
downloadqmk_firmware-d4f9eb5225feb7f2aad01d252b33401e3a80b870.tar.gz
qmk_firmware-d4f9eb5225feb7f2aad01d252b33401e3a80b870.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/maple_computing')
-rw-r--r--keyboards/maple_computing/6ball/config.h7
-rw-r--r--keyboards/maple_computing/6ball/info.json6
-rwxr-xr-xkeyboards/maple_computing/c39/config.h7
-rwxr-xr-xkeyboards/maple_computing/c39/info.json6
-rw-r--r--keyboards/maple_computing/jnao/config.h7
-rw-r--r--keyboards/maple_computing/jnao/info.json6
-rw-r--r--keyboards/maple_computing/the_ruler/config.h7
-rw-r--r--keyboards/maple_computing/the_ruler/info.json6
8 files changed, 24 insertions, 28 deletions
diff --git a/keyboards/maple_computing/6ball/config.h b/keyboards/maple_computing/6ball/config.h
index cc496d675a..591fae2d3e 100644
--- a/keyboards/maple_computing/6ball/config.h
+++ b/keyboards/maple_computing/6ball/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 0xCEEB
-#define PRODUCT_ID 0x0007
-#define DEVICE_VER 0x0001
-#define MANUFACTURER That-Canadian
-#define PRODUCT 6-Ball
-
/* key matrix size */
#define MATRIX_ROWS 1
#define MATRIX_COLS 6
diff --git a/keyboards/maple_computing/6ball/info.json b/keyboards/maple_computing/6ball/info.json
index fc742ad517..087372c186 100644
--- a/keyboards/maple_computing/6ball/info.json
+++ b/keyboards/maple_computing/6ball/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "6-Ball",
+ "manufacturer": "That-Canadian",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xCEEB",
+ "pid": "0x0007",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/maple_computing/c39/config.h b/keyboards/maple_computing/c39/config.h
index 45c503846f..538dbdbf28 100755
--- a/keyboards/maple_computing/c39/config.h
+++ b/keyboards/maple_computing/c39/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 0xCA17
-#define PRODUCT_ID 0xCA39
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Maple Computing
-#define PRODUCT C39
-
/* key matrix size */
#define MATRIX_ROWS 3
#define MATRIX_COLS 13
diff --git a/keyboards/maple_computing/c39/info.json b/keyboards/maple_computing/c39/info.json
index 3600570dde..971c483627 100755
--- a/keyboards/maple_computing/c39/info.json
+++ b/keyboards/maple_computing/c39/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "C39",
+ "manufacturer": "Maple Computing",
"url": "",
"maintainer": "Space Cat",
+ "usb": {
+ "vid": "0xCA17",
+ "pid": "0xCA39",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"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":"Back", "x":5, "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":"M1", "x":11.25, "y":0}, {"label":"M2", "x":12.25, "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":"Enter", "x":5, "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":";", "x":10, "y":1}, {"label":"M3", "x":11.25, "y":1}, {"label":"M4", "x":12.25, "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":"Fn", "x":5, "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":"M5", "x":11.25, "y":2}, {"label":"M6", "x":12.25, "y":2}]
diff --git a/keyboards/maple_computing/jnao/config.h b/keyboards/maple_computing/jnao/config.h
index 7598e049ae..d89ca3ddee 100644
--- a/keyboards/maple_computing/jnao/config.h
+++ b/keyboards/maple_computing/jnao/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 0x1337
-#define PRODUCT_ID 0x6017
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Maple Computing
-#define PRODUCT JNAO Keyboard
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 12
diff --git a/keyboards/maple_computing/jnao/info.json b/keyboards/maple_computing/jnao/info.json
index 4d8f332391..2b2fc17742 100644
--- a/keyboards/maple_computing/jnao/info.json
+++ b/keyboards/maple_computing/jnao/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "JNAO",
+ "manufacturer": "Maple Computing",
"url": "",
"maintainer": "That-Canadian",
+ "usb": {
+ "vid": "0x1337",
+ "pid": "0x6017",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_ortho_5x12": {
"layout": [
diff --git a/keyboards/maple_computing/the_ruler/config.h b/keyboards/maple_computing/the_ruler/config.h
index ec9687cc0b..61027372b9 100644
--- a/keyboards/maple_computing/the_ruler/config.h
+++ b/keyboards/maple_computing/the_ruler/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 0x1337
-#define PRODUCT_ID 0x6007
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Maple Computing
-#define PRODUCT The PCB Ruler
-
/* key matrix size */
#define MATRIX_ROWS 1
#define MATRIX_COLS 6
diff --git a/keyboards/maple_computing/the_ruler/info.json b/keyboards/maple_computing/the_ruler/info.json
index 5f2b9fba8f..c0aa2b371b 100644
--- a/keyboards/maple_computing/the_ruler/info.json
+++ b/keyboards/maple_computing/the_ruler/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "The Ruler",
+ "manufacturer": "Maple Computing",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x1337",
+ "pid": "0x6007",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0, "w":2}]