Merge 2f72a3dd57 into 33b2820095

EEStore.cpp

@@ -31,12 +31,12 @@
 #include "Sensors.h"
 #include "Turnouts.h"
 
-#if defined(ARDUINO_ARCH_SAMC) || defined(ARDUINO_GIGA)
+#if defined(ARDUINO_ARCH_SAMC)
 ExternalEEPROM EEPROM;
 #endif
 
 void EEStore::init() {
-#if defined(ARDUINO_ARCH_SAMC) || defined(ARDUINO_GIGA)
+#if defined(ARDUINO_ARCH_SAMC)
   EEPROM.begin(0x50);  // Address for Microchip 24-series EEPROM with all three
                        // A pins grounded (0b1010000 = 0x50)
 #endif

EEStore.h

@@ -26,7 +26,7 @@
 
 #include <Arduino.h>
 
-#if defined(ARDUINO_ARCH_SAMC) || defined(ARDUINO_GIGA)
+#if defined(ARDUINO_ARCH_SAMC)
 #include <SparkFun_External_EEPROM.h>
 extern ExternalEEPROM EEPROM;
 #else

defines.h

@@ -150,7 +150,7 @@
   // #endif
 #elif defined(ARDUINO_GIGA)
   #define ARDUINO_TYPE "Giga"
-  #ifndef GIGA_EXT_EEPROM
+  #ifndef DISABLE_EEPROM
     #define DISABLE_EEPROM
   #endif
   //#if !defined(I2C_USE_WIRE)