Merge branch 'bugfix-2.0.x' of https://github.com/Foxies-CSTL/Marlin_2.0.x into bugfix-2.0.x

Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h

@@ -24,14 +24,15 @@
 /**
  * FLSUN HiSpeed V1 (STM32F103VET6) board pin assignments
  * FLSun Hispeed (clone MKS_Robin_miniV2) board.
- * MKS Robin Mini USB Use UART3(PB10-TX,PB11-RX)     
+ *
+ * MKS Robin Mini USB uses UART3 (PB10-TX, PB11-RX)
  * #define SERIAL_PORT_2 3
  */
 
 #if NOT_TARGET(__STM32F1__, STM32F1xx)
   #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
 #elif HOTENDS > 1 || E_STEPPERS > 1
-  #error "FLSUN hispeed supports 1 hotends / E-steppers. Comment out this line to continue."
+  #error "FLSUN HiSpeedV1 supports 1 hotend / E-stepper. Comment out this line to continue."
 #endif
 
 #define BOARD_INFO_NAME      "FLSun HiSpeedV1"
@@ -52,13 +53,39 @@
   #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2KB
 #endif
 
+// SPI
+// Note: FLSun Hispeed (clone MKS_Robin_miniV2) board is using SPI2 interface.
+//
+#define ENABLE_SPI2
+
+// SPI Flash
+#define HAS_SPI_FLASH                          1
+#define SPI_FLASH_SIZE                 0x1000000  // 16MB
+
+#if HAS_SPI_FLASH
+  // SPI 2
+  #define W25QXX_CS_PIN                     PB12  // SPI2_NSS / Flash chip-select
+  #define W25QXX_MOSI_PIN                   PB15
+  #define W25QXX_MISO_PIN                   PB14
+  #define W25QXX_SCK_PIN                    PB13
+#endif
+
+//
+// Servos
+//
+//#define SERVO0_PIN                        PA8   // use IO0 to enable BLTOUCH support/remove Mks_Wifi
+
 //
 // Limit Switches
 //
-#define X_STOP_PIN                         PA15   ///-X
+#define X_STOP_PIN                          PA15  // -X
-#define Y_STOP_PIN                         PA12   ///-Y
+#define Y_STOP_PIN                          PA12  // -Y
-#define Z_MIN_PIN                          PA11   ///-Z
+#define Z_MIN_PIN                           PA11  // -Z
-#define Z_MAX_PIN                           PC4   ///+Z
+#define Z_MAX_PIN                           PC4   // +Z
+
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN            MT_DET_1_PIN
+#endif
 
 //
 // Steppers
@@ -99,12 +126,11 @@
     #define Z_SERIAL_TX_PIN                 PA9   // TXD1
     #define Z_SERIAL_RX_PIN                 PA9   // TXD1
 
-/*
+  #elif ENABLED(SOFTWARE_SERIAL)  /*  TMC220x   */
+    /**
      * TMC2208 stepper UART-configurable by PDN_UART pin
      * Software serial
      */
-
-  #elif ENABLED(SOFTWARE_SERIAL)  /*  TMC220x   */
     #define X_SLAVE_ADDRESS                    0
     #define Y_SLAVE_ADDRESS                    0
     #define Z_SLAVE_ADDRESS                    0
@@ -153,7 +179,7 @@
 #endif
 
 //
-///=================EXTRUDER=======================//
+// EXTRUDER
 //
 #if AXIS_DRIVER_TYPE(E0,TMC2208)||AXIS_DRIVER_TYPE(E0,TMC2209)
   #define E0_SLAVE_ADDRESS                     0
@@ -170,7 +196,6 @@
   #endif
 #endif
 
-
 //
 // Temperature Sensors(THM)
 //
@@ -190,12 +215,14 @@
 // Misc. Functions
 //
 //#define POWER_LOSS_PIN                    PA1   // PW_SO
-#ifdef BACKUP_POWER_SUPPLY
+#if ENABLED(BACKUP_POWER_SUPPLY)
   #define POWER_LOSS_PIN                    PA2   // PW_DET (UPS) MKSPWC
 #endif
 
-// Enable Power Supply Control
+//
-#ifdef PSU_CONTROL
+// Power Supply Control
+//
+#if ENABLED(PSU_CONTROL)
   #define KILL_PIN                          PA2   // PW_DET
   #define KILL_PIN_INVERTING                true  //
   //#define PS_ON_PIN                       PA3   // PW_CN /PW_OFF
@@ -205,24 +232,15 @@
 #define MT_DET_2_PIN                        PE6   // FALA_CRTL
 #define MT_DET_PIN_INVERTING               false
 
-#ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN            MT_DET_1_PIN
-#endif
-
-//#define SERVO0_PIN                          PA8   // use IO0 to enable BLTOUCH support/remove Mks_Wifi
-
-//
 //
 // LED / NEOPixel
 //
-//
 //#define LED_PIN                           PB2   // BOOT1
 
-
+#if ENABLED(NEOPIXEL_LED)
-#ifdef NEOPIXEL_LED
   #define LED_PWM                           PA8
   #ifndef NEOPIXEL_PIN
