Update of /cvsroot/firebug/fireboard/beta/tos/lib/SiRF
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28568/tos/lib/SiRF
Modified Files:
SiRFM.nc sirf.h
Log Message:
Added code for parsing blocked sirf messages.
Index: SiRFM.nc
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/tos/lib/SiRF/SiRFM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SiRFM.nc 16 Aug 2005 00:57:34 -0000 1.2
--- SiRFM.nc 17 Aug 2005 01:56:47 -0000 1.3
***************
*** 42,45 ****
--- 42,52 ----
#include "sirf.h"
+ //uint8_t cno[10] = {0};
+ double gps_time;
+ double carrier_phase;
+ double carrier_frequency;
+ float xpos, ypos, zpos;
+
+
command uint8_t SiRF.get_type (const char * sirfstring) {
return 0;
Index: sirf.h
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/tos/lib/SiRF/sirf.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sirf.h 1 Aug 2005 19:52:58 -0000 1.1
--- sirf.h 17 Aug 2005 01:56:47 -0000 1.2
***************
*** 10,14 ****
//#include <sys/types.h>
!
#ifndef FB_HEADER
--- 10,18 ----
//#include <sys/types.h>
! /** Enums for dispatching sirf messages. */
! enum {
! SIRF2 = 2,
! SIRF28 = 28
! };
#ifndef FB_HEADER
***************
*** 16,23 ****
typedef struct _fb_header {
uint8_t seqno;
uint8_t am_type;
! uint8_t rsrvd1;
! uint8_t rsrvd2;
} fb_header;
--- 20,28 ----
typedef struct _fb_header {
+ uint8_t mote_id;
uint8_t seqno;
uint8_t am_type;
! uint8_t blockcount;
! //uint8_t blocknumber;
} fb_header;
***************
*** 26,29 ****
--- 31,36 ----
+
+
typedef struct SiRF_ID2_1 {
***************
*** 41,47 ****
uint8_t dop;
uint8_t mode2;
-
uint16_t gps_week;
} SiRF_ID2_1;
--- 48,54 ----
uint8_t dop;
uint8_t mode2;
uint16_t gps_week;
+
} SiRF_ID2_1;
***************
*** 140,143 ****
--- 147,189 ----
+ typedef struct SiRF_ID2 {
+
+ fb_header header;
+
+ int32_t xpos;
+ int32_t ypos;
+ int32_t zpos;
+
+ uint16_t xvel;
+ uint16_t yvel;
+ uint16_t zvel;
+
+ uint8_t mode1;
+ uint8_t dop;
+ uint8_t mode2;
+ uint16_t gps_week;
+
+ uint32_t gps_tow;
+ uint8_t sv_in_fix;
+
+ uint8_t ch1;
+ uint8_t ch2;
+ uint8_t ch3;
+ uint8_t ch4;
+ uint8_t ch5;
+ uint8_t ch6;
+ uint8_t ch7;
+ uint8_t ch8;
+ uint8_t ch9;
+ uint8_t ch10;
+ uint8_t ch11;
+ uint8_t ch12;
+
+ } SiRF_ID2_t;
+
+ enum {
+ AM_SIRF_ID2 = 155
+ };
+
#endif /* FB_SIRF_H */
|
