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

Revision:
11:d8dbe3b87f9f
Parent:
10:cd1758e186a4
Child:
12:81f37e50f8f8
--- a/VL53L0X_def.h	Thu Jun 27 12:51:34 2019 +0000
+++ b/VL53L0X_def.h	Tue Jul 02 12:38:07 2019 +0000
@@ -80,20 +80,20 @@
 /** 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_FP1616TOFP97(Value) (uint16_t)((Value>>9)&0xFFFF)
+#define VL53L0X_FP97TOFP1616(Value) (FixPoint1616_t)(Value<<9)
+#define VL53L0X_FP1616TOFP88(Value) (uint16_t)((Value>>8)&0xFFFF)
+#define VL53L0X_FP88TOFP1616(Value) (FixPoint1616_t)(Value<<8)
+#define VL53L0X_FP1616TOFP412(Value) (uint16_t)((Value>>4)&0xFFFF)
+#define VL53L0X_FP412TOFP1616(Value) (FixPoint1616_t)(Value<<4)
+#define VL53L0X_FP1616TOFP313(Value) (uint16_t)((Value>>3)&0xFFFF)
+#define VL53L0X_FP313TOFP1616(Value) (FixPoint1616_t)(Value<<3)
+#define VL53L0X_FP1616TOFP08(Value) (uint8_t)((Value>>8)&0x00FF)
+#define VL53L0X_FP08TOFP1616(Value) (FixPoint1616_t)(Value<<8)
+#define VL53L0X_FP1616TOFP53(Value) (uint8_t)((Value>>13)&0x00FF)
+#define VL53L0X_FP53TOFP1616(Value) (FixPoint1616_t)(Value<<13)
+#define VL53L0X_FP1616TOFP102(Value) (uint16_t)((Value>>14)&0x0FFF)
+#define VL53L0X_FP102TOFP1616(Value) (FixPoint1616_t)(Value<<12)
 #define VL53L0X_MAKEUINT16(lsb, msb) (uint16_t)((((uint16_t)msb)<<8) + (uint16_t)lsb)
 
 
@@ -105,8 +105,6 @@
 /** 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  */
@@ -157,8 +155,7 @@
  *  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_NONE                        ((VL53L0X_DeviceError) 0) /*!< 0  NoError  */
 #define VL53L0X_DEVICEERROR_VCSELCONTINUITYTESTFAILURE  ((VL53L0X_DeviceError) 1)
 #define VL53L0X_DEVICEERROR_VCSELWATCHDOGTESTFAILURE    ((VL53L0X_DeviceError) 2)
 #define VL53L0X_DEVICEERROR_NOVHVVALUEFOUND             ((VL53L0X_DeviceError) 3)
@@ -194,7 +191,6 @@
 #define  VL53L0X_STRING_ERROR_INVALID_COMMAND	"Invalid Command Error"
 #define  VL53L0X_STRING_ERROR_DIVISION_BY_ZERO	"Division by zero Error"
 #define  VL53L0X_STRING_ERROR_REF_SPAD_INIT		"Reference Spad Init Error"
-#define  VL53L0X_STRING_ERROR_NOT_IMPLEMENTED	"Not implemented error"
 #define  VL53L0X_STRING_UNKNOW_ERROR_CODE 		"Unknown Error Code"
 
 /* Range Status */
@@ -332,7 +328,7 @@
 #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_CROSSTALK_COMPENSATION_PEAK_RATE_MHz   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
@@ -452,46 +448,42 @@
  *	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)
+#define VL53L0X_ERROR_NONE				((VL53L0X_Error)	0)
+#define VL53L0X_ERROR_CALIBRATION_WARNING ((VL53L0X_Error) -1)
 /*!< Warning invalid calibration data may be in used
 	\a	VL53L0X_InitData()
 	\a VL53L0X_GetOffsetCalibrationData
 	\a VL53L0X_SetOffsetCalibrationData */
