From 2757251218a84195f4d1a5d7654c31378f28a94c Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 1 Jul 2022 15:38:57 +0100 Subject: Specify blackpill board files where relevant (#17521) --- keyboards/yanghu/unicorne/f411/rules.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'keyboards/yanghu/unicorne') diff --git a/keyboards/yanghu/unicorne/f411/rules.mk b/keyboards/yanghu/unicorne/f411/rules.mk index b32a8b7f5b..c25a64f4b3 100644 --- a/keyboards/yanghu/unicorne/f411/rules.mk +++ b/keyboards/yanghu/unicorne/f411/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F411 +BOARD = BLACKPILL_STM32_F411 # Bootloader selection BOOTLOADER = stm32-dfu -- cgit v1.2.1 From fb19e140481ecc360737420850d2d84c67a3d047 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 6 Aug 2022 18:52:13 +1000 Subject: Move keyboard USB IDs and strings to data driven: Y (#17926) --- keyboards/yanghu/unicorne/config.h | 7 ------- keyboards/yanghu/unicorne/info.json | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'keyboards/yanghu/unicorne') diff --git a/keyboards/yanghu/unicorne/config.h b/keyboards/yanghu/unicorne/config.h index 27d21c7906..749f7f69e4 100644 --- a/keyboards/yanghu/unicorne/config.h +++ b/keyboards/yanghu/unicorne/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0204 -#define DEVICE_VER 0x0001 -#define MANUFACTURER yanghu -#define PRODUCT unicorne - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/yanghu/unicorne/info.json b/keyboards/yanghu/unicorne/info.json index 995bed8a03..088e072621 100644 --- a/keyboards/yanghu/unicorne/info.json +++ b/keyboards/yanghu/unicorne/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Unicorne", + "manufacturer": "yanghu", "url": "https://github.com/yanghu/unicorne", "maintainer": "yanghu", + "usb": { + "vid": "0xFEED", + "pid": "0x0204", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_unicorne": { "layout": [ -- cgit v1.2.1 From 34f0c1ac1b0bd5b10735f81ff8e68f7902a6c116 Mon Sep 17 00:00:00 2001 From: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Date: Thu, 11 Aug 2022 00:42:34 -0400 Subject: [Keyboard] fix: unicorne info.json LAYOUT (#17981) --- keyboards/yanghu/unicorne/info.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'keyboards/yanghu/unicorne') diff --git a/keyboards/yanghu/unicorne/info.json b/keyboards/yanghu/unicorne/info.json index 088e072621..67bb7f657d 100644 --- a/keyboards/yanghu/unicorne/info.json +++ b/keyboards/yanghu/unicorne/info.json @@ -8,8 +8,11 @@ "pid": "0x0204", "device_version": "0.0.1" }, + "layout_aliases": { + "LAYOUT": "LAYOUT_split_3x6_4" + }, "layouts": { - "LAYOUT_unicorne": { + "LAYOUT_split_3x6_4": { "layout": [ {"label":"Tab", "x":0, "y":0.8}, {"label":"Q", "x":1, "y":0.8}, @@ -65,4 +68,4 @@ ] } } -} +} -- cgit v1.2.1 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/yanghu/unicorne/keymaps/bcat/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/yanghu/unicorne') diff --git a/keyboards/yanghu/unicorne/keymaps/bcat/keymap.c b/keyboards/yanghu/unicorne/keymaps/bcat/keymap.c index 3da9f880ae..af1e92a984 100644 --- a/keyboards/yanghu/unicorne/keymaps/bcat/keymap.c +++ b/keyboards/yanghu/unicorne/keymaps/bcat/keymap.c @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/7eb0f1c437169f30cc18eac271ad2302 */ [LAYER_ADJUST] = LAYOUT( - _______, MU_TOG, KC_MPLY, KC_VOLU, KC_MSTP, _______, EEP_RST, RESET, _______, _______, _______, _______, + _______, MU_TOG, KC_MPLY, KC_VOLU, KC_MSTP, _______, EEP_RST, QK_BOOT, _______, _______, _______, _______, _______, MU_MOD, KC_MPRV, KC_VOLD, KC_MNXT, _______, RGB_RMOD, RGB_VAD, RGB_VAI, RGB_MOD, RGB_SPI, _______, _______, _______, _______, KC_MUTE, _______, _______, RGB_HUI, RGB_SAD, RGB_SAI, RGB_HUD, RGB_SPD, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______ -- cgit v1.2.1