From cf41c24db853f825150802d30dce73ba507b69c0 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 25 Aug 2022 00:28:38 +1000 Subject: Move keyboard USB IDs and strings to data driven: develop (#18152) * Move keyboard USB IDs and strings to data driven: develop * Also do new onekeys --- keyboards/gmmk/gmmk2/p96/ansi/config.h | 21 --------------------- keyboards/gmmk/gmmk2/p96/ansi/info.json | 6 ++++++ keyboards/gmmk/gmmk2/p96/config.h | 7 ------- keyboards/gmmk/gmmk2/p96/iso/config.h | 21 --------------------- keyboards/gmmk/gmmk2/p96/iso/info.json | 6 ++++++ 5 files changed, 12 insertions(+), 49 deletions(-) delete mode 100644 keyboards/gmmk/gmmk2/p96/ansi/config.h delete mode 100644 keyboards/gmmk/gmmk2/p96/iso/config.h (limited to 'keyboards/gmmk') diff --git a/keyboards/gmmk/gmmk2/p96/ansi/config.h b/keyboards/gmmk/gmmk2/p96/ansi/config.h deleted file mode 100644 index 9f386a4211..0000000000 --- a/keyboards/gmmk/gmmk2/p96/ansi/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021 Glorious, LLC - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "config_common.h" - -#define PRODUCT_ID 0x504B diff --git a/keyboards/gmmk/gmmk2/p96/ansi/info.json b/keyboards/gmmk/gmmk2/p96/ansi/info.json index 1fe1530e4e..a5a1d6c3d5 100644 --- a/keyboards/gmmk/gmmk2/p96/ansi/info.json +++ b/keyboards/gmmk/gmmk2/p96/ansi/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "GMMK V2 96 ANSI", + "manufacturer": "Glorious", "url": "http://www.pcgamingrace.com", "maintainer": "GloriousThrall", + "usb": { + "vid": "0x320F", + "pid": "0x504B", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gmmk/gmmk2/p96/config.h b/keyboards/gmmk/gmmk2/p96/config.h index fec383c240..03a7f58538 100644 --- a/keyboards/gmmk/gmmk2/p96/config.h +++ b/keyboards/gmmk/gmmk2/p96/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0001 -#define VENDOR_ID 0x320F -#define MANUFACTURER Glorious - -#define PRODUCT GMMK 2 96 - /* key matrix size */ #define MATRIX_ROWS 14 #define MATRIX_COLS 8 diff --git a/keyboards/gmmk/gmmk2/p96/iso/config.h b/keyboards/gmmk/gmmk2/p96/iso/config.h deleted file mode 100644 index 97a391b09c..0000000000 --- a/keyboards/gmmk/gmmk2/p96/iso/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021 Glorious, LLC - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "config_common.h" - -#define PRODUCT_ID 0x505A diff --git a/keyboards/gmmk/gmmk2/p96/iso/info.json b/keyboards/gmmk/gmmk2/p96/iso/info.json index 96e9f1312b..df30007a01 100644 --- a/keyboards/gmmk/gmmk2/p96/iso/info.json +++ b/keyboards/gmmk/gmmk2/p96/iso/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "GMMK V2 96 ISO", + "manufacturer": "Glorious", "url": "http://www.pcgamingrace.com", "maintainer": "GloriousThrall", + "usb": { + "vid": "0x320F", + "pid": "0x505A", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ -- cgit v1.2.3