cleanup 2

MarlinFirmware · Nov 3, 2024 · d45baa3 · d45baa3
1 parent 11fa24f
commit d45baa3
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 89 deletions.
diff --git a/Marlin/src/HAL/HC32/inc/SanityCheck.h b/Marlin/src/HAL/HC32/inc/SanityCheck.h
@@ -94,7 +94,7 @@
     #error "SERIAL_DMA requires USART_RX_DMA_SUPPORT to be enabled in the arduino core."
   #endif
 
-  // Before arduino core version 1.2.0, USART_RX_DMA_SUPPORT did not implement 
+  // Before arduino core version 1.2.0, USART_RX_DMA_SUPPORT did not implement
   // core_hook_usart_rx_irq, which is required for the emergency parser.
   // With 1.2.0, this was fixed (see https://github.com/shadow578/framework-arduino-hc32f46x/pull/25).
   #if ENABLED(EMERGENCY_PARSER) && ARDUINO_CORE_VERSION_INT < GET_VERSION_INT(1, 2, 0)

diff --git a/Marlin/src/lcd/sovol_rts/sovol_rts.h b/Marlin/src/lcd/sovol_rts/sovol_rts.h
@@ -236,7 +236,7 @@ enum SovolPage : uint8_t {
   ID_AdvWarn_D      =  49,      ID_AdvWarn_L      =  55 + ID_AdvWarn_D,          // Warning when entering advanced settings
   ID_KillRunaway_D  =  52,      ID_KillRunaway_L  =  55 + ID_KillRunaway_D,      // Thermal runaway
   ID_KillHeat_D     =  53,      ID_KillHeat_L     =  55 + ID_KillHeat_D,         // Thermistor error
-  ID_KillBadTemp_D  =  54,      ID_KillBadTemp_L  =  55 + ID_KillBadTemp_D,      // Heating failed 
+  ID_KillBadTemp_D  =  54,      ID_KillBadTemp_L  =  55 + ID_KillBadTemp_D,      // Heating failed
   ID_KillHome_D     =  55,      ID_KillHome_L     =  55 + ID_KillHome_D,         // Auto-home failed
   ID_Level5_D       =  111,     ID_Level5_L       =   6 + ID_Level5_D,           // Leveling screen 0.05mm
   ID_DriverError_D  =  112,     ID_DriverError_L  =   6 + ID_DriverError_D,      // Driver error

diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
@@ -148,7 +148,7 @@ feedRate_t feedrate_mm_s = MMM_TO_MMS(DEFAULT_FEEDRATE_MM_M);
 int16_t feedrate_percentage = 100;
 #if ENABLED(EDITABLE_HOMING_FEEDRATE)
   xyz_feedrate_t homing_feedrate_mm_m = HOMING_FEEDRATE_MM_M;
-#endif  
+#endif
 
 // Cartesian conversion result goes here:
 xyz_pos_t cartes;

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
@@ -844,7 +844,7 @@
 #elif MB(XTLW_CLIMBER_8TH)
   #include "stm32f4/pins_XTLW_CLIMBER_8TH.h"        // STM32F4                              env:XTLW_CLIMBER_8TH
 #elif MB(FLY_RRF_E3_V1)
-  #include "stm32f4/pins_FLY__RRF_E3_V1.h"          // STM32F4                              env:FLY_RRF_E3_V1
+  #include "stm32f4/pins_FLY_RRF_E3_V1.h"           // STM32F4                              env:FLY_RRF_E3_V1
 
 //
 // Other ARM Cortex-M4

diff --git a/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h b/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
@@ -33,7 +33,7 @@
   #define FLASH_EEPROM_EMULATION
   //#define I2C_EEPROM
 #endif
-//#define E2END                            0xFFF  // 4K
+#define MARLIN_EEPROM_SIZE 0x1000                 // 4K
 
 #define HAL_TIMER_RATE                     F_CPU
 

diff --git a/Marlin/src/pins/stm32f4/pins_BLACKBEEZMINI.h b/Marlin/src/pins/stm32f4/pins_BLACKBEEZMINI.h
@@ -21,14 +21,12 @@
  */
 #pragma once
 
-#if NOT_TARGET(STM32F4)
-  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#elif HOTENDS > 1 || E_STEPPERS > 1
+#include "env_validate.h"
+
+#if HOTENDS > 1 || E_STEPPERS > 1
   #error "STM32F401CCU6 boards support one hotend / E-steppers only."
 #endif
 
-#include "env_validate.h"
-
 #ifndef BOARD_INFO_NAME
   #define BOARD_INFO_NAME "I3DBEE BP_01"
 #endif

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
@@ -21,9 +21,7 @@
  */
 #pragma once
 
-#if NOT_TARGET(STM32F4)
-  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#endif
+#include "env_validate.h"
 
 #ifndef BOARD_INFO_NAME
   #define BOARD_INFO_NAME "BTT E3 RRF"
@@ -225,33 +223,33 @@
 
       CONTROLLER_WARNING("BTT_E3_RRF", "LCD_FOR_MELZI")
 
-     /** LCD_FOR_MELZI display pinout
-      *
-      *               BTT E3 RRF                                   Display Ribbon
-      *                ------                                         ------
-      * (BEEPER)  PE8 | 1  2 | PE9  (BTN_ENC)                    GND |10  9 | 5V
-      * (BTN_EN1) PE7 | 3  4 | RESET                          BEEPER | 8  7 | ESTOP    (RESET)
-      * (BTN_EN2) PB2   5  6 | PE10 (LCD_D4)       (BTN_ENC) ENC_BTN | 6  5 | LCD_SCLK (LCD_D4)
-      * (LCD_RS)  PB1 | 7  8 | PE11 (LCD_EN)       (BTN_EN2) ENC_A   | 4  3 | LCD_DATA (LCD_EN)
-      *           GND | 9 10 | 5V                  (BTN_EN1) ENC_B   | 2  1 | LCD_CS   (LCD_RS)
-      *                ------                                         ------
-      *                 EXP1                                           LCD
-      *
-      * Needs custom cable:
-      *
-      *    Board   Adapter   Display Ribbon (coming from display)
-      *  ----------------------------------
-      *  EXP1-10 ---------- LCD-9   5V
-      *  EXP1-9 ----------- LCD-10  GND
-      *  EXP1-8 ----------- LCD-3   LCD_EN
-      *  EXP1-7 ----------- LCD-1   LCD_RS
-      *  EXP1-6 ----------- LCD-5   LCD_D4
-      *  EXP1-5 ----------- LCD-4   EN2
-      *  EXP1-4 ----------- LCD-7   RESET
-      *  EXP1-3 ----------- LCD-2   EN1
-      *  EXP1-2 ----------- LCD-6   BTN
-      *  EXP1-1 ----------- LCD-8   BEEPER
-      */
+      /** LCD_FOR_MELZI display pinout
+       *
+       *               BTT E3 RRF                                   Display Ribbon
+       *                ------                                         ------
+       * (BEEPER)  PE8 | 1  2 | PE9  (BTN_ENC)                    GND |10  9 | 5V
+       * (BTN_EN1) PE7 | 3  4 | RESET                          BEEPER | 8  7 | ESTOP    (RESET)
+       * (BTN_EN2) PB2   5  6 | PE10 (LCD_D4)       (BTN_ENC) ENC_BTN | 6  5 | LCD_SCLK (LCD_D4)
+       * (LCD_RS)  PB1 | 7  8 | PE11 (LCD_EN)       (BTN_EN2) ENC_A   | 4  3 | LCD_DATA (LCD_EN)
+       *           GND | 9 10 | 5V                  (BTN_EN1) ENC_B   | 2  1 | LCD_CS   (LCD_RS)
+       *                ------                                         ------
+       *                 EXP1                                           LCD
+       *
+       * Needs custom cable:
+       *
+       *    Board   Adapter   Display Ribbon (coming from display)
+       *  ----------------------------------
+       *  EXP1-10 ---------- LCD-9   5V
+       *  EXP1-9 ----------- LCD-10  GND
+       *  EXP1-8 ----------- LCD-3   LCD_EN
+       *  EXP1-7 ----------- LCD-1   LCD_RS
+       *  EXP1-6 ----------- LCD-5   LCD_D4
+       *  EXP1-5 ----------- LCD-4   EN2
+       *  EXP1-4 ----------- LCD-7   RESET
+       *  EXP1-3 ----------- LCD-2   EN1
+       *  EXP1-2 ----------- LCD-6   BTN
+       *  EXP1-1 ----------- LCD-8   BEEPER
+       */
 
     #endif
 

diff --git a/...in/src/pins/stm32f4/pins_FLY__RRF_E3_V1.h → Marlin/src/pins/stm32f4/pins_FLY_RRF_E3_V1.h b/...in/src/pins/stm32f4/pins_FLY__RRF_E3_V1.h → Marlin/src/pins/stm32f4/pins_FLY_RRF_E3_V1.h
@@ -27,10 +27,11 @@
   #define BOARD_INFO_NAME "Fly RRF E3 V1"
 #endif
 
-#define USES_DIAG_JUMPERS //you need Mellow/Fly's specific TMC2209's because they have a dip switch to turn off DIAG to disable auto home
+#define USES_DIAG_JUMPERS // Requires Mellow/Fly TMC2209 with DIAG disable dip switch
 
-// Onboard I2C EEPROM
-//#define I2C_EEPROM - this board doesn't have a real eeprom
+#if NO_EEPROM_SELECTED
+  #define FLASH_EEPROM_EMULATION
+#endif
 #define MARLIN_EEPROM_SIZE 0x1000                 // 4K
 
 //
@@ -137,45 +138,41 @@
 
     #if ENABLED(LCD_FOR_MELZI)
 
-      #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
-        #error "CAUTION! LCD_FOR_MELZI requires wiring modifications. See 'pins_Fly_RRF_E3_V1.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
-      #endif
-
-     /** LCD_FOR_MELZI display pinout
-      *
-      *              Fly RRF E3 V1                                 Display Ribbon
-      *                 ------                                         ------
-      * (BEEPER)  PE12 | 1  2 | PE11  (BTN_ENC)                   GND |10  9 | 5V
-      * (BTN_EN1) PE10 | 3  4 | RESET                          BEEPER | 8  7 | ESTOP    (RESET)
-      * (BTN_EN2) PE9    5  6 | PE8 (LCD_D4)        (BTN_ENC) ENC_BTN | 6  5 | LCD_SCLK (LCD_D4)
-      * (LCD_RS)  PE7  | 7  8 | PB1 (LCD_EN)        (BTN_EN2) ENC_A   | 4  3 | LCD_DATA (LCD_EN)
-      *           GND  | 9 10 | 5V                  (BTN_EN1) ENC_B   | 2  1 | LCD_CS   (LCD_RS)
-      *                 ------                                         ------
-      *                  EXP1                                           LCD
-      *
-      * Needs custom cable:
-      *
-      *    Board   Adapter   Display Ribbon (coming from display)
-      *  ----------------------------------
-      *  EXP1-10 ---------- LCD-9   5V
-      *  EXP1-9 ----------- LCD-10  GND
-      *  EXP1-8 ----------- LCD-3   LCD_EN
-      *  EXP1-7 ----------- LCD-1   LCD_RS
-      *  EXP1-6 ----------- LCD-5   LCD_D4
-      *  EXP1-5 ----------- LCD-4   EN2
-      *  EXP1-4 ----------- LCD-7   RESET
-      *  EXP1-3 ----------- LCD-2   EN1
-      *  EXP1-2 ----------- LCD-6   BTN
-      *  EXP1-1 ----------- LCD-8   BEEPER
-      */
+      CONTROLLER_WARNING("FLY_RRF_E3_V1", "LCD_FOR_MELZI")
+
+      /** LCD_FOR_MELZI display pinout
+       *
+       *              Fly RRF E3 V1                                 Display Ribbon
+       *                 ------                                         ------
+       * (BEEPER)  PE12 | 1  2 | PE11  (BTN_ENC)                   GND |10  9 | 5V
+       * (BTN_EN1) PE10 | 3  4 | RESET                          BEEPER | 8  7 | ESTOP    (RESET)
+       * (BTN_EN2) PE9    5  6 | PE8 (LCD_D4)        (BTN_ENC) ENC_BTN | 6  5 | LCD_SCLK (LCD_D4)
+       * (LCD_RS)  PE7  | 7  8 | PB1 (LCD_EN)        (BTN_EN2) ENC_A   | 4  3 | LCD_DATA (LCD_EN)
+       *           GND  | 9 10 | 5V                  (BTN_EN1) ENC_B   | 2  1 | LCD_CS   (LCD_RS)
+       *                 ------                                         ------
+       *                  EXP1                                           LCD
+       *
+       * Needs custom cable:
+       *
+       *    Board   Adapter   Display Ribbon (coming from display)
+       *  ----------------------------------
+       *  EXP1-10 ---------- LCD-9   5V
+       *  EXP1-9 ----------- LCD-10  GND
+       *  EXP1-8 ----------- LCD-3   LCD_EN
+       *  EXP1-7 ----------- LCD-1   LCD_RS
+       *  EXP1-6 ----------- LCD-5   LCD_D4
+       *  EXP1-5 ----------- LCD-4   EN2
+       *  EXP1-4 ----------- LCD-7   RESET
+       *  EXP1-3 ----------- LCD-2   EN1
+       *  EXP1-2 ----------- LCD-6   BTN
+       *  EXP1-1 ----------- LCD-8   BEEPER
+       */
 
     #endif
 
   #elif ENABLED(ZONESTAR_LCD)                     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
 
-    #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
-      #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_Fly_RRF_E3_V1.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
-    #endif
+    CONTROLLER_WARNING("FLY_RRF_E3_V1", "ZONESTAR_LCD")
 
     #define LCD_PINS_RS              EXP1_06_PIN
     #define LCD_PINS_EN              EXP1_02_PIN
@@ -203,9 +200,7 @@
 
     #if ENABLED(TFTGLCD_PANEL_SPI)
 
-      #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
-        #error "CAUTION! TFTGLCD_PANEL_SPI requires wiring modifications. See 'pins_Fly_RRF_E3_V1.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
-      #endif
+      CONTROLLER_WARNING("FLY_RRF_E3_V1", "TFTGLCD_PANEL_SPI")
 
       /**
        * TFTGLCD_PANEL_SPI display pinout
@@ -241,7 +236,7 @@
     #endif
 
   #else
-    #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, LCD_FOR_MELZI, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the Mellow_RRF_E3_V1."
+    #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, LCD_FOR_MELZI, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the FLY_RRF_E3_V1."
   #endif
 
   // Alter timing for graphical display
@@ -259,9 +254,7 @@
 
 #if ALL(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
 
-  #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
-    #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_Fly_RRF_E3_V1.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
-  #endif
+  CONTROLLER_WARNING("FLY_RRF_E3_V1", "LCD_FYSETC_TFT81050")
 
   /** FYSETC TFT TFT81050 display pinout
    *
@@ -275,7 +268,6 @@
    *                   ------                          ------
    *                   EXP1                            EXP1
    *
-   *
    * Needs custom cable:
    *
    *    Board   Adapter   Display

diff --git a/Marlin/src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h b/Marlin/src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h
@@ -21,9 +21,7 @@
  */
 #pragma once
 
-#if NOT_TARGET(STM32F4)
-  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
-#endif
+#include "env_validate.h"
 
 #ifndef BOARD_INFO_NAME
   #define BOARD_INFO_NAME "Mellow Fly E3 V2"

diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
@@ -193,6 +193,7 @@ build_flags         = ${stm32_variant.build_flags}
                       -DSTM32F407_5VX
                       -DMF_RX_BUFFER_SIZE=255
                       -DMF_TX_BUFFER_SIZE=255
+
 #
 # Mellow/Fly RRF E3 V1 (STM32F407VGT6 ARM Cortex-M4)
 #
@@ -205,7 +206,7 @@ build_flags         = ${stm32_variant.build_flags}
                       -DSTM32F407_5VX
                       -DMF_RX_BUFFER_SIZE=255
                       -DMF_TX_BUFFER_SIZE=255
-                      
+
 #
 # Bigtreetech GTR V1.0 (STM32F407IGT6 ARM Cortex-M4)
 #