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:09:43 +08:00
parent dc5facefbc
commit fa9e82f859
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -427,7 +427,7 @@
#include "lpc1769/pins_FLY_CDY.h" // LPC1769 env:LPC1769 #include "lpc1769/pins_FLY_CDY.h" // LPC1769 env:LPC1769
#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
// //
// Due (ATSAM) boards // Due (ATSAM) boards
// //
@ -575,7 +575,8 @@
#include "stm32f1/pins_TRIGORILLA_PRO.h" // STM32F1 env:trigorilla_pro #include "stm32f1/pins_TRIGORILLA_PRO.h" // STM32F1 env:trigorilla_pro
#elif MB(FLY_MINI) #elif MB(FLY_MINI)
#include "stm32f1/pins_FLY_MINI.h" // STM32F1 env:FLY_MINI #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 // ARM Cortex-M4F
// //