Merge pull request #49 from jimtng/set-distancemode

Fix setThresholdConfig and distance mode definitions

Author: PPVJM

src/SparkFun_VL53L1X.cpp

@@ -164,12 +164,12 @@ uint16_t SFEVL53L1X::getTimingBudgetInMs()
 
 void SFEVL53L1X::setDistanceModeLong()
 {
-	_device->VL53L1X_SetDistanceMode(2);
+	_device->VL53L1X_SetDistanceMode(DISTANCE_LONG);
 }
 
 void SFEVL53L1X::setDistanceModeShort()
 {
-	_device->VL53L1X_SetDistanceMode(1);
+	_device->VL53L1X_SetDistanceMode(DISTANCE_SHORT);
 }
 
 uint8_t SFEVL53L1X::getDistanceMode()
@@ -368,9 +368,9 @@ void SFEVL53L1X::calibrateXTalk(uint16_t targetDistanceInMm)
 
 bool SFEVL53L1X::setThresholdConfig(DetectionConfig *config)
 {
-	VL53L1X_ERROR error = _device->VL53L1X_SetDistanceThreshold(config->thresholdLow, config->thresholdHigh,
-																(uint8_t)config->windowMode, (uint8_t)config->IntOnNoTarget);
-	return (error == VL53L1_ERROR_NONE);
+	return _device->VL53L1X_SetDistanceMode(config->distanceMode) == VL53L1_ERROR_NONE &&
+	       _device->VL53L1X_SetDistanceThreshold(config->thresholdLow, config->thresholdHigh,
+	       	(uint8_t)config->windowMode, (uint8_t)config->IntOnNoTarget) == VL53L1_ERROR_NONE;
 }
 
 bool SFEVL53L1X::getThresholdConfig(DetectionConfig *config)

src/SparkFun_VL53L1X.h

@@ -30,8 +30,8 @@
 #include "vl53l1_error_codes.h"
 #include "vl53l1x_class.h"
 
-#define DISTANCE_SHORT 	0
-#define DISTANCE_LONG 	1
+#define DISTANCE_SHORT 	1
+#define DISTANCE_LONG 	2
 #define WINDOW_BELOW	0
 #define WINDOW_ABOVE	1
 #define WINDOW_OUT		2