Diff: view2.h

Revision:

1:2a58d8fcf7f9

Parent:

0:c95a8c8c3c9b

Child:

2:a885824aefe0

--- a/view2.h	Wed Jun 17 16:34:16 2020 +0000
+++ b/view2.h	Mon Jun 22 21:55:40 2020 +0000
@@ -24,9 +24,11 @@
     void contain(int x, int y);
     void draw();
     void updateLCD();
+    void updateViewChanged(Button* button);
+    bool getViewChanged();
+    void setViewChanged(bool viewChanged);
     void initView();
-    ~View2();
-    
+    ~View2();  
 
 private :
     void drawText();
@@ -37,19 +39,27 @@
     TS_StateTypeDef TS_State;
     uint16_t x, y;
     uint8_t idx;
-    bool screenReleased=false;
+    bool screenReleased=true;
     bool cleared = false;
     uint8_t RGB[3]={0x00, 0x00, 0x00};
     char str[10];
     bool ledSelected[12]={false, false, false, false,
                           false, false, false, false,
                           false, false, false, false};
+    bool viewChanged= false;
+    
     //Animations
     Button *anim1  = new Button(20, 38, ANIMATION_BUTTON_WIDTH, ANIMATION_BUTTON_HEIGHT, LIGHT_GRAY);
     Button *anim2  = new Button(20, 68, ANIMATION_BUTTON_WIDTH, ANIMATION_BUTTON_HEIGHT, LIGHT_GRAY);
     Button *anim3 = new Button(20, 98, ANIMATION_BUTTON_WIDTH, ANIMATION_BUTTON_HEIGHT, LIGHT_GRAY);
     Button *start  = new Button(20, 128, 120, ANIMATION_BUTTON_HEIGHT+5, LIGHT_GRAY);
     Button *stop  = new Button(20, 163, 120, ANIMATION_BUTTON_HEIGHT+5, LIGHT_GRAY);
+    //Animations tab
+    Button *animations = new Button(397, 0, 83, 25, LCD_COLOR_WHITE, LCD_COLOR_WHITE);
+    //LEDs tab
+    Button *leds = new Button(397, 0+25, 83, 25, LCD_COLOR_BLACK, LCD_COLOR_WHITE);
+    Button *hideTop2 = new Button(397, 0+25, 82, 1, LCD_COLOR_BLACK, LCD_COLOR_WHITE);
+    Button *hideRight2 = new Button(479, 0+25, 1, 24, LCD_COLOR_BLACK, LCD_COLOR_WHITE);
 
 };