Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-06-08 09:49:23 +00:00
commit 13defb0bef
178 changed files with 556 additions and 209 deletions

View file

@ -2,6 +2,9 @@
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
## Features ## Features
CONSOLE_ENABLE = yes CONSOLE_ENABLE = yes
ENCODER_ENABLE = yes ENCODER_ENABLE = yes

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -2,6 +2,9 @@
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -1,8 +1,10 @@
# MCU name # MCU name
MCU = STM32F042 MCU = STM32F042
BOARD = ST_NUCLEO32_F042K6 BOARD = ST_NUCLEO32_F042K6
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -2,6 +2,9 @@
MCU = STM32F072 MCU = STM32F072
BOARD = GENERIC_STM32_F072XB BOARD = GENERIC_STM32_F072XB
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #

View file

@ -1,6 +1,10 @@
# MCU name
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #
@ -16,4 +20,3 @@ RGBLIGHT_ENABLE = no
TAP_DANCE_ENABLE = no TAP_DANCE_ENABLE = no
UNICODE_ENABLE = no UNICODE_ENABLE = no
UNICODEMAP_ENABLE = yes UNICODEMAP_ENABLE = yes

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -2,6 +2,9 @@
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -1,6 +1,9 @@
# MCU name
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
BOOTLOADER =
# Bootloader selection
BOOTLOADER = stm32-dfu
BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration(+1000) BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE = yes # Mouse keys(+4700) MOUSEKEY_ENABLE = yes # Mouse keys(+4700)

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -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
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #
@ -20,8 +26,5 @@ WS2812_DRIVER = spi
LAYOUTS = 60_ansi 60_tsangan_hhkb LAYOUTS = 60_ansi 60_tsangan_hhkb
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

View file

@ -1,6 +1,9 @@
# MCU Name # MCU Name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #

View file

@ -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
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #
@ -15,9 +21,6 @@ BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes
WS2812_DRIVER = spi WS2812_DRIVER = spi
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
DEFAULT_FOLDER = cannonkeys/db60/rev2 DEFAULT_FOLDER = cannonkeys/db60/rev2
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread

View file

@ -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
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #
@ -16,8 +22,5 @@ BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes
WS2812_DRIVER = spi WS2812_DRIVER = spi
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

View file

@ -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
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #
@ -19,8 +25,5 @@ WS2812_DRIVER = spi
LAYOUTS = 60_ansi 60_tsangan_hhkb LAYOUTS = 60_ansi 60_tsangan_hhkb
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

View file

@ -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
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #
@ -21,6 +27,3 @@ WS2812_DRIVER = spi
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #

View file

@ -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
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #
@ -18,8 +24,5 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
AUDIO_ENABLE = no # Audio output on port C6 AUDIO_ENABLE = no # Audio output on port C6
WS2812_DRIVER = spi WS2812_DRIVER = spi
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

View file

@ -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
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #
@ -18,8 +24,5 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no # Enable Bluetooth BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output AUDIO_ENABLE = no # Audio output
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

View file

@ -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
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #
@ -15,8 +21,5 @@ CUSTOM_MATRIX = no # Custom matrix file
BACKLIGHT_ENABLE = yes BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = no RGBLIGHT_ENABLE = no
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

View file

@ -1,8 +1,11 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Wildcard to allow APM32 MCU # Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF DFU_SUFFIX_ARGS = -v FFFF -p FFFF
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View file

@ -1,5 +0,0 @@
/* Address for jumping to bootloader on STM32 chips. */
/* It is chip dependent, the correct number can be looked up here (page 175):
* http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
*/
#define STM32_BOOTLOADER_ADDRESS 0x1FFFC800

View file

@ -2,6 +2,12 @@
MCU = STM32F072 MCU = STM32F072
BOARD = GENERIC_STM32_F072XB BOARD = GENERIC_STM32_F072XB
# Bootloader selection
BOOTLOADER = stm32-dfu
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #
@ -25,8 +31,5 @@ QWIIC_DRIVERS += MICRO_OLED
DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1 DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

View file

@ -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
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #
@ -21,7 +27,4 @@ WS2812_DRIVER = spi
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
LAYOUTS = 65_ansi_blocker 65_ansi_blocker_split_bs 65_ansi_blocker_tsangan 65_iso_blocker LAYOUTS = 65_ansi_blocker 65_ansi_blocker_split_bs 65_ansi_blocker_tsangan 65_iso_blocker

View file

@ -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
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #
@ -20,6 +26,3 @@ WS2812_DRIVER = spi
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF

View file

