Revision 1:c1c10e0c32b2, committed 2017-06-13

Comitter:

johnAlexander

Date:

Tue Jun 13 15:31:26 2017 +0000

Parent:

0:cd8e818d4288

Child:

2:bdf097d93eca

Commit message:

Refactor, to remove unused, or legacy code.; Update comments.

Changed in this revision

--- a/X_NUCLEO_53L0A1.lib	Fri Jun 09 07:21:19 2017 +0000
+++ b/X_NUCLEO_53L0A1.lib	Tue Jun 13 15:31:26 2017 +0000
@@ -1,1 +1,1 @@
-https://developer.mbed.org/teams/ST/code/X_NUCLEO_53L0A1/#faf8d62ce6d1
+https://developer.mbed.org/teams/ST/code/X_NUCLEO_53L0A1/#ceaa5a026412

--- a/main.cpp	Fri Jun 09 07:21:19 2017 +0000
+++ b/main.cpp	Tue Jun 13 15:31:26 2017 +0000
@@ -1,92 +1,85 @@
+/* 
+ *  This VL53L0X Expansion board test application performs range measurements
+ *  using the onboard embedded centre sensor, in singleshot, polling mode. 
+ *  Measured ranges are displayed on the on-board 4-digit display.
+ *
+ *  The User Blue button stops the current measurement and entire program, 
+ *  releasing all resources.
+ *
+ *  The Reset button can be used to restart the program.  
+ */
+
+#include <string.h>
+#include <stdio.h>
+
 #include "mbed.h"
 #include "x_nucleo_53l0a1.h"
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-
-/* This VL53L0X Expansion board test application performs a range measurement in polling mode
-   on the onboard embedded top sensor. 
-   The measured data is displayed on the on-board 4-digit display.
-
-   User Blue button stops the current measurement and the entire program, releasing all resources.
-   Reset button is used to restart the program. */
-
-/* Polling operating modes don`t require callback function that handles IRQ 
-   Callback IRQ functions are used only for measure that require interrupt */
-
-/* GetMeasurement is asynchronous! It returns NOT_READY if the measurement value 
-   is not ready to be read from the corresponding register. So you need to wait
-   for the result to be ready */
 
 #define VL53L0_I2C_SDA   D14 
 #define VL53L0_I2C_SCL   D15 
 
-#define RANGE   0
-
-static X_NUCLEO_53L0A1 *board=NULL;
+static X_NUCLEO_53L0A1 *board = NULL;
 VL53L0X_RangingMeasurementData_t data_sensor_centre;
 OperatingMode operating_mode;
     
 /* flags that handle interrupt request */
-bool int_sensor_centre=false, int_stop_measure=false;   
-
-/* ISR callback function of the sensor_centre */
-void SensorTopIRQ(void)
-{
-   int_sensor_centre=true;
-   board->sensor_centre->DisableInterruptMeasureDetectionIRQ();
-}   
+bool int_stop_measure = false;   
 
 /* ISR callback function of the user blue button to stop program */
 void StopMeasureIRQ(void)
 {
-   int_stop_measure=true;
+   int_stop_measure = true;
 }
 
 /* On board 4 digit local display refresh */
-void DisplayRefresh(OperatingMode op_mode)
+void DisplayRefresh(VL53L0X_RangingMeasurementData_t sensor_range_data)
 {   
    char str[5];
    
-   if (op_mode==range_single_shot_polling || op_mode==range_continuous_interrupt || op_mode==range_continuous_polling)
+   if (sensor_range_data.RangeStatus == 0) // we have a valid range.
    {
-      if (data_sensor_centre.RangeStatus == 0) // we have a valid range.
-      {
-         sprintf(str,"%d",data_sensor_centre.RangeMilliMeter);
-      }
-      else
-      {
-         sprintf(str,"%s","----");
-      }
+      sprintf(str,"%d", sensor_range_data.RangeMilliMeter);
+   }
+   else
+   {
+      sprintf(str,"%s","----");
    }
      
    board->display->DisplayString(str);
 }
 
-void RangeMeasure(DevI2C *device_i2c) {
+/*=================================== Main ==================================
+ Press the blue user button to stop measurements in progress    
+=============================================================================*/
+int main()
+{
+#if USER_BUTTON == PC_13  // we are cross compiling for Nucleo-f401 
+   InterruptIn stop_button(USER_BUTTON);
+   stop_button.rise(&StopMeasureIRQ);  
+#endif   
+
+   DevI2C *device_i2c = new DevI2C(VL53L0_I2C_SDA, VL53L0_I2C_SCL);     
    int status;
-
+        
    /* creates the 53L0A1 expansion board singleton obj */
    board=X_NUCLEO_53L0A1::Instance(device_i2c, A2, D8, D2);
     
    board->display->DisplayString("53L0");
    /* init the 53L0A1 expansion board with default values */
-   status=board->InitBoard();
-   if(status)
-      printf("Failed to init board!\n\r");   
-   operating_mode=range_single_shot_polling;
-   /* start the measure on sensor top */
-   status=board->sensor_centre->StartMeasurement(operating_mode, SensorTopIRQ);
-   if(!status)
+   status = board->InitBoard();
+   if (status) printf("Failed to init board!\n\r");   
+   operating_mode = range_single_shot_polling;
+   /* start the measure on sensor centre */
+   status = board->sensor_centre->StartMeasurement(operating_mode, NULL);
+   if (!status)
    {
-      while(1)
+      while (1) // infinite loop. can be broken by pressing Blue (User) button.
       {
-         status=board->sensor_centre->GetMeasurement(operating_mode, &data_sensor_centre);
-         DisplayRefresh(operating_mode);
-         if(int_stop_measure) // Blue Button isr was triggered
+         status = board->sensor_centre->GetMeasurement(operating_mode, &data_sensor_centre);
+         DisplayRefresh(data_sensor_centre);
+         if (int_stop_measure) // Blue Button isr was triggered
          {
-            status=board->sensor_centre->StopMeasurement(operating_mode); // stop the measure and exit
+            status = board->sensor_centre->StopMeasurement(operating_mode); // stop the measure and exit
             int_stop_measure = false;
             printf("\nProgram stopped!\n\n\r");
             break;
@@ -95,19 +88,4 @@
    }
    board->display->DisplayString("BYE");
    delete board;        
-}    
-
-/*=================================== Main ==================================
- Press the blue user button to stop the measurements in progress    
-=============================================================================*/
-int main()
-{   
-#if USER_BUTTON==PC_13  // we are cross compiling for Nucleo-f401 
-   InterruptIn stop_button (USER_BUTTON);
-   stop_button.rise (&StopMeasureIRQ);  
-#endif   
-   DevI2C *device_i2c =new DevI2C(VL53L0_I2C_SDA, VL53L0_I2C_SCL);     
-        
-   RangeMeasure(device_i2c);  // start continuous measures
 }
-