Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
ce1ee47ef5
|
@ -1,6 +1,12 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F072
|
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
|
# Do not put the microcontroller into power saving mode
|
||||||
# when we get USB suspend event. We want it to keep updating
|
# when we get USB suspend event. We want it to keep updating
|
||||||
# backlight effects.
|
# backlight effects.
|
||||||
|
@ -19,4 +25,3 @@ NKRO_ENABLE = yes # USB Nkey Rollover
|
||||||
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
||||||
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
||||||
AUDIO_ENABLE = no # Audio output
|
AUDIO_ENABLE = no # Audio output
|
||||||
NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in
|
|
||||||
|
|
|
@ -4,6 +4,9 @@ MCU = STM32F072
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
||||||
|
# Wildcard to allow APM32 MCU
|
||||||
|
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
|
||||||
|
|
||||||
# Do not put the microcontroller into power saving mode
|
# Do not put the microcontroller into power saving mode
|
||||||
# when we get USB suspend event. We want it to keep updating
|
# when we get USB suspend event. We want it to keep updating
|
||||||
# backlight effects.
|
# backlight effects.
|
||||||
|
|
Loading…
Reference in New Issue