@ -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
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #
@ -19,8 +25,5 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output AUDIO_ENABLE = no # Audio output
WS2812_DRIVER = spi WS2812_DRIVER = spi
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# 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.

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F042 MCU = STM32F042
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
@ -15,4 +18,4 @@ NKRO_ENABLE = no # 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
BLUETOOTH_ENABLE = no # Enable Bluetooth BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output AUDIO_ENABLE = no # Audio output

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F042 MCU = STM32F042
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
@ -15,4 +18,4 @@ NKRO_ENABLE = no # 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
BLUETOOTH_ENABLE = no # Enable Bluetooth BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output AUDIO_ENABLE = no # Audio output

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -2,6 +2,9 @@
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #

View file

@ -19,12 +19,6 @@
#include "config_common.h" #include "config_common.h"
/* Address for jumping to bootloader on STM32 chips. */
/* It is chip dependent, the correct number can be looked up here:
* http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
*/
#define STM32_BOOTLOADER_ADDRESS 0x1FFFD800
/* Backlight configuration /* Backlight configuration
*/ */
#define BACKLIGHT_LEVELS 1 #define BACKLIGHT_LEVELS 1

View file

@ -2,12 +2,6 @@
#include "config_common.h" #include "config_common.h"
/* Address for jumping to bootloader on STM32 chips. */
/* It is chip dependent, the correct number can be looked up here:
* http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
*/
#define STM32_BOOTLOADER_ADDRESS 0x1FFFD800
/* Backlight configuration /* Backlight configuration
*/ */
#define BACKLIGHT_LEVELS 1 #define BACKLIGHT_LEVELS 1

View file

@ -18,12 +18,6 @@
#pragma once #pragma once
#include "config_common.h" #include "config_common.h"
/* Address for jumping to bootloader on STM32 chips. */
/* It is chip dependent, the correct number can be looked up here:
* http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
*/
#define STM32_BOOTLOADER_ADDRESS 0x1FFFD800
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
// #define DEBOUNCE 6 // #define DEBOUNCE 6

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -2,6 +2,9 @@
MCU = STM32F072 MCU = STM32F072
BOARD = GENERIC_STM32_F072XB BOARD = GENERIC_STM32_F072XB
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #

View file

@ -1,6 +1,9 @@
# MCU Name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -1,9 +1,11 @@
# MCU name # MCU name
# Actually F070, but close enough # Actually F070, but close enough
MCU = STM32F072 MCU = STM32F072
BOARD = DURGOD_STM32_F070 BOARD = DURGOD_STM32_F070
# Bootloader selection
BOOTLOADER = stm32-dfu
# Do not put the microcontroller into power saving mode # Do not put the microcontroller into power saving mode
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN OPT_DEFS += -DNO_SUSPEND_POWER_DOWN

View file

@ -2,6 +2,9 @@
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -2,6 +2,9 @@
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -2,6 +2,9 @@
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -2,6 +2,9 @@
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# change yes to no to disable # change yes to no to disable
# #
BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -2,6 +2,9 @@
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F303 MCU = STM32F303
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -2,6 +2,9 @@
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# 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.

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #

View file

@ -25,12 +25,6 @@
#define MANUFACTURER John M Daly #define MANUFACTURER John M Daly
#define PRODUCT CO60 rev6 #define PRODUCT CO60 rev6
/* Address for jumping to bootloader on STM32 chips. */
/* It is chip dependent, the correct number can be looked up here:
* http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
*/
#define STM32_BOOTLOADER_ADDRESS 0x1FFFD800
/* key matrix size */ /* key matrix size */
#define MATRIX_ROWS 5 #define MATRIX_ROWS 5
#define MATRIX_COLS 15 #define MATRIX_COLS 15

View file

@ -2,6 +2,9 @@
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #

View file

@ -26,12 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MANUFACTURER John M Daly #define MANUFACTURER John M Daly
#define PRODUCT CO60 rev7 #define PRODUCT CO60 rev7
/* Address for jumping to bootloader on STM32 chips. */
/* It is chip dependent, the correct number can be looked up here:
* http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
*/
#define STM32_BOOTLOADER_ADDRESS 0x1FFFD800
/* key matrix size */ /* key matrix size */
#define MATRIX_ROWS 5 #define MATRIX_ROWS 5
#define MATRIX_COLS 15 #define MATRIX_COLS 15

View file

@ -2,6 +2,9 @@
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
# Use SPI for RGB underglow: # Use SPI for RGB underglow:
WS2812_DRIVER = spi WS2812_DRIVER = spi

View file

@ -2,6 +2,9 @@
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -2,6 +2,9 @@
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change to "no" to disable the options, or define them in the Makefile in # change to "no" to disable the options, or define them in the Makefile in
# the appropriate keymap folder that will get included automatically # the appropriate keymap folder that will get included automatically
@ -15,4 +18,4 @@ NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: h
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
MIDI_ENABLE = no # MIDI controls MIDI_ENABLE = no # MIDI controls
AUDIO_ENABLE = yes # Audio output on port C6 AUDIO_ENABLE = yes # Audio output on port C6
UNICODE_ENABLE = no # Unicode UNICODE_ENABLE = no # Unicode

