Diff: main.cpp

Revision:

3:a91c12752761

Parent:

2:b7545dbba023

--- a/main.cpp	Mon Nov 09 17:11:10 2020 +0000
+++ b/main.cpp	Sun Jun 13 13:56:40 2021 +0000
@@ -38,7 +38,7 @@
 
 
 #if (MBED_VERSION  > 60300) 
-UnbufferedSerial  pc(SERIAL_TX, SERIAL_RX); 
+UnbufferedSerial  pc(USBTX, USBRX); 
 #else
 Serial pc(SERIAL_TX, SERIAL_RX); 
 #endif
@@ -117,7 +117,7 @@
 int main()
 {   
     int status;
-    VL53L1 * Sensor;
+    VL53L1CB * Sensor;
     uint16_t wordData;
     uint8_t ToFSensor = 1; // 0=Left, 1=Center(default), 2=Right
   
@@ -179,22 +179,22 @@
 
         Dev->comms_type = 1;
 
-        Sensor->VL53L1_RdWord(Dev, 0x01, &wordData);
+        Sensor->VL53L1CB_RdWord(Dev, 0x01, &wordData);
         printf("VL53L1X: %02X   %d\n\r", wordData,Dev->i2c_slave_address);
 /* Device Initialization and setting */  
-        status = Sensor->vl53L1_DataInit();
-        status = Sensor->vl53L1_StaticInit();
-        status = Sensor->vl53L1_SetPresetMode( VL53L1_PRESETMODE_RANGING);
-        status = Sensor->vl53L1_SetDistanceMode( VL53L1_DISTANCEMODE_LONG);
-        status = Sensor->vl53L1_SetMeasurementTimingBudgetMicroSeconds( 50000);
-        status = Sensor->vl53L1_SetInterMeasurementPeriodMilliSeconds( 100);
+        status = Sensor->VL53L1CB_DataInit();
+        status = Sensor->VL53L1CB_StaticInit();
+        status = Sensor->VL53L1CB_SetPresetMode( VL53L1_PRESETMODE_RANGING);
+        status = Sensor->VL53L1CB_SetDistanceMode( VL53L1_DISTANCEMODE_LONG);
+        status = Sensor->VL53L1CB_SetMeasurementTimingBudgetMicroSeconds( 50000);
+        status = Sensor->VL53L1CB_SetInterMeasurementPeriodMilliSeconds( 100);
         }
         
         if (board->sensor_centre!= NULL )
         {
             printf("starting interrupt centre\n");
             int1 =  new WaitForMeasurement(CentreIntPin,&devCentre);
-            status = board->sensor_centre->vl53L1_StartMeasurement();
+            status = board->sensor_centre->VL53L1CB_StartMeasurement();
         }
         
 
@@ -202,14 +202,14 @@
         {
             printf("starting interrupt left\n");
             int2 = new WaitForMeasurement(LeftIntPin,&devLeft);
-            status = board->sensor_left->vl53L1_StartMeasurement();
+            status = board->sensor_left->VL53L1CB_StartMeasurement();
         }
 
         if (board->sensor_right!= NULL )
         {
             printf("starting interrupt right\n");
             int3 = new WaitForMeasurement(RightIntPin,&devRight);
-            status = board->sensor_right->vl53L1_StartMeasurement();
+            status = board->sensor_right->VL53L1CB_StartMeasurement();
         }
     
        // loop waiting for interrupts to happen. This is signaled by   int_centre_result,int_left_result or int_right_result
@@ -228,7 +228,7 @@
 
             if (int_centre_result != 0)
             {
-                status = board->sensor_centre->vl53L1_GetMultiRangingData( pMultiRangingData);
+                status = board->sensor_centre->VL53L1CB_GetMultiRangingData( pMultiRangingData);
                 if ( status == VL53L1_ERROR_NONE)
                 {
                     int no_of_object_found=pMultiRangingData->NumberOfObjectsFound;
@@ -248,13 +248,13 @@
                     }
                 }
                 int_centre_result = 0;
-                status = board->sensor_centre->vl53L1_ClearInterruptAndStartMeasurement();
+                status = board->sensor_centre->VL53L1CB_ClearInterruptAndStartMeasurement();
             }
 
 
             if (int_left_result != 0)
             {
-                status = board->sensor_left->vl53L1_GetMultiRangingData( pMultiRangingData);
+                status = board->sensor_left->VL53L1CB_GetMultiRangingData( pMultiRangingData);
                 if ( status == VL53L1_ERROR_NONE)
                 {
                     int no_of_object_found=pMultiRangingData->NumberOfObjectsFound;
@@ -276,14 +276,14 @@
                 }
  
                 int_left_result = 0;
-                status = board->sensor_left->vl53L1_ClearInterruptAndStartMeasurement();
+                status = board->sensor_left->VL53L1CB_ClearInterruptAndStartMeasurement();
 
             }
             
             
             if (int_right_result != 0)
             {
-                status = board->sensor_right->vl53L1_GetMultiRangingData( pMultiRangingData);
+                status = board->sensor_right->VL53L1CB_GetMultiRangingData( pMultiRangingData);
                 if ( status == VL53L1_ERROR_NONE)
                 {
                     // if valid result print it
@@ -306,7 +306,7 @@
                 // clear interrupt flag
                 int_right_result = 0;
                 // clear theinterrupt and wait for another result
-                status = board->sensor_right->vl53L1_ClearInterruptAndStartMeasurement();
+                status = board->sensor_right->VL53L1CB_ClearInterruptAndStartMeasurement();
 
             }
         }