Removed unneeded Hibiscus variants.

Marlin/Conditionals_LulzBot.h

@@ -13,7 +13,7 @@
  * got disabled.
  */
 
-#define LULZBOT_FW_VERSION ".71" // Change this with each update
+#define LULZBOT_FW_VERSION ".72" // Change this with each update
 
 #if ( \
     !defined(LULZBOT_Gladiola_Mini) && \
@@ -21,10 +21,6 @@
     !defined(LULZBOT_Juniper_TAZ5) && \
     !defined(LULZBOT_Oliveoil_TAZ6) && \
     !defined(LULZBOT_Hibiscus_Mini2) && \
-    !defined(LULZBOT_Hibiscus_Mini2LCD) && \
-    !defined(LULZBOT_Hibiscus_EinsyMini2) && \
-    !defined(LULZBOT_Hibiscus_EinsyMini2LCD) && \
-    !defined(LULZBOT_Hibiscus_EinsyGearedMini2LCD) && \
     !defined(LULZBOT_Quiver_TAZ7) \
 ) || ( \
     !defined(TOOLHEAD_Gladiola_SingleExtruder) && \
@@ -108,60 +104,6 @@
     #define LULZBOT_LCD_MACHINE_NAME "Mini 2"
     #define LULZBOT_IS_MINI
     #define LULZBOT_MINI_BED
-    #define LULZBOT_TWO_PIECE_BED
-    #define LULZBOT_USE_AUTOLEVELING
-    #define LULZBOT_USE_MIN_ENDSTOPS
-    #define LULZBOT_USE_MAX_ENDSTOPS
-    #define LULZBOT_USE_NORMALLY_CLOSED_ENDSTOPS
-    #define LULZBOT_USE_Z_BELT
-    #define LULZBOT_BAUDRATE 250000
-    #define LULZBOT_PRINTCOUNTER
-    #define LULZBOT_UUID "1b8d32d3-0596-4335-8cd4-f3741a095087"
-#endif
-
-#if defined(LULZBOT_Hibiscus_EinsyMini2)
-    #define LULZBOT_CUSTOM_MACHINE_NAME "LulzBot Mini 2"
-    #define LULZBOT_LCD_MACHINE_NAME "Mini Einsy 2"
-    #define LULZBOT_IS_MINI
-    #define LULZBOT_MINI_BED
-    #define LULZBOT_USE_EINSYRAMBO
-    #define LULZBOT_USE_EINSY_RETRO
-    #define LULZBOT_TWO_PIECE_BED
-    #define LULZBOT_USE_AUTOLEVELING
-    #define LULZBOT_SENSORLESS_HOMING
-    #define LULZBOT_USE_TMC_STEALTHCHOP_Z
-    #define LULZBOT_USE_Z_BELT
-    #define LULZBOT_USE_EXPERIMENTAL_FEATURES
-    #define LULZBOT_BAUDRATE 250000
-    #define LULZBOT_PRINTCOUNTER
-    #define LULZBOT_UUID "e5502411-d46d-421d-ba3a-a20126d7930f"
-#endif
-
-#if defined(LULZBOT_Hibiscus_EinsyMini2LCD)
-    #define LULZBOT_CUSTOM_MACHINE_NAME "LulzBot Mini 2 LCD"
-    #define LULZBOT_LCD_MACHINE_NAME "Mini Einsy 2"
-    #define LULZBOT_IS_MINI
-    #define LULZBOT_MINI_BED
-    #define LULZBOT_USE_EINSYRAMBO
-    #define LULZBOT_USE_EINSY_RETRO
-    #define LULZBOT_USE_LCD_DISPLAY
-    #define LULZBOT_TWO_PIECE_BED
-    #define LULZBOT_USE_AUTOLEVELING
-    #define LULZBOT_SENSORLESS_HOMING
-    #define LULZBOT_USE_TMC_STEALTHCHOP_Z
-    #define LULZBOT_USE_Z_BELT
-    #define LULZBOT_USE_EXPERIMENTAL_FEATURES
-    #define LULZBOT_BAUDRATE 250000
-    #define LULZBOT_PRINTCOUNTER
-    #define LULZBOT_UUID "e5502411-d46d-421d-ba3a-a20126d7930f"
-    #define LULZBOT_MODERN_UI
-#endif
-
-#if defined(LULZBOT_Hibiscus_EinsyGearedMini2LCD)
-    #define LULZBOT_CUSTOM_MACHINE_NAME "LulzBot Mini 2 LCD"
-    #define LULZBOT_LCD_MACHINE_NAME "Mini Einsy 2"
-    #define LULZBOT_IS_MINI
-    #define LULZBOT_MINI_BED
     #define LULZBOT_USE_EINSYRAMBO
     #define LULZBOT_USE_EINSY_RETRO
     #define LULZBOT_USE_LCD_DISPLAY
@@ -170,33 +112,12 @@
     #define LULZBOT_SENSORLESS_HOMING
     #define LULZBOT_USE_TMC_STEALTHCHOP_Z
     #define LULZBOT_USE_Z_BELT
-    #define LULZBOT_USE_Z_GEARBOX
-    #define LULZBOT_USE_EXPERIMENTAL_FEATURES
     #define LULZBOT_BAUDRATE 250000
     #define LULZBOT_PRINTCOUNTER
     #define LULZBOT_UUID "e5502411-d46d-421d-ba3a-a20126d7930f"
     #define LULZBOT_MODERN_UI
 #endif
 
-#if defined(LULZBOT_Hibiscus_Mini2LCD)
-    // Prototype Mini w/ Z-Belt
-    #define LULZBOT_CUSTOM_MACHINE_NAME "LulzBot Mini 2 LCD"
-    #define LULZBOT_LCD_MACHINE_NAME "Mini 2 LCD"
-    #define LULZBOT_IS_MINI
-    #define LULZBOT_TWO_PIECE_BED
-    #define LULZBOT_MINI_BED
-    #define LULZBOT_USE_LCD_DISPLAY
-    #define LULZBOT_USE_AUTOLEVELING
-    #define LULZBOT_USE_MIN_ENDSTOPS
-    #define LULZBOT_USE_MAX_ENDSTOPS
-    #define LULZBOT_USE_NORMALLY_CLOSED_ENDSTOPS
-    #define LULZBOT_USE_Z_BELT
-    #define LULZBOT_BAUDRATE 250000
-    #define LULZBOT_PRINTCOUNTER
-    #define LULZBOT_UUID "80fed4d6-4d15-4512-a02e-61b1dc4fb072"
-    #define LULZBOT_MODERN_UI
-#endif
-
 #if defined(LULZBOT_Quiver_TAZ7)
     #define LULZBOT_CUSTOM_MACHINE_NAME "LulzBot TAZ 7"
     #define LULZBOT_LCD_MACHINE_NAME "TAZ 7"
@@ -1769,18 +1690,6 @@
     #define LULZBOT_DEFAULT_MAX_FEEDRATE          {300, 300, 8, 40}      // (mm/sec)
     #define LULZBOT_DEFAULT_MAX_ACCELERATION      {9000,9000,100,1000}
 
-#elif defined(LULZBOT_IS_MINI) && defined(LULZBOT_USE_Z_BELT) && defined(LULZBOT_USE_Z_GEARBOX)
-    #define LULZBOT_Z_STEPS                       500
-    #define LULZBOT_Z_MICROSTEPS                  16
-    #define LULZBOT_DEFAULT_MAX_FEEDRATE          {300, 300, 40, 40}      // (mm/sec)
-
-    #if defined(LULZBOT_USE_TMC_STEALTHCHOP_XY)
-        /* Stealthchop can skip steps if the acceleration is too high */
-        #define LULZBOT_DEFAULT_MAX_ACCELERATION      {3000,3000,200,1000}
-    #else
-        #define LULZBOT_DEFAULT_MAX_ACCELERATION      {9000,9000,200,1000}
-    #endif
-
 #elif defined(LULZBOT_IS_MINI) && defined(LULZBOT_USE_Z_BELT)
     #if defined(LULZBOT_USE_32_MICROSTEPS_ON_Z)
         #define LULZBOT_Z_STEPS                       200
@@ -1926,6 +1835,7 @@
 #else
     #define LULZBOT_ABOUT_TO_DRAW_SCREEN(a)
     #define LULZBOT_LCD_CLEAR
+    #define LULZBOT_LCD_CLEAR_DECL
 #endif
 
 /***************************** CUSTOM SPLASH SCREEN *****************************/

Marlin/Configuration_LulzBot.h

@@ -13,7 +13,6 @@
       Gladiola_Mini            // Lulzbot Mini (Gladiola)
       Gladiola_MiniLCD         // Lulzbot Mini (Gladiola w/ LCD)
       Hibiscus_Mini2           // Lulzbot Mini 2 (Hibiscus)
-      Hibiscus_Mini2LCD        // Lulzbot Mini 2 (Hibiscus w/ LCD)
       Juniper_TAZ5             // Lulzbot TAZ 5 (Juniper, Juniperberry, Juniperbush)
       Oliveoil_TAZ6            // Lulzbot TAZ 6 (Oliveoil)
       Quiver_TAZ7              // Lulzbot TAZ 7 (Quiver)
@@ -21,7 +20,7 @@
    Mini Toolhead Choices:
       Gladiola_SingleExtruder  // Standard Single Extruder (Gladiola)
       Albatross_Flexystruder   // Flexystruder (Albatross)
-      Finch_Aero               // Titan AERO (Finch)
+      Finch_Aerostruder        // Titan Aerostruder (Finch)
 
    TAZ Toolhead Choices:
       Tilapia_SingleExtruder   // Standard Single Extruder (Tilapia)
@@ -30,7 +29,7 @@
       Javelin_DualExtruderV2   // Dual Extruder v2 (Javelin)
       Longfin_FlexyDually      // FlexyDually (Longfin)
       Yellowfin_DualExtruderV3 // Dual Extruder v3 (Yellowfin)
-      Angelfish_Aero           // Titan AERO (Angelfish)
+      Angelfish_Aerostruder    // Titan AERO (Angelfish)
 
 */
 

build-lulzbot-firmware.sh

@@ -22,7 +22,7 @@ MINI_TOOLHEADS="Gladiola_SingleExtruder Albatross_Flexystruder Finch_Aerostruder
 TAZ_MODELS="Juniper_TAZ5 Oliveoil_TAZ6"
 TAZ_TOOLHEADS="Tilapia_SingleExtruder Kanyu_Flexystruder Opah_Moarstruder Javelin_DualExtruderV2 Longfin_FlexyDually Yellowfin_DualExtruderV3 Angelfish_Aerostruder"
 
-MINI2_MODELS="Hibiscus_Mini2 Hibiscus_Mini2LCD Hibiscus_EinsyMini2 Hibiscus_EinsyMini2LCD"
+MINI2_MODELS="Hibiscus_Mini2"
 MINI2_TOOLHEADS="Finch_AerostruderV2"
 
 TAZ7_MODELS="Quiver_TAZ7"