Diff: utility.h

Revision:

155:f31006516956

Parent:

154:90ea16ca7475

Child:

158:059abeb44ba1

--- a/utility.h	Wed Oct 16 03:47:48 2013 +0000
+++ b/utility.h	Sat Oct 19 15:38:44 2013 +0000
@@ -3,7 +3,6 @@
 #include "CAN.h"
 #include "common.h"
 #include "TOUCH_TFTx2.h"
-#include "beep.h"
 #include <cctype>
 #include "ff.h"
 
@@ -52,7 +51,6 @@
 extern unsigned short numSsamples;
 extern unsigned char skin;
 extern unsigned char dtePeriod;
-extern Beep spkr;
 extern unsigned char reqMsgCnt;
 extern float maxTemp;
 extern unsigned long Ah_x10000;
@@ -73,8 +71,10 @@
 extern bool showHealth;
 extern float kWh_trip[0];
 extern float miles_trip[0];
-extern Beep spkr;
+extern PwmOut dled; // for test
+extern PwmOut spkr;
 extern bool brakeMon;
+extern bool regenMon;
 extern Ticker geiger;
 extern unsigned short chirpInt;
 extern unsigned short uMsgId[8];
@@ -110,6 +110,7 @@
     void updateFirmware(); // LM - Update firmware off USB
     bool detectUSB();
     void chirp();
+    void beep(float freq, float time);
 }
 
 //LEAF OBD