firebug-cvs Mailing List for FireBug: wireless wildfire monitoring (Page 12)
Brought to you by:
doolin
Menu
▾
▴
firebug-cvs — cvs mailing list
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(36) |
Jun
(45) |
Jul
(108) |
Aug
(31) |
Sep
(2) |
Oct
(4) |
Nov
(113) |
Dec
(20) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(63) |
Feb
(37) |
Mar
(24) |
Apr
(6) |
May
(5) |
Jun
(5) |
Jul
(71) |
Aug
(42) |
Sep
(7) |
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
(3) |
Apr
|
May
(64) |
Jun
(71) |
Jul
(51) |
Aug
(89) |
Sep
(24) |
Oct
(1) |
Nov
(1) |
Dec
(2) |
| 2006 |
Jan
|
Feb
|
Mar
(3) |
Apr
(2) |
May
|
Jun
|
Jul
(21) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: David M. D. <do...@us...> - 2005-05-27 22:22:12
|
Update of /cvsroot/firebug/fireboard/beta/tools/src/xlisten/boards In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4006/boards Modified Files: fireboard.c Log Message: fireboard handler now processes firebug gga struct. Index: fireboard.c =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tools/src/xlisten/boards/fireboard.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** fireboard.c 27 May 2005 20:17:35 -0000 1.2 --- fireboard.c 27 May 2005 22:22:02 -0000 1.3 *************** *** 389,396 **** double fireboard_convert_dec_sec(XbowSensorboardPacket *packet){ ! XSensorMTS420GPSData *data; ! ! data = (XSensorMTS420GPSData *) packet->data; ! return (data->dec_sec)/1000.0; --- 389,398 ---- double fireboard_convert_dec_sec(XbowSensorboardPacket *packet){ ! //XSensorMTS420GPSData *data; ! //data = (XSensorMTS420GPSData *) packet->data; ! //return (data->dec_sec)/1000.0; ! GGA_Data * data; ! data = (GGA_Data*) packet->data; ! return (data->dec_sec); *************** *** 407,413 **** double fireboard_convert_Lat_dec_min(XbowSensorboardPacket *packet){ ! XSensorMTS420GPSData *data; ! data = (XSensorMTS420GPSData *) packet->data; ! return (data->Lat_dec_min)/10000.0; } --- 409,418 ---- double fireboard_convert_Lat_dec_min(XbowSensorboardPacket *packet){ ! //XSensorMTS420GPSData *data; ! //data = (XSensorMTS420GPSData *) packet->data; ! //return (data->Lat_dec_min)/10000.0; ! GGA_Data * data; ! data = (GGA_Data*) packet->data; ! return (data->Lat_dec_min); } *************** *** 421,428 **** */ float fireboard_convert_Long_dec_min(XbowSensorboardPacket *packet){ ! ! XSensorMTS420GPSData *data; ! data = (XSensorMTS420GPSData *) packet->data; ! return (data->Long_dec_min)/10000.0; } --- 426,438 ---- */ float fireboard_convert_Long_dec_min(XbowSensorboardPacket *packet){ ! ! // XBOW payload ! //XSensorMTS420GPSData *data; ! //data = (XSensorMTS420GPSData *) packet->data; ! //return (data->Long_dec_min)/10000.0; ! // Firebug payload ! GGA_Data * data; ! data = (GGA_Data*) packet->data; ! return (data->Long_dec_min); } |
|
From: David M. D. <do...@us...> - 2005-05-27 20:28:24
|
Update of /cvsroot/firebug/fireboard/beta/tos/sensorboards/mts400/GPS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14185/sensorboards/mts400/GPS Modified Files: NMEA.h NMEAM.nc Log Message: Added gsa parsing. Index: NMEA.h =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tos/sensorboards/mts400/GPS/NMEA.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NMEA.h 27 May 2005 00:38:32 -0000 1.2 --- NMEA.h 27 May 2005 20:28:16 -0000 1.3 *************** *** 125,128 **** --- 125,132 ---- } GGA_Data; + enum { + AM_GGA_DATA = 233 + }; + typedef struct gll_data { Index: NMEAM.nc =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tos/sensorboards/mts400/GPS/NMEAM.nc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NMEAM.nc 27 May 2005 00:38:32 -0000 1.2 --- NMEAM.nc 27 May 2005 20:28:16 -0000 1.3 *************** *** 131,135 **** --- 131,170 ---- } + + #define extract_mode2_m(data) (data[0] - '0') + #define find_next_field_m(foo) while (*foo != ',')foo++;foo++ + #define extract_sat_number_m(foo) (10*(foo[0]-'0') + (foo[1]-'0')) + #define extract_DOP_m(foo) ((foo[0]-'0') + (0.1*(foo[2]-'0'))) + // TODO: Write some test code for this. command result_t NMEA.gsa_parse (GSA_Data * gsa_data, const char * gsa_string) { + + int i; + const char * p = gsa_string; + + find_next_field_m(p); + gsa_data->mode1 = *p; + + find_next_field_m(p); + gsa_data->mode2 = *p - '0'; + + + for (i=0; i<12; i++) { + find_next_field_m(p); + //printf("current char: %c\n",*p); + if (*p != ',') { + gsa_data->sat_used[i] = extract_sat_number_m(p); + } else { + gsa_data->sat_used[i] = 0; + } + } + + find_next_field_m(p); + gsa_data->PDOP = extract_DOP_m(p); + find_next_field_m(p); + gsa_data->HDOP = extract_DOP_m(p); + find_next_field_m(p); + gsa_data->VDOP = extract_DOP_m(p); + + return FAIL; } |
|
From: David M. D. <do...@us...> - 2005-05-27 20:28:10
|
Update of /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14137 Modified Files: TestMTS400M.nc Log Message: Added gsa parsing. Index: TestMTS400M.nc =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400/TestMTS400M.nc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TestMTS400M.nc 27 May 2005 20:18:07 -0000 1.9 --- TestMTS400M.nc 27 May 2005 20:28:02 -0000 1.10 *************** *** 542,546 **** event TOS_MsgPtr GpsReceive.receive(TOS_MsgPtr data) { - uint8_t NS,EW; uint32_t temp; char * leadtek_string; --- 542,545 ---- |
|
From: David M. D. <do...@us...> - 2005-05-27 20:18:16
|
Update of /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12153 Modified Files: TestMTS400M.nc Log Message: gga processing is complete. Index: TestMTS400M.nc =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400/TestMTS400M.nc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** TestMTS400M.nc 27 May 2005 00:38:13 -0000 1.8 --- TestMTS400M.nc 27 May 2005 20:18:07 -0000 1.9 *************** *** 542,552 **** event TOS_MsgPtr GpsReceive.receive(TOS_MsgPtr data) { ! uint8_t i,j,m,length,NS,EW; ! uint16_t k; uint32_t temp; - bool end_of_field; char * leadtek_string; - char *pdata; - float dec_secs,dec_min; GGA_Data gga_data = {0}; GGA_Data * gga_data_ptr; --- 542,548 ---- event TOS_MsgPtr GpsReceive.receive(TOS_MsgPtr data) { ! uint8_t NS,EW; uint32_t temp; char * leadtek_string; GGA_Data gga_data = {0}; GGA_Data * gga_data_ptr; *************** *** 576,579 **** --- 572,579 ---- // Pack everything into xbow structs so that // xlisten can process it. + // TODO: Write a module that translates firebug + // structs into xbow structs, along with a dummy + // module that can be wired in if the xbow + // translation is not needed. pack->xData.dataGps.hour = gga_data_ptr->hours; pack->xData.dataGps.minute = gga_data_ptr->minutes; *************** *** 586,597 **** temp = (uint32_t)(gga_data_ptr->Long_dec_min * 10000); pack->xData.dataGps.long_dec_min= temp; ! ! NS = (gga_fields[3][0] == 'N') ? 1 : 0; ! EW = (gga_fields[5][0] == 'W') ? 1 : 0; ! pack->xData.dataGps.nsewind= EW | (NS<<4); // eg. Status= 000N000E = 00010000 if (gps_pwr_on)call GpsCmd.TxRxSwitch(0); // stop receive from gpsuart atomic state = GPS_DONE; ! iNextPacketID = 2; // issue gga packet xmit WaitingForSend = TRUE; --- 586,597 ---- temp = (uint32_t)(gga_data_ptr->Long_dec_min * 10000); pack->xData.dataGps.long_dec_min= temp; ! pack->xData.dataGps.nsewind = gga_data_ptr->NSEWind; if (gps_pwr_on)call GpsCmd.TxRxSwitch(0); // stop receive from gpsuart atomic state = GPS_DONE; ! ! // TODO: Change this to AM_TYPE ! //iNextPacketID = 2; // issue gga packet xmit ! iNextPacketID = AM_GGA_DATA; // issue gga packet xmit WaitingForSend = TRUE; *************** *** 605,608 **** --- 605,609 ---- } + event result_t GpsCmd.TxRxSet(uint8_t rtstate) { // gps tx/rx switches set to on or off |
|
From: David M. D. <do...@us...> - 2005-05-27 20:17:44
|
Update of /cvsroot/firebug/fireboard/beta/tools/src/xlisten/boards In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12034/boards Modified Files: fireboard.c Log Message: fireboard now correctly processes packets. Index: fireboard.c =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tools/src/xlisten/boards/fireboard.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** fireboard.c 27 May 2005 16:18:43 -0000 1.1 --- fireboard.c 27 May 2005 20:17:35 -0000 1.2 *************** *** 1,11 **** /** ! * Handles conversion to engineering units of mts400/420 packets. * ! * @file mts400.c ! * @author Martin Turon, Hu Siquan * * @version 2004/3/10 mturon Initial version * @n 2004/3/28 husiquan Added temp,pressure,accel,light,gps * @n 2004/11/15 husiquan Added database logging * [...1646 lines suppressed...] ! xdb_execute(command); } ! XPacketHandler fireboard_packet_handler = ! { XTYPE_MTS420, "$Id$", ! fireboard_print_raw, ! fireboard_print_cooked, ! fireboard_print_raw, ! fireboard_print_cooked, ! fireboard_log_raw ! }; ! void fireboard_initialize() { ! xpacket_add_type(&fireboard_packet_handler); } |
|
From: David M. D. <do...@us...> - 2005-05-27 20:17:44
|
Update of /cvsroot/firebug/fireboard/beta/tools/src/xlisten In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12034 Modified Files: Makefile xpacket.c Log Message: fireboard now correctly processes packets. Index: xpacket.c =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tools/src/xlisten/xpacket.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** xpacket.c 24 May 2005 21:50:42 -0000 1.3 --- xpacket.c 27 May 2005 20:17:34 -0000 1.4 *************** *** 41,46 **** mts310_initialize(); /* From boards/mts300.c */ mts400_initialize(); /* From boards/mts400.c */ ! mts420_initialize(); /* From boards/mts400.c */ mts510_initialize(); /* From boards/mts510.c */ --- 41,49 ---- mts310_initialize(); /* From boards/mts300.c */ + fireboard_initialize(); + mts400_initialize(); /* From boards/mts400.c */ ! //mts420_initialize(); /* From boards/mts400.c */ ! mts510_initialize(); /* From boards/mts510.c */ Index: Makefile =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tools/src/xlisten/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 24 May 2005 21:50:36 -0000 1.3 --- Makefile 27 May 2005 20:17:34 -0000 1.4 *************** *** 15,19 **** SRCS += boards/mts300.c boards/mts400.c boards/mts510.c boards/mts101.c SRCS += boards/mep500.c boards/mep401.c boards/ggbacltst.c ! SRCS += boards/mica2.c boards/mica2dot.c boards/micaz.c # Add Mote Data Aquisition board support --- 15,21 ---- SRCS += boards/mts300.c boards/mts400.c boards/mts510.c boards/mts101.c SRCS += boards/mep500.c boards/mep401.c boards/ggbacltst.c ! SRCS += boards/mica2.c boards/mica2dot.c boards/micaz.c boards/fireboard.c ! ! INCLUDES = ../../../tos/sensorboards/mts400/GPS # Add Mote Data Aquisition board support *************** *** 35,42 **** xlisten: $(SRCS) ! $(CC) $(CFLAGS) -o $@ $(SRCS) $(LFLAGS) xlisten-arm: $(SRCS) ! $(ARMCC) -I$(INCDIR) $(CFLAGS) -o $@ $(SRCS) -L$(LIBDIR) $(LFLAGS) clean: --- 37,44 ---- xlisten: $(SRCS) ! $(CC) $(CFLAGS) -o $@ $(SRCS) -I$(INCLUDES) $(LFLAGS) xlisten-arm: $(SRCS) ! $(ARMCC) -I$(INCDIR) $(CFLAGS) -o $@ $(SRCS) -L$(LIBDIR) $(LFLAGS) clean: |
|
From: David M. D. <do...@us...> - 2005-05-27 16:18:57
|
Update of /cvsroot/firebug/fireboard/beta/tools/src/xlisten/boards In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26790 Added Files: fireboard.c Log Message: Started xlisten code for processing fireboard packets. --- NEW FILE: fireboard.c --- /** * Handles conversion to engineering units of mts400/420 packets. * * @file mts400.c * @author Martin Turon, Hu Siquan * * @version 2004/3/10 mturon Initial version * @n 2004/3/28 husiquan Added temp,pressure,accel,light,gps * @n 2004/11/15 husiquan Added database logging * * Copyright (c) 2004 Crossbow Technology, Inc. All rights reserved. * * $Id: fireboard.c,v 1.1 2005/05/27 16:18:43 doolin Exp $ */ #include <math.h> #include "../xdb.h" #include "../xsensors.h" /** MTS400/420 XSensor packet 1 -- contains all MTS400/420 weather sensors readings */ [...1025 lines suppressed...] }; void mts400_initialize() { xpacket_add_type(&mts400_packet_handler); } XPacketHandler mts420_packet_handler = { XTYPE_MTS420, "$Id: fireboard.c,v 1.1 2005/05/27 16:18:43 doolin Exp $", mts420_print_raw, mts420_print_cooked, mts420_print_raw, mts420_print_cooked, mts420_log_raw }; void mts420_initialize() { xpacket_add_type(&mts420_packet_handler); } |
|
From: David M. D. <do...@us...> - 2005-05-27 16:12:33
|
Update of /cvsroot/firebug/fireboard/beta/tools/src/xlisten In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25113 Added Files: Makefile.am configure.in Log Message: Started auto* build setup. --- NEW FILE: Makefile.am --- --- NEW FILE: configure.in --- |
|
From: David M. D. <do...@us...> - 2005-05-27 15:10:55
|
Update of /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12372 Removed Files: TestMTS400M_cleanup.diff Log Message: Removed diff, not needed. --- TestMTS400M_cleanup.diff DELETED --- |
|
From: David M. D. <do...@us...> - 2005-05-27 00:38:47
|
Update of /cvsroot/firebug/fireboard/beta/tos/sensorboards/mts400/GPS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7284/GPS Modified Files: NMEA.h NMEAM.nc Removed Files: NMEA.nc Log Message: Moved gga parsing to nmea module. Index: NMEA.h =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tos/sensorboards/mts400/GPS/NMEA.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** NMEA.h 19 May 2005 17:31:54 -0000 1.1 --- NMEA.h 27 May 2005 00:38:32 -0000 1.2 *************** *** 16,19 **** --- 16,20 ---- #include <inttypes.h> + /** @brief NMEA message parser which uses a lot of macros * and lower-level operations to extract data from the *************** *** 88,97 **** #define is_mss_string_m(ns) ((ns[3]=='M')&&(ns[4]=='S')&&(ns[5]=='S')) ! typedef struct _nmea_data NMEA_Data; // 0 length for using in TinyOS interface // definitions, general type checking, etc. // Members may be added later. ! struct _nmea_data { ! }; --- 89,98 ---- #define is_mss_string_m(ns) ((ns[3]=='M')&&(ns[4]=='S')&&(ns[5]=='S')) ! //typedef struct nmea_data NMEA_Data; // 0 length for using in TinyOS interface // definitions, general type checking, etc. // Members may be added later. ! typedef struct nmea_data { ! } NMEA_Data; *************** *** 110,115 **** */ typedef struct gga_data { - NMEA_Data nd; uint8_t hours; uint8_t minutes; --- 111,116 ---- */ typedef struct gga_data { + //NMEA_Data nd; uint8_t hours; uint8_t minutes; *************** *** 189,192 **** --- 190,194 ---- } VTG_Data; + typedef struct mss_data { NMEA_Data nd; Index: NMEAM.nc =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tos/sensorboards/mts400/GPS/NMEAM.nc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** NMEAM.nc 19 May 2005 17:31:54 -0000 1.1 --- NMEAM.nc 27 May 2005 00:38:32 -0000 1.2 *************** *** 28,32 **** - includes NMEA; module NMEAM { --- 28,31 ---- *************** *** 38,41 **** --- 37,45 ---- implementation { + #include "gps.h" + #include "NMEA.h" + + + command uint8_t NMEA.get_type (const char * nmeastring) { return 0; *************** *** 53,65 **** * done now in the MTS420 driver code. */ ! command result_t NMEA.gga_parse (GGA_Data * ggad, GPS_MsgPtr gps_data) { ! /* int i = 0; int numcommas = 0; int numsats = 0; const char * data; - const char * gga_string; - gga_string = (const char * )(gps_data->data); while (numcommas < 7) { if (gga_string[i] == ',') { --- 57,67 ---- * done now in the MTS420 driver code. */ ! command result_t NMEA.gga_parse (GGA_Data * ggad, const char * gga_string) { ! int i = 0; int numcommas = 0; int numsats = 0; const char * data; while (numcommas < 7) { if (gga_string[i] == ',') { *************** *** 89,153 **** ggad->NSEWind = extract_GGA_NSEWind_m(gga_string); - */ - char gga_fields[GGA_FIELDS][GPS_CHAR_PER_FIELD]; // = {{0}}; - char * pdata; - uint8_t NS,EW; - uint8_t i,j,k,m; - bool end_of_field; - uint8_t length; - - // parse comma delimited fields to gga_filed[][] - end_of_field = FALSE; - i=0; - k=0; - length = gps_data->length; - while (i < GGA_FIELDS) { - // assemble gga_fields array - end_of_field = FALSE; - j = 0; - while ((!end_of_field) &( k < length)) { - if (gps_data->data[k] == GPS_DELIMITER) { - end_of_field = TRUE; - } - else { - gga_fields[i][j] = gps_data->data[k]; - } - j++; - k++; - } - // two commas (,,) indicate empty field - // if field is empty, set it equal to 0 - if (j <= 1) { - for (m=0; m<GPS_CHAR_PER_FIELD; m++) gga_fields[i][m] = '0'; - } - i++; - } - - pdata=gga_fields[6]; - ggad->fixQuality = extract_fix_quality_m(pdata); - - // Extract number_of_satellites - // no fix if less 3 satellites, and bad fix if less than 5 sats. - - pdata=gga_fields[7]; - ggad->num_sats = extract_num_sats_m(pdata); - - // Extract Greenwich time. - pdata=gga_fields[1]; - ggad->hours = extract_hours_m(pdata); - ggad->minutes = extract_minutes_m(pdata); - ggad->dec_sec = extract_dec_sec_m(pdata); - - pdata=gga_fields[2]; - ggad->Lat_deg = extract_Lat_deg_m(pdata); - ggad->Lat_dec_min = extract_Lat_dec_min_m(pdata); - - pdata = gga_fields[4]; - ggad->Long_deg = extract_Long_deg_m(pdata); - ggad->Long_dec_min = extract_Long_dec_min_m(pdata); - - NS = (gga_fields[3][0] == 'N') ? 1 : 0; - EW = (gga_fields[5][0] == 'W') ? 1 : 0; - ggad->NSEWind = EW | (NS<<4); // eg. Status = 000N000E = 00010000 return SUCCESS; --- 91,94 ---- --- NMEA.nc DELETED --- |
|
From: David M. D. <do...@us...> - 2005-05-27 00:38:47
|
Update of /cvsroot/firebug/fireboard/beta/tos/sensorboards/mts400 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7284 Modified Files: GpsPacket.nc Log Message: Moved gga parsing to nmea module. Index: GpsPacket.nc =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tos/sensorboards/mts400/GpsPacket.nc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GpsPacket.nc 19 May 2005 17:31:54 -0000 1.1 --- GpsPacket.nc 27 May 2005 00:38:32 -0000 1.2 *************** *** 90,97 **** } } ! implementation ! { #include "SODebug.h" #include "gps.h" GPS_Msg buffer; //GPS_Msg* bufferPtr; --- 90,99 ---- } } ! ! implementation { ! #include "SODebug.h" #include "gps.h" + GPS_Msg buffer; //GPS_Msg* bufferPtr; |
|
From: David M. D. <do...@us...> - 2005-05-27 00:38:34
|
Update of /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7193 Modified Files: Makefile TestMTS400.nc TestMTS400M.nc sensorboardApp.h Log Message: Moved gga parsing to nmea module. Index: TestMTS400M.nc =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400/TestMTS400M.nc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TestMTS400M.nc 26 May 2005 18:29:58 -0000 1.7 --- TestMTS400M.nc 27 May 2005 00:38:13 -0000 1.8 *************** *** 144,148 **** *****************************************************************************/ ! includes gps; #include "appFeatures.h" --- 144,148 ---- *****************************************************************************/ ! #include "appFeatures.h" *************** *** 193,196 **** --- 193,198 ---- interface ADC as TaosCh1; + interface NMEA as nmea; + interface Timer; interface Leds; *************** *** 201,204 **** --- 203,212 ---- implementation { + // Why do some #includes need to be located + // in the implementation and not at the top + // of the file? + #include "gps.h" + #include "NMEA.h" + enum {START, BUSY, *************** *** 538,626 **** uint32_t temp; bool end_of_field; ! char *packet_format; char *pdata; float dec_secs,dec_min; ! //change to GPS packet!! GPS_MsgPtr gps_data = (GPS_MsgPtr)data; // if gps have been scaned then stop receiving gps uart packet if (state == GPS_DONE) return data; ! // check for NMEA format, gga_fields[0] ! packet_format = gps_data->data; ! // ! if ( !((packet_format[3] == 'G') && (packet_format[4] == 'G') && ! (packet_format[5] == 'A'))) { ! //SODbg(DBG_USR2, "No NEMA format, gps packet parese failed!! \n"); return data; ! } ! ! // parse comma delimited fields to gga_filed[][] ! end_of_field = FALSE; ! i=0; ! k=0; ! length = gps_data->length; ! while (i < GGA_FIELDS) { ! // assemble gga_fields array ! end_of_field = FALSE; ! j = 0; ! while ((!end_of_field) & (k < length)) { ! if (gps_data->data[k] == GPS_DELIMITER) { ! end_of_field = TRUE; ! } ! else { ! gga_fields[i][j] = gps_data->data[k]; ! } ! j++; ! k++; ! } ! // two commas (,,) indicate empty field ! // if field is empty, set it equal to 0 ! if (j <= 1) { ! for (m=0; m<10; m++) gga_fields[i][m] = '0'; ! } ! i++; } ! ! // uint8_t ! pack->xData.dataGps.fixed=(uint8_t)(gga_fields[6][0]-'0'); // invalid ! ! // gga_msg.hours = call extract_hours(gga_fields[1]); ! pdata=gga_fields[1]; ! pack->xData.dataGps.hour=10*(pdata[0]-'0') + (pdata[1]-'0'); ! ! // gga_msg.minutes = call extract_minutes(gga_fields[1]); ! pack->xData.dataGps.minute=10*(pdata[2]-'0') + (pdata[3]-'0'); ! ! // uint32_t ! // gga_msg.dec_sec = call extract_dec_sec(gga_fields[1]); ! dec_secs = 10*(pdata[4]-'0') + (pdata[5]-'0') + 0.1*(pdata[7]-'0') ! + 0.01*(pdata[8]-'0') ! + 0.001*(pdata[9]-'0'); ! temp = (uint32_t)(dec_secs * 1000); pack->xData.dataGps.dec_sec = temp; ! ! // gga_msg.Lat_deg = call extract_Lat_deg(gga_fields[2]); ! pdata=gga_fields[2]; ! pack->xData.dataGps.lat_deg= (uint16_t)(10*(pdata[0]-'0') + (pdata[1]-'0')); ! ! // gga_msg.Lat_dec_min = call extract_Lat_dec_min(gga_fields[2]); ! dec_min = 10*(pdata[2]-'0') + (pdata[3]-'0') + 0.1*(pdata[5]-'0') ! + 0.01*(pdata[6]-'0') + 0.001*(pdata[7]-'0') + 0.0001*(pdata[8]-'0'); ! temp = (uint32_t)(dec_min * 10000); pack->xData.dataGps.lat_dec_min = temp; ! ! // gga_msg.Long_deg = call extract_Long_deg(gga_fields[4]); ! pdata = gga_fields[4]; ! pack->xData.dataGps.long_deg = ! (100*(pdata[0]-'0') + 10*(pdata[1]-'0') + (pdata[2]-'0')); ! ! // gga_msg.Long_dec_min = call extract_Long_dec_min(gga_fields[4]); ! dec_min = 10*(pdata[3]-'0') + (pdata[4]-'0') + 0.1*(pdata[6]-'0') ! + 0.01*(pdata[7]-'0') + 0.001*(pdata[8]-'0') + 0.0001*(pdata[9]-'0'); ! temp = (uint32_t)(dec_min * 10000); pack->xData.dataGps.long_dec_min= temp; ! NS = (gga_fields[3][0] == 'N') ? 1 : 0; EW = (gga_fields[5][0] == 'W') ? 1 : 0; --- 546,590 ---- uint32_t temp; bool end_of_field; ! char * leadtek_string; char *pdata; float dec_secs,dec_min; ! GGA_Data gga_data = {0}; ! GGA_Data * gga_data_ptr; ! //change to GPS packet!! GPS_MsgPtr gps_data = (GPS_MsgPtr)data; + gga_data_ptr = &gga_data; + + // if gps have been scaned then stop receiving gps uart packet if (state == GPS_DONE) return data; ! leadtek_string = gps_data->data; ! if (!is_gga_string_m(leadtek_string)) { return data; ! } else { ! // For some reason there is a compiler warning on ! // gga_data_ptr. ! call nmea.gga_parse(gga_data_ptr, leadtek_string); } ! ! if (gga_data_ptr->num_sats > 2) { ! pack->xData.dataGps.fixed = 1; ! } ! ! // Pack everything into xbow structs so that ! // xlisten can process it. ! pack->xData.dataGps.hour = gga_data_ptr->hours; ! pack->xData.dataGps.minute = gga_data_ptr->minutes; ! temp = (uint32_t)(gga_data_ptr->dec_sec * 1000); pack->xData.dataGps.dec_sec = temp; ! pack->xData.dataGps.lat_deg= gga_data_ptr->Lat_deg; ! temp = (uint32_t)(gga_data_ptr->Lat_dec_min * 10000); pack->xData.dataGps.lat_dec_min = temp; ! pack->xData.dataGps.long_deg = gga_data_ptr->Long_deg; ! temp = (uint32_t)(gga_data_ptr->Long_dec_min * 10000); pack->xData.dataGps.long_dec_min= temp; ! NS = (gga_fields[3][0] == 'N') ? 1 : 0; EW = (gga_fields[5][0] == 'W') ? 1 : 0; Index: sensorboardApp.h =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400/sensorboardApp.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sensorboardApp.h 24 May 2005 21:53:17 -0000 1.3 --- sensorboardApp.h 27 May 2005 00:38:13 -0000 1.4 *************** *** 1,36 **** // $Id$ - #define MAKE_GPS_ENA_OUTPUT() sbi(DDRE,6) - #define SET_GPS_ENA() cbi(PORTE,6) - #define CLR_GPS_ENA() sbi(PORTE,6) - - #define GPS_MSG_LENGTH 100 - #define GPS_CHAR 11 - #define GGA_FIELDS 8 - #define GPS_CHAR_PER_FIELD 10 - #define GPS_DELIMITER ',' - #define GPS_END_MSG '*' - - // 18 bytes. - // - //struct _gga_msg - //{ - // uint8_t hours; - // uint8_t minutes; - // float dec_sec; - // uint8_t Lat_deg; - // float Lat_dec_min; - // uint8_t Long_deg; - // float Long_dec_min; - // uint8_t NSEWind; - // uint8_t num_sats; - //}; ! //typedef struct _gga_msg GGA_Msg; ! // ! // - typedef struct XSensorHeader{ uint8_t board_id; uint8_t packet_id; // 3 --- 1,10 ---- // $Id$ + #ifndef SENSORBOARDAPP_H + #define SENSORBOARDAPP_H ! typedef struct XSensorHeader { uint8_t board_id; uint8_t packet_id; // 3 *************** *** 40,45 **** ! typedef struct GGAMsg ! { uint8_t hour; uint8_t minute; --- 14,19 ---- ! typedef struct GGAMsg { ! uint8_t hour; uint8_t minute; *************** *** 53,58 **** } __attribute__ ((packed)) GGAMsg; ! typedef struct XSensorMTS400DataMsg ! { uint16_t vref; uint16_t humidity; --- 27,33 ---- } __attribute__ ((packed)) GGAMsg; ! ! typedef struct XSensorMTS400DataMsg { ! uint16_t vref; uint16_t humidity; *************** *** 70,73 **** --- 45,49 ---- } __attribute__ ((packed)) XSensorMTS400DataMsg; + enum { AM_XSXMSG = 0, *************** *** 82,83 **** --- 58,61 ---- } __attribute__ ((packed)) XDataMsg; + + #endif /* SENSORBOARDAPP_H */ Index: Makefile =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile 26 May 2005 18:29:58 -0000 1.7 --- Makefile 27 May 2005 00:38:13 -0000 1.8 *************** *** 12,17 **** -I$(XBOWROOT)/lib ! PFLAGS +=-I$(FIREBOARDROOT)/beta/tos/sensorboards/$(SENSORBOARD) ! # -I$(FIREBOARDROOT)/beta/tos/sensorboards/$(SENSORBOARD)/gps PFLAGS += -I$(FIREBOARDROOT)/interfaces --- 12,17 ---- -I$(XBOWROOT)/lib ! PFLAGS += -I$(FIREBOARDROOT)/beta/tos/sensorboards/$(SENSORBOARD) ! PFLAGS += -I$(FIREBOARDROOT)/beta/tos/sensorboards/$(SENSORBOARD)/GPS PFLAGS += -I$(FIREBOARDROOT)/interfaces Index: TestMTS400.nc =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400/TestMTS400.nc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TestMTS400.nc 24 May 2005 21:53:17 -0000 1.3 --- TestMTS400.nc 27 May 2005 00:38:13 -0000 1.4 *************** *** 60,74 **** * */ ! #include "appFeatures.h" includes sensorboardApp; configuration TestMTS400 { - // this module does not provide any interface } implementation { ! components Main, TestMTS400M, SensirionHumidity, ! IntersemaPressure,MicaWbSwitch,GenericComm as Comm, ! TimerC, Voltage, LedsC, Accel, TaosPhoto, ! XEE_PARAMS_COMPONENT #ifdef MTS420 UARTGpsPacket, --- 60,92 ---- * */ ! includes sensorboardApp; + #include "appFeatures.h" + //#include "gps.h" + //#include "NMEA.h" + + + configuration TestMTS400 { } + implementation { ! ! ! components Main, ! TestMTS400M, ! SensirionHumidity, ! IntersemaPressure, ! MicaWbSwitch, ! GenericComm as Comm, ! TimerC, ! Voltage, ! NMEAC, ! LedsC, ! Accel, ! TaosPhoto, ! XEE_PARAMS_COMPONENT ! #ifdef MTS420 UARTGpsPacket, *************** *** 123,125 **** --- 141,146 ---- TestMTS400M.Leds -> LedsC; TestMTS400M.Timer -> TimerC.Timer[unique("Timer")]; + + TestMTS400M.nmea -> NMEAC; + } |
|
From: David M. D. <do...@us...> - 2005-05-26 18:30:08
|
Update of /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23703 Modified Files: Makefile TestMTS400M.nc Log Message: First pass at code clean for WORKING xbow test code. Index: TestMTS400M.nc =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400/TestMTS400M.nc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TestMTS400M.nc 24 May 2005 21:53:17 -0000 1.6 --- TestMTS400M.nc 26 May 2005 18:29:58 -0000 1.7 *************** *** 153,173 **** uses { ! //communication ! interface StdControl as CommControl; ! interface SendMsg as Send; ! interface ReceiveMsg as Receive; #ifdef MTS420 ! //gps ! // interface I2CSwitchCmds as GpsCmd; interface GpsCmd; [...1345 lines suppressed...] + { + IsUART = !IsUART; // change to uart send + atomic { + WaitingForSend = FALSE; // both uart and radio sent, done for current msg + sending_packet = FALSE; + } + } ! return SUCCESS; } /**************************************************************************** ! * Uart msg rcvd. ! * This app doesn't respond to any incoming uart msg ! * Just return ! ****************************************************************************/ event TOS_MsgPtr Receive.receive(TOS_MsgPtr data) { ! return data; } Index: Makefile =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile 25 May 2005 00:00:47 -0000 1.6 --- Makefile 26 May 2005 18:29:58 -0000 1.7 *************** *** 11,16 **** -I$(XBOWROOT)/AXStack/$(PLATFORM) \ -I$(XBOWROOT)/lib ! PFLAGS += -I$(FIREBOARDROOT)/beta/tos/sensorboards/$(SENSORBOARD) \ ! -I$(FIREBOARDROOT)/beta/tos/sensorboards/$(SENSORBOARD)/gps PFLAGS += -I$(FIREBOARDROOT)/interfaces include ../MakeXbowlocal --- 11,18 ---- -I$(XBOWROOT)/AXStack/$(PLATFORM) \ -I$(XBOWROOT)/lib ! ! PFLAGS +=-I$(FIREBOARDROOT)/beta/tos/sensorboards/$(SENSORBOARD) ! # -I$(FIREBOARDROOT)/beta/tos/sensorboards/$(SENSORBOARD)/gps ! PFLAGS += -I$(FIREBOARDROOT)/interfaces include ../MakeXbowlocal |
|
From: Karthik D. <da...@us...> - 2005-05-25 00:00:57
|
Update of /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22868/XSensorMTS400 Modified Files: Makefile Log Message: Update MakeXbowlocal to run with old TOSBase Index: Makefile =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 24 May 2005 18:59:14 -0000 1.5 --- Makefile 25 May 2005 00:00:47 -0000 1.6 *************** *** 11,16 **** -I$(XBOWROOT)/AXStack/$(PLATFORM) \ -I$(XBOWROOT)/lib ! PFLAGS +=-I$(FIREBOARDROOT)/beta/tos/sensorboards/$(SENSORBOARD) \ ! -I$(FIREBOARDROOT)/beta/tos/sensorboards/$(SENSORBOARD)/gps PFLAGS += -I$(FIREBOARDROOT)/interfaces include ../MakeXbowlocal --- 11,16 ---- -I$(XBOWROOT)/AXStack/$(PLATFORM) \ -I$(XBOWROOT)/lib ! PFLAGS += -I$(FIREBOARDROOT)/beta/tos/sensorboards/$(SENSORBOARD) \ ! -I$(FIREBOARDROOT)/beta/tos/sensorboards/$(SENSORBOARD)/gps PFLAGS += -I$(FIREBOARDROOT)/interfaces include ../MakeXbowlocal |
|
From: Karthik D. <da...@us...> - 2005-05-25 00:00:57
|
Update of /cvsroot/firebug/fireboard/beta/apps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22868 Modified Files: MakeXbowlocal Log Message: Update MakeXbowlocal to run with old TOSBase Index: MakeXbowlocal =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/apps/MakeXbowlocal,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MakeXbowlocal 23 May 2005 21:34:36 -0000 1.2 --- MakeXbowlocal 25 May 2005 00:00:47 -0000 1.3 *************** *** 20,25 **** # - default mote group ########################################################################## ! #DEFAULT_LOCAL_GROUP=0x7D ! DEFAULT_LOCAL_GROUP=0x7E ########################################################################## --- 20,25 ---- # - default mote group ########################################################################## ! DEFAULT_LOCAL_GROUP=0x7D ! #DEFAULT_LOCAL_GROUP=0x7E ########################################################################## *************** *** 75,82 **** # ! CFLAGS = -DCC1K_DEFAULT_FREQ=CC1K_433_002_MHZ #CFLAGS = -DCC1K_DEFAULT_FREQ=CC1K_434_845_MHZ ! #CFLAGS = -DCC1K_DEFAULT_FREQ=RADIO_433BAND_CHANNEL_00 #CFLAGS = -DCC1K_DEFAULT_FREQ=RADIO_433BAND_CHANNEL_02 #CFLAGS = -DCC1K_DEFAULT_FREQ=RADIO_433BAND_CHANNEL_04 --- 75,82 ---- # ! #CFLAGS = -DCC1K_DEFAULT_FREQ=CC1K_433_002_MHZ #CFLAGS = -DCC1K_DEFAULT_FREQ=CC1K_434_845_MHZ ! CFLAGS = -DCC1K_DEFAULT_FREQ=RADIO_433BAND_CHANNEL_00 #CFLAGS = -DCC1K_DEFAULT_FREQ=RADIO_433BAND_CHANNEL_02 #CFLAGS = -DCC1K_DEFAULT_FREQ=RADIO_433BAND_CHANNEL_04 |
|
From: David M. D. <do...@us...> - 2005-05-24 22:14:44
|
Update of /cvsroot/firebug/fireboard/beta/tools/src/xlisten In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv388 Added Files: xpacket.h Log Message: Added rest of boards. --- NEW FILE: xpacket.h --- /** * Handles parsing of xsensor packets. * * @file xpacket.h * @author Martin Turon * @version 2004/2/18 mturon Initial version * * Copyright (c) 2004-2005 Crossbow Technology, Inc. All rights reserved. * * $Id: xpacket.h,v 1.1 2005/05/24 22:14:35 doolin Exp $ */ typedef struct TosMsg { uint16_t addr; uint8_t am_type; uint8_t group; uint8_t length; } __attribute__ ((packed)) TosMsg; typedef struct MultihopMsg { uint16_t destaddr; uint16_t nodeid; int16_t seqno; uint8_t hops; } __attribute__ ((packed)) MultihopMsg; |
|
From: David M. D. <do...@us...> - 2005-05-24 21:57:44
|
Update of /cvsroot/firebug/fireboard/beta/tos/sensorboards/mts400 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29279 Modified Files: ADCError.nc Calibration.nc IntersemaLower.nc IntersemaLowerM.nc IntersemaPressure.nc IntersemaPressureM.nc MicaWbSwitch.nc MicaWbSwitchM.nc SensirionHumidity.nc SensirionHumidityM.nc Switch.nc TaosPhoto.nc TaosPhotoM.nc TempHum.nc TempHumM.nc sensorboard.h Log Message: Working mts400 driver code, had to be copied in from xbow stable. |
|
From: David M. D. <do...@us...> - 2005-05-24 21:53:27
|
Update of /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28583 Modified Files: TestMTS400.nc TestMTS400M.nc appFeatures.h sensorboardApp.h Log Message: Working mts400 test code, had to be copied in from xbow stable. Index: TestMTS400M.nc =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400/TestMTS400M.nc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TestMTS400M.nc 23 May 2005 22:25:18 -0000 1.5 --- TestMTS400M.nc 24 May 2005 21:53:17 -0000 1.6 *************** *** 1,3 **** ! /* * * --- 1,3 ---- ! /* tab:4 * * *************** *** 22,26 **** * [...1385 lines suppressed...] ! { ! IsUART = !IsUART; // change to uart send ! atomic { ! WaitingForSend = FALSE; // both uart and radio sent, done for current msg ! sending_packet = FALSE; ! } } ! return SUCCESS; } /**************************************************************************** ! * Uart msg rcvd. ! * This app doesn't respond to any incoming uart msg ! * Just return ! ****************************************************************************/ event TOS_MsgPtr Receive.receive(TOS_MsgPtr data) { ! return data; } Index: sensorboardApp.h =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400/sensorboardApp.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sensorboardApp.h 23 May 2005 21:34:37 -0000 1.2 --- sensorboardApp.h 24 May 2005 21:53:17 -0000 1.3 *************** *** 2,13 **** - - // TODO: Delete this bullshit if possible. #define MAKE_GPS_ENA_OUTPUT() sbi(DDRE,6) #define SET_GPS_ENA() cbi(PORTE,6) #define CLR_GPS_ENA() sbi(PORTE,6) typedef struct XSensorHeader{ --- 2,34 ---- #define MAKE_GPS_ENA_OUTPUT() sbi(DDRE,6) #define SET_GPS_ENA() cbi(PORTE,6) #define CLR_GPS_ENA() sbi(PORTE,6) + #define GPS_MSG_LENGTH 100 + #define GPS_CHAR 11 + #define GGA_FIELDS 8 + #define GPS_CHAR_PER_FIELD 10 + #define GPS_DELIMITER ',' + #define GPS_END_MSG '*' + // 18 bytes. + // + //struct _gga_msg + //{ + // uint8_t hours; + // uint8_t minutes; + // float dec_sec; + // uint8_t Lat_deg; + // float Lat_dec_min; + // uint8_t Long_deg; + // float Long_dec_min; + // uint8_t NSEWind; + // uint8_t num_sats; + //}; + //typedef struct _gga_msg GGA_Msg; + // + // typedef struct XSensorHeader{ *************** *** 53,67 **** }; - typedef struct MyGPS_Msg - { - /* The following fields are received on the gps. */ - int8_t data[60]; - } MyGPS_Msg; - typedef struct XDataMsg { XSensorHeader xSensorHeader; union { XSensorMTS400DataMsg data1; ! MyGPS_Msg dataGps; }xData; } __attribute__ ((packed)) XDataMsg; --- 74,82 ---- }; typedef struct XDataMsg { XSensorHeader xSensorHeader; union { XSensorMTS400DataMsg data1; ! GGAMsg dataGps; }xData; } __attribute__ ((packed)) XDataMsg; Index: appFeatures.h =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400/appFeatures.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** appFeatures.h 23 May 2005 22:09:52 -0000 1.3 --- appFeatures.h 24 May 2005 21:53:17 -0000 1.4 *************** *** 9,19 **** * $Id$ */ - - - - // 23 May 2005: I removed all the MTS420 #ifdefs from the - // code, but will leave this here for now to define the - // SENSOR_BOARD_ID. --dmd - // crossbow sensor board id //define MTS420 to enable gps. --- 9,12 ---- *************** *** 22,25 **** --- 15,19 ---- #define MTS420 + #ifndef MTS420 #define SENSOR_BOARD_ID 0x85 //MTS400 sensor board id *************** *** 28,45 **** #endif ! ! // 23 May 2005: It's not clear how this code feature works, ! // because it seems like either the GPS will run, or the weather ! // sensors will run, but not both at the same time. -dmd ! // TODO: Get rid of this "feature." ! #define FEATURE_GPS_ONLY 0 #ifndef FEATURE_GPS_ONLY #define FEATURE_GPS_ONLY 0 #endif - - - - // TODO: 23 May 2005: Get rid of all this xee shit. -dmd // current Xee lib donnot support MicaZ #ifdef PLATFORM_MICAZ --- 22,30 ---- #endif ! //#define FEATURE_GPS_ONLY 1 #ifndef FEATURE_GPS_ONLY #define FEATURE_GPS_ONLY 0 #endif // current Xee lib donnot support MicaZ #ifdef PLATFORM_MICAZ Index: TestMTS400.nc =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400/TestMTS400.nc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TestMTS400.nc 23 May 2005 19:09:43 -0000 1.2 --- TestMTS400.nc 24 May 2005 21:53:17 -0000 1.3 *************** *** 1,3 **** ! /* * * --- 1,3 ---- ! /* tab:4 * * *************** *** 22,26 **** * */ ! /* * IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING. By * downloading, copying, installing or using the software you agree to --- 22,26 ---- * */ ! /* tab:4 * IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING. By * downloading, copying, installing or using the software you agree to *************** *** 72,76 **** XEE_PARAMS_COMPONENT #ifdef MTS420 ! GpsPacketC, #endif ADCC; --- 72,76 ---- XEE_PARAMS_COMPONENT #ifdef MTS420 ! UARTGpsPacket, #endif ADCC; *************** *** 87,94 **** // Wiring for gps #ifdef MTS420 ! TestMTS400M.GpsControl -> GpsPacketC; ! TestMTS400M.GpsSend -> GpsPacketC; ! TestMTS400M.GpsReceive -> GpsPacketC; ! TestMTS400M.GpsCmd -> GpsPacketC.GpsCmd; //UARTGpsPacket.GpsCmd; #endif --- 87,94 ---- // Wiring for gps #ifdef MTS420 ! TestMTS400M.GpsControl -> UARTGpsPacket; ! //TestMTS400M.GpsSend -> UARTGpsPacket; ! TestMTS400M.GpsReceive -> UARTGpsPacket; ! TestMTS400M.GpsCmd -> UARTGpsPacket.GpsCmd; //UARTGpsPacket.GpsCmd; #endif |
|
From: David M. D. <do...@us...> - 2005-05-24 21:50:52
|
Update of /cvsroot/firebug/fireboard/beta/tools/src/xlisten/boards In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27854/boards Modified Files: mda300.c mts101.c mts400.c Log Message: Working xlisten code. |
Update of /cvsroot/firebug/fireboard/beta/tools/src/xlisten In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27854 Modified Files: Makefile xconvert.c xconvert.h xdb.c xdb.h xlisten.c xpacket.c xsensors.h xserial.c xsocket.c Log Message: Working xlisten code. |
|
From: David M. D. <do...@us...> - 2005-05-24 21:50:50
|
Update of /cvsroot/firebug/fireboard/beta/tools/src/xlisten/amtypes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27854/amtypes Modified Files: health.c surge.c Log Message: Working xlisten code. |
|
From: Karthik D. <da...@us...> - 2005-05-24 18:59:27
|
Update of /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24397 Modified Files: Makefile Log Message: Modified Makefile Index: Makefile =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 23 May 2005 22:09:50 -0000 1.4 --- Makefile 24 May 2005 18:59:14 -0000 1.5 *************** *** 1,17 **** - COMPONENT=TestMTS400 SENSORBOARD=mts400 MSG_SIZE=120 - #XBOWROOT=%T/../contrib/xbow/tos - #XBOWBETAROOT=%T/../contrib/xbow/beta/tos XBOWROOT=$(TOSROOT)/contrib/xbow/tos ! XBOWBETAROOT=$(TOSROOT)/contrib/xbow/beta/tos ! ! PFLAGS=-I$(XBOWBETAROOT)/lib/Xee -I$(XBOWROOT)/platform/$(PLATFORM) \ ! -I$(XBOWROOT)/AXStack/$(PLATFORM) -I$(XBOWROOT)/lib \ ! -I$(XBOWBETAROOT)/sensorboards/$(SENSORBOARD) \ ! -I$(XBOWBETAROOT)/sensorboards/$(SENSORBOARD)/gps include ../MakeXbowlocal include ${TOSROOT}/tools/make/Makerules --- 1,17 ---- COMPONENT=TestMTS400 SENSORBOARD=mts400 MSG_SIZE=120 XBOWROOT=$(TOSROOT)/contrib/xbow/tos ! CWD = $(shell pwd) ! FIREBOARDROOT=$(CWD)/../../.. + PFLAGS= -I$(XBOWROOT)/interfaces -I$(XBOWROOT)/system \ + -I$(XBOWROOT)/platform/$(PLATFORM) \ + -I$(XBOWROOT)/AXStack/$(PLATFORM) \ + -I$(XBOWROOT)/lib + PFLAGS +=-I$(FIREBOARDROOT)/beta/tos/sensorboards/$(SENSORBOARD) \ + -I$(FIREBOARDROOT)/beta/tos/sensorboards/$(SENSORBOARD)/gps + PFLAGS += -I$(FIREBOARDROOT)/interfaces include ../MakeXbowlocal include ${TOSROOT}/tools/make/Makerules |
|
From: David M. D. <do...@us...> - 2005-05-23 23:13:25
|
Update of /cvsroot/firebug/fireboard/beta/tools/gps/SiRF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18606/SiRF Log Message: Directory /cvsroot/firebug/fireboard/beta/tools/gps/SiRF added to the repository |
|
From: David M. D. <do...@us...> - 2005-05-23 23:13:25
|
Update of /cvsroot/firebug/fireboard/beta/tools/gps/NMEA In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18606/NMEA Log Message: Directory /cvsroot/firebug/fireboard/beta/tools/gps/NMEA added to the repository |
|
From: David M. D. <do...@us...> - 2005-05-23 23:12:36
|
Update of /cvsroot/firebug/fireboard/beta/tools/gps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18378/gps Log Message: Directory /cvsroot/firebug/fireboard/beta/tools/gps added to the repository |
