Diff: main.cpp

Revision:

44:3c68d5aa842e

Parent:

43:f03152407731

Child:

46:43aef8f6e9a0

--- a/main.cpp	Mon Sep 12 09:19:46 2016 +0000
+++ b/main.cpp	Mon Sep 12 09:52:06 2016 +0000
@@ -5,200 +5,35 @@
 #include <stdio.h>
 #include <assert.h>
 
-/* This VL6180X Expansion board test application performs a range measurement and an als measurement in interrupt mode
+/* This VL6180X Expansion board test application performs a range measurement and als measurement in polling mode
    on the onboard embedded top sensor. 
-   The board red slider select on the flight the measurement type as ALS or RANGE; the measured data is diplayed on the 
-   on bord 4digits display.
-
-   User Blue button allows to stop current measurement and the entire program releasing all the 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 */
+   The result of both the measures are printed on the serial over.  
+   GetDistance and GetLux are synchronous!. So they blocks the caller until the result will be ready 
+*/
 
 #define VL6180X_I2C_SDA   D14 
 #define VL6180X_I2C_SCL   D15 
 
-#define RANGE   0
-#define ALS     1
-
 static X_NUCLEO_6180XA1 *board=NULL;
-MeasureData_t data_sensor_top;
-OperatingMode operating_mode, prev_operating_mode;
-	
-/* flags that handle interrupt request */
-int int_stop_measure=false;	
-
-/* ISR callback function of the user blue button to stop program */
-void StopMeasureIRQ(void)
-{
-   int_stop_measure=true;
-}
-
-/* On board 4 digit local display refresh */
-void DisplayRefresh(OperatingMode op_mode)
-{   
-   char str[5];
-   
-   if(op_mode==range_continuous_interrupt || op_mode==range_single_shot_polling)
-   {
-      if(data_sensor_top.range_mm!=255)
-      {
-         sprintf(str,"%d",data_sensor_top.range_mm);
-      }
-      else
-      {
-         sprintf(str,"%s","----");
-      }
-   }
-   else if(op_mode==als_continuous_interrupt || op_mode==als_single_shot_polling)
-   {
-      if(data_sensor_top.lux!=0xFFFFFFFF)
-      {
-         sprintf(str,"%d",data_sensor_top.lux);
-      }
-      else
-      {
-         sprintf(str,"%s","----");
-      }
-   }
-   board->display->DisplayString(str, strlen(str));       
-}
-
-/* On board red slider position check */
-enum OpModeIntPoll_t{ PollMeasure, IntMeasure };
-
-OperatingMode CheckSlider(enum OpModeIntPoll_t OpMode) {
-	
-OperatingMode ret;
-int measure= board->RdSwitch();
-
-   switch (OpMode) {
-   	case PollMeasure:
-      if(measure==RANGE)
-        ret = range_single_shot_polling;
-      else if(measure==ALS)
-        ret = als_single_shot_polling;   	   	
-   	break;
-   	
-   	case IntMeasure:
-      if(measure==RANGE)
-        ret = range_continuous_interrupt;
-      else if(measure==ALS)
-        ret = als_continuous_interrupt;   	
-   	break;
-   }
-   return ret;	  
-}
-
-/* Print on USB Serial the started OperatingMode */
-void PrintStartMessage(OperatingMode op_mode)
-{
-   switch (op_mode) {
-   case range_single_shot_polling:
-      printf("\nStarted range single shot polling measure\n\r");   
-      break;
-   case als_single_shot_polling:
-      printf("\nStarted als single shot polling measure\n\r");   
-      break;
-   case range_continuous_interrupt:
-      printf("\nStarted range continuous interrupt measure\n\r");   
-      break;
-   case als_continuous_interrupt:
-      printf("\nStarted als continuous interrupt measure\n\r");   
-      break;
-   default:
-      break;  
-   }
-}
-
-/* Print on USB Serial the stopped OperatingMode */
-void PrintStopMessage(OperatingMode op_mode)
-{
-   switch (op_mode) {
-   case range_single_shot_polling:
-      printf("\nStopped range single shot polling measure\n\r");   
-      break;
-   case als_single_shot_polling:
-      printf("\nStopped als single shot polling measure\n\r");   
-      break;
-   case range_continuous_interrupt:
-      printf("\nStopped range continuous interrupt measure\n\r");   
-      break;
-   case als_continuous_interrupt:
-      printf("\nStopped als continuous interrupt measure\n\r");   
-      break;
-   default:
-      break;  
-   }
-}
-
-/* Print on board 4 Digit display the indicated message <= 4 char */
-#define DELAY 2000  // 2Sec
-void DisplayMsg(const char * msg)
-{
-   Timer timer;
-   char str[5];
-   
-   timer.start();
-   for(int i=0; i<DELAY; i=timer.read_ms())
-   {
-      sprintf(str,"%s",msg);
-      board->display->DisplayString(str, strlen(str));
-   }
-   timer.stop();
-}
-
-
-void PollSingleALSorRangeMeasure (DevI2C *device_i2c) {
-   int status; 	 
-   /* creates the 6180XA1 expansion board singleton obj */
-   board=X_NUCLEO_6180XA1::Instance(device_i2c, A3, A2, D13, D2);
-   DisplayMsg  ("pOLL");
-   /* init the 6180XA1 expansion board with default values */
-   status=board->InitBoard();
-   if(status) printf("Failed to init board!\n\r");   
-   /* check the red slider position for ALS/Range measure */
-   operating_mode=CheckSlider(PollMeasure);   
-   PrintStartMessage(operating_mode);
-   while(1)
-   {
-      if(int_stop_measure) /* Blue Button isr was triggered */
-      {
-         PrintStopMessage(prev_operating_mode);
-		 int_stop_measure = false;
-         printf("\nProgram stopped!\n\n\r");
-         break;
-      }
-      operating_mode=CheckSlider(PollMeasure); /* check if red slider was moved */
-      if (operating_mode == range_single_shot_polling) {
-         board->sensor_top->GetDistance(&data_sensor_top.range_mm);	
-      } else if (operating_mode == als_single_shot_polling) {
-         board->sensor_top->GetLux(&data_sensor_top.lux);
-      }
-      DisplayRefresh(operating_mode);           
-   }
-   DisplayMsg("BYE");
-}	 
 
 /*=================================== Main ==================================
- Move the VL6180X Expansion board red slider to switch between ALS or Range
- measures.
- Press the blue user button to stop the measurements in progress 	
+  Prints on the serial over USB the measured distance and lux.
+  The measures are run in single shot polling mode.
 =============================================================================*/
 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(VL6180X_I2C_SDA, VL6180X_I2C_SCL);     
-		
-   PollSingleALSorRangeMeasure (device_i2c);  // start continous measures Interrupt based
+   int status;
+   uint32_t lux, dist; 	 
+   DevI2C *device_i2c =new DevI2C(VL6180X_I2C_SDA, VL6180X_I2C_SCL);     		
+   /* creates the 6180XA1 expansion board singleton obj */
+   board=X_NUCLEO_6180XA1::Instance(device_i2c, A3, A2, D13, D2);
+   /* init the 6180XA1 expansion board with default values */
+   status=board->InitBoard();
+   if(status) { printf("Failed to init board!\n\r"); return 0; }
+   while(1)
+   {
+      board->sensor_top->GetDistance(&dist);	
+      board->sensor_top->GetLux(&lux);
+      printf ("Distance: %d, Lux: %d\n\r",dist, lux);      	
+   }  
 }
-