Mladen Adamovic / F746_GUI

Dependencies:   Array_Matrix BSP_DISCO_F746NG LCD_DISCO_F746NG TS_DISCO_F746NG

Dependents:   Spectrogram

Fork of F746_GUI by 不韋 呂

Files at this revision

API Documentation at this revision

Comitter:
MikamiUitOpen
Date:
Mon Jan 16 00:23:53 2017 +0000
Parent:
26:a9cf68d24f40
Child:
28:e2b7ea78b7a0
Commit message:
28

Changed in this revision

BlinkLabel.hpp Show annotated file Show diff for this revision Revisions of this file
ResetButton.hpp Show annotated file Show diff for this revision Revisions of this file
--- a/BlinkLabel.hpp	Wed Nov 09 10:30:09 2016 +0000
+++ b/BlinkLabel.hpp	Mon Jan 16 00:23:53 2017 +0000
@@ -2,7 +2,7 @@
 //  BlinkLabel class -- derived class of Label class
 //      For displaying error message
 //
-//  2016/08/16, Copyright (c) 2016 MIKAMI, Naoki
+//  2017/01/16, Copyright (c) 2017 MIKAMI, Naoki
 //-----------------------------------------------------------
 
 #ifndef F746_BLINK_LABEL_HPP
@@ -32,7 +32,7 @@
                 Draw(backColor);
                 wait_ms(off);
                 Draw(textColor);
-                reset->Do();
+                reset->DoIfTouched();
             }
         }
 
--- a/ResetButton.hpp	Wed Nov 09 10:30:09 2016 +0000
+++ b/ResetButton.hpp	Mon Jan 16 00:23:53 2017 +0000
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------
 //  ResetButton class -- derived class of Button class
 //
-//  2016/08/15, Copyright (c) 2016 MIKAMI, Naoki
+//  2017/01/16, Copyright (c) 2017 MIKAMI, Naoki
 //-----------------------------------------------------------
 
 #ifndef F746_RESET_BUTTON_HPP
@@ -24,7 +24,7 @@
             Draw();
         }
 
-        void Do()
+        void DoIfTouched()
         {
             if (!Touched()) return;