Diff: main.cpp

Revision:

2:8a932906e684

Parent:

1:0883bd051a78

Child:

3:96a6e9e58178

--- a/main.cpp	Tue Jun 22 10:01:32 2021 +0000
+++ b/main.cpp	Tue Jun 22 11:52:38 2021 +0000
@@ -36,12 +36,10 @@
     Button talk(10, 100, 60, 35, "Radio");
     Button start(400, 135, 60, 35, "Start", Font12, GuiBase::ENUM_TEXT, GuiBase::ENUM_BACK, LCD_COLOR_DARKGREEN);
 
-
-    const int NUMBER_BUTTONS = 3;
-    const string PNEU[NUMBER_BUTTONS] = {"Soft", "Medium", "Hard"};
-    const string MODE[NUMBER_BUTTONS] = {"1", "2", "3"};
-    ButtonGroup bGroup1(168, 54, 66, 35,  NUMBER_BUTTONS, PNEU, 2, 2, 3, 1, Font12, LCD_COLOR_WHITE, LCD_COLOR_BLACK);
-    ButtonGroup bGroupMode(10, 54, 30, 35,  NUMBER_BUTTONS, MODE, 2, 2, 3, 1, Font12, LCD_COLOR_WHITE, LCD_COLOR_BLACK);
+    const string PNEU[4] = {"Soft", "Medium", "Hard", "Wet"};
+    const string MODE[3] = {"1", "2", "3"};
+    ButtonGroup bGroup1(168, 54, 66, 35,  4, PNEU, 2, 2, 4, 1, Font12, LCD_COLOR_WHITE, LCD_COLOR_BLACK);
+    ButtonGroup bGroupMode(10, 54, 30, 35,  3, MODE, 2, 2, 3, 1, Font12, LCD_COLOR_WHITE, LCD_COLOR_BLACK);
     NumericLabel<int> bTouch(240, 112, "", Label::LEFT, Font12, LCD_COLOR_WHITE);
     NumericLabel<float> valTemp(290,110, "", Label::CENTER, Font12, LCD_COLOR_WHITE, LCD_COLOR_BLACK);
     NumericLabel<float> valHumi(260,135, "", Label::CENTER, Font12, LCD_COLOR_WHITE, LCD_COLOR_BLACK);
@@ -57,9 +55,6 @@
     bGroup1.Draw(1,0xFFFFE800,0xFFFFFFFF); //Yellow
     bGroup1.Draw(2,0xFFFFFFFF,0xFF000000); //White
 
-    pc.baud ( 115200 );
-
-
     // Reset le capteur
     mySI7021status   =   myTempRHsensor.SI7021_SoftReset ();
     // Configuration du capteur
@@ -77,20 +72,34 @@
                     bGroup1.Activate(2);
                     bGroup1.Draw(1,0xFFFFE800,0xFFFFFFFF); //Yellow
                     bGroup1.Draw(2,0xFFFFFFFF,0xFF000000); //White
+                    bGroup1.Draw(3);
                     break;
                 case 1 :
                     bGroup1.Inactivate(1);
                     bGroup1.Activate(0);
+                    bGroup1.Activate(3);
                     bGroup1.Activate(2);
                     bGroup1.Draw(0,0xFFFF0000,0xFFFFFFFF); //Red
                     bGroup1.Draw(2,0xFFFFFFFF,0xFF000000); //White
+                    bGroup1.Draw(3);
                     break;
                 case 2 :
                     bGroup1.Inactivate(2);
                     bGroup1.Activate(0);
                     bGroup1.Activate(1);
+                    bGroup1.Activate(3);
                     bGroup1.Draw(0,0xFFFF0000,0xFFFFFFFF); //Red
                     bGroup1.Draw(1,0xFFFFE800,0xFFFFFFFF); //Yellow
+                    bGroup1.Draw(3);
+                    break;
+                case 3 :
+                    bGroup1.Inactivate(3);
+                    bGroup1.Activate(0);
+                    bGroup1.Activate(1);
+                    bGroup1.Activate(2);
+                    bGroup1.Draw(1,0xFFFFE800,0xFFFFFFFF); //Yellow
+                    bGroup1.Draw(2,0xFFFFFFFF,0xFF000000); //White
+                    bGroup1.Draw(0,0xFFFF0000,0xFFFFFFFF); //Red    
                     break;
             }
         }
@@ -169,7 +178,5 @@
             t.reset();
             BlinkLabel finish(240, 180,"Course Termine",Label::CENTER);
         }
-
-
     }
 }