mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-10-31 21:32:31 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						a61e549a31
					
				| @ -12,6 +12,7 @@ | ||||
|         "nkro": true | ||||
|     }, | ||||
|     "processor": "STM32F401", | ||||
|     "board": "BLACKPILL_STM32_F411", | ||||
|     "url": "https://github.com/diepala/cantor", | ||||
|     "usb": { | ||||
|         "device_version": "1.0.0", | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F411 | ||||
| BOARD = BLACKPILL_STM32_F411 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F401 | ||||
| BOARD = BLACKPILL_STM32_F401 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F411 | ||||
| BOARD = BLACKPILL_STM32_F411 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F401 | ||||
| BOARD = BLACKPILL_STM32_F401 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F401 | ||||
| BOARD = BLACKPILL_STM32_F401 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F411 | ||||
| BOARD = BLACKPILL_STM32_F411 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F401 | ||||
| BOARD = BLACKPILL_STM32_F401 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F411 | ||||
| BOARD = BLACKPILL_STM32_F411 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F401 | ||||
| BOARD = BLACKPILL_STM32_F401 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F411 | ||||
| BOARD = BLACKPILL_STM32_F411 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F411 | ||||
| BOARD = BLACKPILL_STM32_F411 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F401 | ||||
| BOARD = BLACKPILL_STM32_F401 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F401 | ||||
| BOARD = BLACKPILL_STM32_F401 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F411 | ||||
| BOARD = BLACKPILL_STM32_F411 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F401 | ||||
| BOARD = BLACKPILL_STM32_F401 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F401 | ||||
| BOARD = BLACKPILL_STM32_F401 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F411 | ||||
| BOARD = BLACKPILL_STM32_F411 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F411 | ||||
| BOARD = BLACKPILL_STM32_F411 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F401 | ||||
| BOARD = BLACKPILL_STM32_F401 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F401 | ||||
| BOARD = BLACKPILL_STM32_F401 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F411 | ||||
| BOARD = BLACKPILL_STM32_F411 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F411 | ||||
| BOARD = BLACKPILL_STM32_F411 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F411 | ||||
| BOARD = BLACKPILL_STM32_F411 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F411 | ||||
| BOARD = BLACKPILL_STM32_F411 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F411 | ||||
| BOARD = BLACKPILL_STM32_F411 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F411 | ||||
| BOARD = BLACKPILL_STM32_F411 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F411 | ||||
| BOARD = BLACKPILL_STM32_F411 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F401 | ||||
| BOARD = BLACKPILL_STM32_F401 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| # MCU name
 | ||||
| MCU = STM32F411 | ||||
| BOARD = BLACKPILL_STM32_F411 | ||||
| 
 | ||||
| # Bootloader selection
 | ||||
| BOOTLOADER = stm32-dfu | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 QMK Bot
						QMK Bot