Revision 76:fb6779d0963e, committed 2013-04-15

Comitter:

TickTock

Date:

Mon Apr 15 14:40:05 2013 +0000

Parent:

75:77bd26829dca

Child:

77:7c136766466c

Commit message:

Fixed problem with mbed library

Changed in this revision

--- a/main.cpp	Mon Apr 15 14:33:53 2013 +0000
+++ b/main.cpp	Mon Apr 15 14:40:05 2013 +0000
@@ -49,7 +49,7 @@
 // gg - revStr is used in 2 places
 // gg - and is easy to edit here
 // gg - added ZeroSecTick and revStr
-char revStr[7] = "74"; // gg - fix rev number
+char revStr[7] = "76"; // gg - fix rev number
 
 bool logEn = false, logOpen = false; 
 bool yesBattLog = false ; // gg - Batt Log
@@ -64,8 +64,8 @@
 unsigned char battData[256]={0};
 unsigned char msgChanged[100]; // inidcates which bytes changed
 char c;
-volatile unsigned short writePointer = 0;
-unsigned short readPointer=0;
+volatile int writePointer = 0;
+int readPointer=0;
 volatile unsigned short secsNoMsg = 0;
 volatile unsigned short secsNoTouch = 0;
 volatile bool canIdle;

--- a/utility.h	Mon Apr 15 14:33:53 2013 +0000
+++ b/utility.h	Mon Apr 15 14:40:05 2013 +0000
@@ -4,6 +4,7 @@
 #include "CAN.h"
 #include "common.h"
 #include "TOUCH_TFTx2.h"
+#include "beep.h"
 
 extern Timer timer;
 extern volatile unsigned short secsNoMsg;
@@ -19,7 +20,7 @@
 extern bool showCP;
 extern char writeBuffer[maxBufLen][13];
 extern volatile int writePointer;
-extern unsigned short readPointer;
+extern int readPointer;
 extern DigitalOut led1,led2,led3,led4;
 extern char indexLastMsg[0x800];
 extern unsigned char dMode[2];
@@ -47,6 +48,7 @@
 extern unsigned short numSsamples;
 extern unsigned char skin;
 extern unsigned char dtePeriod;
+extern Beep spkr;
 
 extern "C" {
     void mbed_reset();