From e44b6242b70e3fc94b71ab3a463a0cf6b4dba280 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 15 Aug 2022 18:55:21 +0100 Subject: Migrate more F4x1 board files (#18054) --- keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'keyboards/handwired/dactyl_manuform/6x6') diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk index af3cc49296..d929a3516d 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk +++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk @@ -3,6 +3,7 @@ # MCU name MCU = STM32F411 +BOARD = BLACKPILL_STM32_F411 # Bootloader selection BOOTLOADER = tinyuf2 -- cgit v1.2.3 From 48792b030b754c8b3983a97071db1b09ae6353d4 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 20 Aug 2022 10:31:48 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: handwired (#18079) --- keyboards/handwired/dactyl_manuform/6x6/config.h | 4 ---- keyboards/handwired/dactyl_manuform/6x6/info.json | 8 +++++++- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'keyboards/handwired/dactyl_manuform/6x6') diff --git a/keyboards/handwired/dactyl_manuform/6x6/config.h b/keyboards/handwired/dactyl_manuform/6x6/config.h index 15682fcadf..3568b56143 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/config.h +++ b/keyboards/handwired/dactyl_manuform/6x6/config.h @@ -20,10 +20,6 @@ along with this program. If not, see . #include "config_common.h" -#define PRODUCT_ID 0x3636 -#define DEVICE_VER 0x0001 -#define PRODUCT "Dactyl-Manuform (6x6)" - /* USB Device descriptor parameter */ /* key matrix size */ diff --git a/keyboards/handwired/dactyl_manuform/6x6/info.json b/keyboards/handwired/dactyl_manuform/6x6/info.json index 1f4e7dc3a4..bfc65baf18 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Dactyl Manuform 6x6", + "keyboard_name": "Dactyl-Manuform (6x6)", + "manufacturer": "tshort", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x444D", + "pid": "0x3636", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_6x6": { "layout": [ -- cgit v1.2.3 From d2accb48e784030637f5517dfec66b13f1eab609 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 20 Aug 2022 11:34:17 +0100 Subject: RESET -> QK_BOOT keyboard readme (#18110) --- keyboards/handwired/dactyl_manuform/6x6/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/handwired/dactyl_manuform/6x6') diff --git a/keyboards/handwired/dactyl_manuform/6x6/readme.md b/keyboards/handwired/dactyl_manuform/6x6/readme.md index 9b079be466..c7500448da 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/readme.md +++ b/keyboards/handwired/dactyl_manuform/6x6/readme.md @@ -60,4 +60,4 @@ Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key at F1 for left side, and F7 for right side. * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead -* **Keycode in layout**: Press the key mapped to `RESET`, in dumam keymap it's assigned to F1 and F12 keys on mod layers. +* **Keycode in layout**: Press the key mapped to `QK_BOOT`, in dumam keymap it's assigned to F1 and F12 keys on mod layers. -- cgit v1.2.3 From bbc3bc55f2d52b90881470695ee132f5a57bfaa3 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 21 Aug 2022 23:55:30 +0100 Subject: RESET -> QK_BOOT user keymaps (#17940) --- keyboards/handwired/dactyl_manuform/6x6/keymaps/dumam/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/handwired/dactyl_manuform/6x6') diff --git a/keyboards/handwired/dactyl_manuform/6x6/keymaps/dumam/keymap.c b/keyboards/handwired/dactyl_manuform/6x6/keymaps/dumam/keymap.c index 2fb783e0b8..ab258a0c5e 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/keymaps/dumam/keymap.c +++ b/keyboards/handwired/dactyl_manuform/6x6/keymaps/dumam/keymap.c @@ -14,7 +14,7 @@ enum custom_layers { #define KC_SPEC KC_SFTENT //KC_SFTENT - Right Shift when held, Enter when tapped #define KC_INS_ KC_INS #define KC_TAB_ KC_TAB -#define RESET__ RESET +#define RESET__ QK_BOOT const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -- cgit v1.2.3