Justin Hunt / CANary

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   FatFileSystem MSCFileSystem SPI_TFTx2 TFT_fonts TOUCH_TFTx2 beep mbed

Fork of CANary_corrupt by Tick Tock

Diff: displayModes.cpp

Revision:
47:9cc7d876dd6d
Parent:
44:6262a9fd1e56
Child:
48:d1ce92104a1f
diff -r 73e8716f976f -r 9cc7d876dd6d displayModes.cpp
--- a/displayModes.cpp	Tue Apr 02 07:10:57 2013 +0000
+++ b/displayModes.cpp	Tue Apr 02 07:23:46 2013 +0000
@@ -295,7 +295,7 @@
 
 //----------------
 // gg - hist
-void cpHistogram(bool force){ 
+void cpHistogram(bool force, bool showButtons){ 
     short unsigned max, min, jv, i, bd;
     unsigned avg;
     if(force){
@@ -389,7 +389,7 @@
     }
     
     // handle the button
-    if(sMode==1){
+    if(sMode==1&&showButtons){
         tt.foreground(Yellow);
         tt.background(DarkCyan);
         tt.set_font((unsigned char*) Arial12x12);
@@ -568,7 +568,7 @@
             showDateTime(changed,(display==whichTouched));
             break;
         case cpHistScreen: // gg - hist
-            cpHistogram(changed);
+            cpHistogram(changed||showCP,(display==whichTouched));
             break;
         default:
             if (changed){