Diff: Sensors/I2C_Sensor.cpp

Revision:

36:128c55793728

Parent:

34:3aa1cbcde59d

diff -r 2a9465fedb99 -r 128c55793728 Sensors/I2C_Sensor.cpp
--- a/Sensors/I2C_Sensor.cpp	Mon Jun 10 20:47:01 2013 +0000
+++ b/Sensors/I2C_Sensor.cpp	Wed Jun 12 10:26:18 2013 +0000
@@ -4,9 +4,10 @@
 #define GET_I2C_WRITE_ADDRESS(ADR)  (ADR << 1&0xFE) // ADR & 1111 1110
 #define GET_I2C_READ_ADDRESS(ADR)   (ADR << 1|0x01) // ADR | 0000 0001
 
-I2C_Sensor::I2C_Sensor(PinName sda, PinName scl, char i2c_address) :  i2c(sda, scl), local("local")
+I2C_Sensor::I2C_Sensor(PinName sda, PinName scl, char i2c_address) : i2c_init(sda, scl), i2c(sda, scl), local("local")
 {
     I2C_Sensor::i2c_address = i2c_address;
+    i2c_init.frequency(400000); // standard speed
     i2c.frequency(400000); // standard speed
     //i2c.frequency(1500000); // ultrafast!
 }
@@ -27,16 +28,17 @@
     fclose(fp);
 }
 
-//--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-// ATTENTION!!! the I2C option "repeated" = true is important because otherwise interrupts while bus communications cause crashes (see http://www.i2c-bus.org/repeated-start-condition/)
-//--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+//--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+// ATTENTION!!! there was a problem with other interrupts disturbing the i2c communication of the chip... that's why I use I2C to initialise the sonsors and MODI2C to get the data (only made with readMultiRegister)
+// IT DIDN'T WORK STABLE IN OTHER COMBINATIONS (if someone has an idea why please let me know)
+//--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 char I2C_Sensor::readRegister(char reg)
 {
     char value = 0;
     
-    i2c.write(i2c_address, &reg, 1, true);
-    i2c.read(i2c_address, &value, 1, true);
+    i2c_init.write(i2c_address, &reg, 1);
+    i2c_init.read(i2c_address, &value, 1);
 
     return value;
 }
@@ -44,11 +46,11 @@
 void I2C_Sensor::writeRegister(char reg, char data)
 {
     char buffer[2] = {reg, data};
-    i2c.write(i2c_address, buffer, 2, true);
+    i2c_init.write(i2c_address, buffer, 2);
 }
 
 void I2C_Sensor::readMultiRegister(char reg, char* output, int size)
 {
-    i2c.write (i2c_address, &reg, 1, true); // tell register address of the MSB get the sensor to do slave-transmit subaddress updating.
-    i2c.read  (i2c_address, output, size, true); // tell it where to store the data read
+    i2c.write (i2c_address, &reg, 1); // tell register address of the MSB get the sensor to do slave-transmit subaddress updating.
+    i2c.read  (i2c_address, output, size); // tell it where to store the data read
 }
\ No newline at end of file