Diff: Components/VL6180X/vl6180x_class.h

Revision:

3:454541a079f4

Parent:

1:1de1ea2994d9

Child:

4:a5abf7757947

--- a/Components/VL6180X/vl6180x_class.h	Thu Sep 10 08:40:54 2015 +0000
+++ b/Components/VL6180X/vl6180x_class.h	Fri Sep 11 14:39:00 2015 +0200
@@ -65,60 +65,33 @@
     
     /*** Interface Methods ***/
     virtual int Init(void *init_struct) {
-        return VL6180X_Init();
-    }
-
-    virtual int ReadID(uint8_t *ht_id) {
-        return VL6180X_ReadID(ht_id);
+        return VL6180x_InitData(VL6180xDev_t dev);
     }
-
-    /**
-     * @brief       Reset sensor
-     * @return      0 in case of success, an error code otherwise
-     */
-    virtual int Reset(void) {
-        return VL6180X_RebootCmd();
+    
+    virtual int ReadID(uint8_t *rl_id) {
+        return VL6180X_ReadID(rl_id);
     }
-
-    virtual int GetRange(float *pfData) {
-        return VL6180X_GetRange(pfData);
-    }
-
-    virtual int GetLight(float *pfData) {
-        return VL6180X_GetLight(pfData);
+    /*
+    virtual int GetRange(int *piData) {
+        return VL6180X_GetRange(piData);
     }
 
- protected:
-    /*** Methods ***/
-    RANGE_LIGHT_StatusTypeDef VL6180X_Init(RANGE_LIGHT_InitTypeDef *VL6180X_Init);
-    RANGE_LIGHT_StatusTypeDef VL6180X_ReadID(uint8_t *ht_id);
-    RANGE_LIGHT_StatusTypeDef VL6180X_SetID(uint8_t *ht_id);
-    RANGE_LIGHT_StatusTypeDef VL6180X_RebootCmd(void);
-    RANGE_LIGHT_StatusTypeDef VL6180X_GetRange(float* pfData);
-    RANGE_LIGHT_StatusTypeDef VL6180X_GetLight(float* pfData);
+    virtual int GetLight(int *piData) {
+        return VL6180X_GetLight(piData);
+    }
+    */
 
-    /**
-     * @brief  Configures VL6180X interrupt lines for NUCLEO boards
-     */
-    void VL6180X_IO_ITConfig(void)
-    {
-        /* To be implemented */
-    }
-
-    /**
-     * @brief  Configures VL6180X I2C interface
-     * @return RANGE_LIGHT_OK in case of success, an error code otherwise
-     */
-    RANGE_LIGHT_StatusTypeDef VL6180X_IO_Init(void)
-    {
-        return RANGE_LIGHT_OK; /* done in constructor */
-    }
-
+private:
+    /*** Methods ***/
+    int VL6180X_IO_Read(uint8_t *pBuffer, uint8_t RegisterAddress, uint16 NumByteToRead);
+    
+    
     
     /*** Instance Variables ***/
     /* IO Device */
+    
     DevI2C &dev_i2c;
-
+    
     
 };