ADD FLY_CDY BOARD
Conflict resolution
This commit is contained in:
parent
fa9e82f859
commit
1b54c43e53
2 changed files with 2 additions and 1 deletions
|
|
@ -577,6 +577,7 @@
|
|||
#include "stm32f1/pins_FLY_MINI.h" // STM32F1 env:FLY_MINI
|
||||
#elif MB(FLSUN_HISPEED)
|
||||
#include "stm32f1/pins_FLSUN_HISPEED.h" // STM32F1 env:flsun_hispeed
|
||||
|
||||
//
|
||||
// ARM Cortex-M4F
|
||||
//
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@
|
|||
//
|
||||
// LCD / Controller
|
||||
//
|
||||
#define ENABLE_SPI2
|
||||
#define SPI_DEVICE 2
|
||||
#define SS_PIN PB12
|
||||
#define SCK_PIN PB13
|
||||
#define MISO_PIN PB14
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue