[Firebug-cvs] fireboard/beta/tools/gps/SiRF sirf_id28_1.c,1.2,1.3 sirf_id28_2.c,1.2,1.3 sirf_id28_3.
Brought to you by:
doolin
Menu
▾
▴
[Firebug-cvs] fireboard/beta/tools/gps/SiRF sirf_id28_1.c,1.2,1.3 sirf_id28_2.c,1.2,1.3 sirf_id28_3.c,1.2,1.3 sirf_id2_1.c,1.2,1.3 sirf_id2_2.c,1.2,1.3
|
From: David M. D. <do...@us...> - 2005-07-30 03:15:48
|
Update of /cvsroot/firebug/fireboard/beta/tools/gps/SiRF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29532/beta/tools/gps/SiRF Modified Files: sirf_id28_1.c sirf_id28_2.c sirf_id28_3.c sirf_id2_1.c sirf_id2_2.c Log Message: Added link message handling. Index: sirf_id2_2.c =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tools/gps/SiRF/sirf_id2_2.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sirf_id2_2.c 29 Jul 2005 19:12:26 -0000 1.2 --- sirf_id2_2.c 30 Jul 2005 03:15:38 -0000 1.3 *************** *** 16,19 **** --- 16,21 ---- */ //#include "SiRF_ID2_2_private.h" + /** Not the best way to handle xbow dependencies. */ + #include "../xdb.h" *************** *** 63,70 **** - //Format string generated automatically, - //static char formatstring[] = "%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i"; - - void SiRF_ID2_2_set_header_seqno(SiRF_ID2_2 * userdata, uint8_t header_seqno) { --- 65,68 ---- *************** *** 251,256 **** ! // Not yet used. ! #if 0 static char insert_stmt[] = "INSERT into SiRF_ID2_2 (" "header_seqno," --- 249,259 ---- ! //Format string generated automatically, ! //static char formatstring[] = "%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i"; ! ! ! //static char formatstring[] = "%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i"; ! ! static char insert_stmt[] = "INSERT into SiRF_ID2_2 (" "header_seqno," *************** *** 271,303 **** "ch10," "ch11," ! "ch12) values (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)"; - #endif - #if 0 void ! SiRF_ID2_2_pg_log(void * userdata) { char pg_command[255]; SiRF_ID2_2 * data = (SiRF_ID2_2*)userdata; ! sprintf(pg_command,formatstring, ! data->ch2, ! data->ch1, ! data->gps_tow, data->header_rsrvd1, ! data->ch6, ! data->ch10, ! data->ch8, ! data->ch3, data->sv_in_fix, data->ch4, - data->ch12, data->ch5, ! data->header_rsrvd2, ! data->header_am_type, ! data->ch11, ! data->ch9, ! data->header_seqno, data->ch7, } - #endif --- 274,305 ---- "ch10," "ch11," ! "ch12) values (%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i)"; ! void ! SiRF_ID2_2_pg_log(XbowSensorboardPacket * userdata) { char pg_command[255]; SiRF_ID2_2 * data = (SiRF_ID2_2*)userdata; ! sprintf(pg_command,insert_stmt, ! data->header_seqno, ! data->header_am_type, data->header_rsrvd1, ! data->header_rsrvd2, ! data->gps_tow, data->sv_in_fix, + data->ch1, + data->ch2, + data->ch3, data->ch4, data->ch5, ! data->ch6, data->ch7, + data->ch8, + data->ch9, + data->ch10, + data->ch11, + data->ch12); + xdb_execute(pg_command); } *************** *** 488,492 **** /** Print the bytes of the packet. */ void ! SiRF_ID2_2_print_raw (XbowSensorboardPacket *packet) { } --- 490,494 ---- /** Print the bytes of the packet. */ void ! SiRF_ID2_2_print_raw (XbowSensorboardPacket *packet) { } *************** *** 494,498 **** /** Print cooked output. */ void ! SiRF_ID2_2_print_cooked (void * userdata) { SiRF_ID2_2 * data = (SiRF_ID2_2*)userdata; --- 496,500 ---- /** Print cooked output. */ void ! SiRF_ID2_2_print_cooked (XbowSensorboardPacket * userdata) { SiRF_ID2_2 * data = (SiRF_ID2_2*)userdata; *************** *** 501,505 **** printf("header_rsrvd1: %i,\n",data->header_rsrvd1); printf("header_rsrvd2: %i,\n",data->header_rsrvd2); ! printf("gps_tow: %d,\n",data->gps_tow); printf("sv_in_fix: %i,\n",data->sv_in_fix); printf("ch1: %i,\n",data->ch1); --- 503,507 ---- printf("header_rsrvd1: %i,\n",data->header_rsrvd1); printf("header_rsrvd2: %i,\n",data->header_rsrvd2); ! printf("gps_tow: %i,\n",data->gps_tow); printf("sv_in_fix: %i,\n",data->sv_in_fix); printf("ch1: %i,\n",data->ch1); Index: sirf_id28_3.c =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tools/gps/SiRF/sirf_id28_3.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sirf_id28_3.c 29 Jul 2005 19:12:26 -0000 1.2 --- sirf_id28_3.c 30 Jul 2005 03:15:38 -0000 1.3 *************** *** 16,19 **** --- 16,21 ---- */ //#include "SiRF_ID28_3_private.h" + /** Not the best way to handle xbow dependencies. */ + #include "../xdb.h" *************** *** 65,72 **** - //Format string generated automatically, - //static char formatstring[] = "%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i"; - - void SiRF_ID28_3_set_header_seqno(SiRF_ID28_3 * userdata, uint8_t header_seqno) { --- 67,70 ---- *************** *** 273,278 **** ! // Not yet used. ! #if 0 static char insert_stmt[] = "INSERT into SiRF_ID28_3 (" "header_seqno," --- 271,281 ---- ! //Format string generated automatically, ! //static char formatstring[] = "%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i"; ! ! ! //static char formatstring[] = "%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i"; ! ! static char insert_stmt[] = "INSERT into SiRF_ID28_3 (" "header_seqno," *************** *** 295,329 **** "extrapolation_time," "phase_error_count," ! "low_power_count) values (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)"; - #endif - #if 0 void ! SiRF_ID28_3_pg_log(void * userdata) { char pg_command[255]; SiRF_ID28_3 * data = (SiRF_ID28_3*)userdata; ! sprintf(pg_command,formatstring, ! data->cno10, ! data->cno5, data->sync_flags, ! data->phase_error_count, data->cno4, ! data->header_rsrvd1, data->cno7, data->cno8, data->delta_range_interval, - data->cno2, - data->cno1, - data->low_power_count, - data->extrapolation_time, data->mean_delta_range_time, ! data->header_rsrvd2, ! data->header_am_type, ! data->cno6, ! data->cno3, ! data->header_seqno, ! data->cno9, } - #endif --- 298,331 ---- "extrapolation_time," "phase_error_count," ! "low_power_count) values (%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i)"; ! void ! SiRF_ID28_3_pg_log(XbowSensorboardPacket * userdata) { char pg_command[255]; SiRF_ID28_3 * data = (SiRF_ID28_3*)userdata; ! sprintf(pg_command,insert_stmt, ! data->header_seqno, ! data->header_am_type, ! data->header_rsrvd1, ! data->header_rsrvd2, data->sync_flags, ! data->cno1, ! data->cno2, ! data->cno3, data->cno4, ! data->cno5, ! data->cno6, data->cno7, data->cno8, + data->cno9, + data->cno10, data->delta_range_interval, data->mean_delta_range_time, ! data->extrapolation_time, ! data->phase_error_count, ! data->low_power_count); ! xdb_execute(pg_command); } *************** *** 532,536 **** /** Print the bytes of the packet. */ void ! SiRF_ID28_3_print_raw (XbowSensorboardPacket *packet) { } --- 534,538 ---- /** Print the bytes of the packet. */ void ! SiRF_ID28_3_print_raw (XbowSensorboardPacket *packet) { } *************** *** 538,542 **** /** Print cooked output. */ void ! SiRF_ID28_3_print_cooked (void * userdata) { SiRF_ID28_3 * data = (SiRF_ID28_3*)userdata; --- 540,544 ---- /** Print cooked output. */ void ! SiRF_ID28_3_print_cooked (XbowSensorboardPacket * userdata) { SiRF_ID28_3 * data = (SiRF_ID28_3*)userdata; Index: sirf_id28_1.c =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tools/gps/SiRF/sirf_id28_1.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sirf_id28_1.c 29 Jul 2005 19:12:26 -0000 1.2 --- sirf_id28_1.c 30 Jul 2005 03:15:38 -0000 1.3 *************** *** 16,19 **** --- 16,21 ---- */ //#include "SiRF_ID28_1_private.h" + /** Not the best way to handle xbow dependencies. */ + #include "../xdb.h" *************** *** 53,60 **** - //Format string generated automatically, - //static char formatstring[] = "%i, %i, %i, %i, %i, %i, %i, %i"; - - void SiRF_ID28_1_set_header_seqno(SiRF_ID28_1 * userdata, uint8_t header_seqno) { --- 55,58 ---- *************** *** 141,146 **** ! // Not yet used. ! #if 0 static char insert_stmt[] = "INSERT into SiRF_ID28_1 (" "header_seqno," --- 139,149 ---- ! //Format string generated automatically, ! //static char formatstring[] = "%i, %i, %i, %i, %i, %i, %i, %i"; ! ! ! //static char formatstring[] = "%i, %i, %i, %i, %i, %i, %i, %i"; ! ! static char insert_stmt[] = "INSERT into SiRF_ID28_1 (" "header_seqno," *************** *** 151,173 **** "time_tag," "sat_id," ! "gps_sw_time) values (0, 0, 0, 0, 0, 0, 0, 0)"; - #endif - #if 0 void ! SiRF_ID28_1_pg_log(void * userdata) { char pg_command[255]; SiRF_ID28_1 * data = (SiRF_ID28_1*)userdata; ! sprintf(pg_command,formatstring, ! data->channel, ! data->header_rsrvd2, ! data->header_rsrvd1, data->header_am_type, data->time_tag, - data->gps_sw_time, - data->header_seqno, data->sat_id, } - #endif --- 154,175 ---- "time_tag," "sat_id," ! "gps_sw_time) values (%i, %i, %i, %i, %i, %i, %i, %i)"; ! void ! SiRF_ID28_1_pg_log(XbowSensorboardPacket * userdata) { char pg_command[255]; SiRF_ID28_1 * data = (SiRF_ID28_1*)userdata; ! sprintf(pg_command,insert_stmt, ! data->header_seqno, data->header_am_type, + data->header_rsrvd1, + data->header_rsrvd2, + data->channel, data->time_tag, data->sat_id, + data->gps_sw_time); + xdb_execute(pg_command); } *************** *** 268,272 **** /** Print the bytes of the packet. */ void ! SiRF_ID28_1_print_raw (XbowSensorboardPacket *packet) { } --- 270,274 ---- /** Print the bytes of the packet. */ void ! SiRF_ID28_1_print_raw (XbowSensorboardPacket *packet) { } *************** *** 274,278 **** /** Print cooked output. */ void ! SiRF_ID28_1_print_cooked (void * userdata) { SiRF_ID28_1 * data = (SiRF_ID28_1*)userdata; --- 276,280 ---- /** Print cooked output. */ void ! SiRF_ID28_1_print_cooked (XbowSensorboardPacket * userdata) { SiRF_ID28_1 * data = (SiRF_ID28_1*)userdata; Index: sirf_id28_2.c =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tools/gps/SiRF/sirf_id28_2.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sirf_id28_2.c 29 Jul 2005 19:12:26 -0000 1.2 --- sirf_id28_2.c 30 Jul 2005 03:15:38 -0000 1.3 *************** *** 16,19 **** --- 16,21 ---- */ //#include "SiRF_ID28_2_private.h" + /** Not the best way to handle xbow dependencies. */ + #include "../xdb.h" *************** *** 53,60 **** - //Format string generated automatically, - //static char formatstring[] = "%i, %i, %i, %i, %i, %i, %i, %i"; - - void SiRF_ID28_2_set_header_seqno(SiRF_ID28_2 * userdata, uint8_t header_seqno) { --- 55,58 ---- *************** *** 141,146 **** ! // Not yet used. ! #if 0 static char insert_stmt[] = "INSERT into SiRF_ID28_2 (" "header_seqno," --- 139,149 ---- ! //Format string generated automatically, ! //static char formatstring[] = "%i, %i, %i, %i, %i, %i, %i, %i"; ! ! ! //static char formatstring[] = "%i, %i, %i, %i, %i, %i, %i, %i"; ! ! static char insert_stmt[] = "INSERT into SiRF_ID28_2 (" "header_seqno," *************** *** 151,173 **** "carrier_freq," "carrier_phase," ! "time_in_track) values (0, 0, 0, 0, 0, 0, 0, 0)"; - #endif - #if 0 void ! SiRF_ID28_2_pg_log(void * userdata) { char pg_command[255]; SiRF_ID28_2 * data = (SiRF_ID28_2*)userdata; ! sprintf(pg_command,formatstring, ! data->carrier_freq, ! data->header_rsrvd2, ! data->header_rsrvd1, data->header_am_type, data->pseudo_range, data->carrier_phase, ! data->time_in_track, ! data->header_seqno, } - #endif --- 154,175 ---- "carrier_freq," "carrier_phase," ! "time_in_track) values (%i, %i, %i, %i, %i, %i, %i, %i)"; ! void ! SiRF_ID28_2_pg_log(XbowSensorboardPacket * userdata) { char pg_command[255]; SiRF_ID28_2 * data = (SiRF_ID28_2*)userdata; ! sprintf(pg_command,insert_stmt, ! data->header_seqno, data->header_am_type, + data->header_rsrvd1, + data->header_rsrvd2, data->pseudo_range, + data->carrier_freq, data->carrier_phase, ! data->time_in_track); ! xdb_execute(pg_command); } *************** *** 268,272 **** /** Print the bytes of the packet. */ void ! SiRF_ID28_2_print_raw (XbowSensorboardPacket *packet) { } --- 270,274 ---- /** Print the bytes of the packet. */ void ! SiRF_ID28_2_print_raw (XbowSensorboardPacket *packet) { } *************** *** 274,278 **** /** Print cooked output. */ void ! SiRF_ID28_2_print_cooked (void * userdata) { SiRF_ID28_2 * data = (SiRF_ID28_2*)userdata; --- 276,280 ---- /** Print cooked output. */ void ! SiRF_ID28_2_print_cooked (XbowSensorboardPacket * userdata) { SiRF_ID28_2 * data = (SiRF_ID28_2*)userdata; Index: sirf_id2_1.c =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tools/gps/SiRF/sirf_id2_1.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sirf_id2_1.c 29 Jul 2005 19:12:26 -0000 1.2 --- sirf_id2_1.c 30 Jul 2005 03:15:38 -0000 1.3 *************** *** 16,19 **** --- 16,21 ---- */ //#include "SiRF_ID2_1_private.h" + /** Not the best way to handle xbow dependencies. */ + #include "../xdb.h" *************** *** 59,66 **** - //Format string generated automatically, - //static char formatstring[] = "%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i"; - - void SiRF_ID2_1_set_header_seqno(SiRF_ID2_1 * userdata, uint8_t header_seqno) { --- 61,64 ---- *************** *** 207,212 **** ! // Not yet used. ! #if 0 static char insert_stmt[] = "INSERT into SiRF_ID2_1 (" "header_seqno," --- 205,215 ---- ! //Format string generated automatically, ! //static char formatstring[] = "%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i"; ! ! ! //static char formatstring[] = "%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i"; ! ! static char insert_stmt[] = "INSERT into SiRF_ID2_1 (" "header_seqno," *************** *** 223,251 **** "dop," "mode2," ! "gps_week) values (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)"; - #endif - #if 0 void ! SiRF_ID2_1_pg_log(void * userdata) { char pg_command[255]; SiRF_ID2_1 * data = (SiRF_ID2_1*)userdata; ! sprintf(pg_command,formatstring, ! data->mode1, ! data->dop, ! data->header_rsrvd2, ! data->yvel, ! data->zpos, ! data->header_rsrvd1, data->header_am_type, data->xpos, - data->xvel, - data->mode2, - data->header_seqno, data->ypos, data->zvel, ! data->gps_week, } - #endif --- 226,253 ---- "dop," "mode2," ! "gps_week) values (%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i)"; ! void ! SiRF_ID2_1_pg_log(XbowSensorboardPacket * userdata) { char pg_command[255]; SiRF_ID2_1 * data = (SiRF_ID2_1*)userdata; ! sprintf(pg_command,insert_stmt, ! data->header_seqno, data->header_am_type, + data->header_rsrvd1, + data->header_rsrvd2, data->xpos, data->ypos, + data->zpos, + data->xvel, + data->yvel, data->zvel, ! data->mode1, ! data->dop, ! data->mode2, ! data->gps_week); ! xdb_execute(pg_command); } *************** *** 400,404 **** /** Print the bytes of the packet. */ void ! SiRF_ID2_1_print_raw (XbowSensorboardPacket *packet) { } --- 402,406 ---- /** Print the bytes of the packet. */ void ! SiRF_ID2_1_print_raw (XbowSensorboardPacket *packet) { } *************** *** 406,410 **** /** Print cooked output. */ void ! SiRF_ID2_1_print_cooked (void * userdata) { SiRF_ID2_1 * data = (SiRF_ID2_1*)userdata; --- 408,412 ---- /** Print cooked output. */ void ! SiRF_ID2_1_print_cooked (XbowSensorboardPacket * userdata) { SiRF_ID2_1 * data = (SiRF_ID2_1*)userdata; |
