Diff: GPS.h

Revision:

4:c959dd4c5fe8

Parent:

3:c7cd4887560d

Child:

9:e7a5959ffae1

diff -r c7cd4887560d -r c959dd4c5fe8 GPS.h
--- a/GPS.h	Fri Oct 25 09:45:55 2013 +0000
+++ b/GPS.h	Fri Oct 25 17:50:17 2013 +0000
@@ -17,8 +17,9 @@
     #define PROTOCOL(x) (x & 0xFF0000)
 
     virtual int getMessage(char* buf, int len) = 0; 
-    virtual int sendNmea(const char* buf, int len) = 0;
-    virtual int sendUbx(unsigned char cls, unsigned char id, const void* buf, int len) = 0;
+    virtual int send(const char* buf, int len);
+    virtual int sendNmea(const char* buf, int len);
+    virtual int sendUbx(unsigned char cls, unsigned char id, const void* buf, int len);
     
     static const char* findNmeaItemPos(int ix, const char* start, const char* end);
     static bool getNmeaItem(int ix, char* buf, int len, double& val);
@@ -28,7 +29,7 @@
     static int _getMessage(Pipe<char>* pipe, char* buf, int len);
     static int _parseNmea(Pipe<char>* pipe, int len);
     static int _parseUbx(Pipe<char>* pipe, int len);
-    virtual int send(const void* buf, int len) = 0;
+    virtual int _send(const void* buf, int len) = 0;
     static const char toHex[16];
 };
 
@@ -42,7 +43,7 @@
 protected:
     void serialRxIrq(void);
     virtual char next(void);
-    virtual int send(const void* buf, int len);
+    virtual int _send(const void* buf, int len);
     Pipe<char> _pipe;
 };
 
@@ -53,11 +54,12 @@
     bool detect(void);
     
     virtual int getMessage(char* buf, int len);
+    virtual int send(const char* buf, int len);
     virtual int sendNmea(const char* buf, int len);
     virtual int sendUbx(unsigned char cls, unsigned char id, const void* buf, int len);
 protected:
     virtual char next(void);
-    virtual int send(const void* buf, int len);
+    virtual int _send(const void* buf, int len);
     int _get(char* buf, int len);                 // read the NMEA or UBX stream
     
     Pipe<char> _pipe;