Kenji Arai / 6180XA1_simple

Dependents:   Check_VL6180XA1_ToF

Fork of X_NUCLEO_6180XA1 by ST

Revision:
38:18abb7f7dcb2
Parent:
29:6d6b67e2e212
Child:
40:b4d20279e312
diff -r 837cffa6b530 -r 18abb7f7dcb2 Components/VL6180X/vl6180x_class.cpp
--- a/Components/VL6180X/vl6180x_class.cpp	Fri Nov 27 08:47:30 2015 +0000
+++ b/Components/VL6180X/vl6180x_class.cpp	Thu Dec 03 09:45:40 2015 +0000
@@ -158,8 +158,8 @@
 #define AN_GAIN_MULT    (1<<GAIN_FIX_PREC)
  
  
-static int32_t _GetAveTotalTime(VL6180xDev_t dev);
-static int VL6180x_RangeSetEarlyConvergenceEestimateThreshold(VL6180xDev_t dev);
+//int32_t _GetAveTotalTime(VL6180xDev_t dev);
+//int VL6180x_RangeSetEarlyConvergenceEestimateThreshold(VL6180xDev_t dev);
  
 /**
  * ScalerLookUP scaling factor-1 to register #RANGE_SCALER lookup
@@ -253,18 +253,10 @@
 };
 #endif /* VL6180x_SINGLE_DEVICE_DRIVER */
  
- 
- 
 #define Fix7_2_KCPs(x) ((((uint32_t)(x))*1000)>>7)
  
- 
-#if VL6180x_WRAP_AROUND_FILTER_SUPPORT || VL6180x_HAVE_DMAX_RANGING
-static int _GetRateResult(VL6180xDev_t dev, VL6180x_RangeData_t *pRangeData);
-#endif
- 
 #if VL6180x_WRAP_AROUND_FILTER_SUPPORT
 static int _filter_Init(VL6180xDev_t dev);
-static int _filter_GetResult(VL6180xDev_t dev, VL6180x_RangeData_t *pData);
     #define _IsWrapArroundActive(dev) VL6180xDevDataGet(dev,WrapAroundFilterActive)
 #else
     #define _IsWrapArroundActive(dev) 0
@@ -273,7 +265,7 @@
  
 #if VL6180x_HAVE_DMAX_RANGING
    void _DMax_OneTimeInit(VL6180xDev_t dev);
-   static int _DMax_InitData(VL6180xDev_t dev);
+//   static int _DMax_InitData(VL6180xDev_t dev);
    static int _DMax_Compute(VL6180xDev_t dev, VL6180x_RangeData_t *pRange);
     #define _IsDMaxActive(dev) VL6180xDevDataGet(dev,DMaxEnable)
 #else
@@ -282,8 +274,8 @@
     #define _IsDMaxActive(...) 0
 #endif
  
-static int VL6180x_RangeStaticInit(VL6180xDev_t dev);
-static int  VL6180x_UpscaleStaticInit(VL6180xDev_t dev);
+//static int VL6180x_RangeStaticInit(VL6180xDev_t dev);
+//static int  VL6180x_UpscaleStaticInit(VL6180xDev_t dev);
  
 int VL6180X::VL6180x_WaitDeviceBooted(VL6180xDev_t dev){
     uint8_t FreshOutReset;
@@ -1740,7 +1732,7 @@
 /*
  * One time init
  */
-int _filter_Init( VL6180xDev_t dev) {
+static int _filter_Init( VL6180xDev_t dev) {
     int i;
     _FilterData(MeasurementIndex) = 0;