updated version with parameters loaded from sdcard
Dependencies: F7_Ethernet mbed MbedJSONValue LCD_DISCO_F746NG mbed-rtos BSP_DISCO_F746NG CANMsg NetworkAPI SDFileSystem_Warning_Fixed GroveStreamsmodified LcdDiscoF746NgTracer JSON
Diff: GuiJPA.cpp
- Branch:
- jpa
- Revision:
- 12:15ae35cfb03f
- Parent:
- 11:b198b2f2676f
--- a/GuiJPA.cpp Wed Sep 16 05:47:02 2020 +0000 +++ b/GuiJPA.cpp Thu Sep 17 20:32:02 2020 +0000 @@ -1,3 +1,34 @@ +/* + +var LCD_COLOR_BLUE = "0xFF0000FF"; +var LCD_COLOR_GREEN = "0xFF00FF00"; +var LCD_COLOR_RED = "0xFFFF0000"; +var LCD_COLOR_CYAN = "0xFF00FFFF"; +var LCD_COLOR_MAGENTA = "0xFFFF00FF"; +var LCD_COLOR_YELLOW = "0xFFFFFF00"; +var LCD_COLOR_LIGHTBLUE = "0xFF8080FF"; +var LCD_COLOR_LIGHTGREEN = "0xFF80FF80"; +var LCD_COLOR_LIGHTRED = "0xFFFF8080"; +var LCD_COLOR_LIGHTCYAN = "0xFF80FFFF"; +var LCD_COLOR_LIGHTMAGENTA = "0xFFFF80FF"; +var LCD_COLOR_LIGHTYELLOW = "0xFFFFFF80"; +var LCD_COLOR_DARKBLUE = "0xFF000080"; +var LCD_COLOR_DARKGREEN = "0xFF008000"; +var LCD_COLOR_DARKRED = "0xFF800000"; +var LCD_COLOR_DARKCYAN = "0xFF008080"; +var LCD_COLOR_DARKMAGENTA = "0xFF800080"; +var LCD_COLOR_DARKYELLOW = "0xFF808000"; +var LCD_COLOR_WHITE = "0xFFFFFFFF"; +var LCD_COLOR_LIGHTGRAY = "0xFFD3D3D3"; +var LCD_COLOR_GRAY = "0xFF808080"; +var LCD_COLOR_DARKGRAY = "0xFF404040"; +var LCD_COLOR_BLACK = "0xFF000000"; +var LCD_COLOR_BROWN = "0xFFA52A2A"; +var LCD_COLOR_ORANGE = "0xFFFFA500"; +var LCD_COLOR_TRANSPARENT = "0xFF000000"; +*/ + + #include "stm32746g_discovery_lcd.h" #include "stm32746g_discovery_ts.h" #include "MbedJSONValue.h" @@ -122,7 +153,16 @@ txtColorTemp1 = (uint32_t)strtoul("0xFFFFFF00", NULL,16) ; backColorTemp2 = (uint32_t)strtoul("0xFF808080", NULL,16); txtColorTemp2 = (uint32_t)strtoul("0xFFFFFF00", NULL,16) ; - displayOn = (0x01 | displayOn);// display temp1 & temp2 box + displayOn = (0x01 | displayOn);// display temp1 & temp2 box + displayOn = (0x02 | displayOn); // touche 1 + displayOn = (0x04 | displayOn); // touche 2 + displayOn = (0x08 | displayOn); // touche 3 + displayOn = (0x10 | displayOn); //touche 4 + if ((displayOn & 0x02) > 0) {touchButtonJPA1(1);} + if ((displayOn & 0x04) > 0) {touchButtonJPA1(2);} + if ((displayOn & 0x08) > 0) {touchButtonJPA1(3);} + if ((displayOn & 0x10) > 0) {touchButtonJPA1(4);} + } else {