diff options
| author | QMK Bot <hello@qmk.fm> | 2022-01-15 07:51:29 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-01-15 07:51:29 +0000 |
| commit | 02637ec350a9a85594321a2c06f72ecc32571cd9 (patch) | |
| tree | ac53e6f476c5ffd0862ac98ca314201b660f3301 | |
| parent | 9cd2024814a9562e0a82e2bb0b972d8d4e3b6523 (diff) | |
| parent | 7edfb4deffdf648c69d080ff082bf786485708e0 (diff) | |
| download | qmk_firmware-02637ec350a9a85594321a2c06f72ecc32571cd9.tar.gz qmk_firmware-02637ec350a9a85594321a2c06f72ecc32571cd9.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | data/mappings/keyboard_aliases.json | 3 | ||||
| -rw-r--r-- | keyboards/mechlovin/hex4b/rules.mk | 22 |
2 files changed, 4 insertions, 21 deletions
diff --git a/data/mappings/keyboard_aliases.json b/data/mappings/keyboard_aliases.json index 60c91b1bfc..c9467f7c84 100644 --- a/data/mappings/keyboard_aliases.json +++ b/data/mappings/keyboard_aliases.json @@ -344,6 +344,9 @@ 'mechlovin/hannah65/mechlovin9': { target: 'mechlovin/mechlovin9/rev1' }, + 'mechlovin/hex4b': { + target: 'mechlovin/hex4b/rev1' + }, 'melgeek/z70ultra': { target: 'melgeek/z70ultra/rev1' }, diff --git a/keyboards/mechlovin/hex4b/rules.mk b/keyboards/mechlovin/hex4b/rules.mk index c3a1785039..e3d9ab46b4 100644 --- a/keyboards/mechlovin/hex4b/rules.mk +++ b/keyboards/mechlovin/hex4b/rules.mk @@ -1,21 +1 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = usbasploader - -# Processor frequency -F_CPU = 16000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output +DEFAULT_FOLDER = mechlovin/hex4b/rev1 |