Fix reset at start and no EEPROM settings loaded

Fix reset at start due to watchdog and no EEPROM settings loaded due to Virtual EEPROM loaded too early
luc-github · Nov 26, 2014 · fac4a5e · fac4a5e
1 parent 65bcdd8
commit fac4a5e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/ArduinoDUE/Repetier/HAL.h b/src/ArduinoDUE/Repetier/HAL.h
@@ -287,6 +287,9 @@ class HAL
         TC_Configure(DELAY_TIMER, DELAY_TIMER_CHANNEL, TC_CMR_WAVSEL_UP |
                      TC_CMR_WAVE | DELAY_TIMER_CLOCK);
         TC_Start(DELAY_TIMER, DELAY_TIMER_CHANNEL);
+    }
+ static inline void loadVirtualEEPROM(void)
+    {
 #if EEPROM_AVAILABLE && EEPROM_MODE != 0
         // Copy eeprom to ram for faster access
         int i,n = EEPROM_BYTES;

diff --git a/src/ArduinoDUE/Repetier/Printer.cpp b/src/ArduinoDUE/Repetier/Printer.cpp
@@ -923,6 +923,7 @@ SET_INPUT(FIL_SENSOR2_PIN);
 #endif
     sd.initsd();
 #endif
+     HAL::loadVirtualEEPROM();
     // sets autoleveling in eeprom init
     EEPROM::init(); // Read settings from eeprom if wanted
     for(uint8_t i=0; i<E_AXIS_ARRAY; i++) {
@@ -948,13 +949,13 @@ SET_INPUT(FIL_SENSOR2_PIN);
 #if SDSUPPORT
     sd.autoPrint();
 #endif
-#if FEATURE_WATCHDOG
-    HAL::startWatchdog();
-#endif // FEATURE_WATCHDOG
     playsound(880,100);
     playsound(1479,150);
     playsound(1174,100);
     playsound(2349,150);
+#if FEATURE_WATCHDOG
+    HAL::startWatchdog();
+#endif // FEATURE_WATCHDOG
 }
 
 void Printer::defaultLoopActions()