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:
160:905fe45ed54b
Parent:
159:577e9d015693
Child:
167:58d4edf403d4
--- a/utility.h	Fri Nov 08 16:07:53 2013 +0000
+++ b/utility.h	Wed Nov 20 13:13:54 2013 +0000
@@ -47,7 +47,7 @@
 extern float playbackInt;
 extern signed long mWs_x4;
 extern unsigned short numWsamples;
-extern signed long motorRPM;
+extern signed long motorRPM_x2;
 extern unsigned short numSsamples;
 extern unsigned char skin;
 extern unsigned char dtePeriod;
@@ -111,6 +111,7 @@
     bool detectUSB();
     void chirp();
     void beep(float freq, float time);
+    void beep3(float freq1, float time1, float freq2, float time2, float freq3, float time3);
 }
 
 //LEAF OBD