Diff: x_nucleo_6180xa1.cpp

Revision:

48:e799ad44dab7

Parent:

46:116dadbc80f1

Child:

54:17f3bb228b13

--- a/x_nucleo_6180xa1.cpp	Mon May 23 09:59:39 2016 +0000
+++ b/x_nucleo_6180xa1.cpp	Tue Jun 07 14:56:36 2016 +0200
@@ -68,70 +68,54 @@
 {	
    int status, n_dev=0; uint8_t sensor_address;
 	
-   sensor_top->VL6180x_Off();
-   sensor_bottom->VL6180x_Off();
-   sensor_left->VL6180x_Off();
-   sensor_right->VL6180x_Off();
-   sensor_address = NEW_SENSOR_TOP_ADDRESS;
-   status=sensor_top->Init(&sensor_address);
-   if(status)
-   {
-      delete sensor_top;
-      delete gpio0_top;
-      sensor_top=NULL;
-      gpio0_top=NULL;
-      printf("Sensor top not present\n\r");
-   }
-   else
-   {
-      printf("Sensor top present\n\r");
-      n_dev++;
-   }
-   sensor_address = NEW_SENSOR_BOTTOM_ADDRESS;
-   status=sensor_bottom->Init(&sensor_address);
-   if(status)
-   {
-      delete sensor_bottom;
-      delete gpio0_bottom;
-      sensor_bottom=NULL;
-      gpio0_bottom=NULL;
-      printf("Sensor bottom not present\n\r");
-   }
-   else
-   {
-      printf("Sensor bottom present\n\r");
-      n_dev++;
-   }
-   sensor_address = NEW_SENSOR_LEFT_ADDRESS;
-   status=sensor_left->Init(&sensor_address);
-   if(status)
-   {
-      delete sensor_left;
-      delete gpio0_left;
-      sensor_left=NULL;
-      gpio0_left=NULL;
-      printf("Sensor left not present\n\r");
-   }
-   else
-   {
-      printf("Sensor left present\n\r");
-      n_dev++;
-   }
-   sensor_address = NEW_SENSOR_RIGHT_ADDRESS;
-   status=sensor_right->Init(&sensor_address);
-   if(status)
-   {
-      delete sensor_right;
-      delete gpio0_right;
-      sensor_right=NULL;
-      gpio0_right=NULL;
-      printf("Sensor right not present\n\r");
-   }
-   else
-   {
-      printf("Sensor right present\n\r");
-      n_dev++;
-   }
+     sensor_top->VL6180x_Off();
+     sensor_bottom->VL6180x_Off();
+     sensor_left->VL6180x_Off();
+     sensor_right->VL6180x_Off();
+     sensor_address = NEW_SENSOR_TOP_ADDRESS;     
+     status=sensor_top->Init(&sensor_address);
+     if(status)
+     {
+        printf("Sensor top not present\n\r");
+     }
+     else
+     {
+        printf("Sensor top present\n\r");
+        n_dev++;
+     }
+     sensor_address = NEW_SENSOR_BOTTOM_ADDRESS;
+     status=sensor_bottom->Init(&sensor_address);
+     if(status)
+     {
+        printf("Sensor bottom not present\n\r");
+     }
+     else
+     {
+        printf("Sensor bottom present\n\r");
+        n_dev++;
+     }
+     sensor_address = NEW_SENSOR_LEFT_ADDRESS;
+     status=sensor_left->Init(&sensor_address);
+     if(status)
+     {
+        printf("Sensor left not present\n\r");
+     }
+     else
+     {
+        printf("Sensor left present\n\r");
+        n_dev++;
+     }
+     sensor_address = NEW_SENSOR_RIGHT_ADDRESS;
+     status=sensor_right->Init(&sensor_address);
+     if(status)
+     {
+        printf("Sensor right not present\n\r");
+     }
+     else
+     {
+        printf("Sensor right present\n\r");
+        n_dev++;
+     }
    if(n_dev==0)
       return 1;
    else