summaryrefslogtreecommitdiffstats
path: root/keyboards/rominronin/katana60
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2022-08-04 08:05:40 +1000
committerGitHub <noreply@github.com>2022-08-04 08:05:40 +1000
commitb40c03140e5da1edac2faa2b672a84ea28d0a7c1 (patch)
treeebb6eba45162062fcb3d2e327313812fcaf98e33 /keyboards/rominronin/katana60
parent92bcbee22615114286916bbbc4df4256c2818f0d (diff)
Move keyboard USB IDs and strings to data driven: R (#17885)
Diffstat (limited to 'keyboards/rominronin/katana60')
-rw-r--r--keyboards/rominronin/katana60/rev1/config.h7
-rw-r--r--keyboards/rominronin/katana60/rev1/info.json6
-rw-r--r--keyboards/rominronin/katana60/rev2/config.h7
-rw-r--r--keyboards/rominronin/katana60/rev2/info.json6
4 files changed, 12 insertions, 14 deletions
diff --git a/keyboards/rominronin/katana60/rev1/config.h b/keyboards/rominronin/katana60/rev1/config.h
index fea2d7d643..e7f7d92016 100644
--- a/keyboards/rominronin/katana60/rev1/config.h
+++ b/keyboards/rominronin/katana60/rev1/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 0x7272 // "rr" - rominronin
-#define PRODUCT_ID 0x0C2C
-#define DEVICE_VER 0x0001
-#define MANUFACTURER RominRonin CandyKeys
-#define PRODUCT Katana60 rev1
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/rominronin/katana60/rev1/info.json b/keyboards/rominronin/katana60/rev1/info.json
index 8ac62a68e3..1b4ec3c943 100644
--- a/keyboards/rominronin/katana60/rev1/info.json
+++ b/keyboards/rominronin/katana60/rev1/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Katana60 rev1",
+ "manufacturer": "RominRonin CandyKeys",
"url": "",
"maintainer": "rominronin",
+ "usb": {
+ "vid": "0x7272",
+ "pid": "0x0C2C",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/rominronin/katana60/rev2/config.h b/keyboards/rominronin/katana60/rev2/config.h
index 24984c8179..e1441acdfc 100644
--- a/keyboards/rominronin/katana60/rev2/config.h
+++ b/keyboards/rominronin/katana60/rev2/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 0x7272 // "rr" - rominronin
-#define PRODUCT_ID 0xF03B
-#define DEVICE_VER 0x0001
-#define MANUFACTURER RominRonin CandyKeys
-#define PRODUCT Katana60 rev2
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/rominronin/katana60/rev2/info.json b/keyboards/rominronin/katana60/rev2/info.json
index e2ac51024f..3b26ff635e 100644
--- a/keyboards/rominronin/katana60/rev2/info.json
+++ b/keyboards/rominronin/katana60/rev2/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Katana60 rev2",
+ "manufacturer": "RominRonin CandyKeys",
"url": "https://candykeys.com/product/katana60-pcb-V2",
"maintainer": "rominronin",
+ "usb": {
+ "vid": "0x7272",
+ "pid": "0xF03B",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_7u_a": {
"layout": [