ST Expansion SW Team
Updates to follow mbed SDK coding style guidelines.
Dependencies: ST_INTERFACES X_NUCLEO_COMMON
Dependents: 53L0A1_Satellites_with_Interrupts_OS5 Display_53L0A1_OS5
Fork of
X_NUCLEO_53L0A1
by 
ST
Revision 13:615f7e38568c, committed 2017-06-15
- Comitter:
- johnAlexander
- Date:
- Thu Jun 15 13:33:35 2017 +0000
- Parent:
- 12:f6e2bad00dc7
- Child:
- 14:d84672f45f7b
- Commit message:
- Refactor interrupt setup in StartMeasurement, for range_continuous_interrupt mode.
Changed in this revision
--- a/Components/VL53L0X/vl53l0x_class.cpp Wed Jun 14 14:39:27 2017 +0000
+++ b/Components/VL53L0X/vl53l0x_class.cpp Thu Jun 15 13:33:35 2017 +0000
@@ -2266,6 +2266,30 @@
return Status;
}
+VL53L0X_Error VL53L0X::VL53L0X_SetInterruptThresholds(VL53L0X_DEV Dev,
+ VL53L0X_DeviceModes DeviceMode, FixPoint1616_t ThresholdLow,
+ FixPoint1616_t ThresholdHigh)
+{
+ VL53L0X_Error Status = VL53L0X_ERROR_NONE;
+ uint16_t Threshold16;
+ LOG_FUNCTION_START("");
+
+ /* no dependency on DeviceMode for Ewok */
+ /* Need to divide by 2 because the FW will apply a x2 */
+ Threshold16 = (uint16_t)((ThresholdLow >> 17) & 0x00fff);
+ Status = VL53L0X_WrWord(Dev, VL53L0X_REG_SYSTEM_THRESH_LOW, Threshold16);
+
+ if (Status == VL53L0X_ERROR_NONE) {
+ /* Need to divide by 2 because the FW will apply a x2 */
+ Threshold16 = (uint16_t)((ThresholdHigh >> 17) & 0x00fff);
+ Status = VL53L0X_WrWord(Dev, VL53L0X_REG_SYSTEM_THRESH_HIGH,
+ Threshold16);
+ }
+
+ LOG_FUNCTION_END(Status);
+ return Status;
+}
+
VL53L0X_Error VL53L0X::VL53L0X_GetInterruptThresholds(VL53L0X_DEV Dev,
VL53L0X_DeviceModes DeviceMode, FixPoint1616_t *pThresholdLow,
FixPoint1616_t *pThresholdHigh)
@@ -5156,6 +5180,10 @@
{
int status, ClrStatus;
+ status = VL53L0X_StopMeasurement(Device); // it is safer to do this while sensor is stopped
+
+// status = VL53L0X_SetInterruptThresholds(Device, VL53L0X_DEVICEMODE_CONTINUOUS_RANGING, 0, 300);
+
status = VL53L0X_SetGpioConfig(Device, 0, VL53L0X_DEVICEMODE_CONTINUOUS_RANGING,
VL53L0X_REG_SYSTEM_INTERRUPT_GPIO_NEW_SAMPLE_READY,
VL53L0X_INTERRUPTPOLARITY_HIGH);
@@ -5169,6 +5197,7 @@
ClrStatus=ClearInterrupt(VL53L0X_REG_RESULT_INTERRUPT_STATUS|VL53L0X_REG_RESULT_RANGE_STATUS);
if(ClrStatus)
VL53L0X_ErrLog("VL53L0X_ClearErrorInterrupt fail\r\n");
+
if(!status)
{
status=RangeStartContinuousMode();
@@ -5180,6 +5209,7 @@
int VL53L0X::StartMeasurement(OperatingMode operating_mode, void (*fptr)(void))
{
int Status = VL53L0X_ERROR_NONE;
+ int ClrStatus;
uint8_t VhvSettings;
uint8_t PhaseCal;
@@ -5198,22 +5228,34 @@
printf ("GPIO1 Error\r\n");
return 1;
}
- printf ("Setting up GPIO Config\r\n");
- Status = VL53L0X_SetDeviceMode(Device, VL53L0X_DEVICEMODE_CONTINUOUS_RANGING);
-
- if (Status == VL53L0X_ERROR_NONE) {
- Status = RangeConfigInterrupt(VL53L0X_REG_SYSTEM_INTERRUPT_GPIO_NEW_SAMPLE_READY);
+
+ Status = VL53L0X_StopMeasurement(Device); // it is safer to do this while sensor is stopped
+
+// Status = VL53L0X_SetInterruptThresholds(Device, VL53L0X_DEVICEMODE_CONTINUOUS_RANGING, 0, 300);
+
+ Status = VL53L0X_SetGpioConfig(Device, 0, VL53L0X_DEVICEMODE_CONTINUOUS_RANGING,
+ VL53L0X_REG_SYSTEM_INTERRUPT_GPIO_NEW_SAMPLE_READY,
+ VL53L0X_INTERRUPTPOLARITY_HIGH);
+
+ if (Status == VL53L0X_ERROR_NONE)
+ {
+ AttachInterruptMeasureDetectionIRQ(fptr);
+ EnableInterruptMeasureDetectionIRQ();
}
- if (Status == VL53L0X_ERROR_NONE) {
- Status = RangeMeasIntContinuousMode(fptr);
- }
-
+
+ ClrStatus=ClearInterrupt(VL53L0X_REG_RESULT_INTERRUPT_STATUS|VL53L0X_REG_RESULT_RANGE_STATUS);
+ if(ClrStatus)
+ VL53L0X_ErrLog("VL53L0X_ClearErrorInterrupt fail\r\n");
+
if(Status == VL53L0X_ERROR_NONE)
{
- printf ("Call of VL53L0X_StartMeasurement\n");
- Status = VL53L0X_StartMeasurement(Device);
- }
- return Status;
+ Status = VL53L0X_SetDeviceMode(Device, VL53L0X_DEVICEMODE_CONTINUOUS_RANGING); // Setup in continuous ranging mode
+ }
+
+ if(Status == VL53L0X_ERROR_NONE)
+ {
+ Status = VL53L0X_StartMeasurement(Device);
+ }
}
if (operating_mode == range_single_shot_polling)
--- a/Components/VL53L0X/vl53l0x_class.h Wed Jun 14 14:39:27 2017 +0000
+++ b/Components/VL53L0X/vl53l0x_class.h Thu Jun 15 13:33:35 2017 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- Copyright © 2016, STMicroelectronics International N.V.
+ Copyright © 2016, STMicroelectronics International N.V.
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -475,8 +475,8 @@
*/
int WaitDeviceBooted()
{
- return VL53L0X_WaitDeviceBooted(Device);
-// return 1;
+// return VL53L0X_WaitDeviceBooted(Device);
+ return 1;
}
@@ -501,7 +501,7 @@
return VL53L0X_DataInit(Device);
}
-/** deprecated Init funtion from ComponentObject. for backward compatibility
+/** deprecated Init function from ComponentObject. for backward compatibility
*/
virtual int Init(void * NewAddr)
{
@@ -585,7 +585,14 @@
int RangeStartContinuousMode()
{
int status;
- status = RangeSetSystemMode(VL53L0X_REG_SYSRANGE_MODE_START_STOP|VL53L0X_REG_SYSRANGE_MODE_BACKTOBACK);
+ status = VL53L0X_SetDeviceMode(Device, VL53L0X_DEVICEMODE_CONTINUOUS_RANGING);
+
+ if(status == VL53L0X_ERROR_NONE)
+ {
+ printf ("Call of VL53L0X_StartMeasurement\n");
+ status = VL53L0X_StartMeasurement(Device);
+ }
+
return status;
}
@@ -716,7 +723,7 @@
StopMeasurement(range_single_shot_polling);
return status;
}
-/* Deprecated funtion from RangeSensor class. For backward compatibility*/
+/* Deprecated function from RangeSensor class. For backward compatibility*/
virtual int GetDistance(uint32_t *piData)
{
return get_distance(piData);
@@ -734,17 +741,17 @@
*/
int RangeConfigInterrupt(uint8_t ConfigGpioInt)
{
- int status;
- if( ConfigGpioInt<= VL53L0X_REG_SYSTEM_INTERRUPT_GPIO_NEW_SAMPLE_READY)
+ int status = VL53L0X_ERROR_NONE;
+/* if( ConfigGpioInt<= VL53L0X_REG_SYSTEM_INTERRUPT_GPIO_NEW_SAMPLE_READY)
{
status = VL53L0X_UpdateByte(Device, VL53L0X_REG_SYSTEM_INTERRUPT_CONFIG_GPIO, (uint8_t)(~(0x7<<0)), ConfigGpioInt);
}
else
{
status = 1;
- }
- // return VL6180x_RangeConfigInterrupt(Device, ConfigGpioInt);
-
+ }
+*/
+// return VL6180x_RangeConfigInterrupt(Device, ConfigGpioInt);
return status;
}
@@ -1237,6 +1244,9 @@
VL53L0X_Error VL53L0X_StartMeasurement(VL53L0X_DEV Dev);
VL53L0X_Error VL53L0X_CheckAndLoadInterruptSettings(VL53L0X_DEV Dev,
uint8_t StartNotStopFlag);
+ VL53L0X_Error VL53L0X_SetInterruptThresholds(VL53L0X_DEV Dev,
+ VL53L0X_DeviceModes DeviceMode, FixPoint1616_t ThresholdLow,
+ FixPoint1616_t ThresholdHigh);
VL53L0X_Error VL53L0X_GetInterruptThresholds(VL53L0X_DEV Dev,
VL53L0X_DeviceModes DeviceMode, FixPoint1616_t *pThresholdLow,
FixPoint1616_t *pThresholdHigh);