Greatly simplified Architecture, Identical Functions Removed: Platform Interfaces, STP6001 interface

Revision:
10:cd1758e186a4
Parent:
8:2fd7cb217068
Child:
11:d8dbe3b87f9f
--- a/VL53L0X_def.h	Tue Jun 25 11:03:34 2019 +0000
+++ b/VL53L0X_def.h	Thu Jun 27 12:51:34 2019 +0000
@@ -29,30 +29,24 @@
 /**
  * @file VL53L0X_def.h
  *
- * @brief Type definitions for VL53L0X API.
- *
- */
-
+ * @brief Type definitions for VL53L0X API.   */
 
 #ifndef _VL53L0X_DEF_H_
 #define _VL53L0X_DEF_H_
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /** @defgroup VL53L0X_globaldefine_group VL53L0X Defines
  *	@brief	  VL53L0X Defines
- *	@{
- */
-
+ *	@{    */
 /** PAL SPECIFICATION major version */
 #define VL53L0X10_SPECIFICATION_VER_MAJOR   1
 /** PAL SPECIFICATION minor version */
 #define VL53L0X10_SPECIFICATION_VER_MINOR   2
 /** PAL SPECIFICATION sub version */
-#define VL53L0X10_SPECIFICATION_VER_SUB	   7
+#define VL53L0X10_SPECIFICATION_VER_SUB	   	7
 /** PAL SPECIFICATION sub version */
 #define VL53L0X10_SPECIFICATION_VER_REVISION 1440
 
@@ -61,45 +55,99 @@
 /** VL53L0X PAL IMPLEMENTATION minor version */
 #define VL53L0X10_IMPLEMENTATION_VER_MINOR	0
 /** VL53L0X PAL IMPLEMENTATION sub version */
-#define VL53L0X10_IMPLEMENTATION_VER_SUB		9
+#define VL53L0X10_IMPLEMENTATION_VER_SUB	9
 /** VL53L0X PAL IMPLEMENTATION sub version */
 #define VL53L0X10_IMPLEMENTATION_VER_REVISION	3673
 
 /** PAL SPECIFICATION major version */
-#define VL53L0X_SPECIFICATION_VER_MAJOR	 1
+#define VL53L0X_SPECIFICATION_VER_MAJOR	 	1
 /** PAL SPECIFICATION minor version */
-#define VL53L0X_SPECIFICATION_VER_MINOR	 2
+#define VL53L0X_SPECIFICATION_VER_MINOR	 	2
 /** PAL SPECIFICATION sub version */
-#define VL53L0X_SPECIFICATION_VER_SUB	 7
+#define VL53L0X_SPECIFICATION_VER_SUB	 	7
 /** PAL SPECIFICATION sub version */
-#define VL53L0X_SPECIFICATION_VER_REVISION 1440
+#define VL53L0X_SPECIFICATION_VER_REVISION 	1440
 
 /** VL53L0X PAL IMPLEMENTATION major version */
-#define VL53L0X_IMPLEMENTATION_VER_MAJOR	  1
+#define VL53L0X_IMPLEMENTATION_VER_MAJOR	1
 /** VL53L0X PAL IMPLEMENTATION minor version */
-#define VL53L0X_IMPLEMENTATION_VER_MINOR	  1
+#define VL53L0X_IMPLEMENTATION_VER_MINOR	1
+/** VL53L0X PAL IMPLEMENTATION sub version */
+#define VL53L0X_IMPLEMENTATION_VER_SUB	  	21
 /** VL53L0X PAL IMPLEMENTATION sub version */
-#define VL53L0X_IMPLEMENTATION_VER_SUB	  21
-/** VL53L0X PAL IMPLEMENTATION sub version */
-#define VL53L0X_IMPLEMENTATION_VER_REVISION	  4823
-#define VL53L0X_DEFAULT_MAX_LOOP 2000
-#define VL53L0X_MAX_STRING_LENGTH 32
+#define VL53L0X_IMPLEMENTATION_VER_REVISION	4823
+
+/** FixPoint1616_t is used where fractional values are needed
+ * Given a floating point value f it's .16 bit point is (int)(f*(1<<16))*/
+typedef uint32_t FixPoint1616_t;
+#define VL53L0X_FIXPOINT1616TOFIXPOINT97(Value) (uint16_t)((Value>>9)&0xFFFF)
+#define VL53L0X_FIXPOINT97TOFIXPOINT1616(Value) (FixPoint1616_t)(Value<<9)
+#define VL53L0X_FIXPOINT1616TOFIXPOINT88(Value) (uint16_t)((Value>>8)&0xFFFF)
+#define VL53L0X_FIXPOINT88TOFIXPOINT1616(Value) (FixPoint1616_t)(Value<<8)
+#define VL53L0X_FIXPOINT1616TOFIXPOINT412(Value) (uint16_t)((Value>>4)&0xFFFF)
+#define VL53L0X_FIXPOINT412TOFIXPOINT1616(Value) (FixPoint1616_t)(Value<<4)
+#define VL53L0X_FIXPOINT1616TOFIXPOINT313(Value) (uint16_t)((Value>>3)&0xFFFF)
+#define VL53L0X_FIXPOINT313TOFIXPOINT1616(Value) (FixPoint1616_t)(Value<<3)
+#define VL53L0X_FIXPOINT1616TOFIXPOINT08(Value) (uint8_t)((Value>>8)&0x00FF)
+#define VL53L0X_FIXPOINT08TOFIXPOINT1616(Value) (FixPoint1616_t)(Value<<8)
+#define VL53L0X_FIXPOINT1616TOFIXPOINT53(Value) (uint8_t)((Value>>13)&0x00FF)
+#define VL53L0X_FIXPOINT53TOFIXPOINT1616(Value) (FixPoint1616_t)(Value<<13)
+#define VL53L0X_FIXPOINT1616TOFIXPOINT102(Value) (uint16_t)((Value>>14)&0x0FFF)
+#define VL53L0X_FIXPOINT102TOFIXPOINT1616(Value) (FixPoint1616_t)(Value<<12)
+#define VL53L0X_MAKEUINT16(lsb, msb) (uint16_t)((((uint16_t)msb)<<8) + (uint16_t)lsb)
 
 
-/** use where fractional values are expected
- *
- * Given a floating point value f it's .16 bit point is (int)(f*(1<<16))*/
-typedef uint32_t FixPoint1616_t;
+/**  The device model ID  */ 
+#define IDENTIFICATION_MODEL_ID      0x000
+
+#define VL53L0X_OsDelay(...) wait_ms(2) // 2 msec delay. can also use wait(float secs)/wait_us(int)
+
+/** Maximum buffer size to be used in i2c */
+#define VL53L0X_MAX_I2C_XFER_SIZE   64 
+  
+#define VL53L0X_HISTOGRAM_BUFFER_SIZE 24
+
+#define VL53L0X_COPYSTRING(str, ...) strcpy(str, ##__VA_ARGS__)
 
 /*  Speed of light in um per 1E-10 Seconds  */
-#define VL53L0X_SPEED_OF_LIGHT_IN_AIR 2997
+#define VL53L0X_SPEED_OF_LIGHT_IN_AIR 		2997 
+
+/** default device address */
+#define VL53L0X_DEFAULT_ADDRESS		0x52 /* (8-bit) */
+
+#define VL53L0X_DEFAULT_MAX_LOOP 			2000
+
+#define VL53L0X_MAX_STRING_LENGTH 			32
 
+/* equivalent to a range sigma of 655.35mm */
+#define VL53L0X_SIGMA_ESTIMATE_MAX_VALUE    65535
+
+#define REF_ARRAY_SPAD_0  0
+#define REF_ARRAY_SPAD_5  5
+#define REF_ARRAY_SPAD_10 10
+
+static uint32_t refArrayQuadrants[4] = {REF_ARRAY_SPAD_10, REF_ARRAY_SPAD_5,
+                                 REF_ARRAY_SPAD_0, REF_ARRAY_SPAD_5 };
 
-/** @defgroup VL53L0X_DevSpecDefines_group VL53L0X cut1.1 Device Specific Defines
- *  @brief VL53L0X cut1.1 Device Specific Defines
- *  @{
- */
+#define  VL53L0X_STRING_DEVICE_INFO_NAME          "VL53L0X cut1.0"
+#define  VL53L0X_STRING_DEVICE_INFO_NAME_TS0      "VL53L0X TS0"
+#define  VL53L0X_STRING_DEVICE_INFO_NAME_TS1      "VL53L0X TS1"
+#define  VL53L0X_STRING_DEVICE_INFO_NAME_TS2      "VL53L0X TS2"
+#define  VL53L0X_STRING_DEVICE_INFO_NAME_ES1      "VL53L0X ES1 or later"
+#define  VL53L0X_STRING_DEVICE_INFO_TYPE          "VL53L0X"
 
+/* sensor operating modes */
+typedef enum {
+    range_single_shot_polling = 1,
+    range_continuous_polling,
+    range_continuous_interrupt,
+    range_continuous_polling_low_threshold,
+    range_continuous_polling_high_threshold,
+    range_continuous_polling_out_of_window,
+    range_continuous_interrupt_low_threshold,
+    range_continuous_interrupt_high_threshold,
+    range_continuous_interrupt_out_of_window,
+} OperatingMode;
 
 /** @defgroup VL53L0X_DeviceError_group Device Error
  *  @brief Device Error code
@@ -107,10 +155,8 @@
  *  This enum is Device specific it should be updated in the implementation
  *  Use @a VL53L0X_GetStatusErrorString() to get the string.
  *  It is related to Status Register of the Device.
- *  @{
- */
+ *  @{   */
 typedef uint8_t VL53L0X_DeviceError;
-
 #define VL53L0X_DEVICEERROR_NONE                        ((VL53L0X_DeviceError) 0)
 /*!< 0  NoError  */
 #define VL53L0X_DEVICEERROR_VCSELCONTINUITYTESTFAILURE  ((VL53L0X_DeviceError) 1)
@@ -127,7 +173,6 @@
 #define VL53L0X_DEVICEERROR_ALGOUNDERFLOW               ((VL53L0X_DeviceError) 12)
 #define VL53L0X_DEVICEERROR_ALGOOVERFLOW                ((VL53L0X_DeviceError) 13)
 #define VL53L0X_DEVICEERROR_RANGEIGNORETHRESHOLD        ((VL53L0X_DeviceError) 14)
-
 /** @} end of VL53L0X_DeviceError_group */
 
 
@@ -209,27 +254,178 @@
  *
  *  Define used to specify the LimitCheckId.
  *  Use @a VL53L0X_GetLimitCheckInfo() to get the string.
- *  @{
- */
-
+ *  @{    */
 #define VL53L0X_CHECKENABLE_SIGMA_FINAL_RANGE           0
 #define VL53L0X_CHECKENABLE_SIGNAL_RATE_FINAL_RANGE     1
 #define VL53L0X_CHECKENABLE_SIGNAL_REF_CLIP             2
 #define VL53L0X_CHECKENABLE_RANGE_IGNORE_THRESHOLD      3
 #define VL53L0X_CHECKENABLE_SIGNAL_RATE_MSRC            4
 #define VL53L0X_CHECKENABLE_SIGNAL_RATE_PRE_RANGE       5
-
 #define VL53L0X_CHECKENABLE_NUMBER_OF_CHECKS            6
-
 /** @}  end of VL53L0X_CheckEnable_group */
 
 
+
+/** @defgroup VL53L0X_DefineRegisters_group Define Registers
+ *  @brief List of all the defined registers
+ *  @{  */
+#define VL53L0X_REG_SYSRANGE_START              	0x000
+/** mask existing bit in #VL53L0X_REG_SYSRANGE_START*/
+#define VL53L0X_REG_SYSRANGE_MODE_MASK          	0x0F
+/** bit 0 in #VL53L0X_REG_SYSRANGE_START write 1 toggle state in
+ * continuous mode and arm next shot in single shot mode */
+#define VL53L0X_REG_SYSRANGE_MODE_START_STOP    	0x01
+/** bit 1 write 0 in #VL53L0X_REG_SYSRANGE_START set single shot mode */
+#define VL53L0X_REG_SYSRANGE_MODE_SINGLESHOT    	0x00
+/** bit 1 write 1 in #VL53L0X_REG_SYSRANGE_START set back-to-back operation mode */
+#define VL53L0X_REG_SYSRANGE_MODE_BACKTOBACK    	0x02
+/** bit 2 write 1 in #VL53L0X_REG_SYSRANGE_START set timed operation  mode */
+#define VL53L0X_REG_SYSRANGE_MODE_TIMED         	0x04
+/** bit 3 write 1 in #VL53L0X_REG_SYSRANGE_START set histogram operation mode */
+#define VL53L0X_REG_SYSRANGE_MODE_HISTOGRAM       			0x08
+#define VL53L0X_REG_SYSTEM_THRESH_HIGH             			0x000C
+#define VL53L0X_REG_SYSTEM_THRESH_LOW            			0x000E
+#define VL53L0X_REG_SYSTEM_SEQUENCE_CONFIG					0x0001
+#define VL53L0X_REG_SYSTEM_RANGE_CONFIG						0x0009
+#define VL53L0X_REG_SYSTEM_INTERMEASUREMENT_PERIOD			0x0004
+#define VL53L0X_REG_SYSTEM_INTERRUPT_CONFIG_GPIO    		0x000A
+#define VL53L0X_REG_SYSTEM_INTERRUPT_GPIO_DISABLED			0x00
+#define VL53L0X_REG_SYSTEM_INTERRUPT_GPIO_LEVEL_LOW			0x01
+#define VL53L0X_REG_SYSTEM_INTERRUPT_GPIO_LEVEL_HIGH		0x02
+#define VL53L0X_REG_SYSTEM_INTERRUPT_GPIO_OUT_OF_WINDOW		0x03
+#define VL53L0X_REG_SYSTEM_INTERRUPT_GPIO_NEW_SAMPLE_READY	0x04
+#define VL53L0X_REG_GPIO_HV_MUX_ACTIVE_HIGH          		0x0084
+#define VL53L0X_REG_SYSTEM_INTERRUPT_CLEAR           		0x000B
+
+/* Result registers */
+#define VL53L0X_REG_RESULT_INTERRUPT_STATUS          		0x0013
+#define VL53L0X_REG_RESULT_RANGE_STATUS              		0x0014
+#define VL53L0X_REG_RESULT_CORE_PAGE                 		1
+#define VL53L0X_REG_RESULT_CORE_AMBIENT_WINDOW_EVENTS_RTN   0x00BC
+#define VL53L0X_REG_RESULT_CORE_RANGING_TOTAL_EVENTS_RTN    0x00C0
+#define VL53L0X_REG_RESULT_CORE_AMBIENT_WINDOW_EVENTS_REF   0x00D0
+#define VL53L0X_REG_RESULT_CORE_RANGING_TOTAL_EVENTS_REF    0x00D4
+#define VL53L0X_REG_RESULT_PEAK_SIGNAL_RATE_REF             0x00B6
+/* Algo register */
+#define VL53L0X_REG_ALGO_PART_TO_PART_RANGE_OFFSET_MM       0x0028
+#define VL53L0X_REG_I2C_SLAVE_DEVICE_ADDRESS                0x008a
+/* Check Limit registers */
+#define VL53L0X_REG_MSRC_CONFIG_CONTROL                     0x0060
+#define VL53L0X_REG_PRE_RANGE_CONFIG_MIN_SNR               	0X0027
+#define VL53L0X_REG_PRE_RANGE_CONFIG_VALID_PHASE_LOW        0x0056
+#define VL53L0X_REG_PRE_RANGE_CONFIG_VALID_PHASE_HIGH       0x0057
+#define VL53L0X_REG_PRE_RANGE_MIN_COUNT_RATE_RTN_LIMIT      0x0064
+#define VL53L0X_REG_FINAL_RANGE_CONFIG_MIN_SNR              0X0067
+#define VL53L0X_REG_FINAL_RANGE_CONFIG_VALID_PHASE_LOW      0x0047
+#define VL53L0X_REG_FINAL_RANGE_CONFIG_VALID_PHASE_HIGH     0x0048
+#define VL53L0X_REG_FINAL_RANGE_CONFIG_MIN_COUNT_RATE_RTN_LIMIT   0x0044
+#define VL53L0X_REG_PRE_RANGE_CONFIG_SIGMA_THRESH_HI        0X0061
+#define VL53L0X_REG_PRE_RANGE_CONFIG_SIGMA_THRESH_LO        0X0062
+
+/* PRE RANGE registers */
+#define VL53L0X_REG_PRE_RANGE_CONFIG_VCSEL_PERIOD           0x0050
+#define VL53L0X_REG_PRE_RANGE_CONFIG_TIMEOUT_MACROP_HI      0x0051
+#define VL53L0X_REG_PRE_RANGE_CONFIG_TIMEOUT_MACROP_LO      0x0052
+#define VL53L0X_REG_SYSTEM_HISTOGRAM_BIN                    0x0081
+#define VL53L0X_REG_HISTOGRAM_CONFIG_INITIAL_PHASE_SELECT   0x0033
+#define VL53L0X_REG_HISTOGRAM_CONFIG_READOUT_CTRL           0x0055
+#define VL53L0X_REG_FINAL_RANGE_CONFIG_VCSEL_PERIOD         0x0070
+#define VL53L0X_REG_FINAL_RANGE_CONFIG_TIMEOUT_MACROP_HI    0x0071
+#define VL53L0X_REG_FINAL_RANGE_CONFIG_TIMEOUT_MACROP_LO    0x0072
+#define VL53L0X_REG_CROSSTALK_COMPENSATION_PEAK_RATE_MCPS   0x0020
+#define VL53L0X_REG_MSRC_CONFIG_TIMEOUT_MACROP              0x0046
+#define VL53L0X_REG_SOFT_RESET_GO2_SOFT_RESET_N	            0x00bf
+#define VL53L0X_REG_IDENTIFICATION_MODEL_ID                 0x00c0
+#define VL53L0X_REG_IDENTIFICATION_REVISION_ID              0x00c2
+#define VL53L0X_REG_OSC_CALIBRATE_VAL                       0x00f8
+#define VL53L0X_REG_GLOBAL_CONFIG_VCSEL_WIDTH          		0x0032
+#define VL53L0X_REG_GLOBAL_CONFIG_SPAD_ENABLES_REF_0   		0x00B0
+#define VL53L0X_REG_GLOBAL_CONFIG_SPAD_ENABLES_REF_1   		0x00B1
+#define VL53L0X_REG_GLOBAL_CONFIG_SPAD_ENABLES_REF_2   		0x00B2
+#define VL53L0X_REG_GLOBAL_CONFIG_SPAD_ENABLES_REF_3  		0x00B3
+#define VL53L0X_REG_GLOBAL_CONFIG_SPAD_ENABLES_REF_4   		0x00B4
+#define VL53L0X_REG_GLOBAL_CONFIG_SPAD_ENABLES_REF_5   		0x00B5
+#define VL53L0X_REG_GLOBAL_CONFIG_REF_EN_START_SELECT   	0x00B6
+#define VL53L0X_REG_DYNAMIC_SPAD_NUM_REQUESTED_REF_SPAD 	0x004E /* 0x14E */
+#define VL53L0X_REG_DYNAMIC_SPAD_REF_EN_START_OFFSET    	0x004F /* 0x14F */
+#define VL53L0X_REG_POWER_MANAGEMENT_GO1_POWER_FORCE    	0x0080
+#define VL53L0X_REG_VHV_CONFIG_PAD_SCL_SDA__EXTSUP_HV   	0x0089
+#define VL53L0X_REG_ALGO_PHASECAL_LIM                   	0x0030 /* 0x130 */
+#define VL53L0X_REG_ALGO_PHASECAL_CONFIG_TIMEOUT        	0x0030
+/** @} VL53L0X_DefineRegisters_group */
+
+
+static uint8_t DefaultTuningSettings[] = {
+
+    /* update 02/11/2015_v36 */
+    0x01, 0xFF, 0x01,    0x01, 0x00, 0x00,    0x01, 0xFF, 0x00,    0x01, 0x09, 0x00,
+    0x01, 0x10, 0x00,    0x01, 0x11, 0x00,    0x01, 0x24, 0x01,    0x01, 0x25, 0xff,
+    0x01, 0x75, 0x00,    0x01, 0xFF, 0x01,    0x01, 0x4e, 0x2c,    0x01, 0x48, 0x00,
+    0x01, 0x30, 0x20,    0x01, 0xFF, 0x00,    0x01, 0x30, 0x09,    /* mja changed from 0x64. */
+    0x01, 0x54, 0x00,    0x01, 0x31, 0x04,    0x01, 0x32, 0x03,    0x01, 0x40, 0x83,
+    0x01, 0x46, 0x25,    0x01, 0x60, 0x00,    0x01, 0x27, 0x00,    0x01, 0x50, 0x06,
+    0x01, 0x51, 0x00,    0x01, 0x52, 0x96,    0x01, 0x56, 0x08,    0x01, 0x57, 0x30,
+    0x01, 0x61, 0x00,    0x01, 0x62, 0x00,    0x01, 0x64, 0x00,    0x01, 0x65, 0x00,
+    0x01, 0x66, 0xa0,    0x01, 0xFF, 0x01,    0x01, 0x22, 0x32,    0x01, 0x47, 0x14,
+    0x01, 0x49, 0xff,    0x01, 0x4a, 0x00,    0x01, 0xFF, 0x00,    0x01, 0x7a, 0x0a,
+    0x01, 0x7b, 0x00,    0x01, 0x78, 0x21,    0x01, 0xFF, 0x01,    0x01, 0x23, 0x34,
+    0x01, 0x42, 0x00,    0x01, 0x44, 0xff,    0x01, 0x45, 0x26,    0x01, 0x46, 0x05,
+    0x01, 0x40, 0x40,    0x01, 0x0E, 0x06,    0x01, 0x20, 0x1a,    0x01, 0x43, 0x40,
+    0x01, 0xFF, 0x00,    0x01, 0x34, 0x03,    0x01, 0x35, 0x44,    0x01, 0xFF, 0x01,
+    0x01, 0x31, 0x04,    0x01, 0x4b, 0x09,    0x01, 0x4c, 0x05,    0x01, 0x4d, 0x04,
+    0x01, 0xFF, 0x00,    0x01, 0x44, 0x00,    0x01, 0x45, 0x20,    0x01, 0x47, 0x08,
+    0x01, 0x48, 0x28,    0x01, 0x67, 0x00,    0x01, 0x70, 0x04,    0x01, 0x71, 0x01,
+    0x01, 0x72, 0xfe,    0x01, 0x76, 0x00,    0x01, 0x77, 0x00,    0x01, 0xFF, 0x01,
+    0x01, 0x0d, 0x01,    0x01, 0xFF, 0x00,    0x01, 0x80, 0x01,    0x01, 0x01, 0xF8,
+    0x01, 0xFF, 0x01,    0x01, 0x8e, 0x01,    0x01, 0x00, 0x01,    0x01, 0xFF, 0x00,
+    0x01, 0x80, 0x00,    0x00, 0x00, 0x00
+};
+
+static uint8_t InterruptThresholdSettings[] = {
+    /* Start of Interrupt Threshold Settings */
+    0x1, 0xff, 0x00,    0x1, 0x80, 0x01,    0x1, 0xff, 0x01,    0x1, 0x00, 0x00,
+    0x1, 0xff, 0x01,    0x1, 0x4f, 0x02,    0x1, 0xFF, 0x0E,    0x1, 0x00, 0x03,
+    0x1, 0x01, 0x84,    0x1, 0x02, 0x0A,    0x1, 0x03, 0x03,    0x1, 0x04, 0x08,
+    0x1, 0x05, 0xC8,    0x1, 0x06, 0x03,    0x1, 0x07, 0x8D,    0x1, 0x08, 0x08,
+    0x1, 0x09, 0xC6,    0x1, 0x0A, 0x01,    0x1, 0x0B, 0x02,    0x1, 0x0C, 0x00,
+    0x1, 0x0D, 0xD5,    0x1, 0x0E, 0x18,    0x1, 0x0F, 0x12,    0x1, 0x10, 0x01,
+    0x1, 0x11, 0x82,    0x1, 0x12, 0x00,    0x1, 0x13, 0xD5,    0x1, 0x14, 0x18,
+    0x1, 0x15, 0x13,    0x1, 0x16, 0x03,    0x1, 0x17, 0x86,    0x1, 0x18, 0x0A,
+    0x1, 0x19, 0x09,    0x1, 0x1A, 0x08,    0x1, 0x1B, 0xC2,    0x1, 0x1C, 0x03,
+    0x1, 0x1D, 0x8F,    0x1, 0x1E, 0x0A,    0x1, 0x1F, 0x06,    0x1, 0x20, 0x01,
+    0x1, 0x21, 0x02,    0x1, 0x22, 0x00,    0x1, 0x23, 0xD5,    0x1, 0x24, 0x18,
+    0x1, 0x25, 0x22,    0x1, 0x26, 0x01,    0x1, 0x27, 0x82,    0x1, 0x28, 0x00,
+    0x1, 0x29, 0xD5,    0x1, 0x2A, 0x18,    0x1, 0x2B, 0x0B,    0x1, 0x2C, 0x28,
+    0x1, 0x2D, 0x78,    0x1, 0x2E, 0x28,    0x1, 0x2F, 0x91,    0x1, 0x30, 0x00,
+    0x1, 0x31, 0x0B,    0x1, 0x32, 0x00,    0x1, 0x33, 0x0B,    0x1, 0x34, 0x00,
+    0x1, 0x35, 0xA1,    0x1, 0x36, 0x00,    0x1, 0x37, 0xA0,    0x1, 0x38, 0x00,
+    0x1, 0x39, 0x04,    0x1, 0x3A, 0x28,    0x1, 0x3B, 0x30,    0x1, 0x3C, 0x0C,
+    0x1, 0x3D, 0x04,    0x1, 0x3E, 0x0F,    0x1, 0x3F, 0x79,    0x1, 0x40, 0x28,
+    0x1, 0x41, 0x1E,    0x1, 0x42, 0x2F,    0x1, 0x43, 0x87,    0x1, 0x44, 0x00,
+    0x1, 0x45, 0x0B,    0x1, 0x46, 0x00,    0x1, 0x47, 0x0B,    0x1, 0x48, 0x00,
+    0x1, 0x49, 0xA7,    0x1, 0x4A, 0x00,    0x1, 0x4B, 0xA6,    0x1, 0x4C, 0x00,
+    0x1, 0x4D, 0x04,    0x1, 0x4E, 0x01,    0x1, 0x4F, 0x00,    0x1, 0x50, 0x00,
+    0x1, 0x51, 0x80,    0x1, 0x52, 0x09,    0x1, 0x53, 0x08,    0x1, 0x54, 0x01,
+    0x1, 0x55, 0x00,    0x1, 0x56, 0x0F,    0x1, 0x57, 0x79,    0x1, 0x58, 0x09,
+    0x1, 0x59, 0x05,    0x1, 0x5A, 0x00,    0x1, 0x5B, 0x60,    0x1, 0x5C, 0x05,
+    0x1, 0x5D, 0xD1,    0x1, 0x5E, 0x0C,    0x1, 0x5F, 0x3C,    0x1, 0x60, 0x00,
+    0x1, 0x61, 0xD0,    0x1, 0x62, 0x0B,    0x1, 0x63, 0x03,    0x1, 0x64, 0x28,
+    0x1, 0x65, 0x10,    0x1, 0x66, 0x2A,    0x1, 0x67, 0x39,    0x1, 0x68, 0x0B,
+    0x1, 0x69, 0x02,    0x1, 0x6A, 0x28,    0x1, 0x6B, 0x10,    0x1, 0x6C, 0x2A,
+    0x1, 0x6D, 0x61,    0x1, 0x6E, 0x0C,    0x1, 0x6F, 0x00,    0x1, 0x70, 0x0F,
+    0x1, 0x71, 0x79,    0x1, 0x72, 0x00,    0x1, 0x73, 0x0B,    0x1, 0x74, 0x00,
+    0x1, 0x75, 0x0B,    0x1, 0x76, 0x00,    0x1, 0x77, 0xA1,    0x1, 0x78, 0x00,
+    0x1, 0x79, 0xA0,    0x1, 0x7A, 0x00,    0x1, 0x7B, 0x04,    0x1, 0xFF, 0x04,
+    0x1, 0x79, 0x1D,    0x1, 0x7B, 0x27,    0x1, 0x96, 0x0E,    0x1, 0x97, 0xFE,
+    0x1, 0x98, 0x03,    0x1, 0x99, 0xEF,    0x1, 0x9A, 0x02,    0x1, 0x9B, 0x44,
+    0x1, 0x73, 0x07,    0x1, 0x70, 0x01,    0x1, 0xff, 0x01,    0x1, 0x00, 0x01,
+    0x1, 0xff, 0x00,    
+    0x0, 0x00, 0x00};
+
 /** @defgroup VL53L0X_GpioFunctionality_group Gpio Functionality
  *  @brief Defines the different functionalities for the device GPIO(s)
- *  @{
- */
+ *  @{   */
 typedef uint8_t VL53L0X_GpioFunctionality;
-
 #define VL53L0X_GPIOFUNCTIONALITY_OFF                     \
 	((VL53L0X_GpioFunctionality)  0) /*!< NO Interrupt  */
 #define VL53L0X_GPIOFUNCTIONALITY_THRESHOLD_CROSSED_LOW   \
@@ -241,118 +437,10 @@
 /*!< Out Of Window (value < thresh_low OR value > thresh_high)  */
 #define VL53L0X_GPIOFUNCTIONALITY_NEW_MEASURE_READY        \
 	((VL53L0X_GpioFunctionality)  4) /*!< New Sample Ready  */
-
 /** @} end of VL53L0X_GpioFunctionality_group */
 
 
-/* Device register map */
-/** default device address */
-#define VL53L0X_DEFAULT_ADDRESS		0x52 /* (8-bit) */
-
-/** @defgroup VL53L0X_DefineRegisters_group Define Registers
- *  @brief List of all the defined registers
- *  @{
- */
-#define VL53L0X_REG_SYSRANGE_START              0x000
-/** mask existing bit in #VL53L0X_REG_SYSRANGE_START*/
-#define VL53L0X_REG_SYSRANGE_MODE_MASK          0x0F
-/** bit 0 in #VL53L0X_REG_SYSRANGE_START write 1 toggle state in
- * continuous mode and arm next shot in single shot mode */
-#define VL53L0X_REG_SYSRANGE_MODE_START_STOP    0x01
-/** bit 1 write 0 in #VL53L0X_REG_SYSRANGE_START set single shot mode */
-#define VL53L0X_REG_SYSRANGE_MODE_SINGLESHOT    0x00
-/** bit 1 write 1 in #VL53L0X_REG_SYSRANGE_START set back-to-back operation mode */
-#define VL53L0X_REG_SYSRANGE_MODE_BACKTOBACK    0x02
-/** bit 2 write 1 in #VL53L0X_REG_SYSRANGE_START set timed operation  mode */
-#define VL53L0X_REG_SYSRANGE_MODE_TIMED         0x04
-/** bit 3 write 1 in #VL53L0X_REG_SYSRANGE_START set histogram operation mode */
-#define VL53L0X_REG_SYSRANGE_MODE_HISTOGRAM     0x08
-
-
-#define VL53L0X_REG_SYSTEM_THRESH_HIGH               0x000C
-#define VL53L0X_REG_SYSTEM_THRESH_LOW                0x000E
-#define VL53L0X_REG_SYSTEM_SEQUENCE_CONFIG			0x0001
-#define VL53L0X_REG_SYSTEM_RANGE_CONFIG				0x0009
-#define VL53L0X_REG_SYSTEM_INTERMEASUREMENT_PERIOD	0x0004
-#define VL53L0X_REG_SYSTEM_INTERRUPT_CONFIG_GPIO            0x000A
-#define VL53L0X_REG_SYSTEM_INTERRUPT_GPIO_DISABLED			0x00
-#define VL53L0X_REG_SYSTEM_INTERRUPT_GPIO_LEVEL_LOW			0x01
-#define VL53L0X_REG_SYSTEM_INTERRUPT_GPIO_LEVEL_HIGH		0x02
-#define VL53L0X_REG_SYSTEM_INTERRUPT_GPIO_OUT_OF_WINDOW		0x03
-#define VL53L0X_REG_SYSTEM_INTERRUPT_GPIO_NEW_SAMPLE_READY	0x04
-#define VL53L0X_REG_GPIO_HV_MUX_ACTIVE_HIGH          0x0084
-#define VL53L0X_REG_SYSTEM_INTERRUPT_CLEAR           0x000B
-
-/* Result registers */
-#define VL53L0X_REG_RESULT_INTERRUPT_STATUS          0x0013
-#define VL53L0X_REG_RESULT_RANGE_STATUS              0x0014
-#define VL53L0X_REG_RESULT_CORE_PAGE                 1
-#define VL53L0X_REG_RESULT_CORE_AMBIENT_WINDOW_EVENTS_RTN   0x00BC
-#define VL53L0X_REG_RESULT_CORE_RANGING_TOTAL_EVENTS_RTN    0x00C0
-#define VL53L0X_REG_RESULT_CORE_AMBIENT_WINDOW_EVENTS_REF   0x00D0
-#define VL53L0X_REG_RESULT_CORE_RANGING_TOTAL_EVENTS_REF    0x00D4
-#define VL53L0X_REG_RESULT_PEAK_SIGNAL_RATE_REF             0x00B6
-
-/* Algo register */
-#define VL53L0X_REG_ALGO_PART_TO_PART_RANGE_OFFSET_MM       0x0028
-#define VL53L0X_REG_I2C_SLAVE_DEVICE_ADDRESS                0x008a
-
-/* Check Limit registers */
-#define VL53L0X_REG_MSRC_CONFIG_CONTROL                     0x0060
-#define VL53L0X_REG_PRE_RANGE_CONFIG_MIN_SNR                      0X0027
-#define VL53L0X_REG_PRE_RANGE_CONFIG_VALID_PHASE_LOW              0x0056
-#define VL53L0X_REG_PRE_RANGE_CONFIG_VALID_PHASE_HIGH             0x0057
-#define VL53L0X_REG_PRE_RANGE_MIN_COUNT_RATE_RTN_LIMIT            0x0064
-#define VL53L0X_REG_FINAL_RANGE_CONFIG_MIN_SNR                    0X0067
-#define VL53L0X_REG_FINAL_RANGE_CONFIG_VALID_PHASE_LOW            0x0047
-#define VL53L0X_REG_FINAL_RANGE_CONFIG_VALID_PHASE_HIGH           0x0048
-#define VL53L0X_REG_FINAL_RANGE_CONFIG_MIN_COUNT_RATE_RTN_LIMIT   0x0044
-#define VL53L0X_REG_PRE_RANGE_CONFIG_SIGMA_THRESH_HI              0X0061
-#define VL53L0X_REG_PRE_RANGE_CONFIG_SIGMA_THRESH_LO              0X0062
-
-/* PRE RANGE registers */
-#define VL53L0X_REG_PRE_RANGE_CONFIG_VCSEL_PERIOD                 0x0050
-#define VL53L0X_REG_PRE_RANGE_CONFIG_TIMEOUT_MACROP_HI            0x0051
-#define VL53L0X_REG_PRE_RANGE_CONFIG_TIMEOUT_MACROP_LO            0x0052
-#define VL53L0X_REG_SYSTEM_HISTOGRAM_BIN                          0x0081
-#define VL53L0X_REG_HISTOGRAM_CONFIG_INITIAL_PHASE_SELECT         0x0033
-#define VL53L0X_REG_HISTOGRAM_CONFIG_READOUT_CTRL                 0x0055
-#define VL53L0X_REG_FINAL_RANGE_CONFIG_VCSEL_PERIOD               0x0070
-#define VL53L0X_REG_FINAL_RANGE_CONFIG_TIMEOUT_MACROP_HI          0x0071
-#define VL53L0X_REG_FINAL_RANGE_CONFIG_TIMEOUT_MACROP_LO          0x0072
-#define VL53L0X_REG_CROSSTALK_COMPENSATION_PEAK_RATE_MCPS         0x0020
-#define VL53L0X_REG_MSRC_CONFIG_TIMEOUT_MACROP                    0x0046
-#define VL53L0X_REG_SOFT_RESET_GO2_SOFT_RESET_N	                  0x00bf
-#define VL53L0X_REG_IDENTIFICATION_MODEL_ID                       0x00c0
-#define VL53L0X_REG_IDENTIFICATION_REVISION_ID                    0x00c2
-#define VL53L0X_REG_OSC_CALIBRATE_VAL                             0x00f8
-#define VL53L0X_SIGMA_ESTIMATE_MAX_VALUE                          65535
-/* equivalent to a range sigma of 655.35mm */
-
-#define VL53L0X_REG_GLOBAL_CONFIG_VCSEL_WIDTH          0x032
-#define VL53L0X_REG_GLOBAL_CONFIG_SPAD_ENABLES_REF_0   0x0B0
-#define VL53L0X_REG_GLOBAL_CONFIG_SPAD_ENABLES_REF_1   0x0B1
-#define VL53L0X_REG_GLOBAL_CONFIG_SPAD_ENABLES_REF_2   0x0B2
-#define VL53L0X_REG_GLOBAL_CONFIG_SPAD_ENABLES_REF_3   0x0B3
-#define VL53L0X_REG_GLOBAL_CONFIG_SPAD_ENABLES_REF_4   0x0B4
-#define VL53L0X_REG_GLOBAL_CONFIG_SPAD_ENABLES_REF_5   0x0B5
-#define VL53L0X_REG_GLOBAL_CONFIG_REF_EN_START_SELECT   0xB6
-#define VL53L0X_REG_DYNAMIC_SPAD_NUM_REQUESTED_REF_SPAD 0x4E /* 0x14E */
-#define VL53L0X_REG_DYNAMIC_SPAD_REF_EN_START_OFFSET    0x4F /* 0x14F */
-#define VL53L0X_REG_POWER_MANAGEMENT_GO1_POWER_FORCE    0x80
-#define VL53L0X_REG_VHV_CONFIG_PAD_SCL_SDA__EXTSUP_HV   0x0089
-#define VL53L0X_REG_ALGO_PHASECAL_LIM                   0x0030 /* 0x130 */
-#define VL53L0X_REG_ALGO_PHASECAL_CONFIG_TIMEOUT        0x0030
-/** @} VL53L0X_DefineRegisters_group */
-
-/** @} VL53L0X_DevSpecDefines_group */
-
-/****************************************
- * PRIVATE define do not edit
- ****************************************/
-
-/** @brief Defines the parameters of the Get Version Functions
- */
+/** @brief Defines the parameters of the Get Version Functions  */
 typedef struct {
     uint32_t	 revision; /*!< revision number */
     uint8_t		 major;	   /*!< major number */
@@ -360,30 +448,10 @@
     uint8_t		 build;	   /*!< build number */
 } VL53L0X_Version_t;
 
-
-/** @brief Defines the parameters of the Get Device Info Functions
- */
-typedef struct {
-    char Name[VL53L0X_MAX_STRING_LENGTH];
-    /*!< Name of the Device e.g. Left_Distance */
-    char Type[VL53L0X_MAX_STRING_LENGTH];
-    /*!< Type of the Device e.g VL53L0X */
-    char ProductId[VL53L0X_MAX_STRING_LENGTH];
-    /*!< Product Identifier String	*/
-    uint8_t ProductType;
-    /*!< Product Type, VL53L0X = 1, VL53L1 = 2 */
-    uint8_t ProductRevisionMajor;
-    /*!< Product revision major */
-    uint8_t ProductRevisionMinor;
-    /*!< Product revision minor */
-} VL53L0X_DeviceInfo_t;
-
-
 /** @defgroup VL53L0X_define_Error_group Error and Warning code returned by API
  *	The following DEFINE are used to identify the PAL ERROR
  *	@{   */
 typedef int8_t VL53L0X_Error;
-
 #define VL53L0X_ERROR_NONE		((VL53L0X_Error)	0)
 #define VL53L0X_ERROR_CALIBRATION_WARNING	((VL53L0X_Error) -1)
 /*!< Warning invalid calibration data may be in used
@@ -429,10 +497,8 @@
 
 /** @defgroup VL53L0X_define_DeviceModes_group Defines Device modes
  *	Defines all possible modes for the device
- *	@{
- */
+ *	@{    */
 typedef uint8_t VL53L0X_DeviceModes;
-
 #define VL53L0X_DEVICEMODE_SINGLE_RANGING	((VL53L0X_DeviceModes)  0)
 #define VL53L0X_DEVICEMODE_CONTINUOUS_RANGING	((VL53L0X_DeviceModes)  1)
 #define VL53L0X_DEVICEMODE_SINGLE_HISTOGRAM	((VL53L0X_DeviceModes)  2)
@@ -444,13 +510,10 @@
 /** @} VL53L0X_define_DeviceModes_group */
 
 
-
 /** @defgroup VL53L0X_define_HistogramModes_group Defines Histogram modes
  *	Defines all possible Histogram modes for the device
- *	@{
- */
+ *	@{   */
 typedef uint8_t VL53L0X_HistogramModes;
-
 #define VL53L0X_HISTOGRAMMODE_DISABLED		((VL53L0X_HistogramModes) 0)
 /*!< Histogram Disabled */
 #define VL53L0X_HISTOGRAMMODE_REFERENCE_ONLY	((VL53L0X_HistogramModes) 1)
@@ -465,9 +528,7 @@
 
 /** @defgroup VL53L0X_define_PowerModes_group List of available Power Modes
  *	List of available Power Modes
- *	@{
- */
-
+ *	@{   */
 typedef uint8_t VL53L0X_PowerModes;
 #define VL53L0X_POWERMODE_STANDBY_LEVEL1 ((VL53L0X_PowerModes) 0)
 /*!< Standby level 1 */
@@ -477,12 +538,46 @@
 /*!< Idle level 1 */
 #define VL53L0X_POWERMODE_IDLE_LEVEL2	((VL53L0X_PowerModes) 3)
 /*!< Idle level 2 */
-
 /** @} VL53L0X_define_PowerModes_group */
 
+/** @defgroup VL53L0X_define_State_group Defines the current status of the device
+ *	Defines the current status of the device
+ *	@{ */
+typedef uint8_t VL53L0X_State;
+#define VL53L0X_STATE_POWERDOWN		 ((VL53L0X_State)  0)
+/*!< Device is in HW reset	*/
+#define VL53L0X_STATE_WAIT_STATICINIT ((VL53L0X_State)  1)
+/*!< Device is initialized and wait for static initialization  */
+#define VL53L0X_STATE_STANDBY		 ((VL53L0X_State)  2)
+/*!< Device is in Low power Standby mode   */
+#define VL53L0X_STATE_IDLE			 ((VL53L0X_State)  3)
+/*!< Device has been initialized and ready to do measurements  */
+#define VL53L0X_STATE_RUNNING		 ((VL53L0X_State)  4)
+/*!< Device is performing measurement */
+#define VL53L0X_STATE_UNKNOWN		 ((VL53L0X_State)  98)
+/*!< Device is in unknown state and need to be rebooted	 */
+#define VL53L0X_STATE_ERROR			 ((VL53L0X_State)  99)
+/*!< Device is in error state and need to be rebooted  */
+/** @} VL53L0X_define_State_group */
 
-/** @brief Defines all parameters for the device
- */
+
+/** @brief Defines the parameters of the Get Device Info Functions  */
+typedef struct {
+    char Name[VL53L0X_MAX_STRING_LENGTH];
+    /*!< Name of the Device e.g. Left_Distance */
+    char Type[VL53L0X_MAX_STRING_LENGTH];
+    /*!< Type of the Device e.g VL53L0X */
+    char ProductId[VL53L0X_MAX_STRING_LENGTH];
+    /*!< Product Identifier String	*/
+    uint8_t ProductType;
+    /*!< Product Type, VL53L0X = 1, VL53L1 = 2 */
+    uint8_t ProductRevisionMajor;
+    /*!< Product revision major */
+    uint8_t ProductRevisionMinor;
+    /*!< Product revision minor */
+} VL53L0X_DeviceInfo_t;
+
+/** @brief Defines all parameters for the device   */
 typedef struct {
     VL53L0X_DeviceModes DeviceMode;
     /*!< Defines type of measurement to be done for the next measure */
@@ -503,7 +598,6 @@
      *	Expressed in 16.16 fixed point format.	*/
     int32_t RangeOffsetMicroMeters;
     /*!< Range offset adjustment (mm).	*/
-
     uint8_t LimitChecksEnable[VL53L0X_CHECKENABLE_NUMBER_OF_CHECKS];
     /*!< This Array store all the Limit Check enable for this device. */
     uint8_t LimitChecksStatus[VL53L0X_CHECKENABLE_NUMBER_OF_CHECKS];
@@ -517,35 +611,11 @@
 } VL53L0X_DeviceParameters_t;
 
 
-/** @defgroup VL53L0X_define_State_group Defines the current status of the device
- *	Defines the current status of the device
- *	@{
- */
-
-typedef uint8_t VL53L0X_State;
-
-#define VL53L0X_STATE_POWERDOWN		 ((VL53L0X_State)  0)
-/*!< Device is in HW reset	*/
-#define VL53L0X_STATE_WAIT_STATICINIT ((VL53L0X_State)  1)
-/*!< Device is initialized and wait for static initialization  */
-#define VL53L0X_STATE_STANDBY		 ((VL53L0X_State)  2)
-/*!< Device is in Low power Standby mode   */
-#define VL53L0X_STATE_IDLE			 ((VL53L0X_State)  3)
-/*!< Device has been initialized and ready to do measurements  */
-#define VL53L0X_STATE_RUNNING		 ((VL53L0X_State)  4)
-/*!< Device is performing measurement */
-#define VL53L0X_STATE_UNKNOWN		 ((VL53L0X_State)  98)
-/*!< Device is in unknown state and need to be rebooted	 */
-#define VL53L0X_STATE_ERROR			 ((VL53L0X_State)  99)
-/*!< Device is in error state and need to be rebooted  */
-
-/** @} VL53L0X_define_State_group */
 
 
 /**
  * @struct VL53L0X_RangeData_t
- * @brief Range measurement data.
- */
+ * @brief Range measurement data.  */
 typedef struct {
     uint16_t RangeMilliMeter;	/*!< range distance in millimeter. */
     uint16_t RangeDMaxMilliMeter; /*!< Tells what is the maximum detection distance of the device
@@ -564,8 +634,6 @@
 } VL53L0X_RangingMeasurementData_t;
 
 
-#define VL53L0X_HISTOGRAM_BUFFER_SIZE 24
-
 /**
  * @struct VL53L0X_HistogramData_t
  * @brief Histogram measurement data.
@@ -614,7 +682,6 @@
 	// Merged in here all parts of DeviceParams_t
     int32_t	 Part2PartOffsetNVMMicroMeter; /*!< backed up NVM value */
     int32_t	 Part2PartOffsetAdjustmentNVMMicroMeter; /*!< backed up NVM value representing additional offset adjustment */
-    VL53L0X_DeviceParameters_t CurrentParameters; /*!< Current Device Parameter */
     VL53L0X_RangingMeasurementData_t LastRangeMeasure; /*!< Ranging Data */
     VL53L0X_HistogramMeasurementData_t LastHistogramMeasure; /*!< Histogram Data */
     VL53L0X_SpadData_t SpadData; 		/*!< Spad Data; Enables and Good-Map */
@@ -682,7 +749,6 @@
  *	@{
  */
 typedef uint8_t VL53L0X_InterruptPolarity;
-
 #define VL53L0X_INTERRUPTPOLARITY_LOW	   ((VL53L0X_InterruptPolarity)	0)
 /*!< Set active low polarity best setup for falling edge. */
 #define VL53L0X_INTERRUPTPOLARITY_HIGH	   ((VL53L0X_InterruptPolarity)	1)
@@ -693,17 +759,14 @@
 
 /** @defgroup VL53L0X_define_VcselPeriod_group Vcsel Period Defines
  *	Defines the range measurement for which to access the vcsel period.
- *	@{
- */
+ *	@{  */
 typedef uint8_t VL53L0X_VcselPeriod;
-
 #define VL53L0X_VCSEL_PERIOD_PRE_RANGE	((VL53L0X_VcselPeriod) 0)
 /*!<Identifies the pre-range vcsel period. */
 #define VL53L0X_VCSEL_PERIOD_FINAL_RANGE ((VL53L0X_VcselPeriod) 1)
 /*!<Identifies the final range vcsel period. */
 
 /** @} VL53L0X_define_VcselPeriod_group */
-
 /** @defgroup VL53L0X_define_SchedulerSequence_group Defines the steps
  * carried out by the scheduler during a range measurement.
  *	@{
@@ -711,11 +774,11 @@
  *	i.e. enabled/disabled.
  */
 typedef struct {
-    uint8_t		 TccOn;	   /*!<Reports if Target Centre Check On  */
-    uint8_t		 MsrcOn;	   /*!<Reports if MSRC On  */
-    uint8_t		 DssOn;		   /*!<Reports if DSS On  */
-    uint8_t		 PreRangeOn;   /*!<Reports if Pre-Range On	*/
-    uint8_t		 FinalRangeOn; /*!<Reports if Final-Range On  */
+    uint8_t		 TccOn;	   		/*!<Reports if Target Centre Check On  */
+    uint8_t		 MsrcOn;	   	/*!<Reports if MSRC On  */
+    uint8_t		 DssOn;		   	/*!<Reports if DSS On  */
+    uint8_t		 PreRangeOn;   	/*!<Reports if Pre-Range On	*/
+    uint8_t		 FinalRangeOn; 	/*!<Reports if Final-Range On  */
 } VL53L0X_SchedulerSequenceSteps_t;
 
 /** @} VL53L0X_define_SchedulerSequence_group */
@@ -723,8 +786,7 @@
 /** @defgroup VL53L0X_define_SequenceStepId_group Defines the Polarity
  *	of the Interrupt
  *	Defines the the sequence steps performed during ranging..
- *	@{
- */
+ *	@{  */
 typedef uint8_t VL53L0X_SequenceStepId;
 
 #define	 VL53L0X_SEQUENCESTEP_TCC		 ((VL53L0X_VcselPeriod) 0)
@@ -750,73 +812,10 @@
 	Range_Config_HIGH_SPEED
 } VL53L0X_RangingConfig;
 
-
-#define VL53L0X_FIXPOINT1616TOFIXPOINT97(Value) (uint16_t)((Value>>9)&0xFFFF)
-#define VL53L0X_FIXPOINT97TOFIXPOINT1616(Value) (FixPoint1616_t)(Value<<9)
-#define VL53L0X_FIXPOINT1616TOFIXPOINT88(Value) (uint16_t)((Value>>8)&0xFFFF)
-#define VL53L0X_FIXPOINT88TOFIXPOINT1616(Value) (FixPoint1616_t)(Value<<8)
-#define VL53L0X_FIXPOINT1616TOFIXPOINT412(Value) (uint16_t)((Value>>4)&0xFFFF)
-#define VL53L0X_FIXPOINT412TOFIXPOINT1616(Value) (FixPoint1616_t)(Value<<4)
-#define VL53L0X_FIXPOINT1616TOFIXPOINT313(Value) (uint16_t)((Value>>3)&0xFFFF)
-#define VL53L0X_FIXPOINT313TOFIXPOINT1616(Value) (FixPoint1616_t)(Value<<3)
-#define VL53L0X_FIXPOINT1616TOFIXPOINT08(Value) (uint8_t)((Value>>8)&0x00FF)
-#define VL53L0X_FIXPOINT08TOFIXPOINT1616(Value) (FixPoint1616_t)(Value<<8)
-#define VL53L0X_FIXPOINT1616TOFIXPOINT53(Value) (uint8_t)((Value>>13)&0x00FF)
-#define VL53L0X_FIXPOINT53TOFIXPOINT1616(Value) (FixPoint1616_t)(Value<<13)
-#define VL53L0X_FIXPOINT1616TOFIXPOINT102(Value) (uint16_t)((Value>>14)&0x0FFF)
-#define VL53L0X_FIXPOINT102TOFIXPOINT1616(Value) (FixPoint1616_t)(Value<<12)
-#define VL53L0X_MAKEUINT16(lsb, msb) (uint16_t)((((uint16_t)msb)<<8) + (uint16_t)lsb)
-
 /** @} VL53L0X_define_GeneralMacro_group */
 
 /** @} VL53L0X_globaldefine_group */
 
-/****************** define for i2c configuration *******************************/
-
-/** Maximum buffer size to be used in i2c */
-#define VL53L0X_MAX_I2C_XFER_SIZE   64 /* Maximum buffer size to be used in i2c */
-
-#define VL53L0X_COPYSTRING(str, ...) strcpy(str, ##__VA_ARGS__)
-
-#define REF_ARRAY_SPAD_0  0
-#define REF_ARRAY_SPAD_5  5
-#define REF_ARRAY_SPAD_10 10
-
-static uint32_t refArrayQuadrants[4] = {REF_ARRAY_SPAD_10, REF_ARRAY_SPAD_5,
-                                 REF_ARRAY_SPAD_0, REF_ARRAY_SPAD_5 };
-/**
- * The device model ID
- */
-#define IDENTIFICATION_MODEL_ID                 0x000
-
-#define STATUS_OK              0x00
-#define STATUS_FAIL            0x01
-
-#define VL53L0X_OsDelay(...) wait_ms(2) // 2 msec delay. can also use wait(float secs)/wait_us(int)
-
-#define  VL53L0X_STRING_DEVICE_INFO_NAME          "VL53L0X cut1.0"
-#define  VL53L0X_STRING_DEVICE_INFO_NAME_TS0      "VL53L0X TS0"
-#define  VL53L0X_STRING_DEVICE_INFO_NAME_TS1      "VL53L0X TS1"
-#define  VL53L0X_STRING_DEVICE_INFO_NAME_TS2      "VL53L0X TS2"
-#define  VL53L0X_STRING_DEVICE_INFO_NAME_ES1      "VL53L0X ES1 or later"
-#define  VL53L0X_STRING_DEVICE_INFO_TYPE          "VL53L0X"
-
-
-
-/* sensor operating modes */
-typedef enum {
-    range_single_shot_polling = 1,
-    range_continuous_polling,
-    range_continuous_interrupt,
-    range_continuous_polling_low_threshold,
-    range_continuous_polling_high_threshold,
-    range_continuous_polling_out_of_window,
-    range_continuous_interrupt_low_threshold,
-    range_continuous_interrupt_high_threshold,
-    range_continuous_interrupt_out_of_window,
-} OperatingMode;
-
-
 
 #ifdef __cplusplus
 }