Diff: Components/VL6180X/vl6180x_class.h

Revision:

54:17f3bb228b13

Parent:

52:fca21e149934

Child:

56:37d1736bd896

--- a/Components/VL6180X/vl6180x_class.h	Tue Sep 27 12:18:09 2016 +0000
+++ b/Components/VL6180X/vl6180x_class.h	Wed Nov 30 08:25:04 2016 +0000
@@ -466,25 +466,6 @@
     }
 
 /**
- * @brief Get ranging result and only that
- *
- * @par Function Description
- * Unlike @a VL6180x_RangeGetMeasurement() this function only retrieves the range in millimeter \n
- * It does any required up-scale translation\n
- * It can be called after having started a measure and after a succes \n
- * measure is finisched either in polling mode or in interrupt mode \n
- * @warning these function is not doing wrap around filtering \n
- * This function doesn't perform any data ready check!
- *
- * @param pRange_mm  Pointer to range distance
- * @return           0 on success
- */		
-    int GetRange(int32_t *piData)
-    {
-       return VL6180x_RangeGetResult(Device, piData);
-    }
-
-/**
  * @brief Get a single distance measure result
  *
  * @par Function Description
@@ -505,7 +486,7 @@
 		  RangeWaitDeviceReady(2000);				 
           for (status=1; 
                status!=0; 
-               status=GetRange((int32_t *)piData));
+		       status=VL6180x_RangeGetResult(Device, piData));
        }
        StopMeasurement(range_single_shot_polling);
        RangeWaitDeviceReady(2000);
@@ -1102,19 +1083,6 @@
 /** @}  */
 
 /**
- * @brief Get the ALS (light in Lux) level
- *
- * @par Function Description
- * Get the ALS (light in Lux) level 
- * @param *piData The pointer to variable to write in the measure in Lux
- * @return  0       On success
- */				
-    int GetLight(uint32_t *piData)
-    {
-       return VL6180x_AlsGetLux(Device, piData);
-    }
-
-/**
  * @brief Get a single light (in Lux) measure result
  *
  * @par Function Description
@@ -1132,7 +1100,7 @@
           AlsWaitDeviceReady(2000);				 
           for (status=1; 
                status!=0; 
-               status=GetLight(piData));
+               status=VL6180x_AlsGetLux(Device, piData));
        }
        StopMeasurement(als_single_shot_polling);
 	   AlsWaitDeviceReady(2000);				 			 
@@ -1176,7 +1144,7 @@
     int VL6180x_RangePollMeasurement(VL6180xDev_t dev, VL6180x_RangeData_t *pRangeData);
     int VL6180x_RangeGetMeasurementIfReady(VL6180xDev_t dev, VL6180x_RangeData_t *pRangeData);
     int VL6180x_RangeGetMeasurement(VL6180xDev_t dev, VL6180x_RangeData_t *pRangeData);
-    int VL6180x_RangeGetResult(VL6180xDev_t dev, int32_t *pRange_mm);
+    int VL6180x_RangeGetResult(VL6180xDev_t dev, uint32_t *pRange_mm);
     int VL6180x_RangeConfigInterrupt(VL6180xDev_t dev, uint8_t ConfigGpioInt);
     int VL6180x_RangeGetInterruptStatus(VL6180xDev_t dev, uint8_t *pIntStatus);
     int VL6180x_AlsPollMeasurement(VL6180xDev_t dev, VL6180x_AlsData_t *pAlsData);