Diff: Lettres/Fonctions_Display_Elements.cpp

Revision:

6:4ef1fabb6c47

Parent:

3:f247e962c49f

Child:

9:19f7cac66f50

Child:

22:5b2a7d7c73fa

diff -r f247e962c49f -r 4ef1fabb6c47 Lettres/Fonctions_Display_Elements.cpp
--- a/Lettres/Fonctions_Display_Elements.cpp	Thu Mar 14 09:33:30 2019 +0000
+++ b/Lettres/Fonctions_Display_Elements.cpp	Thu Mar 14 10:59:43 2019 +0000
@@ -3,228 +3,197 @@
 
 LCD_DISCO_F429ZI lcd;
 
-int Display_H_1(){
+void Cadrage(){
 
     BSP_LCD_SetFont(&Font20);
-    lcd.DisplayStringAt(0, LINE(1), (uint8_t *)"MBED EXAMPLE", CENTER_MODE);
+    lcd.Clear(LCD_COLOR_BLUE);
+    lcd.SetBackColor(LCD_COLOR_BLUE);
+    lcd.SetTextColor(LCD_COLOR_WHITE);
+    int X0 = 160;
+    int Y0 = 210;
+    lcd.FillRect(X0,Y0,80,1);
+    lcd.FillRect(X0,Y0,1,110);
     wait(1);
+    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 X0 = 50;
-        int Y0 = 50;
-        int pixel = 15;
-        lcd.FillRect(X0,Y0,7*pixel,pixel);
-        lcd.FillRect(X0+3*pixel,Y0+pixel,pixel,3*pixel);
-        lcd.FillRect(X0,Y0+4*pixel,7*pixel,pixel);
-        wait(1);
-        lcd.Clear(LCD_COLOR_BLUE);
-        wait(0.000001);
-    }
-}     
-        
-int Display_He_2(){      
+void Display_H_1(){
 
     BSP_LCD_SetFont(&Font20);
-    lcd.DisplayStringAt(0, LINE(1), (uint8_t *)"MBED EXAMPLE", CENTER_MODE);
+    lcd.Clear(LCD_COLOR_BLUE);
+    lcd.SetBackColor(LCD_COLOR_BLUE);
+    lcd.SetTextColor(LCD_COLOR_WHITE);
+    int X0 = 50;
+    int Y0 = 50;
+    int pixel = 10;
+    lcd.FillRect(X0,Y0,7*pixel,pixel);
+    lcd.FillRect(X0+3*pixel,Y0+pixel,pixel,3*pixel);
+    lcd.FillRect(X0,Y0+4*pixel,7*pixel,pixel);
     wait(1);
+    lcd.Clear(LCD_COLOR_BLUE);
+    wait(0.000001);
+}     
+        
+void Display_He_2(){      
 
-    while(1) {
-        lcd.Clear(LCD_COLOR_BLUE);
-        lcd.SetBackColor(LCD_COLOR_BLUE);
-        lcd.SetTextColor(LCD_COLOR_WHITE);
-        int X1 = 50;
-        int Y1 = 50;
-        int pixel = 15;
-        lcd.FillRect(X1,Y1,7*pixel,pixel);
-        lcd.FillRect(X1+3*pixel,Y1+pixel,pixel,3*pixel);
-        lcd.FillRect(X1,Y1+4*pixel,7*pixel,pixel);
-        int Xe = X1+pixel;
-        int Ye = Y1+6*pixel;
-        lcd.FillRect(Xe,Ye,3*pixel,pixel);
-        lcd.FillRect(Xe-pixel,Ye+pixel,pixel,2*pixel);
-        lcd.FillRect(Xe+pixel,Ye+pixel,pixel,3*pixel);
-        lcd.FillRect(Xe+3*pixel,Ye+pixel,pixel,2*pixel);
-        lcd.FillRect(Xe+2*pixel,Ye+3*pixel,pixel,pixel);
-        wait(1);
-        lcd.Clear(LCD_COLOR_BLUE);
-        wait(0.000001);
-    }
+    BSP_LCD_SetFont(&Font20);
+    lcd.Clear(LCD_COLOR_BLUE);
+    lcd.SetBackColor(LCD_COLOR_BLUE);
+    lcd.SetTextColor(LCD_COLOR_WHITE);
+    int X1 = 170;
+    int Y1 = 220;
+    int pixel = 10;
+    lcd.FillRect(X1,Y1,7*pixel,pixel);
+    lcd.FillRect(X1+3*pixel,Y1+pixel,pixel,3*pixel);
+    lcd.FillRect(X1,Y1+4*pixel,7*pixel,pixel);
+    int Xe = X1+pixel;
+    int Ye = Y1+6*pixel;
+    lcd.FillRect(Xe,Ye,3*pixel,pixel);
+    lcd.FillRect(Xe-pixel,Ye+pixel,pixel,2*pixel);
+    lcd.FillRect(Xe+pixel,Ye+pixel,pixel,3*pixel);
+    lcd.FillRect(Xe+3*pixel,Ye+pixel,pixel,2*pixel);
+    lcd.FillRect(Xe+2*pixel,Ye+3*pixel,pixel,pixel);
+    wait(1);
+    lcd.Clear(LCD_COLOR_BLUE);
+    wait(0.000001);
 }
         
         
-int Display_Li_3(){        
-
-    BSP_LCD_SetFont(&Font20);
-    lcd.DisplayStringAt(0, LINE(1), (uint8_t *)"MBED EXAMPLE", CENTER_MODE);
-    wait(1);
+void Display_Li_3(){        
 
-    while(1) {        
-        lcd.Clear(LCD_COLOR_BLUE);
-        lcd.SetBackColor(LCD_COLOR_BLUE);
-        lcd.SetTextColor(LCD_COLOR_WHITE);
-        int X2 = 50;
-        int Y2 = 50;
-        int pixel = 15;
-        lcd.FillRect(X2,Y2,6*pixel,pixel);
-        lcd.FillRect(X2,Y2+pixel,pixel,4*pixel);
-        lcd.FillRect(X2,Y2+6*pixel,4*pixel,pixel);
-        lcd.FillRect(X2+5*pixel,Y2+6*pixel,pixel,pixel);
-        wait(1);
-        lcd.Clear(LCD_COLOR_BLUE);
-        wait(0.000001);
-    }
+    BSP_LCD_SetFont(&Font20);     
+    lcd.Clear(LCD_COLOR_BLUE);
+    lcd.SetBackColor(LCD_COLOR_BLUE);
+    lcd.SetTextColor(LCD_COLOR_WHITE);
+    int X2 = 170;
+    int Y2 = 220;
+    int pixel = 10;
+    lcd.FillRect(X2,Y2,6*pixel,pixel);
+    lcd.FillRect(X2,Y2+pixel,pixel,4*pixel);
+    lcd.FillRect(X2,Y2+6*pixel,4*pixel,pixel);
+    lcd.FillRect(X2+5*pixel,Y2+6*pixel,pixel,pixel);
+    wait(1);
+    lcd.Clear(LCD_COLOR_BLUE);
+    wait(0.000001);
 }
         
         
-int Display_Be_4(){       
-
-    BSP_LCD_SetFont(&Font20);
-    lcd.DisplayStringAt(0, LINE(1), (uint8_t *)"MBED EXAMPLE", CENTER_MODE);
-    wait(1);
+void Display_Be_4(){       
 
-    while(1) {        
-        lcd.Clear(LCD_COLOR_BLUE);
-        lcd.SetBackColor(LCD_COLOR_BLUE);
-        lcd.SetTextColor(LCD_COLOR_WHITE);
-        int X3 = 50;
-        int Y3 = 50;
-        int pixel = 15;
-        lcd.FillRect(X3,Y3,7*pixel,pixel);
-        lcd.FillRect(X3,Y3+pixel,pixel,3*pixel);
-        lcd.FillRect(X3+3*pixel,Y3+pixel,pixel,3*pixel);
-        lcd.FillRect(X3+6*pixel,Y3+pixel,pixel,3*pixel);
-        lcd.FillRect(X3+pixel,Y3+4*pixel,2*pixel,pixel);
-        lcd.FillRect(X3+4*pixel,Y3+4*pixel,2*pixel,pixel);
-        int Xe = X3+pixel;
-        int Ye = Y3+6*pixel;
-        lcd.FillRect(Xe,Ye,3*pixel,pixel);
-        lcd.FillRect(Xe-pixel,Ye+pixel,pixel,2*pixel);
-        lcd.FillRect(Xe+pixel,Ye+pixel,pixel,3*pixel);
-        lcd.FillRect(Xe+3*pixel,Ye+pixel,pixel,2*pixel);
-        lcd.FillRect(Xe+2*pixel,Ye+3*pixel,pixel,pixel);
-        wait(1);
-        lcd.Clear(LCD_COLOR_BLUE);
-        wait(0.000001);
-    }
+    BSP_LCD_SetFont(&Font20);       
+    lcd.Clear(LCD_COLOR_BLUE);
+    lcd.SetBackColor(LCD_COLOR_BLUE);
+    lcd.SetTextColor(LCD_COLOR_WHITE);
+    int X3 = 170;
+    int Y3 = 220;
+    int pixel = 10;
+    lcd.FillRect(X3,Y3,7*pixel,pixel);
+    lcd.FillRect(X3,Y3+pixel,pixel,3*pixel);
+    lcd.FillRect(X3+3*pixel,Y3+pixel,pixel,3*pixel);
+    lcd.FillRect(X3+6*pixel,Y3+pixel,pixel,3*pixel);
+    lcd.FillRect(X3+pixel,Y3+4*pixel,2*pixel,pixel);
+    lcd.FillRect(X3+4*pixel,Y3+4*pixel,2*pixel,pixel);
+    int Xe = X3+pixel;
+    int Ye = Y3+6*pixel;
+    lcd.FillRect(Xe,Ye,3*pixel,pixel);
+    lcd.FillRect(Xe-pixel,Ye+pixel,pixel,2*pixel);
+    lcd.FillRect(Xe+pixel,Ye+pixel,pixel,3*pixel);
+    lcd.FillRect(Xe+3*pixel,Ye+pixel,pixel,2*pixel);
+    lcd.FillRect(Xe+2*pixel,Ye+3*pixel,pixel,pixel);
+    wait(1);
+    lcd.Clear(LCD_COLOR_BLUE);
+    wait(0.000001);
 }
 
 
-int Display_B_5(){       
+void Display_B_5(){       
+
+    BSP_LCD_SetFont(&Font20);      
+    lcd.Clear(LCD_COLOR_BLUE);
+    lcd.SetBackColor(LCD_COLOR_BLUE);
+    lcd.SetTextColor(LCD_COLOR_WHITE);
+    int X4 = 170;
+    int Y4 = 220;
+    int pixel = 10;
+    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);
+    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);
-
-    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);
-    }
-}        
-        
-int 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);
-    }
+    lcd.Clear(LCD_COLOR_BLUE);
+    wait(0.000001);
 }
         
         