-#define VL53L0X_ERROR_MIN_CLIPPED			((VL53L0X_Error) -2)
+#define VL53L0X_ERROR_MIN_CLIPPED		((VL53L0X_Error) -2)
 /*!< Warning parameter passed was clipped to min before to be applied */
-#define VL53L0X_ERROR_UNDEFINED				((VL53L0X_Error) -3)
+#define VL53L0X_ERROR_UNDEFINED			((VL53L0X_Error) -3)
 /*!< Unqualified error */
-#define VL53L0X_ERROR_INVALID_PARAMS			((VL53L0X_Error) -4)
+#define VL53L0X_ERROR_INVALID_PARAMS	((VL53L0X_Error) -4)
 /*!< Parameter passed is invalid or out of range */
-#define VL53L0X_ERROR_NOT_SUPPORTED			((VL53L0X_Error) -5)
+#define VL53L0X_ERROR_NOT_SUPPORTED		((VL53L0X_Error) -5)
 /*!< Function is not supported in current mode or configuration */
-#define VL53L0X_ERROR_RANGE_ERROR			((VL53L0X_Error) -6)
+#define VL53L0X_ERROR_RANGE_ERROR		((VL53L0X_Error) -6)
 /*!< Device report a ranging error interrupt status */
-#define VL53L0X_ERROR_TIME_OUT				((VL53L0X_Error) -7)
+#define VL53L0X_ERROR_TIME_OUT			((VL53L0X_Error) -7)
 /*!< Aborted due to time out */
-#define VL53L0X_ERROR_MODE_NOT_SUPPORTED			((VL53L0X_Error) -8)
+#define VL53L0X_ERROR_MODE_NOT_SUPPORTED ((VL53L0X_Error) -8)
 /*!< Asked mode is not supported by the device */
-#define VL53L0X_ERROR_BUFFER_TOO_SMALL			((VL53L0X_Error) -9)
+#define VL53L0X_ERROR_BUFFER_TOO_SMALL	((VL53L0X_Error) -9)
 /*!< ... */
-#define VL53L0X_ERROR_GPIO_NOT_EXISTING			((VL53L0X_Error) -10)
+#define VL53L0X_ERROR_GPIO_NOT_EXISTING	((VL53L0X_Error) -10)
 /*!< User tried to setup a non-existing GPIO pin */
 #define VL53L0X_ERROR_GPIO_FUNCTIONALITY_NOT_SUPPORTED  ((VL53L0X_Error) -11)
 /*!< unsupported GPIO functionality */
-#define VL53L0X_ERROR_INTERRUPT_NOT_CLEARED		((VL53L0X_Error) -12)
+#define VL53L0X_ERROR_INTERRUPT_NOT_CLEARED	((VL53L0X_Error) -12)
 /*!< Error during interrupt clear */
-#define VL53L0X_ERROR_CONTROL_INTERFACE			((VL53L0X_Error) -20)
+#define VL53L0X_ERROR_CONTROL_INTERFACE	((VL53L0X_Error) -20)
 /*!< error reported from IO functions */
-#define VL53L0X_ERROR_INVALID_COMMAND			((VL53L0X_Error) -30)
-/*!< The command is not allowed in the current device state
- *	(power down) */
-#define VL53L0X_ERROR_DIVISION_BY_ZERO			((VL53L0X_Error) -40)
+#define VL53L0X_ERROR_INVALID_COMMAND	((VL53L0X_Error) -30)
+/*!< The command is not allowed in the current device state (power down) */
+#define VL53L0X_ERROR_DIVISION_BY_ZERO	((VL53L0X_Error) -40)
 /*!< In the function a division by zero occurs */
 #define VL53L0X_ERROR_REF_SPAD_INIT			((VL53L0X_Error) -50)
 /*!< Error during reference SPAD initialization */
