Diff: Components/VL53L0X/vl53l0x_class.cpp

Revision:

12:f6e2bad00dc7

Parent:

11:ceaa5a026412

Child:

13:615f7e38568c

diff -r ceaa5a026412 -r f6e2bad00dc7 Components/VL53L0X/vl53l0x_class.cpp
--- a/Components/VL53L0X/vl53l0x_class.cpp	Mon Jun 12 13:59:20 2017 +0000
+++ b/Components/VL53L0X/vl53l0x_class.cpp	Wed Jun 14 14:39:27 2017 +0000
@@ -4112,7 +4112,6 @@
 			Status = VL53L0X_ClearInterruptMask(Dev, 0);
 
 	}
-
 	LOG_FUNCTION_END(Status);
 	return Status;
 }
@@ -5152,9 +5151,30 @@
    }
    return status; 
 }
- 
- 
-
+
+int VL53L0X::RangeMeasIntContinuousMode(void (*fptr)(void))
+{
+   int status, ClrStatus;
+
+   status = VL53L0X_SetGpioConfig(Device, 0, VL53L0X_DEVICEMODE_CONTINUOUS_RANGING,
+		VL53L0X_REG_SYSTEM_INTERRUPT_GPIO_NEW_SAMPLE_READY,
+		VL53L0X_INTERRUPTPOLARITY_HIGH);
+   
+   if (!status)
+   {   
+	   	AttachInterruptMeasureDetectionIRQ(fptr);
+	    EnableInterruptMeasureDetectionIRQ();
+   }
+   	
+   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();
+   }
+   return status;
+}
 
 
 int VL53L0X::StartMeasurement(OperatingMode operating_mode, void (*fptr)(void))
@@ -5171,6 +5191,30 @@
 	uint8_t preRangeVcselPeriod = 14;
 	uint8_t finalRangeVcselPeriod = 10;
 
+    if (operating_mode == range_continuous_interrupt)
+    {
+        if (gpio1Int==NULL) 
+        {
+            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);
+        }
+        if (Status == VL53L0X_ERROR_NONE) {
+            Status = RangeMeasIntContinuousMode(fptr);
+        }
+                        
+        if(Status == VL53L0X_ERROR_NONE)
+        {
+	        printf ("Call of VL53L0X_StartMeasurement\n");
+	        Status = VL53L0X_StartMeasurement(Device);
+        }        
+            return Status;
+    }
 
     if (operating_mode == range_single_shot_polling)
     {
@@ -5294,6 +5338,11 @@
         }
     }
 
+	if (operating_mode == range_continuous_interrupt)
+	{
+        Status = VL53L0X_GetRangingMeasurementData(Device, Data);
+        VL53L0X_ClearInterruptMask(Device, VL53L0X_REG_SYSTEM_INTERRUPT_CLEAR | VL53L0X_REG_RESULT_INTERRUPT_STATUS);      
+	}
 
     return Status;
 }
@@ -5336,9 +5385,8 @@
 int VL53L0X::HandleIRQ(OperatingMode operating_mode, VL53L0X_RangingMeasurementData_t *Data)
 {
    int status;
-    
+   status=GetMeasurement(operating_mode, Data);
    EnableInterruptMeasureDetectionIRQ();
-   status=GetMeasurement(operating_mode, Data);
    return status;
 }