Diff: Lettres/Fonctions_Display_Elements.cpp

Revision:

22:5b2a7d7c73fa

Parent:

6:4ef1fabb6c47

Child:

23:1d4562f7b639

--- a/Lettres/Fonctions_Display_Elements.cpp	Thu May 09 10:19:05 2019 +0000
+++ b/Lettres/Fonctions_Display_Elements.cpp	Thu May 09 10:32:58 2019 +0000
@@ -1,9 +1,12 @@
-#include "Display_Elements.h"
-#include "LCD_DISCO_F429ZI.h"
+/*#include "Display_Elements.h"
 
 LCD_DISCO_F429ZI lcd;
 
+<<<<<<< working copy
 void Cadrage(){
+=======
+void Display_H_1(){
+>>>>>>> merge rev
 
     BSP_LCD_SetFont(&Font20);
     lcd.Clear(LCD_COLOR_BLUE);
@@ -61,6 +64,13 @@
         
         
 void Display_Li_3(){        
+<<<<<<< working copy
+=======
+
+    BSP_LCD_SetFont(&Font20);
+    lcd.DisplayStringAt(0, LINE(1), (uint8_t *)"MBED EXAMPLE", CENTER_MODE);
+    wait(1);
+>>>>>>> merge rev
 
     BSP_LCD_SetFont(&Font20);     
     lcd.Clear(LCD_COLOR_BLUE);
@@ -80,6 +90,13 @@
         
         
 void Display_Be_4(){       
+<<<<<<< working copy
+=======
+
+    BSP_LCD_SetFont(&Font20);
+    lcd.DisplayStringAt(0, LINE(1), (uint8_t *)"MBED EXAMPLE", CENTER_MODE);
+    wait(1);
+>>>>>>> merge rev
 
     BSP_LCD_SetFont(&Font20);       
     lcd.Clear(LCD_COLOR_BLUE);
@@ -108,6 +125,7 @@
 
 
 void Display_B_5(){       
+<<<<<<< working copy
 
     BSP_LCD_SetFont(&Font20);      
     lcd.Clear(LCD_COLOR_BLUE);
@@ -128,6 +146,8 @@
 }        
         
 void Display_O_8(){        
+=======
+>>>>>>> merge rev
 
     BSP_LCD_SetFont(&Font20);
     lcd.Clear(LCD_COLOR_BLUE);
@@ -137,8 +157,50 @@
     lcd.SetTextColor(LCD_COLOR_BLUE);
     lcd.FillCircle(100, 100, 70);
     wait(1);
+<<<<<<< working copy
     lcd.Clear(LCD_COLOR_BLUE);
     wait(0.000001);
+=======
+
+    while(1) {        
+        lcd.Clear(LCD_COLOR_BLUE);
+        lcd.SetBackColor(LCD_COLOR_BLUE);
+        lcd.SetTextColor(LCD_COLOR_WHITE);
+        int X4 = 50;
+        int Y4 = 50;
+        int pixel = 15;
+        lcd.FillRect(X4,Y4,7*pixel,pixel);
+        lcd.FillRect(X4,Y4+pixel,pixel,3*pixel);
+        lcd.FillRect(X4+3*pixel,Y4+pixel,pixel,3*pixel);
+        lcd.FillRect(X4+6*pixel,Y4+pixel,pixel,3*pixel);
+        lcd.FillRect(X4+pixel,Y4+4*pixel,2*pixel,pixel);
+        lcd.FillRect(X4+4*pixel,Y4+4*pixel,2*pixel,pixel);
+        wait(1);
+        lcd.Clear(LCD_COLOR_BLUE);
+        wait(0.000001);
+    }
+}        
+        */
+        /*
+void Display_O_8(){        
+
+    BSP_LCD_SetFont(&Font20);
+    lcd.DisplayStringAt(0, LINE(1), (uint8_t *)"MBED EXAMPLE", CENTER_MODE);
+    wait(1);
+
+    while(1) {       
+        //O
+        lcd.Clear(LCD_COLOR_BLUE);
+        lcd.SetBackColor(LCD_COLOR_BLUE);
+        lcd.SetTextColor(LCD_COLOR_WHITE);
+        lcd.FillCircle(100, 100, 80);
+        lcd.SetTextColor(LCD_COLOR_BLUE);
+        lcd.FillCircle(100, 100, 70);
+        wait(1);
+        lcd.Clear(LCD_COLOR_BLUE);
+        wait(0.000001);
+    }
+>>>>>>> merge rev
 }
         
         
@@ -163,6 +225,13 @@
         
         
 void Display_N_7(){       
+<<<<<<< working copy
+=======
+
+    BSP_LCD_SetFont(&Font20);
+    lcd.DisplayStringAt(0, LINE(1), (uint8_t *)"MBED EXAMPLE", CENTER_MODE);
+    wait(1);
+>>>>>>> merge rev
 
     BSP_LCD_SetFont(&Font20);   
     lcd.Clear(LCD_COLOR_BLUE);
@@ -182,6 +251,13 @@
 }
         
 void Display_F_9(){        
+<<<<<<< working copy
+=======
+
+    BSP_LCD_SetFont(&Font20);
+    lcd.DisplayStringAt(0, LINE(1), (uint8_t *)"MBED EXAMPLE", CENTER_MODE);
+    wait(1);
+>>>>>>> merge rev
 
     BSP_LCD_SetFont(&Font20);   
     lcd.Clear(LCD_COLOR_BLUE);
@@ -196,4 +272,4 @@
     wait(1);
     lcd.Clear(LCD_COLOR_BLUE);
     wait(0.000001);
-}
\ No newline at end of file
+}*/
\ No newline at end of file