maxime bouillot / Mbed 2 deprecated testLucadeTHmaxBOUI

Dependencies:   LCD_DISCO_F429ZI mbed BSP_DISCO_F429ZI

Revision:
24:682b9e68dca8
Parent:
23:1d4562f7b639
Child:
25:004d58f42fbd
--- a/main.cpp	Fri May 10 14:06:36 2019 +0000
+++ b/main.cpp	Fri May 10 14:24:19 2019 +0000
@@ -1,12 +1,9 @@
 #include "main.h"
-#include "mbed.h"
+#include "LCD_DISCO_F429ZI.h"
 
 int main(){
-<<<<<<< working copy
-    DisplayMatrixClean(14,14,BS_H(),5,0xFF0000,0x0000FF);
-=======
-    cRR_test();
->>>>>>> merge rev
+    DisplayMatrixClean(14,14,BS_H(),5,LCD_COLOR_RED,LCD_COLOR_WHITE);
+    wait(30);
     return 1;
 }