Move writeBlock function outside of class.

Author: nseidle

libraries/EEPROM/examples/Example2_AllFunctions/Example2_AllFunctions.ino

@@ -30,7 +30,7 @@ void setup()
 
   long startTime;
   long endTime;
-  uint16_t randomLocation;
+  int randomLocation;
 
   //Test erase time
   startTime = millis();

libraries/EEPROM/src/EEPROM.cpp

@@ -43,7 +43,7 @@
 //Write a byte to a given "EEPROM" location
 void write(uint16_t eepromLocation, uint8_t dataToWrite)
 {
-  EEPROM.writeBlockToEEPROM(eepromLocation, &dataToWrite, 1);
+  writeBlockToEEPROM(eepromLocation, &dataToWrite, 1);
 }
 
 //Read a byte from a given location in "EEPROM"
@@ -65,7 +65,7 @@ void EEPROMClass::erase()
 //2) Record user data into SRAM. Check if new data is different from flash.
 //3) Erase flash page (8k)
 //4) Write SRAM back into flash
-void EEPROMClass::writeBlockToEEPROM(uint16_t eepromLocation, const uint8_t *dataToWrite, uint16_t blockSize)
+void writeBlockToEEPROM(uint16_t eepromLocation, const uint8_t *dataToWrite, uint16_t blockSize)
 {
   //Error check
   if (eepromLocation + blockSize >= AP3_FLASH_EEPROM_SIZE)

libraries/EEPROM/src/EEPROM.h

@@ -64,14 +64,14 @@
 Error : EEPROM start address must be divisble by 8192
 #endif
 
-//By limiting EEPROM size to 1024 bytes, we reduce the amount of SRAM required and
-//time needed to mask in individual bytes and words into flash. It can be increased
-//to 8096 if needed
-#define AP3_FLASH_EEPROM_SIZE 1024 //In bytes
+        //By limiting EEPROM size to 1024 bytes, we reduce the amount of SRAM required and
+        //time needed to read/write words into flash. It can be increased
+        //to 8096 if needed
+        const int AP3_FLASH_EEPROM_SIZE = 1024 * 2; //In bytes
 
-        uint8_t
-        read(uint16_t eepromLocation);
+uint8_t read(uint16_t eepromLocation);
 void write(uint16_t eepromLocation, uint8_t dataToWrite);
+void writeBlockToEEPROM(uint16_t eepromLocation, const uint8_t *dataToWrite, uint16_t blockSize);
 
 struct EERef
 {
@@ -164,7 +164,6 @@ struct EEPROMClass
   void write(int idx, uint8_t val) { (EERef(idx)) = val; }
   void update(int idx, uint8_t val) { EERef(idx).update(val); }
   void erase();
-  void writeBlockToEEPROM(uint16_t eepromLocation, const uint8_t *dataToWrite, uint16_t blockSize);
 
   //STL and C++11 iteration capability.
   EEPtr