Simplify reference to EEPROM library.

Author: James Foster

CHANGELOG.md

@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 ### Added
-- Support for mock EEPROM (but only if board supports it; added mega2560 to TestSomething config)
+- Support for mock EEPROM (but only if board supports it)
 
 ### Changed
 - Move repository from https://github.com/ianfixes/arduino_ci to https://github.com/Arduino-CI/arduino_ci

SampleProjects/TestSomething/test/eeprom.cpp

@@ -1,8 +1,9 @@
 #include <ArduinoUnitTests.h>
 #include <Arduino.h>
-#include <EEPROM.h>
 
-#ifdef EEPROM_SIZE
+// Only run EEPROM tests if there is hardware support!
+#if defined(EEPROM_SIZE) || (defined(E2END) && E2END)
+#include <EEPROM.h>
 
 unittest(length)
 {

cpp/arduino/EEPROM.h

@@ -4,7 +4,7 @@
   New version by Christopher Andrews 2015.
 
   Copy of https://github.com/arduino/ArduinoCore-megaavr/blob/c8a1dd996c783777ec46167cfd8ad3fd2e6df185/libraries/EEPROM/src/EEPROM.h
-  modified by James Foster 2020 to work with Arduino CI.
+  modified by James Foster in 2020 to work with Arduino CI.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -27,16 +27,24 @@
 #include <inttypes.h>
 #include <avr/io.h>
 
+// different EEPROM implementations have different macros that leak out
 #if !defined(EEPROM_SIZE) && defined(E2END) && (E2END)
 #define EEPROM_SIZE (E2END + 1)
 #endif 
-#ifdef EEPROM_SIZE
 
-// Is this all the custom code required?
+// Does the current board have EEPROM?
+#ifndef EEPROM_SIZE
+// In lieu of an "EEPROM.h not found" error for unsupported boards
+#error "EEPROM library not available for your board"
+#endif
+
+// On a real device this would be in hardware, but we have a mock board!
 static uint8_t eeprom[EEPROM_SIZE];
 inline uint8_t eeprom_read_byte( uint8_t* index ) { return eeprom[(unsigned long) index % EEPROM_SIZE]; }
 inline void eeprom_write_byte( uint8_t* index, uint8_t value ) { eeprom[(unsigned long) index % EEPROM_SIZE] = value; }
 
+// Everything following is from the original (referenced above)
+
 /***
     EERef class.
     
@@ -156,4 +164,3 @@ struct EEPROMClass{
 
 static EEPROMClass EEPROM;
 #endif
-#endif