diff options
author | QMK Bot <hello@qmk.fm> | 2021-06-08 09:49:23 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-06-08 09:49:23 +0000 |
commit | 13defb0befa31110e70fafbeeb26bd6883472c86 (patch) | |
tree | 6d35884f908326ddf696fb4d08957341a8946e16 /keyboards/cannonkeys/satisfaction75 | |
parent | 84e691717cd8a49b345ec35aa2a2374bebce07f0 (diff) | |
parent | 9dcd03b6ca512126231478131796c093d237067f (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/cannonkeys/satisfaction75')
-rw-r--r-- | keyboards/cannonkeys/satisfaction75/bootloader_defs.h | 5 | ||||
-rw-r--r-- | keyboards/cannonkeys/satisfaction75/rules.mk | 9 |
2 files changed, 6 insertions, 8 deletions
diff --git a/keyboards/cannonkeys/satisfaction75/bootloader_defs.h b/keyboards/cannonkeys/satisfaction75/bootloader_defs.h deleted file mode 100644 index dccd0fa5d1..0000000000 --- a/keyboards/cannonkeys/satisfaction75/bootloader_defs.h +++ /dev/null @@ -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 diff --git a/keyboards/cannonkeys/satisfaction75/rules.mk b/keyboards/cannonkeys/satisfaction75/rules.mk index 3861b4849f..174f20c0e6 100644 --- a/keyboards/cannonkeys/satisfaction75/rules.mk +++ b/keyboards/cannonkeys/satisfaction75/rules.mk @@ -2,6 +2,12 @@ MCU = STM32F072 BOARD = GENERIC_STM32_F072XB +# Bootloader selection +BOOTLOADER = stm32-dfu + +# Wildcard to allow APM32 MCU +DFU_SUFFIX_ARGS = -v FFFF -p FFFF + # Build Options # comment out to disable the options. # @@ -25,8 +31,5 @@ QWIIC_DRIVERS += MICRO_OLED 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 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE |