Merge remote-tracking branch 'origin/master' into develop

2022-08-14 01:54:23 -07:00
parent e948fa6f6e 4195eb8fe1
commit ac31e42974
145 changed files with 789 additions and 471 deletions
--- a/keyboards/bastardkb/charybdis/3x5/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/config.h
@@ -18,8 +18,6 @@

 #pragma once

-#include "config_common.h"
-
 /* Key matrix configuration. */
 #define MATRIX_ROWS 8 // Rows are doubled-up.
 #define MATRIX_COLS 5
--- a/keyboards/bastardkb/charybdis/3x5/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/info.json
@@ -1,6 +1,8 @@
 {
    "url": "https://bastardkb.com/charybdis-nano",
+    "manufacturer": "Bastard Keyboards",
    "usb": {
+        "vid": "0xA8F8",
        "pid": "0x1832",
    },
    "layouts": {
--- a/keyboards/bastardkb/charybdis/4x6/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/config.h
@@ -18,8 +18,6 @@

 #pragma once

-#include "config_common.h"
-
 /* Key matrix configuration. */
 #define MATRIX_ROWS 10 // Rows are doubled-up.
 #define MATRIX_COLS 6
--- a/keyboards/bastardkb/charybdis/4x6/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/info.json
@@ -1,6 +1,8 @@
 {
    "url": "https://bastardkb.com/charybdis",
+    "manufacturer": "Bastard Keyboards",
    "usb": {
+        "vid": "0xA8F8",
        "pid": "0x1833",
    },
    "layouts": {