Diff: x_nucleo_6180xa1.h

Revision:

16:0d4776564733

Parent:

15:454710d17358

Child:

18:c98aa73dc4a5

--- a/x_nucleo_6180xa1.h	Tue Oct 20 16:44:28 2015 +0200
+++ b/x_nucleo_6180xa1.h	Tue Oct 27 15:25:11 2015 +0100
@@ -43,7 +43,7 @@
 /* Includes ------------------------------------------------------------------*/
 #include "mbed.h"
 #include "vl6180x_class.h"
-#include "display_class.h"
+#include "Display_class.h"
 #include "STMPE1600_class.h"
 #include "DevI2C.h"
 
@@ -57,81 +57,125 @@
 
 class X_NUCLEO_6180XA1
 {
-	public:
-		X_NUCLEO_6180XA1(DevI2C *ext_i2c) : dev_i2c(ext_i2c)
+ public:
+    X_NUCLEO_6180XA1(DevI2C *ext_i2c) : dev_i2c(ext_i2c)
     {
-			 gpio0_top=new STMPE1600DigiOut(*dev_i2c, GPIO_12);
-			 sensor_top=new VL6180X(*dev_i2c, *gpio0_top, PB_0);
-			 gpio0_bottom=new STMPE1600DigiOut(*dev_i2c, GPIO_13);
-			 sensor_bottom=new VL6180X(*dev_i2c, *gpio0_bottom, PA_4);
-			 gpio0_left=new STMPE1600DigiOut(*dev_i2c, GPIO_14);
-			 sensor_left=new VL6180X(*dev_i2c, *gpio0_left, D13);
-			 gpio0_right=new STMPE1600DigiOut(*dev_i2c, GPIO_15);
-			 sensor_right=new VL6180X(*dev_i2c, *gpio0_right, PA_10);
-		}
+       digit1=new STMPE1600DigiOut(*dev_i2c, GPIO_7);
+       digit2=new STMPE1600DigiOut(*dev_i2c, GPIO_8);
+       digit3=new STMPE1600DigiOut(*dev_i2c, GPIO_9);
+       digit4=new STMPE1600DigiOut(*dev_i2c, GPIO_10);			
+			
+       dispA=new STMPE1600DigiOut(*dev_i2c, GPIO_0);			
+       dispB=new STMPE1600DigiOut(*dev_i2c, GPIO_1);			
+       dispC=new STMPE1600DigiOut(*dev_i2c, GPIO_2);			
+       dispD=new STMPE1600DigiOut(*dev_i2c, GPIO_3);			
+       dispE=new STMPE1600DigiOut(*dev_i2c, GPIO_4);			
+       dispF=new STMPE1600DigiOut(*dev_i2c, GPIO_5);			
+       dispG=new STMPE1600DigiOut(*dev_i2c, GPIO_6);						
+       //display=new Display(*digit1,*digit2,*digit3,*digit4,*dispA,*dispB,*dispC,*dispD,*dispE,*dispF,*dispG);
+       display=new Display(*ext_i2c);
+
+       gpio0_top=new STMPE1600DigiOut(*dev_i2c, GPIO_12);
+       sensor_top=new VL6180X(*dev_i2c, *gpio0_top, PB_0);
+       
+       gpio0_bottom=new STMPE1600DigiOut(*dev_i2c, GPIO_13);
+       sensor_bottom=new VL6180X(*dev_i2c, *gpio0_bottom, PA_4);
+       
+       gpio0_left=new STMPE1600DigiOut(*dev_i2c, GPIO_14);
+       sensor_left=new VL6180X(*dev_i2c, *gpio0_left, PA_5);
+       
+       gpio0_right=new STMPE1600DigiOut(*dev_i2c, GPIO_15);
+       sensor_right=new VL6180X(*dev_i2c, *gpio0_right, PA_10);
+    }
 		
