summaryrefslogtreecommitdiffstats
path: root/keyboards/acekeyboard
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2022-07-26 10:52:18 +1000
committerGitHub <noreply@github.com>2022-07-26 01:52:18 +0100
commit674422eb13a4f5c9c8238629e42f4fc1d7641ede (patch)
treea6bd07b6866ea0bb189c05e2bf63cbfa20dc5bc5 /keyboards/acekeyboard
parenta939293aca697cb263f4972dbb1521d273fbf499 (diff)
Move keyboard USB IDs and strings to data driven: A (#17781)
Diffstat (limited to 'keyboards/acekeyboard')
-rw-r--r--keyboards/acekeyboard/titan60/config.h7
-rw-r--r--keyboards/acekeyboard/titan60/info.json6
2 files changed, 6 insertions, 7 deletions
diff --git a/keyboards/acekeyboard/titan60/config.h b/keyboards/acekeyboard/titan60/config.h
index 6cfaa7980e..f348a12cf4 100644
--- a/keyboards/acekeyboard/titan60/config.h
+++ b/keyboards/acekeyboard/titan60/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 0xACE1 // Ace
-#define PRODUCT_ID 0x5449 // TI
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Acekeyboard
-#define PRODUCT titan60
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
diff --git a/keyboards/acekeyboard/titan60/info.json b/keyboards/acekeyboard/titan60/info.json
index 8e7b41c9cd..0867639515 100644
--- a/keyboards/acekeyboard/titan60/info.json
+++ b/keyboards/acekeyboard/titan60/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Titan60",
+ "manufacturer": "Acekeyboard",
"url": "https://acekeyboard.co/",
"maintainer": "keebnewb",
+ "usb": {
+ "vid": "0xACE1",
+ "pid": "0x5449",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_60_ansi": {
"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}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":2.75}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]