summaryrefslogtreecommitdiff
path: root/keyboards/unikeyboard
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2022-08-04 08:53:46 +1000
committerGitHub <noreply@github.com>2022-08-03 23:53:46 +0100
commita30c1884c7ccbdc5a454cedbed61f465f6c275ba (patch)
treebea6eaca68fa70fafda1d78c8a648735b87d00ec /keyboards/unikeyboard
parent1fd8d5c322a8686baab627f7e56f6de5d44a0810 (diff)
Move keyboard USB IDs and strings to data driven: U (#17900)
Diffstat (limited to 'keyboards/unikeyboard')
-rw-r--r--keyboards/unikeyboard/diverge3/config.h7
-rw-r--r--keyboards/unikeyboard/diverge3/info.json6
-rw-r--r--keyboards/unikeyboard/divergetm2/config.h7
-rw-r--r--keyboards/unikeyboard/divergetm2/info.json8
-rw-r--r--keyboards/unikeyboard/felix/config.h7
-rw-r--r--keyboards/unikeyboard/felix/info.json6
6 files changed, 19 insertions, 22 deletions
diff --git a/keyboards/unikeyboard/diverge3/config.h b/keyboards/unikeyboard/diverge3/config.h
index 502e97bd91..72544405c2 100644
--- a/keyboards/unikeyboard/diverge3/config.h
+++ b/keyboards/unikeyboard/diverge3/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 0x1257
-#define DEVICE_VER 0x0001
-#define MANUFACTURER UniKeyboard
-#define PRODUCT diverge3
-
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 8
diff --git a/keyboards/unikeyboard/diverge3/info.json b/keyboards/unikeyboard/diverge3/info.json
index fc678b40bc..74dc2641a1 100644
--- a/keyboards/unikeyboard/diverge3/info.json
+++ b/keyboards/unikeyboard/diverge3/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Diverge3",
+ "manufacturer": "UniKeyboard",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x1257",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0.75}, {"x":2, "y":0.25}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0.25}, {"x":6, "y":0.5}, {"x":10, "y":0.5}, {"x":11, "y":0.25}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0.25}, {"x":15, "y":0.75}, {"x":16, "y":0}, {"x":0, "y":1}, {"x":1, "y":1.75}, {"x":2, "y":1.25}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1.25}, {"x":6, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.25}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1.25}, {"x":15, "y":1.75}, {"x":16, "y":1}, {"x":0, "y":2}, {"x":1, "y":2.75}, {"x":2, "y":2.25}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2.25}, {"x":6, "y":2.5}, {"x":10, "y":2.5}, {"x":11, "y":2.25}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2.25}, {"x":15, "y":2.75}, {"x":16, "y":2}, {"x":0, "y":3}, {"x":1, "y":3.75}, {"x":2, "y":3.25}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3.25}, {"x":6, "y":3.5}, {"x":10, "y":3.5}, {"x":11, "y":3.25}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3.25}, {"x":15, "y":3.75}, {"x":16, "y":3}, {"x":0, "y":4}, {"x":1, "y":4.75}, {"x":2, "y":4.25}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4.75, "h":1.25}, {"x":6, "y":5, "h":1.25}, {"x":7, "y":5.25}, {"x":9, "y":5.25}, {"x":10, "y":5, "h":1.25}, {"x":11, "y":4.75, "h":1.25}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4.25}, {"x":15, "y":4.75}, {"x":16, "y":4}]
diff --git a/keyboards/unikeyboard/divergetm2/config.h b/keyboards/unikeyboard/divergetm2/config.h
index ee8372aa7e..bfebd4563a 100644
--- a/keyboards/unikeyboard/divergetm2/config.h
+++ b/keyboards/unikeyboard/divergetm2/config.h
@@ -19,13 +19,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x1256
-#define DEVICE_VER 0x0001
-#define MANUFACTURER UniKeyboard
-#define PRODUCT diverge tm2
-
/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 6
diff --git a/keyboards/unikeyboard/divergetm2/info.json b/keyboards/unikeyboard/divergetm2/info.json
index fc64e57906..4d707c944c 100644
--- a/keyboards/unikeyboard/divergetm2/info.json
+++ b/keyboards/unikeyboard/divergetm2/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "UniKeyboard Diverge TM 2",
+ "keyboard_name": "Diverge TM 2",
+ "manufacturer": "UniKeyboard",
"url": "",
"maintainer": "islandman93, xton",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x1256",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/unikeyboard/felix/config.h b/keyboards/unikeyboard/felix/config.h
index 64319f029f..e199d0792c 100644
--- a/keyboards/unikeyboard/felix/config.h
+++ b/keyboards/unikeyboard/felix/config.h
@@ -2,13 +2,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x6060
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Unikeyboard
-#define PRODUCT Felix
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 4
diff --git a/keyboards/unikeyboard/felix/info.json b/keyboards/unikeyboard/felix/info.json
index f81d56f340..74b923206d 100644
--- a/keyboards/unikeyboard/felix/info.json
+++ b/keyboards/unikeyboard/felix/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Felix",
+ "manufacturer": "UniKeyboard",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6060",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_ortho_5x4": {
"layout": [