Diff: main.cpp

Revision:

3:6ecc831dc9fa

Parent:

2:7d8d349f52ce

Child:

4:d50740df0184

--- a/main.cpp	Fri Apr 30 14:29:25 2021 +0000
+++ b/main.cpp	Fri May 07 10:11:09 2021 +0000
@@ -1,5 +1,5 @@
 /*
- *  This VL53L1X Expansion board test application performs range measurements
+ *  This VL53L1CB Expansion board test application performs range measurements
  *  using the onboard embedded centre sensor, in singleshot, polling mode.
  *  Measured ranges are ouput on the Serial Port, running at 115200 baud.
  *
@@ -11,11 +11,12 @@
  */
  
 #include <stdio.h>
+#include <time.h>
 
 #include "mbed.h"
+
 #include "XNucleo53L1A2.h"
 #include "ToF_I2C.h"
-#include <time.h>
 
 
 
@@ -39,7 +40,7 @@
 
 static XNucleo53L1A2 *board=NULL;
 
-// MBed V6.4 has renamed wait_ms and UnbufferedSerial replaces Serial
+// MBed V6.x has renamed wait_ms and UnbufferedSerial replaces Serial
 #if (MBED_VERSION  > 60300) 
 UnbufferedSerial  pc(USBTX, USBRX); 
 extern "C" void wait_ms(int ms);
@@ -67,6 +68,9 @@
     uint32_t  start_time_ms;
     uint32_t  current_time_ms;
     
+    double signalRate = 0.0;
+    double ambientRate = 0.0;
+    
     pc.baud(115200);  // baud rate is important as printf statements take a lot of time
 
     printf("Polling Lite-Ranging mbed = %d \r\n",MBED_VERSION);
@@ -189,8 +193,10 @@
                                                  current_time_ms = us_ticker_read() / 1000;
 
                  if((status==0) &&  (RangingData.RangeStatus != 10)) {
-                     printf("data %d,%d,%d,%.2f,%.2f\n", ToFSensor,RangingData.RangeStatus,RangingData.RangeMilliMeter,
-                           (RangingData.SignalRateRtnMegaCps/65536.0),RangingData.AmbientRateRtnMegaCps/65336.0);
+//                     printf("data %d,%d,%d,%2.2f,%2.2f\n", ToFSensor, RangingData.RangeStatus, RangingData.RangeMilliMeter,
+//                           (RangingData.SignalRateRtnMegaCps/65536.0), RangingData.AmbientRateRtnMegaCps/65336.0);
+                     printf("data %d, %d, %d, %.2f, %.2f\n", ToFSensor, RangingData.RangeStatus, RangingData.RangeMilliMeter,
+                           (RangingData.SignalRateRtnMegaCps/65336.0), (RangingData.AmbientRateRtnMegaCps/65336.0));
 
                  }
             } // if status
@@ -207,8 +213,12 @@
 
                 polling_time_ms = current_time_ms - start_time_ms;
                 if((status==0) &&  (RangingData.RangeStatus != 10)) {
-                    printf("data %d,%d,%d,%.2f,%.2f  %d\n", ToFSensor,RangingData.RangeStatus,RangingData.RangeMilliMeter,
-                          (RangingData.SignalRateRtnMegaCps/65536.0),RangingData.AmbientRateRtnMegaCps/65336.0,polling_time_ms);
+//                    printf("data %d,%d,%d,%2.2f,%2.2f  %d\n", ToFSensor, RangingData.RangeStatus, RangingData.RangeMilliMeter,
+//                          (RangingData.SignalRateRtnMegaCps/65536.0), (RangingData.AmbientRateRtnMegaCps/65336.0), polling_time_ms);
+                    signalRate = RangingData.SignalRateRtnMegaCps / 65535.0;
+                    ambientRate = RangingData.AmbientRateRtnMegaCps / 65535.0;
+                    printf("data %d, %d, %d, %2.2f, %2.2f, %d\n", ToFSensor, RangingData.RangeStatus, RangingData.RangeMilliMeter,
+                          signalRate, ambientRate, polling_time_ms);
                 }
             }