diff options
| author | Drashna Jael're <drashna@live.com> | 2022-08-14 01:54:23 -0700 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2022-08-14 01:54:23 -0700 |
| commit | ac31e429741a640b0d03d2ebd76554b7fe9247e0 (patch) | |
| tree | 8d21aa6f2b7e0c3ee75b37e4f2edb1ae010db525 /keyboards/bastardkb | |
| parent | e948fa6f6e184a3c9a317a7aa680e33e7629b0d4 (diff) | |
| parent | 4195eb8fe1de39855b622ee282950c10fdbf0988 (diff) | |
| download | qmk_firmware-ac31e429741a640b0d03d2ebd76554b7fe9247e0.tar.gz qmk_firmware-ac31e429741a640b0d03d2ebd76554b7fe9247e0.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/bastardkb')
| -rw-r--r-- | keyboards/bastardkb/charybdis/3x5/config.h | 2 | ||||
| -rw-r--r-- | keyboards/bastardkb/charybdis/3x5/info.json | 2 | ||||
| -rw-r--r-- | keyboards/bastardkb/charybdis/4x6/config.h | 2 | ||||
| -rw-r--r-- | keyboards/bastardkb/charybdis/4x6/info.json | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/keyboards/bastardkb/charybdis/3x5/config.h b/keyboards/bastardkb/charybdis/3x5/config.h index 57634258be..6e3b8a7124 100644 --- 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 diff --git a/keyboards/bastardkb/charybdis/3x5/info.json b/keyboards/bastardkb/charybdis/3x5/info.json index ece533944e..41c80b457f 100644 --- 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": { diff --git a/keyboards/bastardkb/charybdis/4x6/config.h b/keyboards/bastardkb/charybdis/4x6/config.h index f0c1f48cdf..f557089073 100644 --- 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 diff --git a/keyboards/bastardkb/charybdis/4x6/info.json b/keyboards/bastardkb/charybdis/4x6/info.json index 4bd0983709..c95bf07516 100644 --- 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": { |