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/pierce | |
| parent | fa207545a9759c50b9f230eb608d86a9085801d4 (diff) | |
| parent | f46379f308783994b8178f95adc686f4b4c3ebd8 (diff) | |
merge upstream master
Diffstat (limited to 'keyboards/pierce')
| -rw-r--r-- | keyboards/pierce/config.h | 7 | ||||
| -rw-r--r-- | keyboards/pierce/info.json | 6 | ||||
| -rw-r--r-- | keyboards/pierce/keymaps/durken1/config.h | 4 | ||||
| -rw-r--r-- | keyboards/pierce/readme.md | 2 |
4 files changed, 7 insertions, 12 deletions
diff --git a/keyboards/pierce/config.h b/keyboards/pierce/config.h index 242b2ebf92..0855427bcd 100644 --- a/keyboards/pierce/config.h +++ b/keyboards/pierce/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER durken -#define PRODUCT pierce - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 10 diff --git a/keyboards/pierce/info.json b/keyboards/pierce/info.json index 9c377c0013..850741cd9d 100644 --- a/keyboards/pierce/info.json +++ b/keyboards/pierce/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "pierce", + "manufacturer": "durken", "url": "https://github.com/durken1/pierce", "maintainer": "durken1", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_3x5_3": { "layout": [ diff --git a/keyboards/pierce/keymaps/durken1/config.h b/keyboards/pierce/keymaps/durken1/config.h index 7d19a0b83b..bc0bb1c4b8 100644 --- a/keyboards/pierce/keymaps/durken1/config.h +++ b/keyboards/pierce/keymaps/durken1/config.h @@ -27,9 +27,6 @@ #define PERMISSIVE_HOLD -// Recommended for heavy chording. -#define QMK_KEYS_PER_SCAN 4 - // Combo settings #define COMBO_COUNT 3 #define COMBO_TERM 35 @@ -74,4 +71,3 @@ #ifdef AUTO_BUTTONS #define AUTO_BUTTONS_TIMEOUT 750 #endif - diff --git a/keyboards/pierce/readme.md b/keyboards/pierce/readme.md index 351bacbfa0..be7ba1948b 100644 --- a/keyboards/pierce/readme.md +++ b/keyboards/pierce/readme.md @@ -24,4 +24,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 2 ways: * **Physical reset button**: Briefly press the button on the dongle / wired half -* **Keycode in layout**: Press the key mapped to `RESET` if it is available +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available |