Diff: main.cpp

Revision:

5:6caa39f97aad

Parent:

4:d50740df0184

--- a/main.cpp	Fri May 07 13:48:27 2021 +0000
+++ b/main.cpp	Thu Jun 10 10:44:05 2021 +0100
@@ -66,7 +66,7 @@
 int main()
 {   
     int status;
-    VL53L1 * Sensor;
+    VL53L1CB * Sensor;
     uint16_t wordData;
     uint8_t ToFSensor = 1; // 0=Left, 1=Center(default), 2=Right
     static VL53L1_RangingMeasurementData_t RangingData;
@@ -128,16 +128,16 @@
             Dev->comms_speed_khz = 400;
             Dev->comms_type = 1;
     
-            Sensor->VL53L1_RdWord(Dev, 0x01, &wordData);
-            printf("VL53L1X: %02X   %d\n\r", wordData,Dev->i2c_slave_address);
+            Sensor->VL53L1CB_RdWord(Dev, 0x01, &wordData);
+            printf("VL53L1CB: %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_LITE_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_LITE_RANGING);
+            status = Sensor->VL53L1CB_SetDistanceMode( VL53L1_DISTANCEMODE_LONG);
+            status = Sensor->VL53L1CB_SetMeasurementTimingBudgetMicroSeconds( 50000);
+            status = Sensor->VL53L1CB_SetInterMeasurementPeriodMilliSeconds( 100);
         }
         
         if (board->sensor_centre!= NULL ) 
@@ -189,13 +189,13 @@
             }  // switch
         
             start_time_ms = us_ticker_read() / 1000;
-            status = Sensor->vl53L1_StartMeasurement();  
+            status = Sensor->VL53L1CB_StartMeasurement();  
 
-            status = Sensor->vl53L1_WaitMeasurementDataReady();
+            status = Sensor->VL53L1CB_WaitMeasurementDataReady();
 
             if(!status)
             {
-                 status = Sensor->vl53L1_GetRangingMeasurementData( &RangingData);
+                 status = Sensor->VL53L1CB_GetRangingMeasurementData( &RangingData);
                                                  current_time_ms = us_ticker_read() / 1000;
 
                  if((status==0) &&  (RangingData.RangeStatus != 10)) {
@@ -208,11 +208,11 @@
                 printf("VL53L1_WaitMeasurementDataReady failed %d \n",status);
             }
 
-            status = Sensor->vl53L1_ClearInterruptAndStartMeasurement();                                     
-            status = Sensor->vl53L1_WaitMeasurementDataReady();
+            status = Sensor->VL53L1CB_ClearInterruptAndStartMeasurement();                                     
+            status = Sensor->VL53L1CB_WaitMeasurementDataReady();
             if(!status)
             {
-                status = Sensor->vl53L1_GetRangingMeasurementData( &RangingData);
+                status = Sensor->VL53L1CB_GetRangingMeasurementData( &RangingData);
 
                 polling_time_ms = current_time_ms - start_time_ms;
                 if((status==0) &&  (RangingData.RangeStatus != 10)) {
@@ -223,10 +223,10 @@
                 }
             }
 
-            status = Sensor->vl53L1_ClearInterruptAndStartMeasurement();
+            status = Sensor->VL53L1CB_ClearInterruptAndStartMeasurement();
         
 
-            status = Sensor->vl53L1_StopMeasurement();  
+            status = Sensor->VL53L1CB_StopMeasurement();  
         } // endwhile(1)
         
     }