diff options
| author | InigoGutierrez <inigogf.95@gmail.com> | 2022-09-25 16:02:54 +0200 |
|---|---|---|
| committer | InigoGutierrez <inigogf.95@gmail.com> | 2022-09-25 16:02:54 +0200 |
| commit | 6afdd9d74da250e47ac64d6690bd19d037045e99 (patch) | |
| tree | 661f6cfb244c02bcd1fbfe8fb9b2bd9242a91394 /keyboards/yanghu | |
| parent | 93a55e61b59d20f7cd842cce02e5b18a63a23612 (diff) | |
| parent | 1bdf4cdc22ae57d111efb2f7d71e405e5c7b3f11 (diff) | |
| download | qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.tar.gz qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.zip | |
Merge branch 'master' into taamas
Diffstat (limited to 'keyboards/yanghu')
| -rw-r--r-- | keyboards/yanghu/unicorne/config.h | 7 | ||||
| -rw-r--r-- | keyboards/yanghu/unicorne/f411/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/yanghu/unicorne/info.json | 13 | ||||
| -rw-r--r-- | keyboards/yanghu/unicorne/keymaps/bcat/keymap.c | 2 |
4 files changed, 13 insertions, 10 deletions
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/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 diff --git a/keyboards/yanghu/unicorne/info.json b/keyboards/yanghu/unicorne/info.json index 995bed8a03..67bb7f657d 100644 --- a/keyboards/yanghu/unicorne/info.json +++ b/keyboards/yanghu/unicorne/info.json @@ -1,9 +1,18 @@ { "keyboard_name": "Unicorne", + "manufacturer": "yanghu", "url": "https://github.com/yanghu/unicorne", "maintainer": "yanghu", + "usb": { + "vid": "0xFEED", + "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}, @@ -59,4 +68,4 @@ ] } } -} +} 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, _______, _______, _______ |