-		~X_NUCLEO_6180XA1()
+    ~X_NUCLEO_6180XA1()
     {
-			 if(gpio0_top!=NULL)
-			 {
-			   delete gpio0_top;
-			   gpio0_top=NULL;
-			 }
-			 if(sensor_top!=NULL)
-			 {
-			   delete sensor_top;
-				 sensor_top=NULL;
-			 }
-			 if(gpio0_bottom!=NULL)
-			 {
-			   delete gpio0_bottom;
-			   gpio0_bottom=NULL;
-			 }
-			 if(sensor_bottom!=NULL)
-			 {
-			   delete sensor_bottom;
-				 sensor_bottom=NULL;
-			 }
-			 if(gpio0_left!=NULL)
-			 {
-				 delete gpio0_left;
-				 gpio0_left=NULL;
-			 }				 
-			 if(sensor_left!=NULL)
-			 {
-				 delete sensor_left;
-				 sensor_left=NULL;
-			 }
-			 if(gpio0_right!=NULL)
-			 {
-				 delete gpio0_right;
-				 gpio0_right=NULL;
-			 }
-			 if(sensor_right!=NULL)
-			 {
-				 delete sensor_right;
-				 sensor_right=NULL;
-			 }
-		}
+       if(gpio0_top!=NULL)
+       {
+          delete gpio0_top;
+          gpio0_top=NULL;
+       }
+       if(sensor_top!=NULL)
+       {
+          delete sensor_top;
+	  sensor_top=NULL;
+       }
+       if(gpio0_bottom!=NULL)
+       {
+          delete gpio0_bottom;
+          gpio0_bottom=NULL;
+       }
+       if(sensor_bottom!=NULL)
+       {
+          delete sensor_bottom;
+	  sensor_bottom=NULL;
+       }
+       if(gpio0_left!=NULL)
+       {
+          delete gpio0_left;
+          gpio0_left=NULL;
+       }
+       if(sensor_left!=NULL)
+       {
+          delete sensor_left;
+	  sensor_left=NULL;
+       }
+       if(gpio0_left!=NULL)
+       {
+          delete gpio0_left;
+          gpio0_left=NULL;
+       }
+       if(sensor_left!=NULL)
+       {
+          delete sensor_left;
+	  sensor_left=NULL;
+       }
+       if(gpio0_right!=NULL)
+       {
+          delete gpio0_right;
+          gpio0_right=NULL;
+       }
+       if(sensor_right!=NULL)
+       {
+          delete sensor_right;
+	  sensor_right=NULL;
+       }
+    }
 		  
-	  DevI2C *dev_i2c;	
-		STMPE1600DigiOut *gpio0_top;
-		STMPE1600DigiOut *gpio0_bottom;
-		STMPE1600DigiOut *gpio0_left;
-		STMPE1600DigiOut *gpio0_right;
-		VL6180X *sensor_top;
-		VL6180X *sensor_bottom;
-		VL6180X *sensor_left;
-		VL6180X *sensor_right;
+    DevI2C *dev_i2c;
+        
+    VL6180X *sensor_top;
+    VL6180X *sensor_bottom;
+    VL6180X *sensor_left;
+    VL6180X *sensor_right;
+    
+    STMPE1600DigiOut *gpio0_top;
+    STMPE1600DigiOut *gpio0_bottom;
+    STMPE1600DigiOut *gpio0_left;
+    STMPE1600DigiOut *gpio0_right;
 
-		//Display *display;
-		
-		static X_NUCLEO_6180XA1 *Instance(DevI2C *ext_i2c);
+    
+    STMPE1600DigiOut *digit1;
+    STMPE1600DigiOut *digit2;
+    STMPE1600DigiOut *digit3;
+    STMPE1600DigiOut *digit4;		
 		
-	  int InitBoard();
+    STMPE1600DigiOut *dispA;		
+    STMPE1600DigiOut *dispB;
+    STMPE1600DigiOut *dispC;
+    STMPE1600DigiOut *dispD;
+    STMPE1600DigiOut *dispE;
+    STMPE1600DigiOut *dispF;
+    STMPE1600DigiOut *dispG;
+
+    Display *display;
 		
-	private:
-		static X_NUCLEO_6180XA1 *_instance;
+    static X_NUCLEO_6180XA1 *Instance(DevI2C *ext_i2c);
+		
+    int InitBoard();
+		
+ private:
+    static X_NUCLEO_6180XA1 *_instance;
 };
 
 #endif /* __X_NUCLEO_6180XA1_H */