3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

ADD FLY_CDY BOARD

Browse source 
Conflict resolution
This commit is contained in:
FLYmaker 2020-11-02 11:19:24 +08:00
parent fa9e82f859
commit 1b54c43e53
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Marlin/src/pins/pins.h
View file

@ -577,6 +577,7 @@
#include "stm32f1/pins_FLY_MINI.h" // STM32F1 env:FLY_MINI #include "stm32f1/pins_FLY_MINI.h" // STM32F1 env:FLY_MINI
#elif MB(FLSUN_HISPEED) #elif MB(FLSUN_HISPEED)
#include "stm32f1/pins_FLSUN_HISPEED.h" // STM32F1 env:flsun_hispeed #include "stm32f1/pins_FLSUN_HISPEED.h" // STM32F1 env:flsun_hispeed
// //
// ARM Cortex-M4F // ARM Cortex-M4F
// //

2
Marlin/src/pins/stm32f1/pins_FLY_MINI.h
View file

@ -132,7 +132,7 @@
// //
// LCD / Controller // LCD / Controller
// //
#define ENABLE_SPI2 #define SPI_DEVICE 2
#define SS_PIN PB12 #define SS_PIN PB12
#define SCK_PIN PB13 #define SCK_PIN PB13
#define MISO_PIN PB14 #define MISO_PIN PB14