alex/GY-63_MS5611
1
0
Fork 0
mirror of https://github.com/RobTillaart/Arduino.git synced 2024-10-03 18:09:02 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

+ Arduino 1.0 comaptible

Browse Source
This commit is contained in:
Rob Tillaart 2013-09-30 16:43:17 +02:00
parent aab07947c8
commit 151438bfc2
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libraries/I2C_EEPROM/I2C_eeprom.cpp
View File

@ -1,7 +1,7 @@
//
// FILE: I2C_eeprom.cpp
// AUTHOR: Rob Tillaart
// VERSION: 0.2.01
// VERSION: 1.0.00
// PURPOSE: Simple I2C_eeprom library for Arduino with EEPROM 24LC256 et al.
//
// HISTORY:
@ -9,15 +9,13 @@
// 0.1.01 - 2011-02-07 added setBlock function
// 0.2.00 - 2011-02-11 fixed 64 bit boundary bug
// 0.2.01 - 2011-08-13 _readBlock made more robust + return value
// 1.0.00 - 2013-06-09 support for Arduino 1.0.x
//
// Released to the public domain
//
#include <I2C_eeprom.h>
#include "Wstring.h"
#include "Wiring.h"
////////////////////////////////////////////////////////////////////
//
// PUBLIC
@ -118,10 +116,19 @@ int I2C_eeprom::endOfPage(unsigned int address)
void I2C_eeprom::_WriteBlock(unsigned int address, uint8_t* buffer, uint8_t length)
{
Wire.beginTransmission(_Device);
#if defined(ARDUINO) && ARDUINO >= 100
Wire.write((int)(address >> 8));
Wire.write((int)(address & 0xFF));
for (uint8_t c = 0; c < length; c++)
Wire.write(buffer[c]);
#else
Wire.send((int)(address >> 8));
Wire.send((int)(address & 0xFF));
for (uint8_t c = 0; c < length; c++)
Wire.send(buffer[c]);
#endif
Wire.endTransmission();
delay(5);
}
@ -129,6 +136,22 @@ void I2C_eeprom::_WriteBlock(unsigned int address, uint8_t* buffer, uint8_t leng
// pre: buffer is large enough to hold length bytes
int I2C_eeprom::_ReadBlock(unsigned int address, uint8_t* buffer, uint8_t length)
{
#if defined(ARDUINO) && ARDUINO >= 100
Wire.beginTransmission(_Device);
Wire.write((int)(address >> 8));
Wire.write((int)(address & 0xFF));
Wire.endTransmission();
Wire.requestFrom(_Device, length);
int c = 0;
unsigned long before = millis();
while ((c < length) && ((millis() - before) < 1000))
{
if (Wire.available()) buffer[c++] = Wire.read();
}
return c;
#else
Wire.beginTransmission(_Device);
Wire.send((int)(address >> 8));
Wire.send((int)(address & 0xFF));
@ -142,7 +165,9 @@ int I2C_eeprom::_ReadBlock(unsigned int address, uint8_t* buffer, uint8_t length
if (Wire.available()) buffer[c++] = Wire.receive();
}
return c;
#endif
}
//
// END OF FILE
//

13
libraries/I2C_EEPROM/I2C_eeprom.h
View File

@ -4,18 +4,27 @@
// FILE: I2C_eeprom.h
// AUTHOR: Rob Tillaart
// PURPOSE: Simple I2C_eeprom library for Arduino with EEPROM 24LC256 et al.
// VERSION: 1.0.00
// HISTORY: See I2C_eeprom.cpp
// URL: http://arduino.cc/playground/Main/LibraryForI2CEEPROM
//
// Released to the public domain
//
#include <Wire.h>
#include <Wire.h>
#if defined(ARDUINO) && ARDUINO >= 100
#include "Arduino.h"
#else
#include "WProgram.h"
#include "Wstring.h"
#include "Wiring.h"
#endif
// BLOCKSIZE must be 16
#define BLOCKSIZE 16
#define I2C_EEPROM_VERSION "0.2.01"
#define I2C_EEPROM_VERSION "1.0"
// interface
class I2C_eeprom