Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
a61e549a31
|
@ -12,6 +12,7 @@
|
||||||
"nkro": true
|
"nkro": true
|
||||||
},
|
},
|
||||||
"processor": "STM32F401",
|
"processor": "STM32F401",
|
||||||
|
"board": "BLACKPILL_STM32_F411",
|
||||||
"url": "https://github.com/diepala/cantor",
|
"url": "https://github.com/diepala/cantor",
|
||||||
"usb": {
|
"usb": {
|
||||||
"device_version": "1.0.0",
|
"device_version": "1.0.0",
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F411
|
MCU = STM32F411
|
||||||
|
BOARD = BLACKPILL_STM32_F411
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F401
|
MCU = STM32F401
|
||||||
|
BOARD = BLACKPILL_STM32_F401
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F411
|
MCU = STM32F411
|
||||||
|
BOARD = BLACKPILL_STM32_F411
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F401
|
MCU = STM32F401
|
||||||
|
BOARD = BLACKPILL_STM32_F401
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F401
|
MCU = STM32F401
|
||||||
|
BOARD = BLACKPILL_STM32_F401
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F411
|
MCU = STM32F411
|
||||||
|
BOARD = BLACKPILL_STM32_F411
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F401
|
MCU = STM32F401
|
||||||
|
BOARD = BLACKPILL_STM32_F401
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F411
|
MCU = STM32F411
|
||||||
|
BOARD = BLACKPILL_STM32_F411
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F401
|
MCU = STM32F401
|
||||||
|
BOARD = BLACKPILL_STM32_F401
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F411
|
MCU = STM32F411
|
||||||
|
BOARD = BLACKPILL_STM32_F411
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F411
|
MCU = STM32F411
|
||||||
|
BOARD = BLACKPILL_STM32_F411
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F401
|
MCU = STM32F401
|
||||||
|
BOARD = BLACKPILL_STM32_F401
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F401
|
MCU = STM32F401
|
||||||
|
BOARD = BLACKPILL_STM32_F401
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F411
|
MCU = STM32F411
|
||||||
|
BOARD = BLACKPILL_STM32_F411
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F401
|
MCU = STM32F401
|
||||||
|
BOARD = BLACKPILL_STM32_F401
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F401
|
MCU = STM32F401
|
||||||
|
BOARD = BLACKPILL_STM32_F401
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F411
|
MCU = STM32F411
|
||||||
|
BOARD = BLACKPILL_STM32_F411
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F411
|
MCU = STM32F411
|
||||||
|
BOARD = BLACKPILL_STM32_F411
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F401
|
MCU = STM32F401
|
||||||
|
BOARD = BLACKPILL_STM32_F401
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F401
|
MCU = STM32F401
|
||||||
|
BOARD = BLACKPILL_STM32_F401
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F411
|
MCU = STM32F411
|
||||||
|
BOARD = BLACKPILL_STM32_F411
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F411
|
MCU = STM32F411
|
||||||
|
BOARD = BLACKPILL_STM32_F411
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F411
|
MCU = STM32F411
|
||||||
|
BOARD = BLACKPILL_STM32_F411
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F411
|
MCU = STM32F411
|
||||||
|
BOARD = BLACKPILL_STM32_F411
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F411
|
MCU = STM32F411
|
||||||
|
BOARD = BLACKPILL_STM32_F411
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F411
|
MCU = STM32F411
|
||||||
|
BOARD = BLACKPILL_STM32_F411
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F411
|
MCU = STM32F411
|
||||||
|
BOARD = BLACKPILL_STM32_F411
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F401
|
MCU = STM32F401
|
||||||
|
BOARD = BLACKPILL_STM32_F401
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = STM32F411
|
MCU = STM32F411
|
||||||
|
BOARD = BLACKPILL_STM32_F411
|
||||||
|
|
||||||
# Bootloader selection
|
# Bootloader selection
|
||||||
BOOTLOADER = stm32-dfu
|
BOOTLOADER = stm32-dfu
|
||||||
|
|
Loading…
Reference in a new issue