15.02-RC2

TinkerGnome · Feb 18, 2015 · be9f3f6 · be9f3f6
1 parent aa7a38c
commit be9f3f6
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 237 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -10,7 +10,7 @@
 // build by the user have been successfully uploaded into firmware.
 #define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time
 #ifndef STRING_CONFIG_H_AUTHOR
-#define STRING_CONFIG_H_AUTHOR "Tinker_15.02-RC1" // Who made the changes.
+#define STRING_CONFIG_H_AUTHOR "Tinker_15.02-RC2" // Who made the changes.
 #endif
 
 // SERIAL_PORT selects which serial port should be used for communication with the host.

diff --git a/Marlin/StackList.h b/Marlin/StackList.h
diff --git a/Marlin/UltiLCD2_menu_first_run.cpp b/Marlin/UltiLCD2_menu_first_run.cpp
@@ -438,12 +438,11 @@ 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;
+        menu.replace_menu(menu_t(lcd_menu_first_run_print_1), false);
         return;
     }
     SELECT_MAIN_MENU_ITEM(0);