-#define VL53L0X_ERROR_NOT_IMPLEMENTED			((VL53L0X_Error) -99)
-/*!< Tells requested functionality has not been implemented yet or
- * not compatible with the device */
 /** @} VL53L0X_define_Error_group */
 
 
@@ -501,7 +493,6 @@
 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)
 #define VL53L0X_DEVICEMODE_CONTINUOUS_TIMED_RANGING ((VL53L0X_DeviceModes) 3)
 #define VL53L0X_DEVICEMODE_SINGLE_ALS		((VL53L0X_DeviceModes) 10)
 #define VL53L0X_DEVICEMODE_GPIO_DRIVE		((VL53L0X_DeviceModes) 20)
@@ -510,22 +501,6 @@
 /** @} 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)
-/*!< Histogram Reference array only */
-#define VL53L0X_HISTOGRAMMODE_RETURN_ONLY	((VL53L0X_HistogramModes) 2)
-/*!< Histogram Return array only */
-#define VL53L0X_HISTOGRAMMODE_BOTH		((VL53L0X_HistogramModes) 3)
-/*!< Histogram both Reference and Return Arrays */
-/* ... Modes to be added depending on device */
-/** @} VL53L0X_define_HistogramModes_group */
-
-
 /** @defgroup VL53L0X_define_PowerModes_group List of available Power Modes
  *	List of available Power Modes
  *	@{   */
@@ -580,50 +555,42 @@
 /** @brief Defines all parameters for the device   */
 typedef struct {
     VL53L0X_DeviceModes DeviceMode;
-    /*!< Defines type of measurement to be done for the next measure */
-    VL53L0X_HistogramModes HistogramMode;
-    /*!< Defines type of histogram measurement to be done for the next
-     *	measure */
-    uint32_t MeasurementTimingBudgetMicroSeconds;
+    /*!< Defines type of measurement to be done for the next measurement */
+    uint32_t MeasurementTimingBudget_us;
     /*!< Defines the allowed total time for a single measurement */
-    uint32_t InterMeasurementPeriodMilliSeconds;
+    uint32_t InterMeasurementPeriod_ms;
     /*!< Defines time between two consecutive measurements (between two
      *	measurement starts). If set to 0 means back-to-back mode */
     uint8_t XTalkCompensationEnable;
     /*!< Tells if Crosstalk compensation shall be enable or not	 */
-    uint16_t XTalkCompensationRangeMilliMeter;
-    /*!< CrossTalk compensation range in millimeter	 */
-    FixPoint1616_t XTalkCompensationRateMegaCps;
+    uint16_t XTalkCompensationRange_mm;
+    /*!< CrossTalk compensation range in _mm	 */
+    FixPoint1616_t XTalkCompensationRate_MHz;
     /*!< CrossTalk compensation rate in Mega counts per seconds.
      *	Expressed in 16.16 fixed point format.	*/
-    int32_t RangeOffsetMicroMeters;
-    /*!< Range offset adjustment (mm).	*/
+    int32_t RangeOffset_um;
+    /*!< Range offset adjustment (mm) last programmed.	*/
     uint8_t LimitChecksEnable[VL53L0X_CHECKENABLE_NUMBER_OF_CHECKS];
-    /*!< This Array store all the Limit Check enable for this device. */
+    /*!< This Array store all the  6 Limit Check enables for this device. */
     uint8_t LimitChecksStatus[VL53L0X_CHECKENABLE_NUMBER_OF_CHECKS];
-    /*!< This Array store all the Status of the check linked to last
-    * measurement. */
+    /*!< This Array store all the  6 Status of the check linked to last measurement. */
     FixPoint1616_t LimitChecksValue[VL53L0X_CHECKENABLE_NUMBER_OF_CHECKS];
     /*!< This Array store all the Limit Check value for this device */
-
     uint8_t WrapAroundCheckEnable;
     /*!< Tells if Wrap Around Check shall be enable or not */
 } VL53L0X_DeviceParameters_t;
 