-int Display_C_6(){      
+void Display_C_6(){      
 
     BSP_LCD_SetFont(&Font20);
-    lcd.DisplayStringAt(0, LINE(1), (uint8_t *)"MBED EXAMPLE", CENTER_MODE);
+    lcd.Clear(LCD_COLOR_BLUE);
+    lcd.SetBackColor(LCD_COLOR_BLUE);
+    lcd.SetTextColor(LCD_COLOR_WHITE);
+    int X5 = 170;
+    int Y5 = 220;
+    int pixel = 10;
+    lcd.FillRect(X5,Y5,4*pixel,pixel);
+    lcd.FillRect(X5-pixel,Y5+pixel,pixel,3*pixel);
+    lcd.FillRect(X5+4*pixel,Y5+pixel,pixel,3*pixel);
+    lcd.FillRect(X5,Y5+4*pixel,pixel,pixel);
+    lcd.FillRect(X5+3*pixel,Y5+4*pixel,pixel,pixel);
     wait(1);
-
-    while(1) {
-        lcd.Clear(LCD_COLOR_BLUE);
-        lcd.SetBackColor(LCD_COLOR_BLUE);
-        lcd.SetTextColor(LCD_COLOR_WHITE);
-        int X5 = 50;
-        int Y5 = 50;
-        int pixel = 15;
-        lcd.FillRect(X5,Y5,4*pixel,pixel);
-        lcd.FillRect(X5-pixel,Y5+pixel,pixel,3*pixel);
-        lcd.FillRect(X5+4*pixel,Y5+pixel,pixel,3*pixel);
-        lcd.FillRect(X5,Y5+4*pixel,pixel,pixel);
-        lcd.FillRect(X5+3*pixel,Y5+4*pixel,pixel,pixel);
-        wait(1);
-        lcd.Clear(LCD_COLOR_BLUE);
-        wait(0.000001);
-    }
+    lcd.Clear(LCD_COLOR_BLUE);
+    wait(0.000001);
 }
         
         
-int Display_N_7(){       
-
-    BSP_LCD_SetFont(&Font20);
-    lcd.DisplayStringAt(0, LINE(1), (uint8_t *)"MBED EXAMPLE", CENTER_MODE);
-    wait(1);
+void Display_N_7(){       
 
-    while(1) {        
-        lcd.Clear(LCD_COLOR_BLUE);
-        lcd.SetBackColor(LCD_COLOR_BLUE);
-        lcd.SetTextColor(LCD_COLOR_WHITE);
-        int X6 = 50;
-        int Y6 = 50;
-        int pixel = 15;
-        lcd.FillRect(X6,Y6,7*pixel,pixel);
-        lcd.FillRect(X6,Y6+4*pixel,7*pixel,pixel);
-        lcd.FillRect(X6+4*pixel,Y6+pixel,pixel,pixel);
-        lcd.FillRect(X6+3*pixel,Y6+2*pixel,pixel,pixel);
-        lcd.FillRect(X6+2*pixel,Y6+3*pixel,pixel,pixel);
-        wait(1);
-        lcd.Clear(LCD_COLOR_BLUE);
-        wait(0.000001);
-    }
+    BSP_LCD_SetFont(&Font20);   
+    lcd.Clear(LCD_COLOR_BLUE);
+    lcd.SetBackColor(LCD_COLOR_BLUE);
+    lcd.SetTextColor(LCD_COLOR_WHITE);
+    int X6 = 170;
+    int Y6 = 220;
+    int pixel = 10;
+    lcd.FillRect(X6,Y6,7*pixel,pixel);
+    lcd.FillRect(X6,Y6+4*pixel,7*pixel,pixel);
+    lcd.FillRect(X6+4*pixel,Y6+pixel,pixel,pixel);
+    lcd.FillRect(X6+3*pixel,Y6+2*pixel,pixel,pixel);
+    lcd.FillRect(X6+2*pixel,Y6+3*pixel,pixel,pixel);
+    wait(1);
+    lcd.Clear(LCD_COLOR_BLUE);
+    wait(0.000001);
 }
         
-int Display_F_9(){        
-
-    BSP_LCD_SetFont(&Font20);
-    lcd.DisplayStringAt(0, LINE(1), (uint8_t *)"MBED EXAMPLE", CENTER_MODE);
-    wait(1);
+void Display_F_9(){        
 
-    while(1) {       
-        lcd.Clear(LCD_COLOR_BLUE);
-        lcd.SetBackColor(LCD_COLOR_BLUE);
-        lcd.SetTextColor(LCD_COLOR_WHITE);
-        int X7 = 50;
-        int Y7 = 50;
-        int pixel = 15;
-        lcd.FillRect(X7,Y7,7*pixel,pixel);
-        lcd.FillRect(X7+3*pixel,Y7+pixel,pixel,3*pixel);
-        lcd.FillRect(X7+6*pixel,Y7+pixel,pixel,4*pixel);
-        wait(1);
-        lcd.Clear(LCD_COLOR_BLUE);
-        wait(0.000001);
-    }
+    BSP_LCD_SetFont(&Font20);   
+    lcd.Clear(LCD_COLOR_BLUE);
+    lcd.SetBackColor(LCD_COLOR_BLUE);
+    lcd.SetTextColor(LCD_COLOR_WHITE);
+    int X7 = 170;
+    int Y7 = 220;
+    int pixel = 10;
+    lcd.FillRect(X7,Y7,7*pixel,pixel);
+    lcd.FillRect(X7+3*pixel,Y7+pixel,pixel,3*pixel);
+    lcd.FillRect(X7+6*pixel,Y7+pixel,pixel,4*pixel);
+    wait(1);
+    lcd.Clear(LCD_COLOR_BLUE);
+    wait(0.000001);
 }
\ No newline at end of file