summaryrefslogtreecommitdiff
path: root/keyboards/ckeys
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-07-25 23:04:48 +0000
committerQMK Bot <hello@qmk.fm>2022-07-25 23:04:48 +0000
commit1e651dbdb0815013da00804257df67aab5e28167 (patch)
treea9e7fe329803a6ced4e8644615ebf5b84a47e6a7 /keyboards/ckeys
parent4baed8037d18d73f3937006c9f0379c3e15d6125 (diff)
parenta939293aca697cb263f4972dbb1521d273fbf499 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/ckeys')
-rwxr-xr-xkeyboards/ckeys/handwire_101/config.h7
-rw-r--r--keyboards/ckeys/handwire_101/info.json8
-rw-r--r--keyboards/ckeys/nakey/config.h7
-rw-r--r--keyboards/ckeys/nakey/info.json6
-rw-r--r--keyboards/ckeys/obelus/config.h7
-rw-r--r--keyboards/ckeys/obelus/info.json6
-rwxr-xr-xkeyboards/ckeys/thedora/config.h7
-rw-r--r--keyboards/ckeys/thedora/info.json8
-rw-r--r--keyboards/ckeys/washington/config.h7
-rw-r--r--keyboards/ckeys/washington/info.json8
10 files changed, 33 insertions, 38 deletions
diff --git a/keyboards/ckeys/handwire_101/config.h b/keyboards/ckeys/handwire_101/config.h
index 6b3f6c5b7f..0b9db50d2e 100755
--- a/keyboards/ckeys/handwire_101/config.h
+++ b/keyboards/ckeys/handwire_101/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 0x6060
-#define DEVICE_VER 0x0001
-#define MANUFACTURER cKeys
-#define PRODUCT Handwire 101
-
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 4
diff --git a/keyboards/ckeys/handwire_101/info.json b/keyboards/ckeys/handwire_101/info.json
index 19e6edb481..344c34e5d8 100644
--- a/keyboards/ckeys/handwire_101/info.json
+++ b/keyboards/ckeys/handwire_101/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "cKeys Handwire 101",
+ "keyboard_name": "Handwire 101",
+ "manufacturer": "cKeys",
"url": "https://ckeys.org/slides/handwire/",
"maintainer": "brandenbyers",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6060",
+ "device_version": "0.0.1"
+ },
"layout_aliases": {
"LAYOUT": "LAYOUT_ortho_4x4"
},
diff --git a/keyboards/ckeys/nakey/config.h b/keyboards/ckeys/nakey/config.h
index b620ff08c7..cd1296034b 100644
--- a/keyboards/ckeys/nakey/config.h
+++ b/keyboards/ckeys/nakey/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 0x6060
-#define DEVICE_VER 0x0001
-#define MANUFACTURER cKeys
-#define PRODUCT naKey
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 4
diff --git a/keyboards/ckeys/nakey/info.json b/keyboards/ckeys/nakey/info.json
index 2f939be578..1f1e67fedf 100644
--- a/keyboards/ckeys/nakey/info.json
+++ b/keyboards/ckeys/nakey/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "naKey",
+ "manufacturer": "cKeys",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6060",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_numpad_5x4": {
"layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"+", "x":3, "y":1, "h":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":3, "h":2}]
diff --git a/keyboards/ckeys/obelus/config.h b/keyboards/ckeys/obelus/config.h
index 1759f6c5fc..0ac18c7aa5 100644
--- a/keyboards/ckeys/obelus/config.h
+++ b/keyboards/ckeys/obelus/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 0x6060
-#define DEVICE_VER 0x0001
-#define MANUFACTURER You
-#define PRODUCT obelus
-
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 4
diff --git a/keyboards/ckeys/obelus/info.json b/keyboards/ckeys/obelus/info.json
index f930f65bc5..7c0629fd5e 100644
--- a/keyboards/ckeys/obelus/info.json
+++ b/keyboards/ckeys/obelus/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Obelus",
+ "manufacturer": "cKeys",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6060",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_ortho_4x4": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}]
diff --git a/keyboards/ckeys/thedora/config.h b/keyboards/ckeys/thedora/config.h
index 8e96c8ed06..c14b575678 100755
--- a/keyboards/ckeys/thedora/config.h
+++ b/keyboards/ckeys/thedora/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x6060
-#define DEVICE_VER 0x0001
-#define MANUFACTURER ckeys
-#define PRODUCT thedora
-
#define ENCODERS_PAD_A { B13 }
#define ENCODERS_PAD_B { B15 }
#define ENCODER_RESOLUTION 4
diff --git a/keyboards/ckeys/thedora/info.json b/keyboards/ckeys/thedora/info.json
index 631da8f26e..311ccec843 100644
--- a/keyboards/ckeys/thedora/info.json
+++ b/keyboards/ckeys/thedora/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "The Dora Board.",
+ "keyboard_name": "thedora",
+ "manufacturer": "ckeys",
"url": "https://ckeys.org/slides/exboard",
"maintainer": "brandenbyers",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6060",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/ckeys/washington/config.h b/keyboards/ckeys/washington/config.h
index 2d5a8ce3ad..643f61c5d6 100644
--- a/keyboards/ckeys/washington/config.h
+++ b/keyboards/ckeys/washington/config.h
@@ -17,13 +17,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 0x002A
-#define DEVICE_VER 0x0001
-#define MANUFACTURER merlin04
-#define PRODUCT Washington Macropad
-
/* key matrix size */
#define MATRIX_ROWS 3
#define MATRIX_COLS 3
diff --git a/keyboards/ckeys/washington/info.json b/keyboards/ckeys/washington/info.json
index 304e4f3354..20e83faf2b 100644
--- a/keyboards/ckeys/washington/info.json
+++ b/keyboards/ckeys/washington/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "washington",
+ "keyboard_name": "Washington Macropad",
+ "manufacturer": "merlin04",
"url": "https://keypcb.xyz/ViewPage/Washington",
"maintainer": "merlin04",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x002A",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [{"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":0, "y":0.75}, {"x":0.5, "y":1.75}, {"x":1.5, "y":2}]