-
-
-
 /**
  * @struct VL53L0X_RangeData_t
  * @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
+    uint16_t Range_mm;	/*!< range distance in _mm. */
+    uint16_t RangeDMax_mm; /*!< Tells what is the maximum detection distance of the device
      * in current setup and environment conditions (Filled when	applicable) */
-    FixPoint1616_t SignalRateRtnMegaCps; /*!< Return signal rate (MCPS)\n these is a 16.16 fix point
+    FixPoint1616_t SignalRateRtn_MHz; /*!< Return signal rate (MHz)\n these is a 16.16 fix point
      *	value, which is effectively a measure of target  reflectance.*/
-    FixPoint1616_t AmbientRateRtnMegaCps;
-    /*!< Return ambient rate (MCPS)\n these is a 16.16 fix point value, 
+    FixPoint1616_t AmbientRateRtn_MHz;
+    /*!< Return ambient rate (MHz)\n these is a 16.16 fix point value, 
       which is effectively a measure of the ambient light.*/
     uint16_t EffectiveSpadRtnCount; /*!< Return the effective SPAD count for the return signal.
      *	To obtain Real value it should be divided by 256 */
@@ -634,40 +601,15 @@
 } VL53L0X_RangingMeasurementData_t;
 
 
-/**
- * @struct VL53L0X_HistogramData_t
- * @brief Histogram measurement data.
- */
-typedef struct {
-    /* Histogram Measurement data */
-    uint32_t HistogramData[VL53L0X_HISTOGRAM_BUFFER_SIZE];/*!< Histogram data */
-    uint8_t HistogramType; 	/*!< Indicate the types of histogram data :Return only, Reference only, both Return and Reference */
-    uint8_t FirstBin; 		/*!< First Bin value */
-    uint8_t BufferSize; 	/*!< Buffer Size - Set by the user.*/
-    uint8_t NumberOfBins; 	/*!< Number of bins filled by the histogram measurement */
-    VL53L0X_DeviceError ErrorStatus; /*!< Error status of the current measurement. \n
-    see @a ::VL53L0X_DeviceError @a VL53L0X_GetStatusErrorString() */
-} VL53L0X_HistogramMeasurementData_t;
-
 #define VL53L0X_REF_SPAD_BUFFER_SIZE 6
