Diff: MBEDI2CInterface.h

Revision:

2:6dafea14e21e

Parent:

1:80ebfbf95667

diff -r 80ebfbf95667 -r 6dafea14e21e MBEDI2CInterface.h
--- a/MBEDI2CInterface.h	Tue Jan 12 15:45:51 2016 +0000
+++ b/MBEDI2CInterface.h	Fri Apr 01 08:39:58 2016 +0000
@@ -1,36 +1,60 @@
 #ifndef __MBEDI2CINTERFACE_H  
 #define __MBEDI2CINTERFACE_H  
 
+#include "I2C.h"
+
 #define VERSION_MBEDI2CInterface_HDR "1.00" 
 
 
 class MBEDI2CInterface :public I2CInterface {
     
-    I2C i2cdev;
+    mbed::I2C i2cdev;
     public :
         
-    MBEDI2CInterface(PinName sda, PinName scl): 
-    getVersion( VERSION_MBEDI2CInterface_HDR,VERSION_MBEDI2CInterface_HDR, __TIME__, __DATE__),i2cdev(sda,scl){
+    MBEDI2CInterface(PinName sda, PinName scl)
+    : getVersion(VERSION_MBEDI2CInterface_HDR, VERSION_MBEDI2CInterface_HDR, __TIME__, __DATE__),
+      i2cdev(sda,scl) {
         // no init code yet 
-    } ;
-    // next could perhaps more efficient  but not yet investigated 
-virtual void    frequency (int hz){return i2cdev.frequency(hz) ;};
-virtual int     read (int address, char *data, int length, bool repeated=false){
-            return i2cdev.read ( address, data, length, repeated);};
- virtual int     read (int ack){return i2cdev.read ( ack);};// Read a single byte from the I2C bus.
- virtual int     write (int address, const char *data, int length, bool repeated=false){
-            return i2cdev.write ( address, data, length, repeated);
-        }
-virtual int     write (int data){return i2cdev.write (data);};//  Write single byte out on the I2C bus.
-virtual void    start (void){i2cdev.start ();};// Creates a start condition on the I2C bus.
-virtual void    stop (void){i2cdev.stop();};// Creates a stop condition on the I2C bus.
-virtual int     transfer (int address, const char *tx_buffer, int tx_length, char *rx_buffer, int rx_length, void* callbackfunction,  bool repeated=false){
-            return  -1;  // seems transfer not supported in mbed or not correctly called below
-           //  return i2cdev.transfer (address, tx_buffer,  tx_length, rx_buffer,  rx_length, callback,  event,  repeated);
-        };    
+    }
+    // next could perhaps more efficient  but not yet investigated
+
+    virtual void    frequency (int hz){
+        return i2cdev.frequency(hz) ;
+    }
+
+    virtual int     read (int address, char *data, int length, bool repeated=false) {
+        return i2cdev.read(address, data, length, repeated);
+    }
+
+    // Read a single byte from the I2C bus.
+    virtual int     read(int ack) {
+         return i2cdev.read(ack);
+    }
+    
+    virtual int     write(int address, const char *data, int length, bool repeated=false){
+        return i2cdev.write(address, data, length, repeated);
+    }
+    
+    //  Write single byte out on the I2C bus.
+    virtual int     write(int data) {
+        return i2cdev.write(data);
+    }
+    // Creates a start condition on the I2C bus
+    virtual void    start(void) {
+        i2cdev.start();
+    }
+    // Creates a stop condition on the I2C bus.
+    virtual void    stop(void) {
+        i2cdev.stop();
+    }
+    
+    virtual int     transfer(int address, const char *tx_buffer, int tx_length, char *rx_buffer, int rx_length, void* callbackfunction,  bool repeated=false){
+        return  -1;  // seems transfer not supported in mbed or not correctly called below
+        //  return i2cdev.transfer (address, tx_buffer,  tx_length, rx_buffer,  rx_length, callback,  event,  repeated);
+    }
     
     
-    } ;
+} ;