Diff: main.cpp

Revision:

4:8f6e0ef3fffe

Parent:

3:92661d767dd1

diff -r 92661d767dd1 -r 8f6e0ef3fffe main.cpp
--- a/main.cpp	Sun Nov 08 18:33:37 2020 +0000
+++ b/main.cpp	Wed Nov 11 15:27:24 2020 +0000
@@ -7,18 +7,15 @@
     uint16_t y=0;
     uint16_t temps = 100;
     int NumeroPage = 0;
-
-
-
-    char Text[2];
     
-    int TAB_ingredients[6]={0,0,0,0,0,0};
+    int TAB_ingredients[6]={0,0,0,0,0,0};//Dans l'ordre : Pates, oeufs, tomate, lardon, steak, creme;
     
 
     BSP_LCD_Init(); //Initialisation LCD
     BSP_LCD_LayerDefaultInit(LTDC_ACTIVE_LAYER, LCD_FB_START_ADDRESS);
     BSP_LCD_SelectLayer(LTDC_ACTIVE_LAYER);
-
+    BSP_LCD_Clear(LCD_COLOR_WHITE);
+    
     TS_StateTypeDef TS_State;
     BSP_TS_Init(BSP_LCD_GetXSize(), BSP_LCD_GetYSize()); // Initialisation de la fonction tactile
     AfficherPage(0);
@@ -32,33 +29,43 @@
             x = TS_State.touchX[0];
             y = TS_State.touchY[0];
 
-            if (( Bouton(160,0,80,33,x,y) == true ) && ( NumeroPage == 0 )) {
+            if (( Bouton(160,0,80,33,x,y) == true ) && ( NumeroPage == 0 )) { //Validation
                 NumeroPage =1;
+                BSP_LCD_Clear(LCD_COLOR_WHITE);
                 AfficherPage(NumeroPage);
             } 
-            
-            else if (( Bouton(240,0,80,33,x,y)== true ) && ( NumeroPage== 0 )) {
-                TAB_ingredients[0]=0;
-                sprintf((char*)&TextTomate, "%d", TAB_ingredients[0]);
-                BSP_LCD_SetBackColor(LCD_COLOR_WHITE);
-                BSP_LCD_SetTextColor(LCD_COLOR_BLACK);
-                BSP_LCD_DisplayStringAt(400, 61, (uint8_t *)&Text, LEFT_MODE);
+            else if (( Bouton(240,0,80,33,x,y)== true ) && ( NumeroPage== 0 )) {//Annulation
+               TAB_ingredients[0]=TAB_ingredients[1]=TAB_ingredients[2]=TAB_ingredients[3]=TAB_ingredients[4]=TAB_ingredients[5]=0;
+               BSP_LCD_Clear(LCD_COLOR_WHITE);
+                AfficherPage(NumeroPage);              
+            }
+            else if (( Bouton(0,33,160,90,x,y)== true ) && ( NumeroPage== 0 )) {//Pates
+                TAB_ingredients[0]+=1;                
             }
-            
-            else if (( Bouton(320,33,160,90,x,y)== true ) && ( NumeroPage== 0 )) {
-                TAB_ingredients[0]+=1;
-                sprintf((char*)&TextTomate[0], "%d", TAB_ingredients[0]);
-                BSP_LCD_SetBackColor(LCD_COLOR_WHITE);
-                BSP_LCD_SetTextColor(LCD_COLOR_BLACK);
-                BSP_LCD_DisplayStringAt(400, 61, (uint8_t *)&Text, LEFT_MODE);
-            }
-            
-            
+            else if (( Bouton(160,33,160,90,x,y)== true ) && ( NumeroPage== 0 )) {//Oeufs
+                TAB_ingredients[1]+=1;
+                }
+            else if (( Bouton(320,33,160,90,x,y)== true ) && ( NumeroPage== 0 )) {//Tomates
+                TAB_ingredients[2]+=1;
+                }
+            else if (( Bouton(0,123,160,90,x,y)== true ) && ( NumeroPage== 0 )) {//Lardons
+                TAB_ingredients[3]+=1;
+                }
+            else if (( Bouton(160,123,160,90,x,y)== true ) && ( NumeroPage== 0 )) {//Steak
+                TAB_ingredients[4]+=1;
+                 }
+            else if (( Bouton(320,123,160,90,x,y)== true ) && ( NumeroPage== 0 )) {//creme
+                TAB_ingredients[5]+=1;
+                }
+                
+                
+        if(NumeroPage == 0){ //Affichage du tableau ingredients
+            Affiche_Ingredients(TAB_ingredients); 
+         }              
         HAL_Delay(temps);
         TS_State.touchEventId [0] = 0;
         TS_State.touchEventId [1] = 0;
-        
-
+    
         }
         
     }