-
-/**  @struct VL53L0X_SpadData_t
- * @brief Spad Configuration Data. */
-typedef struct {
-    uint8_t RefSpadEnables[VL53L0X_REF_SPAD_BUFFER_SIZE];
-    /*!< Reference Spad Enables */
-    uint8_t RefGoodSpadMap[VL53L0X_REF_SPAD_BUFFER_SIZE];
-    /*!< Reference Spad Good Spad Map */
-} VL53L0X_SpadData_t;
-
 typedef struct {
     // merged in here all parts of "VL53L0X_DeviceSpecificParameters_t DeviceSpecificParameters;"
-    FixPoint1616_t OscFrequencyMHz; 	/* Frequency used */
+    FixPoint1616_t OscFrequency_MHz; 	/* Frequency used */
     uint16_t LastEncodedTimeout; 		/* last encoded Time out used for timing budget*/
     VL53L0X_GpioFunctionality Pin0GpioFunctionality; /* store the functionality of the GPIO: pin0 */
-    uint32_t FinalRangeTimeoutMicroSecs;/*!< Execution time of the final range*/
+    uint32_t FinalRangeTimeout_us;/*!< Execution time of the final range*/
 	uint8_t FinalRangeVcselPulsePeriod;	/*!< Vcsel pulse period (pll clocks) for the final range measurement*/
-    uint32_t PreRangeTimeoutMicroSecs;	/*!< Execution time of the final range*/
+    uint32_t PreRangeTimeout_us;	/*!< Execution time of the final range*/
     uint8_t PreRangeVcselPulsePeriod;	/*!< Vcsel pulse period (pll clocks) for the pre-range measurement*/
     uint8_t ReadDataFromDeviceDone; /* Indicate if read from device has been done (==1) or not (==0) */
     uint8_t ModuleId; 				/* Module ID */
@@ -679,12 +621,14 @@
     uint32_t PartUIDUpper; /*!< Unique Part ID Upper */
     uint32_t PartUIDLower; /*!< Unique Part ID Lower */
     FixPoint1616_t SignalRateMeasFixed400mm; /*!< Peek Signal rate at 400 mm*/
+    
+    // Merged in here the VL53L0X_SpadData_t SpadData; 		/*!< Spad Data; Enables and Good-Map */
+    uint8_t RefSpadEnables[VL53L0X_REF_SPAD_BUFFER_SIZE]; /*!< Reference Spad Enables */
+    uint8_t RefGoodSpadMap[VL53L0X_REF_SPAD_BUFFER_SIZE]; /*!< Reference Spad Good Spad Map */
+    
 	// 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_RangingMeasurementData_t LastRangeMeasure; /*!< Ranging Data */
-    VL53L0X_HistogramMeasurementData_t LastHistogramMeasure; /*!< Histogram Data */
-    VL53L0X_SpadData_t SpadData; 		/*!< Spad Data; Enables and Good-Map */
+    int32_t	 Part2PartOffsetNVM_um; /*!< backed up NVM value */
+    int32_t	 Part2PartOffsetAdjustNVM_um; /*!< backed up NVM value representing additional offset adjustment */
     uint8_t SequenceConfig; 			/*!< Internal value for the sequence config */
     uint8_t RangeFractionalEnable; 		/*!< Enable/Disable fractional part of ranging data */
     VL53L0X_State PalState;        		/*!< Current state of the PAL for this device */
@@ -695,12 +639,12 @@
     uint8_t StopVariable;				/*!< StopVariable used during the stop sequence */
     uint16_t targetRefRate;				/*!< Target Ambient Rate for Ref spad management */
     FixPoint1616_t SigmaEstimate;		/*!< Sigma Estimate - based on ambient & VCSEL rates and  signal_total_events */
-    FixPoint1616_t LastSignalRefMcps;	/*!< Latest Signal ref in Mcps */
-    uint8_t *pTuningSettingsPointer;	/*!< Pointer for Tuning Settings table */
-    uint8_t UseInternalTuningSettings;	/*!< Indicate if we use	 Tuning Settings table */
+    FixPoint1616_t LastSignalRef_MHz;	/*!< Latest Signal ref in MHz */
+    uint8_t *pTuningSettingsPointer;	/*!< Pointer for alternative Tuning Settings table */
+    uint8_t UseInternalTuningSettings;	/*!< Indicate if we use	 Tuning Settings table, default = True */
     uint16_t LinearityCorrectiveGain;	/*!< Linearity Corrective Gain value in x1000 */
-    uint16_t DmaxCalRangeMilliMeter; 	/*!< Dmax Calibration Range millimeter */
-    FixPoint1616_t DmaxCalSignalRateRtnMegaCps;/*!< Dmax Calibration Signal Rate Return MegaCps */
+    uint16_t DmaxCalRange_mm; 	/*!< Dmax Calibration Range _mm */
+    FixPoint1616_t DmaxCalSignalRateRtn_MHz;/*!< Dmax Calibration Signal Rate Return _MHz */
     
 } VL53L0X_DevData_t;
 
@@ -744,6 +688,8 @@
 #define VL53L0X_SETDEVICESPECIFICPARAMETER(field, value) Data.field = value
 #define VL53L0X_GETDEVICESPECIFICPARAMETER(field) 		 Data.field
  */
