Merge pull request RobTillaart#20 from ifreislich/master

RobTillaart · RobTillaart · commit 2a3ea88b94fa · 2015-05-20T19:58:50.000+02:00
_pageBlock loop never terminates due to incorrect variable in while()
diff --git a/libraries/I2C_EEPROM/I2C_eeprom.cpp b/libraries/I2C_EEPROM/I2C_eeprom.cpp
@@ -183,7 +183,7 @@ int I2C_eeprom::_pageBlock(const uint16_t memoryAddress, const uint8_t* buffer,
     uint16_t addr = memoryAddress;
     uint16_t len = length;
     int rv = 0;
-    while (length > 0)
+    while (len > 0)
     {
         uint8_t bytesUntilPageBoundary = this->_pageSize - addr % this->_pageSize;
         uint8_t cnt = min(len, bytesUntilPageBoundary);
@@ -262,4 +262,4 @@ void I2C_eeprom::waitEEReady()
     }
 }
 
-// END OF FILE
+// END OF FILE
diff --git a/libraries/I2C_EEPROM/examples/I2C_eeprom_test/I2C_eeprom_test.ino b/libraries/I2C_EEPROM/examples/I2C_eeprom_test/I2C_eeprom_test.ino
@@ -39,7 +39,7 @@ void setup()
     SERIAL_OUT.print("SIZE: ");
     SERIAL_OUT.print(size);
     SERIAL_OUT.println(" KB");
-  } else if (size = 0)
+  } else if (size == 0)
   {
     SERIAL_OUT.println("WARNING: Can't determine eeprom size");
   }

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ int I2C_eeprom::_pageBlock(const uint16_t memoryAddress, const uint8_t* buffer,`
`183`	`183`	`uint16_t addr = memoryAddress;`
`184`	`184`	`uint16_t len = length;`
`185`	`185`	`int rv = 0;`
`186`		`- while (length > 0)`
	`186`	`+ while (len > 0)`
`187`	`187`	`{`
`188`	`188`	`uint8_t bytesUntilPageBoundary = this->_pageSize - addr % this->_pageSize;`
`189`	`189`	`uint8_t cnt = min(len, bytesUntilPageBoundary);`
`@@ -262,4 +262,4 @@ void I2C_eeprom::waitEEReady()`
`262`	`262`	`}`
`263`	`263`	`}`
`264`	`264`
`265`		`-// END OF FILE`
	`265`	`+// END OF FILE`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ void setup()`
`39`	`39`	`SERIAL_OUT.print("SIZE: ");`
`40`	`40`	`SERIAL_OUT.print(size);`
`41`	`41`	`SERIAL_OUT.println(" KB");`
`42`		`- } else if (size = 0)`
	`42`	`+ } else if (size == 0)`
`43`	`43`	`{`
`44`	`44`	`SERIAL_OUT.println("WARNING: Can't determine eeprom size");`
`45`	`45`	`}`