-    #define NEOPIXEL_PIN                       PA8  // USED WIFI IO0/IO1/TX/RX PIN
+    #define NEOPIXEL_PIN                 LED_PWM  // USED WIFI IO0/IO1/TX/RX PIN
   #endif
 #endif
 
@@ -231,14 +249,13 @@
 //#define GPIO_CLEAR                        PA8   // IO0
 //#define GPIO_SET                          PA5
 
-
 //
 // SD Card
 //
 #define SDIO_SUPPORT
 #define SDIO_CLOCK                       4500000  // 4.5 MHz /* 18 MHz (18000000) or 4.5MHz (450000) */
 //#define SDIO_CLOCK                    18000000  // 18 MHz (18000000)
-#ifdef SDIO_SUPPORT
+#if ENABLED(SDIO_SUPPORT)
   #define SCK_PIN                           PB13  // SPI2
   #define MISO_PIN                          PB14  // SPI2
   #define MOSI_PIN                          PB15  // SPI2
@@ -265,30 +282,30 @@
  * because Marlin uses the reset as a failsafe to revive a glitchy LCD.
  */
 
- /* MKS Robin TFT v2.0 with ILI9341 */
+// MKS Robin TFT v2.0 with ILI9341
 // Read display identification information (0xD3 on ILI9341)
 //#define XPT2046_X_CALIBRATION            12013
 //#define XPT2046_Y_CALIBRATION            -8711
 //#define XPT2046_X_OFFSET                   -32
 //#define XPT2046_Y_OFFSET                   256
 
-  /* MKS Robin TFT v1.1 with ILI9328 */
+// MKS Robin TFT v1.1 with ILI9328
 //#define XPT2046_X_CALIBRATION           -11792
 //#define XPT2046_Y_CALIBRATION             8947
 //#define XPT2046_X_OFFSET                   342
 //#define XPT2046_Y_OFFSET                   -19
 
-  /* MKS Robin TFT v1.1 with R61505 */
+// MKS Robin TFT v1.1 with R61505
 //#define XPT2046_X_CALIBRATION            12489
 //#define XPT2046_Y_CALIBRATION             9210
 //#define XPT2046_X_OFFSET                   -52
 //#define XPT2046_Y_OFFSET                   -17
 
-  /* QQS-Pro use MKS Robin TFT v2.0 */
+// QQS-Pro uses MKS Robin TFT v2.0
-  //+++++++++++++++++++++++//
+
 // Shared FSMC Configs
 #if HAS_FSMC_TFT
-  #define DOGLCD_MOSI                       -1    // prevent redefine Conditionals_post.h
+  #define DOGLCD_MOSI                       -1    // Prevent auto-define by Conditionals_post.h
   #define DOGLCD_SCK                        -1
 
   #define FSMC_CS_PIN                       PD7   // NE4
@@ -303,7 +320,6 @@
 
   #define TOUCH_BUTTONS_HW_SPI
   #define TOUCH_BUTTONS_HW_SPI_DEVICE          2
-
 #endif
 
 // XPT2046 Touch Screen calibration
@@ -340,7 +356,6 @@
   #define TFT_MARLINUI_COLOR              0xFFFF  // White
   #define TFT_BTARROWS_COLOR              0xDEE6  // 11011 110111 00110 Yellow
   #define TFT_BTOKMENU_COLOR              0x145F  // 00010 100010 11111 Cyan
-
 #endif
 
 #if NEED_TOUCH_PINS
@@ -349,19 +364,3 @@
   #define TOUCH_MISO_PIN                    PB14  // SPI2_MISO
   #define TOUCH_MOSI_PIN                    PB15  // SPI2_MOSI
 #endif
-
-// SPI
-// Note: FLSun Hispeed (clone MKS_Robin_miniV2) board is using SPI2 interface.
-//
-#define ENABLE_SPI2
-// SPI Flash
-#define HAS_SPI_FLASH                         1
-#define SPI_FLASH_SIZE                0x1000000   // 16MB
-
-#if HAS_SPI_FLASH
-// SPI 2
-  #define W25QXX_CS_PIN                    PB12   //SPI2_NSS / Flash chip-select
-  #define W25QXX_MOSI_PIN                  PB15
-  #define W25QXX_MISO_PIN                  PB14
-  #define W25QXX_SCK_PIN                   PB13
-#endif

platformio.ini

@@ -1145,11 +1145,9 @@ extra_scripts = ${common.extra_scripts}
   buildroot/share/PlatformIO/scripts/mks_robin_mini.py
   buildroot/share/PlatformIO/scripts/add_nanolib.py
 build_flags       = ${common_stm32f1.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4
-lib_deps  =
+lib_deps          = SoftwareSerialM
-  SoftwareSerialM
   #Adafruit NeoPixel=https://github.com/Foxies-CSTL/Robin-NeoPixel-Lib/archive/master.zip
 
-
 #
 # STM32F401VE
 # 'STEVAL-3DP001V1' STM32F401VE board - https://www.st.com/en/evaluation-tools/steval-3dp001v1.html