Diff: vl6180x_cfg.h

Revision:

60:972b4898a007

Parent:

59:81afbb75311d

--- a/vl6180x_cfg.h	Sun Jan 28 02:07:05 2018 +0000
+++ b/vl6180x_cfg.h	Thu Feb 01 12:05:43 2018 +0000
@@ -16,7 +16,7 @@
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
-NON-INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS ARE DISCLAIMED. 
+NON-INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS ARE DISCLAIMED.
 IN NO EVENT SHALL STMICROELECTRONICS INTERNATIONAL N.V. BE LIABLE FOR ANY
 DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -25,11 +25,17 @@
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ********************************************************************************/
+
+//------- Feburary 1st, 2018 by JH1PJL / K.Arai --------------------------------
+// Change X_NUCLEO_6180XA1 library to 6180XA1_simplest library
+//    modified -> all related files
+//------------------------------------------------------------------------------
+
 /*
  * $Date: 2015-01-08 14:35:34 +0100 (Thu, 08 Jan 2015) $
  * $Revision: 2042 $
  */
- 
+
 /**
  * @file VL6180X_cfg.h
  *
@@ -52,7 +58,7 @@
 /**
  * @def VL6180X_UPSCALE_SUPPORT
  * @brief Configure up-scale capabilities and default up-scale factor for ranging operations
- * 
+ *
  * @li 1 : Fixed scaling by 1 (no up-scaling support)
  * @li 2 : Fixed scaling by 2
  * @li 3 : Fixed scaling by 3
@@ -71,33 +77,18 @@
 /**
  * @def VL6180X_HAVE_DMAX_RANGING
  * @brief Enable DMax calculation for ranging applications.
- *  
+ *
  * When set to 1, __Dmax__ is returned by API typically when  @a VL6180X_RangePollMeasurement() high level
  * function is called (this is returned in @a VL6180X_RangeData_t structure).
- * __Dmax__ is an estimation of the maximum distance (in mm) the product can report a valid distance of a 17% target for 
+ * __Dmax__ is an estimation of the maximum distance (in mm) the product can report a valid distance of a 17% target for
  * the current ambient light conditions (__Dmax__ decreases when ambient light increases). __Dmax__ should be used only
  * when the product is not able to return a valid distance (no object or object is too far from the ranging sensor).
- * Typically, this is done by checking the __errorStatus__ field of the @a VL6180X_RangeData_t structure returned by 
+ * Typically, this is done by checking the __errorStatus__ field of the @a VL6180X_RangeData_t structure returned by
  * the @a VL6180X_RangePollMeasurement() function.
  * You may refer to ::RangeError_u to get full list of supported error codes.
- * @warning Dmax is estimated for a 17% grey target. If the real target has a reflectance lower than 17%, report Dmax could be over-estimated 
+ * @warning Dmax is estimated for a 17% grey target. If the real target has a reflectance lower than 17%, report Dmax could be over-estimated
  */
-#define VL6180X_HAVE_DMAX_RANGING   1
-
-/**
- * @def VL6180X_WRAP_AROUND_FILTER_SUPPORT
- * @brief Enable wrap around filter (WAF) feature
- *  
- * In specific conditions, when targeting a mirror or a very reflective metal, a __wrap around__ effect can occur internally to the
- * ranging product which results in returning a wrong distance (under-estimated). Goal of the WAF is to detect this wrap arround effect
- * and to filter it by returning a non-valid distance : __errorStatus__ set to 16 (see ::RangeError_u)
- * @warning Wrap-around filter can not be used when device is running in continuous mode 
- * 
- * @li 0 : Filter is not supported, no filtering code is included in API
- * @li 1 : Filter is supported and active by default
- * @li -1 : Filter is supported but is not active by default @a VL6180X_FilterSetState() can turn it on and off at any time
- */
-#define VL6180X_WRAP_AROUND_FILTER_SUPPORT   1
+#define VL6180X_HAVE_DMAX_RANGING   0
 
 /**
  * @def VL6180X_EXTENDED_RANGE
@@ -106,18 +97,11 @@
  * Device that do not formally support extended ranging should only be used with a scaling factor of 1.
  * Correct operation with scaling factor other than 1 (>200mm ) is not granted by ST.
  */
-//#define VL6180X_EXTENDED_RANGE 0
+#define VL6180X_EXTENDED_RANGE  0
 
 #define EXTENDED_RANGE_50CM     0
-//#define EXTENDED_RANGE_50CM     1
-
-#if EXTENDED_RANGE_50CM
-#define VL6180X_UPSCALE_SUPPORT -3
-#define VL6180X_EXTENDED_RANGE  1
-#else
 #define VL6180X_UPSCALE_SUPPORT -1
 #define VL6180X_EXTENDED_RANGE  0
-#endif
 
 #if (VL6180X_EXTENDED_RANGE) && (VL6180X_ALS_SUPPORT)
 #warning "Als support should be OFF for extended range"