Merge branch 'master' of https://github.com/thijse/Arduino-Libraries

Conflicts:
	EEPROMEx/EEPROMex.h

Author: thijse

EEPROMex.h

@@ -29,8 +29,8 @@
 #include <avr/eeprom.h>
 
 // Boards with ATmega328, Duemilanove, Uno, UnoSMD, Lilypad - 1024 bytes (1 kilobyte)
-// Boards with ATmega1280 or 2560, Arduino Mega series – 4096 bytes (4 kilobytes)
-// Boards with ATmega168, Lilypad, old Nano, Diecimila  – 512 bytes (1/2 kilobyte)
+// Boards with ATmega1280 or 2560, Arduino Mega series – 4096 bytes (4 kilobytes)
+// Boards with ATmega168, Lilypad, old Nano, Diecimila  – 512 bytes (1/2 kilobyte)
 
 #define EEPROMSizeATmega168   512     
 #define EEPROMSizeATmega328   1024     
@@ -55,112 +55,111 @@
 
 class EEPROMClassEx
 {
-      
+	  
   public:
-    EEPROMClassEx();
-    bool     isReady();
-    int      writtenBytes();
-    void     setMemPool(int base, int memSize);
-    void     setMaxAllowedWrites(int allowedWrites);
-    int      getAddress(int noOfBytes);
+	EEPROMClassEx();
+	bool 	 isReady();
+	int 	 writtenBytes();
+    void 	 setMemPool(int base, int memSize);
+	void  	 setMaxAllowedWrites(int allowedWrites);
+	int 	 getAddress(int noOfBytes);
 
-    uint8_t  read(int); 
-    bool     readBit(int, byte);
-    uint8_t  readByte(int);
+	uint8_t  read(int);	
+	bool 	 readBit(int, byte);
+	uint8_t  readByte(int);
     uint16_t readInt(int);
     uint32_t readLong(int);
-    float    readFloat(int);
-    double   readDouble(int);
-            
+	float    readFloat(int);
+	double   readDouble(int);
+			
     bool     write(int, uint8_t);
-    bool     writeBit(int , uint8_t, bool);
-    bool     writeByte(int, uint8_t);
-    bool     writeInt(int, uint16_t);
-    bool     writeLong(int, uint32_t);
-    bool     writeFloat(int, float);
-    bool     writeDouble(int, double);
-
-    bool     update(int, uint8_t);
-    bool     updateBit(int , uint8_t, bool);
-    bool     updateByte(int, uint8_t);
-    bool     updateInt(int, uint16_t);
-    bool     updateLong(int, uint32_t);
-    bool     updateFloat(int, float);
-    bool     updateDouble(int, double);
-
-    
+	bool 	 writeBit(int , uint8_t, bool);
+	bool     writeByte(int, uint8_t);
+	bool 	 writeInt(int, uint16_t);
+	bool 	 writeLong(int, uint32_t);
+	bool 	 writeFloat(int, float);
+	bool 	 writeDouble(int, double);
+
+	bool     update(int, uint8_t);
+	bool 	 updateBit(int , uint8_t, bool);
+	bool     updateByte(int, uint8_t);
+	bool 	 updateInt(int, uint16_t);
+	bool 	 updateLong(int, uint32_t);
+	bool 	 updateFloat(int, float);
+	bool 	 updateDouble(int, double);
+
+	
     // Use template for other data formats
 
 
-    template <class T> int readBlock(int address, const T value[], int items)
-    {
-        if (!isWriteOk(address+items*sizeof(T))) return 0;
-        unsigned int i;
-        for (i = 0; i < (unsigned int)items; i++)
-            readBlock<T>(address+(i*sizeof(T)),value[i]);
-        return i;
-    }
-    
-    template <class T> int readBlock(int address, const T& value)
-    {       
-        eeprom_read_block((void*)&value, (const void*)address, sizeof(value));
-        return sizeof(value);
-    }
-    
-    template <class T> int writeBlock(int address, const T value[], int items)
-    {   
-        if (!isWriteOk(address+items*sizeof(T))) return 0;
-        unsigned int i;
-        for (i = 0; i < (unsigned int)items; i++)
-              writeBlock<T>(address+(i*sizeof(T)),value[i]);
-        return i;
-    }
-    
-    template <class T> int writeBlock(int address, const T& value)
-    {
-        if (!isWriteOk(address+sizeof(value))) return 0;
-        eeprom_write_block((void*)&value, (void*)address, sizeof(value));                         
-        return sizeof(value);
-    }
-
-    template <class T> int updateBlock(int address, const T value[], int items)
-    {
-        int writeCount=0;
-        if (!isWriteOk(address+items*sizeof(T))) return 0;
-        unsigned int i;
-        for (i = 0; i < (unsigned int)items; i++)
-              writeCount+= updateBlock<T>(address+(i*sizeof(T)),value[i]);
-        return writeCount;
-    }
-    
-    template <class T> int updateBlock(int address, const T& value)
-    {
-        int writeCount=0;
-        if (!isWriteOk(address+sizeof(value))) return 0;
-        const byte* bytePointer = (const byte*)(const void*)&value;
-        for (unsigned int i = 0; i < (unsigned int)sizeof(value); i++) {
-            if (read(address)!=*bytePointer) {
-                write(address, *bytePointer);
-                writeCount++;       
-            }
-            address++;
-            bytePointer++;
-        }
-        return writeCount;
-    }
-    
-    
-    
+	template <class T> int readBlock(int address, const T value[], int items)
+	{
+		unsigned int i;
+		for (i = 0; i < (unsigned int)items; i++)
+			readBlock<T>(address+(i*sizeof(T)),value[i]);
+		return i;
+	}
+	
+	template <class T> int readBlock(int address, const T& value)
+	{		
+		eeprom_read_block((void*)&value, (const void*)address, sizeof(value));
+		return sizeof(value);
+	}
+	
+	template <class T> int writeBlock(int address, const T value[], int items)
+	{	
+		if (!isWriteOk(address+items*sizeof(T))) return 0;
+		unsigned int i;
+		for (i = 0; i < (unsigned int)items; i++)
+			  writeBlock<T>(address+(i*sizeof(T)),value[i]);
+		return i;
+	}
+	
+	template <class T> int writeBlock(int address, const T& value)
+	{
+		if (!isWriteOk(address+sizeof(value))) return 0;
+		eeprom_write_block((void*)&value, (void*)address, sizeof(value));			  			  
+		return sizeof(value);
+	}
+
+	template <class T> int updateBlock(int address, const T value[], int items)
+	{
+		int writeCount=0;
+		if (!isWriteOk(address+items*sizeof(T))) return 0;
+		unsigned int i;
+		for (i = 0; i < (unsigned int)items; i++)
+			  writeCount+= updateBlock<T>(address+(i*sizeof(T)),value[i]);
+		return writeCount;
+	}
+	
+	template <class T> int updateBlock(int address, const T& value)
+	{
+		int writeCount=0;
+		if (!isWriteOk(address+sizeof(value))) return 0;
+		const byte* bytePointer = (const byte*)(const void*)&value;
+		for (unsigned int i = 0; i < (unsigned int)sizeof(value); i++) {
+			if (read(address)!=*bytePointer) {
+				write(address, *bytePointer);
+				writeCount++;		
+			}
+			address++;
+			bytePointer++;
+		}
+		return writeCount;
+	}
+	
+	
+	
 private:
-    //Private variables
-    static int _base;
-    static int _memSize;
-    static int _nextAvailableaddress;   
-    static int _writeCounts;
-    int _allowedWrites; 
-    bool checkWrite(int base,int noOfBytes);    
-    bool isWriteOk(int address);
-    bool isReadOk(int address);
+	//Private variables
+	static int _base;
+	static int _memSize;
+	static int _nextAvailableaddress;	
+	static int _writeCounts;
+	int _allowedWrites;	
+	bool checkWrite(int base,int noOfBytes);	
+	bool isWriteOk(int address);
+	bool isReadOk(int address);
 };
 
 extern EEPROMClassEx EEPROM;

