Merge pull request #3130 from DRracer/move-alldata-2-end

Move All Data into last position in Factory Reset menu

Firmware/Marlin_main.cpp

@@ -743,7 +743,7 @@ static void factory_reset(char level)
 		factory_reset_stats();
 		// [[fallthrough]] // there is no break intentionally
 
-	case 4: // Level 4: Preparation after being serviced
+	case 3: // Level 3: Preparation after being serviced
 		// Force language selection at the next boot up.
 		lang_reset();
 		// Force the "Follow calibration flow" message at the next boot up.
@@ -758,7 +758,7 @@ static void factory_reset(char level)
 #endif //FILAMENT_SENSOR
 		break;
 
-	case 3:
+	case 4:
 		menu_progressbar_init(EEPROM_TOP, PSTR("ERASING all data"));
 		// Erase EEPROM
 		for (uint16_t i = 0; i < EEPROM_TOP; i++) {

Firmware/ultralcd.cpp

@@ -5999,7 +5999,7 @@ char reset_menu() {
     int8_t enc_dif = 0;
 	char cursor_pos = 0;
 
-    const char *const item[items_no] PROGMEM = {PSTR("Language"), PSTR("Statistics"), PSTR("Shipping prep"), PSTR("All Data"), PSTR("Service prep")
+    const char *const item[items_no] PROGMEM = {PSTR("Language"), PSTR("Statistics"), PSTR("Shipping prep"), PSTR("Service prep"), PSTR("All Data")
 #ifdef SNMM
     , PSTR("Bowden length")
 #endif