add fast forward move to the extrude menu

TinkerGnome · Mar 7, 2019 · f14282e · f14282e
1 parent 6a806b4
commit f14282e
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 9 deletions.
diff --git a/Marlin/UltiLCD2_gfx.cpp b/Marlin/UltiLCD2_gfx.cpp
@@ -161,6 +161,11 @@ const uint8_t revSpeedGfx[] PROGMEM = {
     0x08, 0x14, 0x22, 0x08, 0x14, 0x22
 };
 
+const uint8_t fwdSpeedGfx[] PROGMEM = {
+    6, 8, //size
+    0x22, 0x14, 0x08, 0x22, 0x14, 0x08
+};
+
 const uint8_t homeGfx[] PROGMEM = {
     7, 8, //size
     0x08, 0x7C, 0x46, 0x6F, 0x46, 0x7C, 0x08

diff --git a/Marlin/UltiLCD2_gfx.h b/Marlin/UltiLCD2_gfx.h
@@ -31,6 +31,7 @@ extern const uint8_t fan1Gfx[] PROGMEM;
 extern const uint8_t retractSpeedGfx[] PROGMEM;
 extern const uint8_t retractLenGfx[] PROGMEM;
 extern const uint8_t revSpeedGfx[] PROGMEM;
+extern const uint8_t fwdSpeedGfx[] PROGMEM;
 extern const uint8_t homeGfx[] PROGMEM;
 extern const uint8_t contrastGfx[] PROGMEM;
 extern const uint8_t brightnessGfx[] PROGMEM;

diff --git a/Marlin/tinkergnome.cpp b/Marlin/tinkergnome.cpp
@@ -2815,7 +2815,7 @@ static void lcd_extrude_quit_move()
     process_command_P(PSTR("M84 E0"));
 }
 
-static void lcd_extrude_init_pull()
+static void lcd_fastmove_init()
 {
     st_synchronize();
     plan_set_e_position(st_get_position(E_AXIS) / e_steps_per_unit(active_extruder) / volume_to_filament_length[active_extruder], active_extruder, true);
@@ -2835,7 +2835,7 @@ static void lcd_extrude_init_pull()
     max_e_jerk = FILAMENT_LONG_MOVE_JERK;
 }
 
-static void lcd_extrude_quit_pull()
+static void lcd_fastmove_quit()
 {
     // reset feeedrate and acceleration to default
     max_feedrate[E_AXIS] = OLD_FEEDRATE;
@@ -2851,13 +2851,13 @@ static void lcd_extrude_quit_pull()
     lcd_extrude_quit_move();
 }
 
-static void lcd_extrude_pull()
+static void lcd_extrude_fastmove(const float distance)
 {
     if (lcd_lib_button_down)
     {
         if (printing_state == PRINT_STATE_NORMAL && !blocks_queued())
         {
-            TARGET_POS(E_AXIS) -= FILAMENT_REVERSAL_LENGTH / volume_to_filament_length[active_extruder];
+            TARGET_POS(E_AXIS) += distance / volume_to_filament_length[active_extruder];
             plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], TARGET_POS(E_AXIS), max_feedrate[E_AXIS]*0.7f, active_extruder);
         }
     } else {
@@ -2866,6 +2866,24 @@ static void lcd_extrude_pull()
     }
 }
 
+static void lcd_extrude_pull()
+{
+  #ifdef PREVENT_LENGTHY_EXTRUDE
+    lcd_extrude_fastmove(-EXTRUDE_MAXLENGTH*9/10);
+  #else
+    lcd_extrude_fastmove(-FILAMENT_REVERSAL_LENGTH*2);
+  #endif
+}
+
+static void lcd_extrude_load()
+{
+  #ifdef PREVENT_LENGTHY_EXTRUDE
+    lcd_extrude_fastmove(EXTRUDE_MAXLENGTH*9/10);
+  #else
+    lcd_extrude_fastmove(FILAMENT_REVERSAL_LENGTH*2);
+  #endif
+}
+
 static void lcd_extrude_tune()
 {
     menu.add_menu(lcd_menu_tune_extrude);
@@ -2894,7 +2912,11 @@ static const menu_t & get_extrude_menuoption(uint8_t nr, menu_t &opt)
     }
     else if (nr == menu_index++)
     {
-        opt.setData(MENU_INPLACE_EDIT, lcd_extrude_init_pull, lcd_extrude_pull, lcd_extrude_quit_pull);
+        opt.setData(MENU_INPLACE_EDIT, lcd_fastmove_init, lcd_extrude_pull, lcd_fastmove_quit);
+    }
+    else if (nr == menu_index++)
+    {
+        opt.setData(MENU_INPLACE_EDIT, lcd_fastmove_init, lcd_extrude_load, lcd_fastmove_quit);
     }
     else if (nr == menu_index++)
     {
@@ -3012,16 +3034,38 @@ static void drawExtrudeSubmenu (uint8_t nr, uint8_t &flags)
         }
         LCDMenu::drawMenuBox(LCD_CHAR_MARGIN_LEFT+2
                            , 35
-                           , 3*LCD_CHAR_SPACING
+                           , 2*LCD_CHAR_SPACING
+                           , LCD_CHAR_HEIGHT
+                           , flags);
+        if (flags & MENU_SELECTED)
+        {
+            lcd_lib_clear_gfx(LCD_CHAR_MARGIN_LEFT+5, 35, revSpeedGfx);
+        }
+        else
+        {
+            lcd_lib_draw_gfx(LCD_CHAR_MARGIN_LEFT+5, 35, revSpeedGfx);
+        }
+    }
+    else if (nr == index++)
+    {
+        // load material
+        if (flags & (MENU_SELECTED | MENU_ACTIVE))
+        {
+            lcd_lib_draw_string_leftP(5, PSTR("Click & hold to load"));
+            flags |= MENU_STATUSLINE;
+        }
+        LCDMenu::drawMenuBox(LCD_CHAR_MARGIN_LEFT+(3*LCD_CHAR_SPACING)+2
+                           , 35
+                           , 2*LCD_CHAR_SPACING
                            , LCD_CHAR_HEIGHT
                            , flags);
         if (flags & MENU_SELECTED)
         {
-            lcd_lib_clear_gfx(LCD_CHAR_MARGIN_LEFT+LCD_CHAR_SPACING+2, 35, revSpeedGfx);
+            lcd_lib_clear_gfx(LCD_CHAR_MARGIN_LEFT+(3*LCD_CHAR_SPACING)+5, 35, fwdSpeedGfx);
         }
         else
         {
-            lcd_lib_draw_gfx(LCD_CHAR_MARGIN_LEFT+LCD_CHAR_SPACING+2, 35, revSpeedGfx);
+            lcd_lib_draw_gfx(LCD_CHAR_MARGIN_LEFT+(3*LCD_CHAR_SPACING)+5, 35, fwdSpeedGfx);
         }
     }
     else if (nr == index++)
@@ -3081,7 +3125,7 @@ void lcd_menu_expert_extrude()
     lcd_basic_screen();
     lcd_lib_draw_hline(3, 124, 13);
 
-    uint8_t len = card.sdprinting() ? 6 : 7;
+    uint8_t len = card.sdprinting() ? 7 : 8;
 
     menu.process_submenu(get_extrude_menuoption, len);