Diff: main.cpp

Revision:

3:13b323fb08e8

Parent:

2:a655d6640167

Child:

4:95cde28a5cf1

--- a/main.cpp	Tue Oct 20 15:00:59 2015 +0000
+++ b/main.cpp	Wed Oct 21 18:08:19 2015 +0000
@@ -2,13 +2,11 @@
 #include "TS_DISCO_F746NG.h"
 #include "LCD_DISCO_F746NG.h"
 
-#include "MenuGUIButton.h"
-#include "MenuGUIMenu.h"
-#include "MenuGUI.h"
 #include "main.h"
 
 LCD_DISCO_F746NG lcd;
 TS_DISCO_F746NG ts;
+DigitalOut myled(LED1);
 
 //MenuGUIButton button01;
 //MenuGUIButton button02;
@@ -26,6 +24,7 @@
     uint8_t prev_nb_touches = 0;
 
     lcd.DisplayStringAt(0, LINE(5), (uint8_t *)"TOUCHSCREEN DEMO", CENTER_MODE);
+    led_on();
     wait(0.2);
 
     status = ts.Init(lcd.GetXSize(), lcd.GetYSize());
@@ -45,6 +44,7 @@
     lcd.SetFont(&Font12);
     lcd.SetBackColor(LCD_COLOR_BLUE);
     lcd.SetTextColor(LCD_COLOR_WHITE);
+    led_off();
     
     /* For test / demo
     ------------------
@@ -58,11 +58,12 @@
     |------|  |------|  |------|
     |  b2  |  |  b4  |  |  b7  |
     |------|  |------|  |------|
-     ->menu02
+     ->menu02            -> Led ON
 
               |------|  |------|
               |  b5  |  |  b8  |
               |------|  |------|
+               -> Led OFF
     menu_main  menu01    menu02
     
     */
@@ -73,8 +74,14 @@
     MenuGUIButton button04 (100, 140, 80, 50, "b4", &lcd);
     
     MenuGUIButton button05 (190, 80, 80, 50, "b5", &lcd);
+        button05.callback = true;
+        //button05.callback_function = led_off;
+        button05.callback_function = led_toggle;
     MenuGUIButton button06 (190, 140, 80, 50, "b6", &lcd);
     MenuGUIButton button07 (190, 80, 80, 50, "b7", &lcd);
+        button07.callback = true;
+        //button07.callback_function = led_on;
+        button07.callback_function = led_toggle;
     MenuGUIButton button08 (190, 140, 80, 50, "b8", &lcd);
     
     // Main menu
@@ -165,6 +172,29 @@
 }
 
 
+// Functions definition
+void led_power (int state) {
+    myled = state;
+    }
+
+void led_on (void) {
+    led_power(1);
+    }
+    
+void led_off (void) {
+    led_power(0);
+    }
+    
+void led_toggle (void) {
+    static int toggle = 0;
+    if (toggle) {
+        led_on();
+        toggle = 0;
+        }
+    else {
+        led_off();
+        toggle = 1;
+        }
+    }
 
 
-