Merge branch 'master' into geek_mode

TinkerGnome · Feb 18, 2015 · aa7a38c · aa7a38c
2 parents e3d4bbb + 5cad5af
commit aa7a38c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
@@ -2223,6 +2223,7 @@ void process_commands()
           lifetime_stats_tick();
         }
 
+        plan_set_e_position(current_position[E_AXIS]);
         //return to normal
         if(code_seen('L'))
         {

diff --git a/Marlin/UltiLCD2_menu_first_run.cpp b/Marlin/UltiLCD2_menu_first_run.cpp
@@ -304,6 +304,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.
 }
@@ -434,6 +435,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);
@@ -469,7 +481,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();

diff --git a/Marlin/UltiLCD2_menu_print.cpp b/Marlin/UltiLCD2_menu_print.cpp
@@ -58,6 +58,8 @@ void abortPrint()
     card.pause = false;
     pauseRequested = false;
 
+    enquecommand_P(PSTR("M401"));
+
     if (primed)
     {
         // set up the end of print retraction
@@ -71,8 +73,6 @@ void abortPrint()
         primed = false;
     }
 
-    enquecommand_P(PSTR("M401"));
-
     if (current_position[Z_AXIS] > Z_MAX_POS - 30)
     {
         enquecommand_P(PSTR("G28 X0 Y0"));