From 1b54c43e53b955b69ce5d1553c48aeb3511c6321 Mon Sep 17 00:00:00 2001
From: FLYmaker <FLYmaker@users.noreply.github.com>
Date: Mon, 2 Nov 2020 11:19:24 +0800
Subject: [PATCH] ADD FLY_CDY BOARD

Conflict resolution
---
 Marlin/src/pins/pins.h                  | 1 +
 Marlin/src/pins/stm32f1/pins_FLY_MINI.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 0d978e3171..de80013f1f 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -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
 //
diff --git a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
index c342bc2165..b746ca6280 100644
--- a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
@@ -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