diff options
| author | lokher <lokher@gmail.com> | 2022-09-13 11:13:00 +0800 |
|---|---|---|
| committer | lokher <lokher@gmail.com> | 2022-09-13 11:13:00 +0800 |
| commit | fe13cedf8c09fa34d5cec4e4c624738095176625 (patch) | |
| tree | 818436626d49c7f22f325632b2053edba10d4358 /keyboards/knobgoblin | |
| parent | fa207545a9759c50b9f230eb608d86a9085801d4 (diff) | |
| parent | f46379f308783994b8178f95adc686f4b4c3ebd8 (diff) | |
merge upstream master
Diffstat (limited to 'keyboards/knobgoblin')
| -rw-r--r-- | keyboards/knobgoblin/config.h | 7 | ||||
| -rw-r--r-- | keyboards/knobgoblin/info.json | 8 | ||||
| -rw-r--r-- | keyboards/knobgoblin/keymaps/moults31/keymap.c | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/keyboards/knobgoblin/config.h b/keyboards/knobgoblin/config.h index ed6d69d6f0..57a0a016c4 100644 --- a/keyboards/knobgoblin/config.h +++ b/keyboards/knobgoblin/config.h @@ -18,12 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4B47 // KG -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER MrT1ddl3s -#define PRODUCT Knob Goblin /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 5 @@ -31,7 +25,6 @@ /* key matrix pins */ #define MATRIX_ROW_PINS { D4, B6, B2, B3, B1 } #define MATRIX_COL_PINS { B5, B4, E6, D7, C6 } -#define UNUSED_PINS #define ENCODERS_PAD_A { F7, F5 } #define ENCODERS_PAD_B { F6, F4 } diff --git a/keyboards/knobgoblin/info.json b/keyboards/knobgoblin/info.json index cea6915409..44a9d81ed5 100644 --- a/keyboards/knobgoblin/info.json +++ b/keyboards/knobgoblin/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "knobgoblin", + "keyboard_name": "Knob Goblin", + "manufacturer": "MrT1ddl3s", "url": "", "maintainer": "MrT1ddl3s", + "usb": { + "vid": "0x4B47", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho": { "layout": [ diff --git a/keyboards/knobgoblin/keymaps/moults31/keymap.c b/keyboards/knobgoblin/keymaps/moults31/keymap.c index 20dda4ccd0..775f9d1b5d 100644 --- a/keyboards/knobgoblin/keymaps/moults31/keymap.c +++ b/keyboards/knobgoblin/keymaps/moults31/keymap.c @@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [10] = LAYOUT_ortho( - RESET, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, TO(7), TO(8), TO(9), KC_TRNS, TO(4), TO(5), TO(6), KC_TRNS, KC_TRNS, TO(1), TO(2), TO(3), KC_TRNS, |