summaryrefslogtreecommitdiff
path: root/keyboards/handwired
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-08-21 22:09:30 +0000
committerQMK Bot <hello@qmk.fm>2022-08-21 22:09:30 +0000
commite36ae90a651df6ccad5f6d125135ee0240a01f02 (patch)
tree834b7f0b4bdbe09730574948837d56f0aca7a111 /keyboards/handwired
parent51e4e91285722fd9fc93eaa4617dfa7501b5ddf0 (diff)
parentb0eda7701a372e820264c6a78afa1f8c410845f7 (diff)
downloadqmk_firmware-e36ae90a651df6ccad5f6d125135ee0240a01f02.tar.gz
qmk_firmware-e36ae90a651df6ccad5f6d125135ee0240a01f02.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/handwired')
-rw-r--r--keyboards/handwired/tractyl_manuform/4x6_right/config.h4
-rw-r--r--keyboards/handwired/tractyl_manuform/4x6_right/info.json6
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/config.h3
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h2
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json3
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h2
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json3
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h2
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json3
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/info.json5
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h2
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json3
-rw-r--r--keyboards/handwired/tractyl_manuform/config.h3
-rw-r--r--keyboards/handwired/tractyl_manuform/info.json5
14 files changed, 25 insertions, 21 deletions
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/config.h b/keyboards/handwired/tractyl_manuform/4x6_right/config.h
index 5bfb17ee31..0e15056baf 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/config.h
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/config.h
@@ -20,10 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-#define PRODUCT_ID 0x3537
-#define DEVICE_VER 0x0001
-#define PRODUCT Tractyl Manuform(4x6)
-
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 10
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
index 0681db1f3e..62b61072ec 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
@@ -1,7 +1,11 @@
{
- "keyboard_name": "Tractyl Manuform 4x6",
+ "keyboard_name": "Tractyl Manuform (4x6)",
"url": "",
"maintainer": "drashna",
+ "usb": {
+ "pid": "0x3537",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_4x6_right": {
"layout": [
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/config.h
index fc5037ae9d..53a2b41e06 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/config.h
@@ -20,9 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-#define PRODUCT_ID 0x3536
-#define DEVICE_VER 0x0001
-
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 12
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
index ab72957b5c..402f0c99e5 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
@@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define PRODUCT Tractyl Manuform(5x6) Elite C
-
// wiring of each half
#define MATRIX_COL_PINS \
{ D4, D7, E6, B4, B5, B7 }
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json
new file mode 100644
index 0000000000..b3cb5928de
--- /dev/null
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json
@@ -0,0 +1,3 @@
+{
+ "keyboard_name": "Tractyl Manuform (5x6) Elite-C"
+}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
index bf7f2c7605..f3f3fb7e22 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
@@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define PRODUCT Tractyl Manuform(5x6) Proton C
-
// wiring of each half
#define MATRIX_COL_PINS \
{ B0, B1, B2, B3, B4, B5 }
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
new file mode 100644
index 0000000000..d88708d17d
--- /dev/null
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
@@ -0,0 +1,3 @@
+{
+ "keyboard_name": "Tractyl Manuform (5x6) Proton-C"
+}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
index b31f450553..791317b9e9 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
@@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define PRODUCT Tractyl Manuform(5x6) BlackPill
-
// wiring of each half
#define MATRIX_COL_PINS \
{ A15, B3, B4, B5, B6, B7 }
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
new file mode 100644
index 0000000000..7466004165
--- /dev/null
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
@@ -0,0 +1,3 @@
+{
+ "keyboard_name": "Tractyl Manuform (5x6) BlackPill"
+}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/info.json
index 81a308fd21..5000486242 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/info.json
@@ -1,6 +1,9 @@
{
- "keyboard_name": "Tractyl Manuform 5x6",
"url": "",
+ "usb": {
+ "pid": "0x3536",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_5x6_right": {
"layout": [
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
index 6eb3186332..735fe96f0f 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
@@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define PRODUCT Tractyl Manuform(5x6) Teensy 2.0 ++
-
// wiring of each half
#define MATRIX_COL_PINS \
{ C0, C1, C2, C3, C4, C5 }
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json
new file mode 100644
index 0000000000..dfdbc435bc
--- /dev/null
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json
@@ -0,0 +1,3 @@
+{
+ "keyboard_name": "Tractyl Manuform (5x6) Teensy 2.0++"
+}
diff --git a/keyboards/handwired/tractyl_manuform/config.h b/keyboards/handwired/tractyl_manuform/config.h
index 845125c5cd..6f62685f4e 100644
--- a/keyboards/handwired/tractyl_manuform/config.h
+++ b/keyboards/handwired/tractyl_manuform/config.h
@@ -20,9 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x44DD
-
/* disable debug print */
// #define NO_DEBUG
diff --git a/keyboards/handwired/tractyl_manuform/info.json b/keyboards/handwired/tractyl_manuform/info.json
index 7214e6773b..c84d008e15 100644
--- a/keyboards/handwired/tractyl_manuform/info.json
+++ b/keyboards/handwired/tractyl_manuform/info.json
@@ -1,4 +1,7 @@
{
"manufacturer": "QMK Community",
- "maintainer": "Drashna Jael're"
+ "maintainer": "Drashna Jael're",
+ "usb": {
+ "vid": "0x44DD"
+ }
}