Merge branch 'turnouteeprom' into mergetest, conflicts in DCC.cpp resolved

Conflicts:
	DCC.cpp

DCC.cpp

@@ -20,10 +20,10 @@
 #include "DCC.h"
 #include "DCCWaveform.h"
 #include "DIAG.h"
+#include "EEStore.h"
 #include "GITHUB_SHA.h"
 #include "version.h"
 
-
 // This module is responsible for converting API calls into
 // messages to be sent to the waveform generator.
 // It has no visibility of the hardware, timers, interrupts
@@ -48,6 +48,11 @@ __FlashStringHelper* DCC::shieldName=NULL;
 void DCC::begin(const __FlashStringHelper* motorShieldName, MotorDriver * mainDriver, MotorDriver* progDriver, byte timerNumber) {
   shieldName=(__FlashStringHelper*)motorShieldName;
   DIAG(F("<iDCC-EX V-%S / %S / %S G-%S>\n"), F(VERSION), F(ARDUINO_TYPE), shieldName, F(GITHUB_SHA));
+
+  // Load stuff from EEprom
+  (void)EEPROM; // tell compiler not to warn this is unused
+  EEStore::init();
+
   DCCWaveform::begin(mainDriver,progDriver, timerNumber); 
 }