Tick Tock / Mbed 2 deprecated CANary_merge

Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341

Dependencies:   SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed

Fork of CANary by Tick Tock

Diff: utility.h

Revision:
40:0e6e71a7323f
Parent:
39:eef8beac7411
Child:
41:8d4609ea7259
--- a/utility.h	Mon Mar 25 15:13:15 2013 +0000
+++ b/utility.h	Sun Mar 31 17:45:05 2013 +0000
@@ -15,6 +15,7 @@
 extern bool touched;
 extern bool logOpen;
 extern bool logCP; // Turbo3
+extern bool showCP;
 extern char writeBuffer[maxBufLen][13];
 extern volatile int writePointer;
 extern DigitalOut led1,led2,led3,led4;
@@ -37,8 +38,8 @@
 extern bool playbackOpen;
 extern bool step;
 extern float playbackInt;
-extern signed long mWs;
-extern unsigned short pbts;
+extern signed long mWs_x4;
+extern unsigned short numWsamples;
 
 extern "C" {
     void mbed_reset();