Arnaud Apelbaum / button

Interfaçage NeoPixel Ring 12, LPRO MECSE, Arnaud A.

Diff: view.h

Revision:
5:c4038609e806
Parent:
3:86ea18a6bfff
Child:
6:03acf74857cc
--- a/view.h	Mon Jun 15 03:21:35 2020 +0000
+++ b/view.h	Wed Jun 17 14:05:32 2020 +0000
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #define SCREENWIDTH 480
 #define SCREENHEIGHT 272
-#define LED_BUTTON_SIZE 15
+#define LED_BUTTON_SIZE 40
 #define RGB_TEXT_VIEW_WIDTH 30
 #define RGB_TEXT_VIEW_HEIGHT 15
 #define PLUS_MINUS_BUTTON_SIZE 30
@@ -53,44 +53,44 @@
                           false, false, false, false,
                           false, false, false, false};
     //LEDS buttons
-    Button *led0 = new Button(372, 32, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_WHITE);
-    Button *led1 = new Button(401, 40, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_WHITE);
-    Button *led2 = new Button(425, 64, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_WHITE);
-    Button *led3 = new Button(432, 92, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_WHITE);
-    Button *led4 = new Button(424, 122, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_WHITE);
-    Button *led5 = new Button(401, 145, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_WHITE);
-    Button *led6 = new Button(372, 153, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_WHITE);
-    Button *led7 = new Button(342, 142, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_WHITE);
-    Button *led8 = new Button(319, 122, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_WHITE);
-    Button *led9 = new Button(312, 92, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_WHITE);
-    Button *led10 = new Button(319, 64, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_WHITE);
-    Button *led11 = new Button(343, 40, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_WHITE);
+    Button *led0 = new Button(300, 5, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_BLACK, LCD_COLOR_WHITE);
+    Button *led1 = new Button(353, 20, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_BLACK, LCD_COLOR_WHITE);
+    Button *led2 = new Button(397, 65, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_BLACK, LCD_COLOR_WHITE);
+    Button *led3 = new Button(410, 118, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_BLACK, LCD_COLOR_WHITE);
+    Button *led4 = new Button(396, 170, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_BLACK, LCD_COLOR_WHITE);
+    Button *led5 = new Button(354, 212, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_BLACK, LCD_COLOR_WHITE);
+    Button *led6 = new Button(300, 227, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_BLACK, LCD_COLOR_WHITE);
+    Button *led7 = new Button(245, 212, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_BLACK, LCD_COLOR_WHITE);
+    Button *led8 = new Button(204, 170, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_BLACK, LCD_COLOR_WHITE);
+    Button *led9 = new Button(190, 118, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_BLACK, LCD_COLOR_WHITE);
+    Button *led10 = new Button(203, 62, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_BLACK, LCD_COLOR_WHITE);
+    Button *led11 = new Button(245, 20, LED_BUTTON_SIZE, LED_BUTTON_SIZE, LCD_COLOR_BLACK, LCD_COLOR_WHITE);
     //RGB TextView
-    Button *redTextview = new Button(220, 38, RGB_TEXT_VIEW_WIDTH, RGB_TEXT_VIEW_HEIGHT, LCD_COLOR_RED);
-    Button *greenTextview  = new Button(220, 128, RGB_TEXT_VIEW_WIDTH, RGB_TEXT_VIEW_HEIGHT, LCD_COLOR_GREEN);
-    Button *blueTextview  = new Button(220, 218, RGB_TEXT_VIEW_WIDTH, RGB_TEXT_VIEW_HEIGHT, LCD_COLOR_BLUE);
+    Button *redTextview = new Button(90, 38, RGB_TEXT_VIEW_WIDTH, RGB_TEXT_VIEW_HEIGHT, LCD_COLOR_RED);
+    Button *greenTextview  = new Button(90, 128, RGB_TEXT_VIEW_WIDTH, RGB_TEXT_VIEW_HEIGHT, LCD_COLOR_GREEN);
+    Button *blueTextview  = new Button(90, 218, RGB_TEXT_VIEW_WIDTH, RGB_TEXT_VIEW_HEIGHT, LCD_COLOR_BLUE);
     //RGB + and -
-    Button *plusRED = new Button(185, 8, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
-    Button *minusRED  = new Button(185, 53, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
-    Button *plusGREEN  = new Button(185, 98, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
-    Button *minusGREEN = new Button(185, 143, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
-    Button *plusBLUE  = new Button(185, 188, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
-    Button *minusBLUE  = new Button(185, 233, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
-    Button *plus10RED = new Button(185-35, 8, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
-    Button *minus10RED  = new Button(185-35, 53, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
-    Button *plus10GREEN  = new Button(185-35, 98, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
-    Button *minus10GREEN = new Button(185-35, 143, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
-    Button *plus10BLUE  = new Button(185-35, 188, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
-    Button *minus10BLUE  = new Button(185-35, 233, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
+    Button *plusRED = new Button(185-130, 8, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
+    Button *minusRED  = new Button(185-130, 53, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
+    Button *plusGREEN  = new Button(185-130, 98, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
+    Button *minusGREEN = new Button(185-130, 143, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
+    Button *plusBLUE  = new Button(185-130, 188, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
+    Button *minusBLUE  = new Button(185-130, 233, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
+    Button *plus10RED = new Button(185-35-130, 8, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
+    Button *minus10RED  = new Button(185-35-130, 53, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
+    Button *plus10GREEN  = new Button(185-35-130, 98, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
+    Button *minus10GREEN = new Button(185-35-130, 143, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
+    Button *plus10BLUE  = new Button(185-35-130, 188, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
+    Button *minus10BLUE  = new Button(185-35-130, 233, PLUS_MINUS_BUTTON_SIZE, PLUS_MINUS_BUTTON_SIZE, LIGHT_GRAY);
     //SET NEW COLOR
-    Button *setNewColor  = new Button(290, 208, 100, 25, LIGHT_GRAY);
-    Button *cancel  = new Button(290, 238, 100, 25, LIGHT_GRAY);
+    Button *setNewColor  = new Button(270, 100, 100, 25, LIGHT_GRAY);
+    Button *cancel  = new Button(270, 150, 100, 25, LIGHT_GRAY);
     //Animations
-    Button *anim1  = new Button(20, 38, ANIMATION_BUTTON_WIDTH, ANIMATION_BUTTON_HEIGHT, LIGHT_GRAY);
+    /*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);
+    Button *stop  = new Button(20, 163, 120, ANIMATION_BUTTON_HEIGHT+5, LIGHT_GRAY);*/
 
 };