From 306e50b84cdf0aaac01838c4519209b642dee113 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 30 Jul 2022 13:02:47 +1000 Subject: Move keyboard USB IDs and strings to data driven: D (#17814) --- keyboards/dtisaac/cg108/config.h | 7 ------- keyboards/dtisaac/cg108/info.json | 8 ++++++-- keyboards/dtisaac/dosa40rgb/config.h | 7 ------- keyboards/dtisaac/dosa40rgb/info.json | 8 +++++++- keyboards/dtisaac/dtisaac01/config.h | 7 ------- keyboards/dtisaac/dtisaac01/info.json | 6 ++++++ 6 files changed, 19 insertions(+), 24 deletions(-) (limited to 'keyboards/dtisaac') diff --git a/keyboards/dtisaac/cg108/config.h b/keyboards/dtisaac/cg108/config.h index 7ce2de42b8..ec4dce5f54 100644 --- a/keyboards/dtisaac/cg108/config.h +++ b/keyboards/dtisaac/cg108/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4454 // DT -#define PRODUCT_ID 0x4973 // Is -#define DEVICE_VER 0x0002 -#define MANUFACTURER DTIsaac -#define PRODUCT CG108 - /* key matrix size */ #define MATRIX_ROWS 11 #define MATRIX_COLS 11 diff --git a/keyboards/dtisaac/cg108/info.json b/keyboards/dtisaac/cg108/info.json index 0ecc1764f6..eb6189088c 100644 --- a/keyboards/dtisaac/cg108/info.json +++ b/keyboards/dtisaac/cg108/info.json @@ -1,9 +1,13 @@ { "keyboard_name": "CG108", + "manufacturer": "DTIsaac", "url": "", "maintainer": "daotakisaac", - "width": 22.5, - "height": 6.5, + "usb": { + "vid": "0x4454", + "pid": "0x4973", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dtisaac/dosa40rgb/config.h b/keyboards/dtisaac/dosa40rgb/config.h index 8d61f61128..ccb3f74867 100644 --- a/keyboards/dtisaac/dosa40rgb/config.h +++ b/keyboards/dtisaac/dosa40rgb/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4454 // DT -#define PRODUCT_ID 0x4973 // Is -#define DEVICE_VER 0x0004 -#define MANUFACTURER DTIsaac -#define PRODUCT >_Dosa40 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 11 diff --git a/keyboards/dtisaac/dosa40rgb/info.json b/keyboards/dtisaac/dosa40rgb/info.json index 2feed40d42..d24975ca8b 100644 --- a/keyboards/dtisaac/dosa40rgb/info.json +++ b/keyboards/dtisaac/dosa40rgb/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": ">_Dosa40rgb", + "keyboard_name": ">_Dosa40", + "manufacturer": "DTIsaac", "url": "", "maintainer": "DTIsaac", + "usb": { + "vid": "0x4454", + "pid": "0x4973", + "device_version": "0.0.4" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dtisaac/dtisaac01/config.h b/keyboards/dtisaac/dtisaac01/config.h index eb1ff71536..71b5baa093 100644 --- a/keyboards/dtisaac/dtisaac01/config.h +++ b/keyboards/dtisaac/dtisaac01/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4454 -#define PRODUCT_ID 0x4973 -#define DEVICE_VER 0x0001 -#define MANUFACTURER DTIsaac -#define PRODUCT dtisaac01 - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 9 diff --git a/keyboards/dtisaac/dtisaac01/info.json b/keyboards/dtisaac/dtisaac01/info.json index eac22cda30..790648d64b 100644 --- a/keyboards/dtisaac/dtisaac01/info.json +++ b/keyboards/dtisaac/dtisaac01/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "dtisaac01", + "manufacturer": "DTIsaac", "url": "", "maintainer": "DTIsaac", + "usb": { + "vid": "0x4454", + "pid": "0x4973", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ -- cgit v1.2.1 From 154d35ac146422bef938ed9756f6e0012baa83a2 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sat, 6 Aug 2022 23:23:35 +1000 Subject: Remove `UNUSED_PINS` (#17931) --- keyboards/dtisaac/cg108/config.h | 1 - keyboards/dtisaac/dosa40rgb/config.h | 1 - keyboards/dtisaac/dtisaac01/config.h | 1 - 3 files changed, 3 deletions(-) (limited to 'keyboards/dtisaac') diff --git a/keyboards/dtisaac/cg108/config.h b/keyboards/dtisaac/cg108/config.h index ec4dce5f54..211b60b3e0 100644 --- a/keyboards/dtisaac/cg108/config.h +++ b/keyboards/dtisaac/cg108/config.h @@ -36,7 +36,6 @@ along with this program. If not, see . /* key matrix pins */ #define MATRIX_ROW_PINS { F4, F1, F0, F5, F6, F7, D4, D5, D3, D2, D0 } #define MATRIX_COL_PINS { C7, C6, B4, D7, B3, B2, B0, E6, B1, D1, D6 } -#define UNUSED_PINS /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/dtisaac/dosa40rgb/config.h b/keyboards/dtisaac/dosa40rgb/config.h index ccb3f74867..2651a4d9b5 100644 --- a/keyboards/dtisaac/dosa40rgb/config.h +++ b/keyboards/dtisaac/dosa40rgb/config.h @@ -35,7 +35,6 @@ along with this program. If not, see . */ #define MATRIX_ROW_PINS { B7, D7, F1, F0 } #define MATRIX_COL_PINS { D1, D6, D3, D2, B6, C6, C7, F7, F6, F5, F4 } -#define UNUSED_PINS /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/dtisaac/dtisaac01/config.h b/keyboards/dtisaac/dtisaac01/config.h index 71b5baa093..9b9a012ab4 100644 --- a/keyboards/dtisaac/dtisaac01/config.h +++ b/keyboards/dtisaac/dtisaac01/config.h @@ -35,7 +35,6 @@ along with this program. If not, see . */ #define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, B4, D2, B2, B1, B3, D4, D6 } #define MATRIX_COL_PINS { C7, C6, D0, B5, F0, D7, B0, B7, D1 } -#define UNUSED_PINS /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION ROW2COL -- cgit v1.2.1 From d2accb48e784030637f5517dfec66b13f1eab609 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 20 Aug 2022 11:34:17 +0100 Subject: RESET -> QK_BOOT keyboard readme (#18110) --- keyboards/dtisaac/cg108/readme.md | 2 +- keyboards/dtisaac/dosa40rgb/readme.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/dtisaac') diff --git a/keyboards/dtisaac/cg108/readme.md b/keyboards/dtisaac/cg108/readme.md index 3bf38f7689..c454e0b877 100644 --- a/keyboards/dtisaac/cg108/readme.md +++ b/keyboards/dtisaac/cg108/readme.md @@ -23,4 +23,4 @@ Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead -* **Keycode in layout**: Press the key mapped to `RESET` if it is available +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/dtisaac/dosa40rgb/readme.md b/keyboards/dtisaac/dosa40rgb/readme.md index a2995a5c0f..30e549aa6e 100644 --- a/keyboards/dtisaac/dosa40rgb/readme.md +++ b/keyboards/dtisaac/dosa40rgb/readme.md @@ -23,4 +23,4 @@ Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead -* **Keycode in layout**: Press the key mapped to `RESET` if it is available +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available -- cgit v1.2.1