Fix broken bootloader builds in develop. (#15880)

This commit is contained in:
Dasky 2022-01-15 01:04:58 +00:00 committed by GitHub
parent 77eae62d62
commit 08a42dc72c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 17 additions and 1 deletions

View file

@ -5,6 +5,7 @@
"debounce": 6,
"processor": "STM32F303",
"board": "QMK_PROTON_C",
"bootloader": "stm32-dfu",
"diode_direction": "COL2ROW",
"features": {
"audio": true,

View file

@ -5,6 +5,7 @@
"debounce": 5,
"processor": "STM32F303",
"board": "QMK_PROTON_C",
"bootloader": "stm32-dfu",
"diode_direction": "COL2ROW",
"features": {
"audio": true,

View file

@ -5,6 +5,7 @@
"debounce": 5,
"processor": "STM32F303",
"board": "QMK_PROTON_C",
"bootloader": "stm32-dfu",
"diode_direction": "COL2ROW",
"features": {
"audio": true,

View file

@ -4,6 +4,7 @@
"maintainer": "skullydazed",
"processor": "STM32F303",
"board": "QMK_PROTON_C",
"bootloader": "stm32-dfu",
"matrix_pins": {
"direct": [
["A10", "A9"],

View file

@ -2,7 +2,7 @@
MCU = STM32F072
# Bootloader selection
Bootloader = stm32-dfu
BOOTLOADER = stm32-dfu
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF

View file

@ -5,6 +5,7 @@
"debounce": 5,
"processor": "STM32F303",
"board": "QMK_PROTON_C",
"bootloader": "stm32-dfu",
"features": {
"bootmagic": true,
"extrakey": true,

View file

@ -3,6 +3,7 @@
"manufacturer": "Nightingale Studios",
"maintainer": "zvecr",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"diode_direction": "COL2ROW",
"matrix_pins": {
"cols": ["A3", "F1", "F0", "C15", "C14", "C13", "B11", "B10", "B2", "B1", "B0", "A7", "A5", "A6", "A4", "B5"],

View file

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

View file

@ -1,6 +1,9 @@
# MCU name
MCU = STM32F303
# Bootloader selection
BOOTLOADER = stm32-dfu
# Touch encoder needs
SRC += ../common/touch_encoder.c
SRC += ../common/common_oled.c

View file

@ -16,4 +16,8 @@
#include "bootloader.h"
#pragma message "Unknown bootloader set, you may not be able to enter bootloader using software reset"
__attribute__((weak)) void bootloader_jump(void) {}
__attribute__((weak)) void enter_bootloader_mode_if_requested(void) {}