Diff: src/cMatrice.cpp

Revision:

7:4b283e36b147

Parent:

5:d6b0bf27bac6

Child:

8:92d0c4961a16

--- a/src/cMatrice.cpp	Thu Mar 31 11:24:34 2016 +0000
+++ b/src/cMatrice.cpp	Fri Apr 01 14:30:30 2016 +0000
@@ -1,100 +1,81 @@
 #include "cMatrice.h"
 
-
-cMatrice::cMatrice()
-{
-    _matrice = new unsigned char *[8];
-    for(unsigned char i = 0; i <= 7; i++)
-    {
-        _matrice[i] = new unsigned char[8];
+cMatrice::cMatrice() {
+	_matrice = new unsigned char *[8];
+	for (unsigned char i = 0; i <= 7; i++) {
+		_matrice[i] = new unsigned char[8];
 
-    }
-    
+	}
 
-    for(unsigned char i = 0; i < 8 ; i++)
-    {
-        for(unsigned char j = 0; j < 8 ; j ++)
-        {
-            _matrice[i][j] = LED_BLEU_FONCE;
-        }
-    }
+	for (unsigned char i = 0; i < 8; i++) {
+		for (unsigned char j = 0; j < 8; j++) {
+			_matrice[i][j] = LED_BLEU_FONCE;
+		}
+	}
 }
 
-
-
-cMatrice::~cMatrice()
-{
-    //dtor
+cMatrice::~cMatrice() {
+	//dtor
 }
 
 /*// GETTER
-unsigned char cMatrice::getMatrice()
-{
+ unsigned char cMatrice::getMatrice()
+ {
 
-    return _matrice;
-}*/
+ return _matrice;
+ }*/
 
 // SETTER
-void cMatrice::updateMatrice(cForme &f)
-{
+void cMatrice::updateMatrice(cForme &f) {
 
 }
 // METHODES
-void cMatrice::envoyerMatrice()
-{
-    DigitalOut cs(p14);
-    SPI matrice(p11,p12,p13);
-    _matrice[0][0] = LED_ORANGE;
-    
-    cs = 0;
-    wait(0.5);
-    
-    for(char i=0; i<8; i++)
-    {
-        for(char j=0; j<8; j++)
-        {
-            matrice.write(_matrice[i][j]);
-        }
-    }
-    wait(0.5);
-    cs = 1;     
+void cMatrice::envoyerMatrice() {
+
+	DigitalOut cs(p14);
+	SPI matrice(p11, p12, p13);
+	matrice.frequency(100000);
+
+	_matrice[0][0] = LED_ORANGE;
+
+	cs = 0;
+	wait(0.5);
+
+	for (char i = 0; i < 8; i++) {
+		for (char j = 0; j < 8; j++) {
+			matrice.write(_matrice[i][j]);
+		}
+	}
+	wait(0.5);
+	cs = 1;
 }
+
 //      Paramètres:
 //  f: Forme à afficher
 //  c: Couleur
-void cMatrice::afficherForme(cForme &f, unsigned char c){
+void cMatrice::afficherForme(cForme &f, unsigned char c) {
 // Changement de couleur des Leds
-    for(unsigned char i = 0; i < 4 ; i++){
-        f.getLed(i).allumer(c);
-        _matrice[f.getLed(i).getPositionX()][f.getLed(i).getPositionY()] = c;
-    }
+	for (unsigned char i = 0; i < 4; i++) {
+		//f.getLed(i).allumer(c);
+		_matrice[f.getLed(i).getPositionX()][f.getLed(i).getPositionY()] = c;
+	}
 }
 
-void cMatrice::ajouterForme(cForme & f, unsigned char c){
-    _formes.insert(_formes.begin(), f);
-    afficherForme(f, c);
-}
-
-void cMatrice::supprimerForme(cForme & f){
-    _formes.push_back(f);
+void cMatrice::ajouterForme(cForme & f, unsigned char c) {
+	_formes.insert(_formes.begin(), f);
+	afficherForme(f, c);
 }
 
 //      Description:
 //  Nettoyage de la matrice, passage à 0 de la valeur de chaque Led
-void cMatrice::clear(){
-    DigitalOut cs(p14);
-    SPI matrice(p11,p12,p13);
-    cs = 0;
-
-    for(char i=0; i<8; i++)
-        {
-            for(char j=0; j<8; j++)
-            {
-                _matrice[i][j] = LED_NOIR;
-                matrice.write(_matrice[i][j]);
-            }
-        }
-    cs = 1;
+void cMatrice::clear() {
+	for (char i = 0; i < 8; i++) {
+		for (char j = 0; j < 8; j++) {
+			_matrice[i][j] = LED_NOIR;
+		}
+	}
 }
 
-
+cForme cMatrice::getForme(unsigned int i){
+	return _formes.at(i);
+}