README.md

@@ -12,7 +12,7 @@ The EEPROMex library is an extension of the standard Arduino EEPROM library. It
 * Debugging of writing out of memory range.
 
 You can download the library here: 
-[http://thijs.elenbaas.net/downloads/?did=3](http://thijs.elenbaas.net/downloads/?did=3)
+[http://thijs.elenbaas.net/downloads/?did=3](http://thijs.elenbaas.net/downloads)
 
 And find detailed explanation and samples of the functionality here: 
 [http://thijs.elenbaas.net/2012/07/extended-eeprom-library-for-arduino](http://thijs.elenbaas.net/2012/07/extended-eeprom-library-for-arduino)
@@ -109,6 +109,9 @@ Based on processor:
 *EEPROMSizeATmega168
 *EEPROMSizeATmega328
 *EEPROMSizeATmega1280
+*EEPROMSizeATmega32u4
+*EEPROMSizeAT90USB1286
+*EEPROMSizeMK20DX128
 ```
 Based on board:
 ```
@@ -119,6 +122,12 @@ Based on board:
 *EEPROMSizeMega
 *EEPROMSizeDiecimila
 *EEPROMSizeNano
+*EEPROMSizeTeensy2
+*EEPROMSizeLeonardo
+*EEPROMSizeMicro
+*EEPROMSizeYun
+*EEPROMSizeTeensy2pp
+*EEPROMSizeTeensy3
 ```
 
 ### EEPROM performance