From a336c152cafbcf2ed4a83f36e35cb70b3a038d67 Mon Sep 17 00:00:00 2001
From: daid <daid303@gmail.com>
Date: Tue, 17 Feb 2015 11:02:46 +0100
Subject: [PATCH 1/3] Do not require a material selection when there is only a
 single material available in the list.

---
 Marlin/UltiLCD2_menu_first_run.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/Marlin/UltiLCD2_menu_first_run.cpp b/Marlin/UltiLCD2_menu_first_run.cpp
index df18b97ab..98569a801 100644
--- a/Marlin/UltiLCD2_menu_first_run.cpp
+++ b/Marlin/UltiLCD2_menu_first_run.cpp
@@ -287,6 +287,7 @@ static void lcd_menu_first_run_bed_level_paper_right()
 
 static void parkHeadForHeating()
 {
+    lcd_material_reset_defaults();
     enquecommand_P(PSTR("G1 F12000 X110 Y10"));
     enquecommand_P(PSTR("M84"));//Disable motor power.
 }
@@ -417,6 +418,17 @@ static void lcd_menu_first_run_material_load_wait()
 
 static void lcd_menu_first_run_material_select_1()
 {
+    if (eeprom_read_byte(EEPROM_MATERIAL_COUNT_OFFSET()) == 1)
+    {
+        digipot_current(2, motor_current_setting[2]);//Set E motor power to default.
+        
+        for(uint8_t e=0; e<EXTRUDERS; e++)
+            lcd_material_set_material(0, e);
+        SET_FIRST_RUN_DONE();
+        
+        currentMenu = lcd_menu_first_run_print_1;
+        return;
+    }
     SELECT_MAIN_MENU_ITEM(0);
     lcd_info_screen(lcd_menu_first_run_material_select_material, doCooldown, PSTR("READY"));
     DRAW_PROGRESS_NR(16);
@@ -451,7 +463,6 @@ static void lcd_menu_first_run_material_select_material()
     {
         digipot_current(2, motor_current_setting[2]);//Set E motor power to default.
 
-        lcd_material_reset_defaults();
         for(uint8_t e=0; e<EXTRUDERS; e++)
             lcd_material_set_material(SELECTED_SCROLL_MENU_ITEM(), e);
         SET_FIRST_RUN_DONE();

From 11b151a1c6c1249d5954f2128a36bc42b931f7cc Mon Sep 17 00:00:00 2001
From: daid <daid303@gmail.com>
Date: Wed, 18 Feb 2015 09:36:16 +0100
Subject: [PATCH 2/3] Fix end of print retraction.

---
 Marlin/UltiLCD2_menu_print.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/UltiLCD2_menu_print.cpp b/Marlin/UltiLCD2_menu_print.cpp
index 1d22c5ff5..7d7586b10 100644
--- a/Marlin/UltiLCD2_menu_print.cpp
+++ b/Marlin/UltiLCD2_menu_print.cpp
@@ -65,6 +65,8 @@ static void abortPrint()
     card.pause = false;
     pauseRequested = false;
 
+    enquecommand_P(PSTR("M401"));
+
     if (primed)
     {
         // set up the end of print retraction
@@ -78,8 +80,6 @@ static void abortPrint()
         primed = false;
     }
 
-    enquecommand_P(PSTR("M401"));
-
     if (current_position[Z_AXIS] > Z_MAX_POS - 30)
     {
         enquecommand_P(PSTR("G28 X0 Y0"));

From 630d4eee6002051aa81ea68400ec41c053b1acdb Mon Sep 17 00:00:00 2001
From: daid <daid303@gmail.com>
Date: Wed, 18 Feb 2015 09:41:22 +0100
Subject: [PATCH 3/3] Fix the push forward when we retracted, and changed
 filament.

---
 Marlin/Marlin_main.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 98a81f663..7d27ef7f3 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -2165,6 +2165,7 @@ void process_commands()
           lifetime_stats_tick();
         }
 
+        plan_set_e_position(current_position[E_AXIS]);
         //return to normal
         if(code_seen('L'))
         {