Attempt to avoid race conditions writing to eeprom.

Author: ivan-galvez

Marlin/GuiManager.cpp

@@ -526,7 +526,6 @@ void lcd_emergency_stop()
 	if (eeprom::StorageManager::getEmergency() == eeprom::EMERGENCY_STOP_INACTIVE)
 	{
 		SERIAL_ECHOLN("KILLED: Requested Emergency Stop!");
-		eeprom::StorageManager::setEmergency();
 		stop_buffer = true;
 		stop_buffer_code = 999;
 
@@ -546,6 +545,7 @@ void lcd_emergency_stop()
 
 		cancel_heatup = true;
 		action_cooldown();
+		eeprom::StorageManager::setEmergency();
 	}
 	else
 	{

Marlin/Marlin.h

@@ -221,7 +221,7 @@ void calculate_delta(float cartesian[3]);
 void calculate_SCARA_forward_Transform(float f_scara[3]);
 #endif
 extern void RESET(void);
-void reset(void) __attribute__((naked)) __attribute__((section(".init3")));
+void wdt_init(void) __attribute__((naked)) __attribute__((section(".init3")));
 void prepare_move();
 void kill();
 void Stop();

Marlin/Marlin_main.cpp

@@ -4877,10 +4877,10 @@ void RESET()
 
    SERIAL_ECHOLN("RESET: Wait for watchdog reset");
    wdt_enable(WDTO_15MS);
-   while (1) {};
+   while (1);
 }
 
-void reset(void)
+void wdt_init(void)
 {
 	cli();
 	// Note that for newer devices (any AVR that has the option to also
@@ -4890,6 +4890,7 @@ void reset(void)
 	// to turn off the watchdog early during program startup.
 	MCUSR = 0; // clear reset flags
 	wdt_disable();
+	return;
 }
 
 void set_relative_mode(bool value){