View file

@ -2,6 +2,9 @@
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -1,8 +1,8 @@
# MCU name # MCU name
MCU = STM32F401 MCU = STM32F401
# Address of the bootloader in system memory # Bootloader selection
STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View file

@ -1,8 +1,8 @@
# MCU name # MCU name
MCU = STM32F411 MCU = STM32F411
# Address of the bootloader in system memory # Bootloader selection
STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View file

@ -1,10 +1,10 @@
# MCU name # MCU name
MCU = STM32F411 MCU = STM32F411
# Bootloader selection
BOOTLOADER = tinyuf2
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #
KEYBOARD_SHARED_EP = yes KEYBOARD_SHARED_EP = yes
# We want to use the tinyuf2 bootloader...
BOOTLOADER = tinyuf2

View file

@ -1,3 +1,6 @@
# MCU name # MCU name
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu

View file

@ -1,6 +1,8 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

View file

@ -1,12 +1,8 @@
# MCU name # MCU name
MCU = STM32F401 MCU = STM32F401
# Address of the bootloader in system memory # Bootloader selection
STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 BOOTLOADER = stm32-dfu
# Options to pass to dfu-util when flashing
DFU_ARGS = -d 0483:DF11 -a 0 -s 0x08000000:leave
DFU_SUFFIX_ARGS = -v 0483 -p DF11
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View file

@ -1,12 +1,8 @@
# MCU name # MCU name
MCU = STM32F411 MCU = STM32F411
# Address of the bootloader in system memory # Bootloader selection
STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 BOOTLOADER = stm32-dfu
# Options to pass to dfu-util when flashing
DFU_ARGS = -d 0483:DF11 -a 0 -s 0x08000000:leave
DFU_SUFFIX_ARGS = -v 0483 -p DF11
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View file

@ -1,8 +1,8 @@
# MCU name # MCU name
MCU = STM32F401 MCU = STM32F401
# Address of the bootloader in system memory # Bootloader selection
STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View file

@ -1,8 +1,8 @@
# MCU name # MCU name
MCU = STM32F411 MCU = STM32F411
# Address of the bootloader in system memory # Bootloader selection
STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View file

@ -2,6 +2,9 @@
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -2,6 +2,9 @@
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -26,12 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MANUFACTURER John M Daly #define MANUFACTURER John M Daly
#define PRODUCT SteamVan rev1 #define PRODUCT SteamVan rev1
/* Address for jumping to bootloader on STM32 chips. */
/* It is chip dependent, the correct number can be looked up here:
* http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
*/
#define STM32_BOOTLOADER_ADDRESS 0x1FFFD800
/* key matrix size */ /* key matrix size */
#define MATRIX_ROWS 4 #define MATRIX_ROWS 4
#define MATRIX_COLS 12 #define MATRIX_COLS 12

View file

@ -2,6 +2,9 @@
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
# Use SPI for RGB underglow: # Use SPI for RGB underglow:
WS2812_DRIVER = spi WS2812_DRIVER = spi

View file

@ -1,3 +1,4 @@
# MCU name
MCU = STM32F103 MCU = STM32F103
# Bootloader selection # Bootloader selection

View file

@ -2,6 +2,9 @@
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #

View file

@ -1,3 +1,4 @@
# MCU name
MCU = STM32F103 MCU = STM32F103
# Bootloader selection # Bootloader selection

View file

@ -3,7 +3,7 @@ MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection # Bootloader selection
BOOTLOADER = atmel-dfu BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
@ -20,4 +20,4 @@ NKRO_ENABLE = yes # USB Nkey Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no # Enable Bluetooth BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output AUDIO_ENABLE = no # Audio output

View file

@ -2,6 +2,9 @@
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
# 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.

View file

@ -2,6 +2,9 @@
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
# 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.

View file

@ -2,6 +2,9 @@
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
# 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.

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -2,6 +2,9 @@
MCU = STM32F303 MCU = STM32F303
BOARD = QMK_PROTON_C BOARD = QMK_PROTON_C
# Bootloader selection
BOOTLOADER = stm32-dfu
BACKLIGHT_ENABLE = no BACKLIGHT_ENABLE = no
BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes # Mouse keys MOUSEKEY_ENABLE = yes # Mouse keys

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

View file

@ -1,6 +1,9 @@
# MCU name # MCU name
MCU = STM32F072 MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #

Some files were not shown because too many files have changed in this diff Show more