diff options
| author | QMK Bot <hello@qmk.fm> | 2021-12-06 17:38:55 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-12-06 17:38:55 +0000 |
| commit | ce1ee47ef533b257e213e38e86c370c6e73693e2 (patch) | |
| tree | 071256e58407ba2b95cc124a14f8a7f21c7bfd4f /keyboards | |
| parent | 942b3cf16cceec2afa72bea2f12ef543f395a5db (diff) | |
| parent | 366d26a2efda5ed40c4c0e0d49d3ce622f44d916 (diff) | |
| download | qmk_firmware-ce1ee47ef533b257e213e38e86c370c6e73693e2.tar.gz qmk_firmware-ce1ee47ef533b257e213e38e86c370c6e73693e2.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
| -rwxr-xr-x | keyboards/mnk1800s/rules.mk | 7 | ||||
| -rwxr-xr-x | keyboards/mnk50/rules.mk | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/keyboards/mnk1800s/rules.mk b/keyboards/mnk1800s/rules.mk index 3e71d4e8d7..bc2fdaccd8 100755 --- a/keyboards/mnk1800s/rules.mk +++ b/keyboards/mnk1800s/rules.mk @@ -1,6 +1,12 @@ # MCU name MCU = STM32F072 +# Bootloader selection +BOOTLOADER = stm32-dfu + +# Wildcard to allow APM32 MCU +DFU_SUFFIX_ARGS = -v FFFF -p FFFF + # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. @@ -19,4 +25,3 @@ NKRO_ENABLE = yes # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/mnk50/rules.mk b/keyboards/mnk50/rules.mk index 26154419de..bc2fdaccd8 100755 --- a/keyboards/mnk50/rules.mk +++ b/keyboards/mnk50/rules.mk @@ -4,6 +4,9 @@ MCU = STM32F072 # Bootloader selection BOOTLOADER = stm32-dfu +# Wildcard to allow APM32 MCU +DFU_SUFFIX_ARGS = -v FFFF -p FFFF + # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. |