Diff: include/cJeu.h

Revision:

24:9f3005f1ba96

Parent:

23:298a1314fc81

Child:

25:b59758a85ed3

--- a/include/cJeu.h	Fri Apr 15 12:13:34 2016 +0000
+++ b/include/cJeu.h	Mon Apr 18 20:25:50 2016 +0000
@@ -1,6 +1,7 @@
 #ifndef JEU_H
 #define JEU_H
 
+#include "SparkFun_APDS9960.h"
 #include "cMatrice.h"
 #include "cCarre.h"
 #include "cZed.h"
@@ -10,26 +11,32 @@
 #include "cCollision.h"
 #include "cSPI.h"
 #include "cBoussole.h"
+#include "rtos.h"
 
 #define START_THREAD 1
 
-class cJeu 
+class cJeu
 {
+    // ATTRIBUTS
     private:
     cMatrice *_mat;
     cForme *_ptrForme;
     cSPI _spi;
+    unsigned char _score;
     cBoussole *_boussole;
     unsigned char *_detec;
 
     ////////////////////////////////////////////////////
-Ticker tick;
-    //InterruptIn _interrupt;
-    unsigned char _score;    
+    InterruptIn _interrupt(PinName pin);
+    I2C *_i2c;
+    SparkFun_APDS9960 *apds(I2C);
     public:
     // CONSTRUCTEURS
     cJeu();
-    cJeu(unsigned char, unsigned char);
+    ////
+    //cJeu(unsigned char, unsigned char);
+    cJeu(unsigned char, unsigned char, PinName pin);
+
     // DESTRUCTEUR
     ~cJeu();
     // SETTERS
@@ -46,8 +53,7 @@
     void nouvelleManche();
     int partieEnCours();
     void fin();
-    void detectionMouvement(void const *args);
-    
+    void detectionMouvement(void const *args);    
 };
 
 #endif //JEU_H
\ No newline at end of file