+ 
+ 
 /** @defgroup VL53L0X_define_InterruptPolarity_group Defines the Polarity  of the Interrupt
  *	Defines the Polarity of the Interrupt
  *	@{
@@ -770,9 +716,7 @@
 /** @defgroup VL53L0X_define_SchedulerSequence_group Defines the steps
  * carried out by the scheduler during a range measurement.
  *	@{
- *	Defines the states of all the steps in the scheduler
- *	i.e. enabled/disabled.
- */
+ *	Defines the states of all the steps in the scheduler i.e. enabled/disabled. */
 typedef struct {
     uint8_t		 TccOn;	   		/*!<Reports if Target Centre Check On  */
     uint8_t		 MsrcOn;	   	/*!<Reports if MSRC On  */
@@ -780,30 +724,20 @@
     uint8_t		 PreRangeOn;   	/*!<Reports if Pre-Range On	*/
     uint8_t		 FinalRangeOn; 	/*!<Reports if Final-Range On  */
 } VL53L0X_SchedulerSequenceSteps_t;
-
 /** @} VL53L0X_define_SchedulerSequence_group */
 
-/** @defgroup VL53L0X_define_SequenceStepId_group Defines the Polarity
- *	of the Interrupt
+/** @defgroup VL53L0X_define_SequenceStepId_group 
  *	Defines the the sequence steps performed during ranging..
  *	@{  */
 typedef uint8_t VL53L0X_SequenceStepId;
+#define	 VL53L0X_SEQUENCESTEP_TCC		  ((VL53L0X_VcselPeriod) 0) /*!<Target CentreCheck identifier. */
+#define	 VL53L0X_SEQUENCESTEP_DSS		  ((VL53L0X_VcselPeriod) 1) /*!<Dynamic Spad Selection function Identifier. */
+#define	 VL53L0X_SEQUENCESTEP_MSRC		  ((VL53L0X_VcselPeriod) 2) /*!<Minimum Signal Rate Check function Identifier. */
+#define	 VL53L0X_SEQUENCESTEP_PRE_RANGE	  ((VL53L0X_VcselPeriod) 3) /*!<Pre-Range check Identifier. */
+#define	 VL53L0X_SEQUENCESTEP_FINAL_RANGE ((VL53L0X_VcselPeriod) 4) /*!<Final Range Check Identifier. */
+#define	 VL53L0X_SEQUENCESTEP_NUMBER_OF_CHECKS			 5 /*!<Number of Sequence Step Managed by the API. */
+/** @} VL53L0X_define_SequenceStepId_group */
 
-#define	 VL53L0X_SEQUENCESTEP_TCC		 ((VL53L0X_VcselPeriod) 0)
-/*!<Target CentreCheck identifier. */
-#define	 VL53L0X_SEQUENCESTEP_DSS		 ((VL53L0X_VcselPeriod) 1)
-/*!<Dynamic Spad Selection function Identifier. */
-#define	 VL53L0X_SEQUENCESTEP_MSRC		 ((VL53L0X_VcselPeriod) 2)
-/*!<Minimum Signal Rate Check function Identifier. */
-#define	 VL53L0X_SEQUENCESTEP_PRE_RANGE	 ((VL53L0X_VcselPeriod) 3)
-/*!<Pre-Range check Identifier. */
-#define	 VL53L0X_SEQUENCESTEP_FINAL_RANGE ((VL53L0X_VcselPeriod) 4)
-/*!<Final Range Check Identifier. */
-
-#define	 VL53L0X_SEQUENCESTEP_NUMBER_OF_CHECKS			 5
-/*!<Number of Sequence Step Managed by the API. */
-
-/** @} VL53L0X_define_SequenceStepId_group */
 
 typedef enum {
 	Range_Config_DEFAULT,
@@ -811,8 +745,7 @@
 	Range_Config_HIGH_ACCURACY,
 	Range_Config_HIGH_SPEED
 } VL53L0X_RangingConfig;
-
-/** @} VL53L0X_define_GeneralMacro_group */
+/** @} VL53L0X_define_SequenceStepId_group */
 
 /** @} VL53L0X_globaldefine_group */