firebug-cvs Mailing List for FireBug: wireless wildfire monitoring (Page 5)
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-08-16 00:57:44
|
Update of /cvsroot/firebug/fireboard/beta/tos/interfaces In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv677/tos/interfaces Modified Files: SiRF.nc Log Message: Added sirf parsing test code. Index: SiRF.nc =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tos/interfaces/SiRF.nc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SiRF.nc 2 Aug 2005 01:44:17 -0000 1.2 --- SiRF.nc 16 Aug 2005 00:57:34 -0000 1.3 *************** *** 19,23 **** command uint8_t get_type (const char * sirfstring); ! command result_t id2_parse (sirf_id2, const char * sirf_string); } --- 19,24 ---- command uint8_t get_type (const char * sirfstring); ! command result_t id2_parse (const char * sirf_string); ! command result_t id28_parse (const char * sirf_string); } |
|
From: David M. D. <do...@us...> - 2005-08-16 00:57:44
|
Update of /cvsroot/firebug/fireboard/beta/tools/gps/SiRF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv677/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 sirf parsing test code. |
|
From: David M. D. <do...@us...> - 2005-08-16 00:57:30
|
Update of /cvsroot/firebug/fireboard/beta/apps/TestSiRF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv632 Added Files: .cvsignore Makefile TestSiRF.nc TestSiRFM.nc Log Message: Added sirf parsing test code. --- NEW FILE: TestSiRF.nc --- includes sirf; configuration TestSiRF { } implementation { components Main, SiRFC, TestSiRFM; Main.StdControl -> TestSiRFM; TestSiRFM.SiRF -> SiRFC; } --- NEW FILE: Makefile --- include ../Makelocal COMPONENT=TestSiRF #SENSORBOARD=mts400 #MSG_SIZE=120 #XBOWROOT=$(TOSROOT)/contrib/xbow/tos CWD = $(shell pwd) FIREBOARDROOT=$(CWD)/../../.. PFLAGS = -I$(FIREBOARDROOT)/beta/tos/lib/SiRF PFLAGS += -I$(FIREBOARDROOT)/beta/tos/interfaces #PFLAGS += -I$(XBOWROOT)/interfaces #PFLAGS += -I$(XBOWROOT)/system #PFLAGS += -I$(XBOWROOT)/platform/$(PLATFORM) #PFLAGS += -I$(XBOWROOT)/AXStack/$(PLATFORM) #PFLAGS += -I$(XBOWROOT)/lib #PFLAGS += -I$(FIREBOARDROOT)/beta/tos/sensorboards/$(SENSORBOARD) #PFLAGS += -I$(FIREBOARDROOT)/beta/tos/sensorboards/$(SENSORBOARD)/GPS #include ../MakeXbowlocal #include ${TOSROOT}/tools/make/Makerules include ${TOSROOT}/apps/Makerules --- NEW FILE: TestSiRFM.nc --- module TestSiRFM { provides interface StdControl; uses { interface SiRF; } } implementation { #include "sirf.h" command result_t StdControl.init() { return FAIL; } command result_t StdControl.start() { return FAIL; } command result_t StdControl.stop() { return FAIL; } } --- NEW FILE: .cvsignore --- build *~ |
|
From: David M. D. <do...@us...> - 2005-08-16 00:55:38
|
Update of /cvsroot/firebug/fireboard/beta/apps/TestSiRF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32752/TestSiRF Log Message: Directory /cvsroot/firebug/fireboard/beta/apps/TestSiRF added to the repository |
|
From: David M. D. <do...@us...> - 2005-08-10 04:48:11
|
Update of /cvsroot/firebug/fireboard/beta/tools/src/xlisten In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8352 Modified Files: Makefile xpacket.c xsensors.h Log Message: Chnges to link est. Index: xpacket.c =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tools/src/xlisten/xpacket.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** xpacket.c 8 Aug 2005 20:18:14 -0000 1.8 --- xpacket.c 8 Aug 2005 20:37:45 -0000 1.9 *************** *** 14,17 **** --- 14,21 ---- #include "xpacket.h" + #define AM_SURGEMSG 17 + #define AM_LINKESTIMATORMSG 20 + #define AM_PINGMSG 21 + static unsigned g_datastart = XPACKET_DATASTART; *************** *** 351,355 **** } */ ! case AM_LINKMSG: { XbowSensorboardPacket *packet; packet = xpacket_get_sensor_data(tos_packet); --- 355,361 ---- } */ ! case AM_LINKMSG: ! case AM_LINKESTIMATORMSG: { ! XbowSensorboardPacket *packet; packet = xpacket_get_sensor_data(tos_packet); *************** *** 364,367 **** --- 370,375 ---- } + + case AMTYPE_HEALTH: case AMTYPE_SURGE_MSG: Index: xsensors.h =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tools/src/xlisten/xsensors.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** xsensors.h 1 Aug 2005 19:17:22 -0000 1.8 --- xsensors.h 8 Aug 2005 20:37:45 -0000 1.9 *************** *** 29,32 **** --- 29,34 ---- #include "../../../fireworks/apps/TestLink/LinkMsg.h" + //#include "MultihopLinkEstimator.h" + /** Index: Makefile =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tools/src/xlisten/Makefile,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Makefile 8 Aug 2005 20:17:41 -0000 1.15 --- Makefile 8 Aug 2005 20:37:37 -0000 1.16 *************** *** 25,28 **** --- 25,29 ---- INCLUDES = -I../../../tos/sensorboards/mts400/GPS INCLUDES += -I../../../apps/XSensorMTS400 + INCLUDES += -I../../../fireworks/apps/MultihopLinkEstimator # Add Mote Data Aquisition board support |
|
From: David M. D. <do...@us...> - 2005-08-10 04:43:39
|
Update of /cvsroot/firebug/fireboard/beta/tools/src/xlisten In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3333 Modified Files: xpacket.c xsensors.h Log Message: Link estimate offset added. Index: xpacket.c =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tools/src/xlisten/xpacket.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** xpacket.c 8 Aug 2005 20:37:45 -0000 1.9 --- xpacket.c 8 Aug 2005 22:26:39 -0000 1.10 *************** *** 184,187 **** --- 184,192 ---- break; + case AM_LINKESTIMATORMSG: + datastart = XPACKET_DATASTART_LINKEST; + //fprintf(stderr,"fireworks datastart: %d\n", datastart); + break; + default: return NULL; Index: xsensors.h =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tools/src/xlisten/xsensors.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** xsensors.h 8 Aug 2005 20:37:45 -0000 1.9 --- xsensors.h 8 Aug 2005 22:26:39 -0000 1.10 *************** *** 130,133 **** --- 130,134 ---- #define XPACKET_DATASTART 12 //!< Default offset to data payload #define XPACKET_DATASTART_FIREWORKS 10 //!< Offset to Fireworks data + #define XPACKET_DATASTART_LINKEST 11 //!< Offset to Fireworks data #define XPACKET_BOARD_TABLE 0 //!< offset to XSensor board table |
|
From: Karthik D. <da...@us...> - 2005-08-10 04:43:28
|
Update of /cvsroot/firebug/fireboard/beta/fireworks/apps/MultihopLinkEstimator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27959 Modified Files: Makefile MultihopLinkEstimator.h MultihopLinkEstimatorM.nc Log Message: Updated Timer firing Index: MultihopLinkEstimatorM.nc =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/fireworks/apps/MultihopLinkEstimator/MultihopLinkEstimatorM.nc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MultihopLinkEstimatorM.nc 8 Aug 2005 17:14:20 -0000 1.2 --- MultihopLinkEstimatorM.nc 8 Aug 2005 19:51:52 -0000 1.3 *************** *** 93,96 **** --- 93,102 ---- static void initialize() { + #ifdef LE_LEDS + call Leds.redOn(); + call Leds.greenOn(); + call Leds.yellowOn(); + #endif + timer_rate = INITIAL_TIMER_RATE; atomic gfSendBusy = FALSE; *************** *** 116,120 **** pReading->type = SURGE_TYPE_SENSORREADING; pReading->parentaddr = call RouteControl.getParent(); ! pReading->reading = gSensorData; pReading->seq_no = seqno++; --- 122,127 ---- pReading->type = SURGE_TYPE_SENSORREADING; pReading->parentaddr = call RouteControl.getParent(); ! // pReading->reading = gSensorData; ! pReading->reading = 13; pReading->seq_no = seqno++; *************** *** 132,136 **** pingMsg->seqno = ++pseqno; pingMsg->source = TOS_LOCAL_ADDRESS; ! #ifdef MHOP_LEDS call Leds.redOn(); #endif --- 139,143 ---- pingMsg->seqno = ++pseqno; pingMsg->source = TOS_LOCAL_ADDRESS; ! #ifdef LE_LEDS call Leds.redOn(); #endif *************** *** 146,150 **** if(call Send.getBuffer(&leMsg, &len) != NULL) { ! #ifdef MHOP_LEDS call Leds.yellowOn(); #endif --- 153,157 ---- if(call Send.getBuffer(&leMsg, &len) != NULL) { ! #ifdef LE_LEDS call Leds.yellowOn(); #endif *************** *** 166,170 **** call MacControl.enableAck(); ! randomtimer = (call Random.rand() & 0xffff) + 1; call LinkTimer.start(TIMER_ONE_SHOT, randomtimer); --- 173,177 ---- call MacControl.enableAck(); ! randomtimer = (call Random.rand() & 0xfff) + 1; call LinkTimer.start(TIMER_ONE_SHOT, randomtimer); *************** *** 199,203 **** uint16_t rtimer; ! post sendPing(); /* Choose a random number between (1-4096)ms and add it to 10000. Basically, choose a random number between --- 206,212 ---- uint16_t rtimer; ! #ifdef LE_LEDS ! call Leds.greenToggle(); ! #endif /* Choose a random number between (1-4096)ms and add it to 10000. Basically, choose a random number between *************** *** 206,209 **** --- 215,220 ---- rtimer = (call Random.rand() & 0x1fff) + 0x2710; call Timer.start(TIMER_ONE_SHOT, rtimer); + + post sendPing(); return SUCCESS; } *************** *** 227,231 **** PingMsg *pingMsg = (PingMsg *) &(m->data); ! #ifdef MHOP_LEDS call Leds.greenToggle(); #endif --- 238,242 ---- PingMsg *pingMsg = (PingMsg *) &(m->data); ! #ifdef LE_LEDS call Leds.greenToggle(); #endif *************** *** 256,260 **** event result_t SendPing.sendDone(TOS_MsgPtr m, result_t success) { dbg(DBG_USR2, "MultihopLinkEstimatorM: sent ping 0x%x\n", success); ! #ifdef MHOP_LEDS call Leds.redOff(); #endif --- 267,271 ---- event result_t SendPing.sendDone(TOS_MsgPtr m, result_t success) { dbg(DBG_USR2, "MultihopLinkEstimatorM: sent ping 0x%x\n", success); ! #ifdef LE_LEDS call Leds.redOff(); #endif *************** *** 265,269 **** event result_t SendLinkEstimate.sendDone(TOS_MsgPtr m, result_t success) { dbg(DBG_USR2, "MultihopLinkEstimatorM: sent ping 0x%x\n", success); ! #ifdef MHOP_LEDS call Leds.yellowOff(); #endif --- 276,280 ---- event result_t SendLinkEstimate.sendDone(TOS_MsgPtr m, result_t success) { dbg(DBG_USR2, "MultihopLinkEstimatorM: sent ping 0x%x\n", success); ! #ifdef LE_LEDS call Leds.yellowOff(); #endif Index: Makefile =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/fireworks/apps/MultihopLinkEstimator/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 6 Aug 2005 21:54:20 -0000 1.1 --- Makefile 8 Aug 2005 19:51:51 -0000 1.2 *************** *** 1,3 **** ! PFLAGS= -I%T/lib/MultiHopLQI -DSEND_QUEUE_SIZE=8 -DMHOP_LEDS PLATFORMS=telos telosa telosb tmote --- 1,3 ---- ! PFLAGS= -I%T/lib/MultiHopLQI -DSEND_QUEUE_SIZE=8 -DLE_LEDS PLATFORMS=telos telosa telosb tmote Index: MultihopLinkEstimator.h =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/fireworks/apps/MultihopLinkEstimator/MultihopLinkEstimator.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MultihopLinkEstimator.h 8 Aug 2005 17:14:13 -0000 1.2 --- MultihopLinkEstimator.h 8 Aug 2005 19:51:51 -0000 1.3 *************** *** 70,75 **** enum { AM_SURGEMSG = 17, ! AM_LINKESTIMATORMSG = 18, ! AM_PINGMSG = 19 }; --- 70,75 ---- enum { AM_SURGEMSG = 17, ! AM_LINKESTIMATORMSG = 20, ! AM_PINGMSG = 21 }; |
|
From: David M. D. <do...@us...> - 2005-08-10 03:51:36
|
Update of /cvsroot/firebug/fireboard/beta/tools/src/xlisten/boards In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1391/boards Modified Files: LinkEstimatorMsg.c SurgeMsg.c Log Message: Chnges to link est. Index: LinkEstimatorMsg.c =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tools/src/xlisten/boards/LinkEstimatorMsg.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LinkEstimatorMsg.c 8 Aug 2005 17:37:46 -0000 1.1 --- LinkEstimatorMsg.c 8 Aug 2005 20:15:48 -0000 1.2 *************** *** 31,37 **** #endif /** The Active Message type associated with this message. */ ! //static const int AM_TYPE = 18; ! //#define AM_TYPE 18 --- 31,37 ---- #endif /** The Active Message type associated with this message. */ ! //static const int AM_TYPE = 20; ! //#define AM_TYPE 20 *************** *** 261,265 **** XPacketHandler LinkEstimatorMsgP_packet_handler = { // This should be replaced with the AM_TYPE ! 18, "$Id$", LinkEstimatorMsgP_print_raw, --- 261,265 ---- XPacketHandler LinkEstimatorMsgP_packet_handler = { // This should be replaced with the AM_TYPE ! 20, "$Id$", LinkEstimatorMsgP_print_raw, |
|
From: David M. D. <do...@us...> - 2005-08-10 03:51:28
|
Update of /cvsroot/firebug/fireboard/beta/tools/src/xlisten In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2451 Modified Files: xpacket.c Log Message: Chnges to link est. Index: xpacket.c =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tools/src/xlisten/xpacket.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** xpacket.c 1 Aug 2005 19:17:22 -0000 1.7 --- xpacket.c 8 Aug 2005 20:18:14 -0000 1.8 *************** *** 57,60 **** --- 57,62 ---- LinkMsgP_initialize(); + SurgeMsgP_initialize(); + LinkEstimatorMsgP_initialize(); } |
|
From: David M. D. <do...@us...> - 2005-08-10 03:36:29
|
Update of /cvsroot/firebug/fireboard/beta/fireworks/apps/MultihopLinkEstimator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20951/beta/fireworks/apps/MultihopLinkEstimator Modified Files: MultihopLinkEstimator.h Log Message: . Index: MultihopLinkEstimator.h =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/fireworks/apps/MultihopLinkEstimator/MultihopLinkEstimator.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MultihopLinkEstimator.h 9 Aug 2005 00:07:53 -0000 1.4 --- MultihopLinkEstimator.h 9 Aug 2005 00:08:48 -0000 1.5 *************** *** 32,35 **** --- 32,39 ---- /* Surge modified as MultihopLinkEstimator */ + #ifndef FB_MULTIHOPLINKESTIMATOR_H + #define FB_MULTIHOPLINKESTIMATOR_H + + int INITIAL_TIMER_RATE = 2048; int FOCUS_TIMER_RATE = 1000; *************** *** 77,78 **** --- 81,83 ---- + #endif /** FB_MULTIHOPLINKESTIMATOR_H */ |
|
From: Karthik D. <da...@us...> - 2005-08-10 03:30:40
|
Update of /cvsroot/firebug/fireboard/beta/tools/src/xlisten In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2055 Modified Files: Makefile Log Message: Changed Makefile Index: Makefile =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tools/src/xlisten/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile 8 Aug 2005 17:37:46 -0000 1.14 --- Makefile 8 Aug 2005 20:17:41 -0000 1.15 *************** *** 56,58 **** clean: ! rm -f *.o boards/*.o xlisten xlisten-arm xlisten.exe fbpacket.exe xlisten-telos --- 56,58 ---- clean: ! rm -f *.o boards/*.o xlisten xlisten-arm xlisten.exe fbpacket.exe xlisten-telos.exe |
|
From: Karthik D. <da...@us...> - 2005-08-10 03:05:37
|
Update of /cvsroot/firebug/fireboard/beta/fireworks/apps/MultihopLinkEstimator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20808 Modified Files: MultihopLinkEstimator.h MultihopLinkEstimatorM.nc Log Message: Reduce seq no to 16-bit Index: MultihopLinkEstimatorM.nc =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/fireworks/apps/MultihopLinkEstimator/MultihopLinkEstimatorM.nc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MultihopLinkEstimatorM.nc 8 Aug 2005 19:51:52 -0000 1.3 --- MultihopLinkEstimatorM.nc 9 Aug 2005 00:07:53 -0000 1.4 *************** *** 72,76 **** TOS_Msg gMsgBuffer; norace uint16_t gSensorData; // protected by gfSendBusy flag ! uint32_t seqno; bool initTimer; bool gfSendBusy; --- 72,76 ---- TOS_Msg gMsgBuffer; norace uint16_t gSensorData; // protected by gfSendBusy flag ! uint16_t seqno; bool initTimer; bool gfSendBusy; *************** *** 85,90 **** bool leSendBusy; bool pSendBusy; ! uint32_t pseqno; ! uint32_t leseqno; /*********************************************************************** --- 85,96 ---- bool leSendBusy; bool pSendBusy; ! uint16_t pseqno; ! uint16_t leseqno; ! ! uint16_t lesource; ! uint16_t lerssi; ! uint16_t lelqi; ! uint16_t sourceseqno; ! /*********************************************************************** *************** *** 112,115 **** --- 118,126 ---- leseqno = 0; pseqno = 0; + + lesource = 0; + lerssi = 0; + lelqi = 0; + sourceseqno = 0; } *************** *** 132,149 **** task void sendPing() { ! PingMsg *pingMsg; uint16_t len; ! if((pingMsg = call Send.getBuffer(&pMsg, &len)) != NULL) { ! /* Build the ping packet */ ! pingMsg->seqno = ++pseqno; ! pingMsg->source = TOS_LOCAL_ADDRESS; #ifdef LE_LEDS ! call Leds.redOn(); #endif ! pSendBusy = TRUE; ! if(call SendPing.send(TOS_BCAST_ADDR, sizeof(PingMsg), &pMsg) != SUCCESS) { ! pSendBusy = FALSE; ! } } } --- 143,158 ---- task void sendPing() { ! PingMsg *pingMsg = (PingMsg *) &(pMsg.data); uint16_t len; ! /* Build the ping packet */ ! pingMsg->seqno = ++pseqno; ! pingMsg->source = TOS_LOCAL_ADDRESS; #ifdef LE_LEDS ! call Leds.redOn(); #endif ! pSendBusy = TRUE; ! if(call SendPing.send(TOS_BCAST_ADDR, sizeof(PingMsg), &pMsg) != SUCCESS) { ! pSendBusy = FALSE; } } *************** *** 151,159 **** task void sendLinkEstimate() { uint16_t len; ! if(call Send.getBuffer(&leMsg, &len) != NULL) { #ifdef LE_LEDS call Leds.yellowOn(); #endif leSendBusy = TRUE; if((call SendLinkEstimate.send(&leMsg, sizeof(LinkEstimatorMsg))) != SUCCESS) { --- 160,175 ---- task void sendLinkEstimate() { uint16_t len; + LinkEstimatorMsg *linkMsg; ! if((linkMsg = (LinkEstimatorMsg *) call Send.getBuffer(&leMsg, &len)) != NULL) { #ifdef LE_LEDS call Leds.yellowOn(); #endif + linkMsg->source = lesource; + linkMsg->dest = TOS_LOCAL_ADDRESS; + linkMsg->RSSI = lerssi; + linkMsg->LQI = lelqi; + linkMsg->source_seqno = sourceseqno; + leSendBusy = TRUE; if((call SendLinkEstimate.send(&leMsg, sizeof(LinkEstimatorMsg))) != SUCCESS) { *************** *** 214,218 **** rtimer = (call Random.rand() & 0x1fff) + 0x2710; ! call Timer.start(TIMER_ONE_SHOT, rtimer); post sendPing(); --- 230,234 ---- rtimer = (call Random.rand() & 0x1fff) + 0x2710; ! call LinkTimer.start(TIMER_ONE_SHOT, rtimer); post sendPing(); *************** *** 238,245 **** PingMsg *pingMsg = (PingMsg *) &(m->data); - #ifdef LE_LEDS - call Leds.greenToggle(); - #endif - /* Build the LinkEstimatorMsg */ atomic { --- 254,257 ---- *************** *** 247,255 **** le->seqno = ++leseqno; ! le->source = pingMsg->source; ! le->dest = TOS_LOCAL_ADDRESS; ! le->RSSI = m->strength; ! le->LQI = m->lqi; ! le->source_seqno = pingMsg->seqno; post sendLinkEstimate(); } --- 259,266 ---- le->seqno = ++leseqno; ! lesource = pingMsg->source; ! lerssi = m->strength; ! lelqi = m->lqi; ! sourceseqno = pingMsg->seqno; post sendLinkEstimate(); } Index: MultihopLinkEstimator.h =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/fireworks/apps/MultihopLinkEstimator/MultihopLinkEstimator.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MultihopLinkEstimator.h 8 Aug 2005 19:51:51 -0000 1.3 --- MultihopLinkEstimator.h 9 Aug 2005 00:07:53 -0000 1.4 *************** *** 48,61 **** typedef struct LinkEstimatorMsg { ! uint32_t seqno; uint16_t source; uint16_t dest; uint16_t RSSI; uint16_t LQI; ! uint32_t source_seqno; } LinkEstimatorMsg; typedef struct PingMsg { ! uint32_t seqno; uint16_t source; } PingMsg; --- 48,61 ---- typedef struct LinkEstimatorMsg { ! uint16_t seqno; uint16_t source; uint16_t dest; uint16_t RSSI; uint16_t LQI; ! uint16_t source_seqno; } LinkEstimatorMsg; typedef struct PingMsg { ! uint16_t seqno; uint16_t source; } PingMsg; *************** *** 65,69 **** uint16_t reading; uint16_t parentaddr; ! uint32_t seq_no; } SurgeMsg; --- 65,69 ---- uint16_t reading; uint16_t parentaddr; ! uint16_t seq_no; } SurgeMsg; |
|
From: Karthik D. <da...@us...> - 2005-08-10 02:40:42
|
Update of /cvsroot/firebug/fireboard/beta/tools/src/xlisten In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25607 Modified Files: xsensors.h Log Message: xsensors change Index: xsensors.h =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tools/src/xlisten/xsensors.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** xsensors.h 8 Aug 2005 22:26:39 -0000 1.10 --- xsensors.h 9 Aug 2005 00:39:50 -0000 1.11 *************** *** 130,134 **** #define XPACKET_DATASTART 12 //!< Default offset to data payload #define XPACKET_DATASTART_FIREWORKS 10 //!< Offset to Fireworks data ! #define XPACKET_DATASTART_LINKEST 11 //!< Offset to Fireworks data #define XPACKET_BOARD_TABLE 0 //!< offset to XSensor board table --- 130,134 ---- #define XPACKET_DATASTART 12 //!< Default offset to data payload #define XPACKET_DATASTART_FIREWORKS 10 //!< Offset to Fireworks data ! #define XPACKET_DATASTART_LINKEST 18 //!< Offset to Fireworks data #define XPACKET_BOARD_TABLE 0 //!< offset to XSensor board table |
Update of /cvsroot/firebug/fireboard/beta/tools/src/xlisten/boards In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25493/boards Modified Files: LinkEstimatorMsg.c SurgeMsg.c linkmsg.c sirf_id28_1.c sirf_id28_2.c sirf_id28_3.c sirf_id2_1.c sirf_id2_2.c Log Message: Link estimate offset added. Index: SurgeMsg.c =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tools/src/xlisten/boards/SurgeMsg.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SurgeMsg.c 8 Aug 2005 20:15:49 -0000 1.2 --- SurgeMsg.c 9 Aug 2005 00:39:08 -0000 1.3 *************** *** 56,60 **** uint16_t reading; uint16_t parentaddr; ! uint32_t seq_no; }; --- 56,60 ---- uint16_t reading; uint16_t parentaddr; ! uint16_t seq_no; }; *************** *** 92,100 **** void ! SurgeMsgP_set_seq_no(SurgeMsgP * userdata, uint32_t seq_no) { userdata->seq_no = seq_no; } ! uint32_t SurgeMsgP_get_seq_no(SurgeMsgP * userdata) { return userdata->seq_no; --- 92,100 ---- void ! SurgeMsgP_set_seq_no(SurgeMsgP * userdata, uint16_t seq_no) { userdata->seq_no = seq_no; } ! uint16_t SurgeMsgP_get_seq_no(SurgeMsgP * userdata) { return userdata->seq_no; *************** *** 164,169 **** * User is responsible for "cooking" the data. */ ! static uint32_t ! seq_no_convert(uint32_t seq_no) { return seq_no; } --- 164,169 ---- * User is responsible for "cooking" the data. */ ! static uint16_t ! seq_no_convert(uint16_t seq_no) { return seq_no; } *************** *** 232,236 **** #endif /** The default size of this message type in bytes. */ ! //static int DEFAULT_MESSAGE_SIZE = 10; /** If incomplete types are used, we need to provide a way --- 232,236 ---- #endif /** The default size of this message type in bytes. */ ! //static int DEFAULT_MESSAGE_SIZE = 8; /** If incomplete types are used, we need to provide a way Index: LinkEstimatorMsg.c =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tools/src/xlisten/boards/LinkEstimatorMsg.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LinkEstimatorMsg.c 8 Aug 2005 20:15:48 -0000 1.2 --- LinkEstimatorMsg.c 9 Aug 2005 00:39:08 -0000 1.3 *************** *** 53,62 **** struct _LinkEstimatorMsgP { ! uint32_t seqno; uint16_t source; uint16_t dest; uint16_t RSSI; uint16_t LQI; ! uint32_t source_seqno; }; --- 53,62 ---- struct _LinkEstimatorMsgP { ! uint16_t seqno; uint16_t source; uint16_t dest; uint16_t RSSI; uint16_t LQI; ! uint16_t source_seqno; }; *************** *** 64,72 **** void ! LinkEstimatorMsgP_set_seqno(LinkEstimatorMsgP * userdata, uint32_t seqno) { userdata->seqno = seqno; } ! uint32_t LinkEstimatorMsgP_get_seqno(LinkEstimatorMsgP * userdata) { return userdata->seqno; --- 64,72 ---- void ! LinkEstimatorMsgP_set_seqno(LinkEstimatorMsgP * userdata, uint16_t seqno) { userdata->seqno = seqno; } ! uint16_t LinkEstimatorMsgP_get_seqno(LinkEstimatorMsgP * userdata) { return userdata->seqno; *************** *** 114,122 **** void ! LinkEstimatorMsgP_set_source_seqno(LinkEstimatorMsgP * userdata, uint32_t source_seqno) { userdata->source_seqno = source_seqno; } ! uint32_t LinkEstimatorMsgP_get_source_seqno(LinkEstimatorMsgP * userdata) { return userdata->source_seqno; --- 114,122 ---- void ! LinkEstimatorMsgP_set_source_seqno(LinkEstimatorMsgP * userdata, uint16_t source_seqno) { userdata->source_seqno = source_seqno; } ! uint16_t LinkEstimatorMsgP_get_source_seqno(LinkEstimatorMsgP * userdata) { return userdata->source_seqno; *************** *** 166,171 **** * User is responsible for "cooking" the data. */ ! static uint32_t ! seqno_convert(uint32_t seqno) { return seqno; } --- 166,171 ---- * User is responsible for "cooking" the data. */ ! static uint16_t ! seqno_convert(uint16_t seqno) { return seqno; } *************** *** 206,211 **** * User is responsible for "cooking" the data. */ ! static uint32_t ! source_seqno_convert(uint32_t source_seqno) { return source_seqno; } --- 206,211 ---- * User is responsible for "cooking" the data. */ ! static uint16_t ! source_seqno_convert(uint16_t source_seqno) { return source_seqno; } *************** *** 278,282 **** #endif /** The default size of this message type in bytes. */ ! //static int DEFAULT_MESSAGE_SIZE = 16; /** If incomplete types are used, we need to provide a way --- 278,282 ---- #endif /** The default size of this message type in bytes. */ ! //static int DEFAULT_MESSAGE_SIZE = 12; /** If incomplete types are used, we need to provide a way |
|
From: David M. D. <do...@us...> - 2005-08-10 02:37:18
|
Update of /cvsroot/firebug/fireboard/beta/tools/src/xlisten In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25493 Modified Files: genc.pm Log Message: Link estimate offset added. |
|
From: Karthik D. <da...@us...> - 2005-08-08 17:46:57
|
Update of /cvsroot/firebug/fireboard/beta/fireworks/apps/MultihopLinkEstimator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2184 Modified Files: MultihopLinkEstimator.nc Log Message: Minor changes to configuration Index: MultihopLinkEstimator.nc =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/fireworks/apps/MultihopLinkEstimator/MultihopLinkEstimator.nc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MultihopLinkEstimator.nc 8 Aug 2005 17:14:20 -0000 1.2 --- MultihopLinkEstimator.nc 8 Aug 2005 17:46:49 -0000 1.3 *************** *** 73,77 **** /* Additions for Link Estimation */ ! multihopM.ReceiveMsg[AM_LEMSG] -> Comm.ReceiveMsg[AM_LINKESTIMATORMSG]; MultihopLinkEstimatorM.SendLinkEstimate -> multihopM.Send[AM_LINKESTIMATORMSG]; --- 73,77 ---- /* Additions for Link Estimation */ ! multihopM.ReceiveMsg[AM_LINKESTIMATORMSG] -> Comm.ReceiveMsg[AM_LINKESTIMATORMSG]; MultihopLinkEstimatorM.SendLinkEstimate -> multihopM.Send[AM_LINKESTIMATORMSG]; |
|
From: David M. D. <do...@us...> - 2005-08-08 17:37:55
|
Update of /cvsroot/firebug/fireboard/beta/tools/src/xlisten/boards In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv403/boards Added Files: LinkEstimatorMsg.c SurgeMsg.c Log Message: Handlers for multihop link estimation. --- NEW FILE: LinkEstimatorMsg.c --- /** * This class is automatically generated by mig. DO NOT EDIT THIS FILE. * This code implements C interface to the 'LinkEstimatorMsgP' * message type. */ #include <stdio.h> #include <stdlib.h> #include <memory.h> /** Private header is programmer specified for handling * conversion functions, etc. */ //#include "LinkEstimatorMsgP_private.h" /** Not the best way to handle xbow dependencies. */ #ifdef TELOS_MOTE #include "../xdb.h" #include "../xsensors.h" #endif /** These need to be moved to a header file. */ typedef struct _LinkEstimatorMsgP LinkEstimatorMsgP; #ifndef TELOS_MOTE typedef struct _XbowSensorboardPacket XbowSensorboardPacket; #endif /** The Active Message type associated with this message. */ //static const int AM_TYPE = 18; //#define AM_TYPE 18 // This struct is defined to keep gcc happy while the module // is under development. At some point in the near future, a // a convention for passing arguments into the functions will // have to be defined. struct _XbowSensorboardPacket { unsigned char data[29]; }; struct _LinkEstimatorMsgP { uint32_t seqno; uint16_t source; uint16_t dest; uint16_t RSSI; uint16_t LQI; uint32_t source_seqno; }; void LinkEstimatorMsgP_set_seqno(LinkEstimatorMsgP * userdata, uint32_t seqno) { userdata->seqno = seqno; } uint32_t LinkEstimatorMsgP_get_seqno(LinkEstimatorMsgP * userdata) { return userdata->seqno; } void LinkEstimatorMsgP_set_source(LinkEstimatorMsgP * userdata, uint16_t source) { userdata->source = source; } uint16_t LinkEstimatorMsgP_get_source(LinkEstimatorMsgP * userdata) { return userdata->source; } void LinkEstimatorMsgP_set_dest(LinkEstimatorMsgP * userdata, uint16_t dest) { userdata->dest = dest; } uint16_t LinkEstimatorMsgP_get_dest(LinkEstimatorMsgP * userdata) { return userdata->dest; } void LinkEstimatorMsgP_set_RSSI(LinkEstimatorMsgP * userdata, uint16_t RSSI) { userdata->RSSI = RSSI; } uint16_t LinkEstimatorMsgP_get_RSSI(LinkEstimatorMsgP * userdata) { return userdata->RSSI; } void LinkEstimatorMsgP_set_LQI(LinkEstimatorMsgP * userdata, uint16_t LQI) { userdata->LQI = LQI; } uint16_t LinkEstimatorMsgP_get_LQI(LinkEstimatorMsgP * userdata) { return userdata->LQI; } void LinkEstimatorMsgP_set_source_seqno(LinkEstimatorMsgP * userdata, uint32_t source_seqno) { userdata->source_seqno = source_seqno; } uint32_t LinkEstimatorMsgP_get_source_seqno(LinkEstimatorMsgP * userdata) { return userdata->source_seqno; } //Format string generated automatically, //static char formatstring[] = "%i, %i, %i, %i, %i, %i"; //static char formatstring[] = "%i, %i, %i, %i, %i, %i"; static char insert_stmt[] = "INSERT into LinkEstimatorMsgP (" "result_time," "seqno," "source," "dest," "RSSI," "LQI," "source_seqno) values (now(), %i, %i, %i, %i, %i, %i)"; void LinkEstimatorMsgP_pg_log(XbowSensorboardPacket * userdata) { char pg_command[255]; LinkEstimatorMsgP * data = (LinkEstimatorMsgP*)userdata; sprintf(pg_command,insert_stmt, data->seqno, data->source, data->dest, data->RSSI, data->LQI, data->source_seqno); #ifdef TELOS_MOTE xdb_execute(pg_command); #endif } /** @brief Default behavior is to return the input as output. * User is responsible for "cooking" the data. */ static uint32_t seqno_convert(uint32_t seqno) { return seqno; } /** @brief Default behavior is to return the input as output. * User is responsible for "cooking" the data. */ static uint16_t source_convert(uint16_t source) { return source; } /** @brief Default behavior is to return the input as output. * User is responsible for "cooking" the data. */ static uint16_t dest_convert(uint16_t dest) { return dest; } /** @brief Default behavior is to return the input as output. * User is responsible for "cooking" the data. */ static uint16_t RSSI_convert(uint16_t RSSI) { return RSSI; } /** @brief Default behavior is to return the input as output. * User is responsible for "cooking" the data. */ static uint16_t LQI_convert(uint16_t LQI) { return LQI; } /** @brief Default behavior is to return the input as output. * User is responsible for "cooking" the data. */ static uint32_t source_seqno_convert(uint32_t source_seqno) { return source_seqno; } void LinkEstimatorMsgP_cook_packet(LinkEstimatorMsgP * userdata) { userdata->seqno = seqno_convert(userdata->seqno); userdata->source = source_convert(userdata->source); userdata->dest = dest_convert(userdata->dest); userdata->RSSI = RSSI_convert(userdata->RSSI); userdata->LQI = LQI_convert(userdata->LQI); userdata->source_seqno = source_seqno_convert(userdata->source_seqno); } /** User has to fill in any conversion code * necessary for processing. */ LinkEstimatorMsgP * LinkEstimatorMsgP_convert(char * data) { // Just to keep gcc happy. return (LinkEstimatorMsgP*)data; } /** Print the bytes of the packet. */ void LinkEstimatorMsgP_print_raw (XbowSensorboardPacket *packet) { printf("LinkEstimatorMsgP print raw.\n"); } /** Print cooked output. */ void LinkEstimatorMsgP_print_cooked (XbowSensorboardPacket * userdata) { LinkEstimatorMsgP * data = (LinkEstimatorMsgP*)userdata; printf("LinkEstimatorMsgP print cooked:\n"); printf(" seqno: %i,\n",data->seqno); printf(" source: %i,\n",data->source); printf(" dest: %i,\n",data->dest); printf(" RSSI: %i,\n",data->RSSI); printf(" LQI: %i,\n",data->LQI); printf(" source_seqno: %i,\n",data->source_seqno); } #ifdef TELOS_MOTE XPacketHandler LinkEstimatorMsgP_packet_handler = { // This should be replaced with the AM_TYPE 18, "$Id: LinkEstimatorMsg.c,v 1.1 2005/08/08 17:37:46 doolin Exp $", LinkEstimatorMsgP_print_raw, LinkEstimatorMsgP_print_cooked, LinkEstimatorMsgP_print_raw, LinkEstimatorMsgP_print_cooked, LinkEstimatorMsgP_pg_log, {0} }; void LinkEstimatorMsgP_initialize() { xpacket_add_type(&LinkEstimatorMsgP_packet_handler); } #endif /** The default size of this message type in bytes. */ //static int DEFAULT_MESSAGE_SIZE = 16; /** If incomplete types are used, we need to provide a way * to manage memory. */ LinkEstimatorMsgP * LinkEstimatorMsgP_new() { LinkEstimatorMsgP * userdata = (LinkEstimatorMsgP*)malloc(sizeof(LinkEstimatorMsgP)); memset((void*)userdata,0xda,sizeof(LinkEstimatorMsgP)); return userdata; } void LinkEstimatorMsgP_delete(LinkEstimatorMsgP * userdata) { memset((void*)userdata,0xdd,sizeof(LinkEstimatorMsgP)); free(userdata); } --- NEW FILE: SurgeMsg.c --- /** * This class is automatically generated by mig. DO NOT EDIT THIS FILE. * This code implements C interface to the 'SurgeMsgP' * message type. */ #include <stdio.h> #include <stdlib.h> #include <memory.h> /** Private header is programmer specified for handling * conversion functions, etc. */ //#include "SurgeMsgP_private.h" /** Not the best way to handle xbow dependencies. */ #ifdef TELOS_MOTE #include "../xdb.h" #include "../xsensors.h" #endif /** These need to be moved to a header file. */ typedef struct _SurgeMsgP SurgeMsgP; #ifndef TELOS_MOTE typedef struct _XbowSensorboardPacket XbowSensorboardPacket; #endif /** The Active Message type associated with this message. */ //static const int AM_TYPE = 17; //#define AM_TYPE 17 // This struct is defined to keep gcc happy while the module // is under development. At some point in the near future, a // a convention for passing arguments into the functions will // have to be defined. struct _XbowSensorboardPacket { unsigned char data[29]; }; struct _SurgeMsgP { uint16_t type; uint16_t reading; uint16_t parentaddr; uint32_t seq_no; }; void SurgeMsgP_set_type(SurgeMsgP * userdata, uint16_t type) { userdata->type = type; } uint16_t SurgeMsgP_get_type(SurgeMsgP * userdata) { return userdata->type; } void SurgeMsgP_set_reading(SurgeMsgP * userdata, uint16_t reading) { userdata->reading = reading; } uint16_t SurgeMsgP_get_reading(SurgeMsgP * userdata) { return userdata->reading; } void SurgeMsgP_set_parentaddr(SurgeMsgP * userdata, uint16_t parentaddr) { userdata->parentaddr = parentaddr; } uint16_t SurgeMsgP_get_parentaddr(SurgeMsgP * userdata) { return userdata->parentaddr; } void SurgeMsgP_set_seq_no(SurgeMsgP * userdata, uint32_t seq_no) { userdata->seq_no = seq_no; } uint32_t SurgeMsgP_get_seq_no(SurgeMsgP * userdata) { return userdata->seq_no; } //Format string generated automatically, //static char formatstring[] = "%i, %i, %i, %i"; //static char formatstring[] = "%i, %i, %i, %i"; static char insert_stmt[] = "INSERT into SurgeMsgP (" "result_time," "type," "reading," "parentaddr," "seq_no) values (now(), %i, %i, %i, %i)"; void SurgeMsgP_pg_log(XbowSensorboardPacket * userdata) { char pg_command[255]; SurgeMsgP * data = (SurgeMsgP*)userdata; sprintf(pg_command,insert_stmt, data->type, data->reading, data->parentaddr, data->seq_no); #ifdef TELOS_MOTE xdb_execute(pg_command); #endif } /** @brief Default behavior is to return the input as output. * User is responsible for "cooking" the data. */ static uint16_t type_convert(uint16_t type) { return type; } /** @brief Default behavior is to return the input as output. * User is responsible for "cooking" the data. */ static uint16_t reading_convert(uint16_t reading) { return reading; } /** @brief Default behavior is to return the input as output. * User is responsible for "cooking" the data. */ static uint16_t parentaddr_convert(uint16_t parentaddr) { return parentaddr; } /** @brief Default behavior is to return the input as output. * User is responsible for "cooking" the data. */ static uint32_t seq_no_convert(uint32_t seq_no) { return seq_no; } void SurgeMsgP_cook_packet(SurgeMsgP * userdata) { userdata->type = type_convert(userdata->type); userdata->reading = reading_convert(userdata->reading); userdata->parentaddr = parentaddr_convert(userdata->parentaddr); userdata->seq_no = seq_no_convert(userdata->seq_no); } /** User has to fill in any conversion code * necessary for processing. */ SurgeMsgP * SurgeMsgP_convert(char * data) { // Just to keep gcc happy. return (SurgeMsgP*)data; } /** Print the bytes of the packet. */ void SurgeMsgP_print_raw (XbowSensorboardPacket *packet) { printf("SurgeMsgP print raw.\n"); } /** Print cooked output. */ void SurgeMsgP_print_cooked (XbowSensorboardPacket * userdata) { SurgeMsgP * data = (SurgeMsgP*)userdata; printf("SurgeMsgP print cooked:\n"); printf(" type: %i,\n",data->type); printf(" reading: %i,\n",data->reading); printf(" parentaddr: %i,\n",data->parentaddr); printf(" seq_no: %i,\n",data->seq_no); } #ifdef TELOS_MOTE XPacketHandler SurgeMsgP_packet_handler = { // This should be replaced with the AM_TYPE 17, "$Id: SurgeMsg.c,v 1.1 2005/08/08 17:37:46 doolin Exp $", SurgeMsgP_print_raw, SurgeMsgP_print_cooked, SurgeMsgP_print_raw, SurgeMsgP_print_cooked, SurgeMsgP_pg_log, {0} }; void SurgeMsgP_initialize() { xpacket_add_type(&SurgeMsgP_packet_handler); } #endif /** The default size of this message type in bytes. */ //static int DEFAULT_MESSAGE_SIZE = 10; /** If incomplete types are used, we need to provide a way * to manage memory. */ SurgeMsgP * SurgeMsgP_new() { SurgeMsgP * userdata = (SurgeMsgP*)malloc(sizeof(SurgeMsgP)); memset((void*)userdata,0xda,sizeof(SurgeMsgP)); return userdata; } void SurgeMsgP_delete(SurgeMsgP * userdata) { memset((void*)userdata,0xdd,sizeof(SurgeMsgP)); free(userdata); } |
|
From: David M. D. <do...@us...> - 2005-08-08 17:37:54
|
Update of /cvsroot/firebug/fireboard/beta/tools/src/xlisten In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv403 Modified Files: Makefile Log Message: Handlers for multihop link estimation. Index: Makefile =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/tools/src/xlisten/Makefile,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile 2 Aug 2005 01:44:17 -0000 1.13 --- Makefile 8 Aug 2005 17:37:46 -0000 1.14 *************** *** 20,24 **** SRCS += boards/sirf_id2_1.c boards/sirf_id2_2.c SRCS += boards/sirf_id28_1.c boards/sirf_id28_2.c boards/sirf_id28_3.c ! INCLUDES = -I../../../tos/sensorboards/mts400/GPS --- 20,25 ---- SRCS += boards/sirf_id2_1.c boards/sirf_id2_2.c SRCS += boards/sirf_id28_1.c boards/sirf_id28_2.c boards/sirf_id28_3.c ! SRCS += boards/LinkEstimatorMsg.c ! SRCS += boards/SurgeMsg.c INCLUDES = -I../../../tos/sensorboards/mts400/GPS |
|
From: David M. D. <do...@us...> - 2005-08-08 17:37:26
|
Update of /cvsroot/firebug/fireboard/beta/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv313 Modified Files: firebug-db-setup.sh Added Files: LinkEstimatorMsg.pgsql SurgeMsg.pgsql Log Message: Table for multihop link estimation. --- NEW FILE: SurgeMsg.pgsql --- /** * This class is automatically generated by mig. DO NOT EDIT THIS FILE. * This code provides postgres table to the 'SurgeMsgP' * message type. */ CREATE TABLE SurgeMsgP ( result_time timestamp without time zone, type integer, reading integer, parentaddr integer, seq_no integer); --- NEW FILE: LinkEstimatorMsg.pgsql --- /** * This class is automatically generated by mig. DO NOT EDIT THIS FILE. * This code provides postgres table to the 'LinkEstimatorMsgP' * message type. */ CREATE TABLE LinkEstimatorMsgP ( result_time timestamp without time zone, seqno integer, source integer, dest integer, RSSI integer, LQI integer, source_seqno integer); Index: firebug-db-setup.sh =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/bin/firebug-db-setup.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** firebug-db-setup.sh 30 Jul 2005 03:15:37 -0000 1.5 --- firebug-db-setup.sh 8 Aug 2005 17:37:18 -0000 1.6 *************** *** 56,59 **** --- 56,61 ---- psql --echo-queries --dbname firebug firebug < sirf_functions.pgsql; psql --echo-queries --dbname firebug firebug < linkmsg.pgsql; + psql --echo-queries --dbname firebug firebug < LinkEstimatorMsg.pgsql; + psql --echo-queries --dbname firebug firebug < SurgeMsg.pgsql; |
|
From: Karthik D. <da...@us...> - 2005-08-08 17:14:31
|
Update of /cvsroot/firebug/fireboard/beta/fireworks/apps/MultihopLinkEstimator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28174 Modified Files: MultihopLinkEstimator.h MultihopLinkEstimator.nc MultihopLinkEstimatorM.nc Log Message: More edits Index: MultihopLinkEstimator.nc =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/fireworks/apps/MultihopLinkEstimator/MultihopLinkEstimator.nc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MultihopLinkEstimator.nc 6 Aug 2005 21:54:20 -0000 1.1 --- MultihopLinkEstimator.nc 8 Aug 2005 17:14:20 -0000 1.2 *************** *** 73,78 **** /* Additions for Link Estimation */ ! multihopM.ReceiveMsg[AM_LEMSG] -> Comm.ReceiveMsg[AM_LEMSG]; ! MultihopLinkEstimatorM.SendLinkEstimate -> multihopM.Send[AM_LEMSG]; MultihopLinkEstimatorM.ReceivePing -> Comm.ReceiveMsg[AM_PINGMSG]; --- 73,78 ---- /* Additions for Link Estimation */ ! multihopM.ReceiveMsg[AM_LEMSG] -> Comm.ReceiveMsg[AM_LINKESTIMATORMSG]; ! MultihopLinkEstimatorM.SendLinkEstimate -> multihopM.Send[AM_LINKESTIMATORMSG]; MultihopLinkEstimatorM.ReceivePing -> Comm.ReceiveMsg[AM_PINGMSG]; Index: MultihopLinkEstimatorM.nc =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/fireworks/apps/MultihopLinkEstimator/MultihopLinkEstimatorM.nc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MultihopLinkEstimatorM.nc 6 Aug 2005 21:54:20 -0000 1.1 --- MultihopLinkEstimatorM.nc 8 Aug 2005 17:14:20 -0000 1.2 *************** *** 151,155 **** leSendBusy = TRUE; if((call SendLinkEstimate.send(&leMsg, sizeof(LinkEstimatorMsg))) != SUCCESS) { ! leSendBusy = FALSE; } } --- 151,155 ---- leSendBusy = TRUE; if((call SendLinkEstimate.send(&leMsg, sizeof(LinkEstimatorMsg))) != SUCCESS) { ! atomic leSendBusy = FALSE; } } Index: MultihopLinkEstimator.h =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/fireworks/apps/MultihopLinkEstimator/MultihopLinkEstimator.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MultihopLinkEstimator.h 6 Aug 2005 21:54:20 -0000 1.1 --- MultihopLinkEstimator.h 8 Aug 2005 17:14:13 -0000 1.2 *************** *** 70,74 **** enum { AM_SURGEMSG = 17, ! AM_LEMSG = 18, AM_PINGMSG = 19 }; --- 70,74 ---- enum { AM_SURGEMSG = 17, ! AM_LINKESTIMATORMSG = 18, AM_PINGMSG = 19 }; |
|
From: Karthik D. <da...@us...> - 2005-08-06 21:54:31
|
Update of /cvsroot/firebug/fireboard/beta/fireworks/apps/MultihopLinkEstimator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5320 Added Files: Makefile MultihopLinkEstimator.h MultihopLinkEstimator.nc MultihopLinkEstimatorM.nc SurgeCmd.h Log Message: TinyOS components for MultihopLinkEstimator --- NEW FILE: MultihopLinkEstimator.nc --- // $Id: MultihopLinkEstimator.nc,v 1.1 2005/08/06 21:54:20 dantu Exp $ /* tab:4 * "Copyright (c) 2000-2003 The Regents of the University of California. * All rights reserved. * * Permission to use, copy, modify, and distribute this software and its * documentation for any purpose, without fee, and without written agreement is * hereby granted, provided that the above copyright notice, the following * two paragraphs and the author appear in all copies of this software. * * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS." * * Copyright (c) 2002-2003 Intel Corporation * All rights reserved. * * This file is distributed under the terms in the attached INTEL-LICENSE * file. If you do not find these files, copies can be found by writing to * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, * 94704. Attention: Intel License Inquiry. */ /** * **/ includes MultihopLinkEstimator; includes SurgeCmd; includes MultiHop; configuration MultihopLinkEstimator { } implementation { components Main, MultihopLinkEstimatorM , TimerC , LedsC , DelugeC , DemoSensorC as Sensor , RandomLFSR , GenericComm as Comm , CC2420RadioC , LQIMultiHopRouter as multihopM ; Main.StdControl -> DelugeC; Main.StdControl -> TimerC; Main.StdControl -> Comm; Main.StdControl -> Sensor; Main.StdControl -> multihopM.StdControl; Main.StdControl -> MultihopLinkEstimatorM.StdControl; MultihopLinkEstimatorM.ADC -> Sensor; MultihopLinkEstimatorM.Timer -> TimerC.Timer[unique("Timer")]; MultihopLinkEstimatorM.LinkTimer -> TimerC.Timer[unique("Timer")]; MultihopLinkEstimatorM.Leds -> LedsC; // NoLeds; MultihopLinkEstimatorM.Random -> RandomLFSR; MultihopLinkEstimatorM.CC2420Control -> CC2420RadioC.CC2420Control; MultihopLinkEstimatorM.MacControl -> CC2420RadioC.MacControl; MultihopLinkEstimatorM.RouteControl -> multihopM; MultihopLinkEstimatorM.Send -> multihopM.Send[AM_SURGEMSG]; multihopM.ReceiveMsg[AM_SURGEMSG] -> Comm.ReceiveMsg[AM_SURGEMSG]; /* Additions for Link Estimation */ multihopM.ReceiveMsg[AM_LEMSG] -> Comm.ReceiveMsg[AM_LEMSG]; MultihopLinkEstimatorM.SendLinkEstimate -> multihopM.Send[AM_LEMSG]; MultihopLinkEstimatorM.ReceivePing -> Comm.ReceiveMsg[AM_PINGMSG]; MultihopLinkEstimatorM.SendPing -> Comm.SendMsg[AM_PINGMSG]; } --- NEW FILE: SurgeCmd.h --- // $Id: SurgeCmd.h,v 1.1 2005/08/06 21:54:20 dantu Exp $ /* tab:4 * "Copyright (c) 2000-2003 The Regents of the University of California. * All rights reserved. * * Permission to use, copy, modify, and distribute this software and its * documentation for any purpose, without fee, and without written agreement is * hereby granted, provided that the above copyright notice, the following * two paragraphs and the author appear in all copies of this software. * * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS." * * Copyright (c) 2002-2003 Intel Corporation * All rights reserved. * * This file is distributed under the terms in the attached INTEL-LICENSE * file. If you do not find these files, copies can be found by writing to * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, * 94704. Attention: Intel License Inquiry. */ typedef struct SurgeCmdMsg { uint16_t type; union { // FOR SURGE_TYPE_SETRATE uint32_t newrate; // FOR SURGE_TYPE_FOCUS uint16_t focusaddr; } args; } SurgeCmdMsg; enum { AM_SURGECMDMSG = 18 }; --- NEW FILE: MultihopLinkEstimatorM.nc --- // $Id: MultihopLinkEstimatorM.nc,v 1.1 2005/08/06 21:54:20 dantu Exp $ /* tab:4 * "Copyright (c) 2000-2003 The Regents of the University of California. * All rights reserved. * * Permission to use, copy, modify, and distribute this software and its * documentation for any purpose, without fee, and without written agreement is * hereby granted, provided that the above copyright notice, the following * two paragraphs and the author appear in all copies of this software. * * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS." * * Copyright (c) 2002-2003 Intel Corporation * All rights reserved. * * This file is distributed under the terms in the attached INTEL-LICENSE * file. If you do not find these files, copies can be found by writing to * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, * 94704. Attention: Intel License Inquiry. */ includes MultihopLinkEstimator; includes SurgeCmd; /* * Data gather application */ module MultihopLinkEstimatorM { provides { interface StdControl; } uses { interface ADC; interface Timer; interface Timer as LinkTimer; interface Leds; interface CC2420Control; interface MacControl; interface Send; interface RouteControl; interface Random; /* Addition for link estimation */ interface SendMsg as SendPing; interface Send as SendLinkEstimate; interface ReceiveMsg as ReceivePing; } } implementation { enum { TIMER_GETADC_COUNT = 1, // Timer ticks for ADC TIMER_CHIRP_COUNT = 10, // Timer on/off chirp count }; bool sleeping; // application command state bool focused; bool rebroadcast_adc_packet; TOS_Msg gMsgBuffer; norace uint16_t gSensorData; // protected by gfSendBusy flag uint32_t seqno; bool initTimer; bool gfSendBusy; int timer_rate; int timer_ticks; /* Additional global data for link estimation */ TOS_Msg pMsg; TOS_Msg leMsg; bool leSendBusy; bool pSendBusy; uint32_t pseqno; uint32_t leseqno; /*********************************************************************** * Initialization ***********************************************************************/ static void initialize() { timer_rate = INITIAL_TIMER_RATE; atomic gfSendBusy = FALSE; sleeping = FALSE; seqno = 0; initTimer = TRUE; rebroadcast_adc_packet = FALSE; focused = FALSE; /* Initialize link estimation data */ atomic pSendBusy = FALSE; atomic leSendBusy = FALSE; leseqno = 0; pseqno = 0; } task void SendData() { SurgeMsg *pReading; uint16_t Len; dbg(DBG_USR1, "MultihopLinkEstimatorM: Sending sensor reading\n"); if ((pReading = (SurgeMsg *)call Send.getBuffer(&gMsgBuffer,&Len)) != NULL) { pReading->type = SURGE_TYPE_SENSORREADING; pReading->parentaddr = call RouteControl.getParent(); pReading->reading = gSensorData; pReading->seq_no = seqno++; if ((call Send.send(&gMsgBuffer,sizeof(SurgeMsg))) != SUCCESS) atomic gfSendBusy = FALSE; } } task void sendPing() { PingMsg *pingMsg; uint16_t len; if((pingMsg = call Send.getBuffer(&pMsg, &len)) != NULL) { /* Build the ping packet */ pingMsg->seqno = ++pseqno; pingMsg->source = TOS_LOCAL_ADDRESS; #ifdef MHOP_LEDS call Leds.redOn(); #endif pSendBusy = TRUE; if(call SendPing.send(TOS_BCAST_ADDR, sizeof(PingMsg), &pMsg) != SUCCESS) { pSendBusy = FALSE; } } } task void sendLinkEstimate() { uint16_t len; if(call Send.getBuffer(&leMsg, &len) != NULL) { #ifdef MHOP_LEDS call Leds.yellowOn(); #endif leSendBusy = TRUE; if((call SendLinkEstimate.send(&leMsg, sizeof(LinkEstimatorMsg))) != SUCCESS) { leSendBusy = FALSE; } } } command result_t StdControl.init() { initialize(); return SUCCESS; } command result_t StdControl.start() { uint16_t randomtimer; call CC2420Control.SetRFPower(15); call MacControl.enableAck(); randomtimer = (call Random.rand() & 0xffff) + 1; call LinkTimer.start(TIMER_ONE_SHOT, randomtimer); randomtimer = (call Random.rand() & 0xfff) + 1; return call Timer.start(TIMER_ONE_SHOT, randomtimer); } command result_t StdControl.stop() { return call Timer.stop(); } /*********************************************************************** * Commands and events ***********************************************************************/ event result_t Timer.fired() { if (initTimer) { initTimer = FALSE; return call Timer.start(TIMER_REPEAT, timer_rate); } dbg(DBG_USR1, "MultihopLinkEstimatorM: Timer fired\n"); timer_ticks++; if (timer_ticks % TIMER_GETADC_COUNT == 0) { call ADC.getData(); } return SUCCESS; } event result_t LinkTimer.fired() { uint16_t rtimer; post sendPing(); /* Choose a random number between (1-4096)ms and add it to 10000. Basically, choose a random number between 10000-14096*/ rtimer = (call Random.rand() & 0x1fff) + 0x2710; call Timer.start(TIMER_ONE_SHOT, rtimer); return SUCCESS; } async event result_t ADC.dataReady(uint16_t data) { //SurgeMsg *pReading; //uint16_t Len; dbg(DBG_USR1, "MultihopLinkEstimatorM: Got ADC reading: 0x%x\n", data); atomic { if (!gfSendBusy) { gfSendBusy = TRUE; gSensorData = data; post SendData(); } } return SUCCESS; } /* Receive Ping Msg routine for LinkEstimation */ event TOS_MsgPtr ReceivePing.receive(TOS_MsgPtr m) { PingMsg *pingMsg = (PingMsg *) &(m->data); #ifdef MHOP_LEDS call Leds.greenToggle(); #endif /* Build the LinkEstimatorMsg */ atomic { LinkEstimatorMsg *le = (LinkEstimatorMsg *) &(leMsg.data); le->seqno = ++leseqno; le->source = pingMsg->source; le->dest = TOS_LOCAL_ADDRESS; le->RSSI = m->strength; le->LQI = m->lqi; le->source_seqno = pingMsg->seqno; post sendLinkEstimate(); } return m; } event result_t Send.sendDone(TOS_MsgPtr m, result_t success) { dbg(DBG_USR2, "MultihopLinkEstimatorM: output complete 0x%x\n", success); atomic gfSendBusy = FALSE; return SUCCESS; } event result_t SendPing.sendDone(TOS_MsgPtr m, result_t success) { dbg(DBG_USR2, "MultihopLinkEstimatorM: sent ping 0x%x\n", success); #ifdef MHOP_LEDS call Leds.redOff(); #endif atomic pSendBusy = FALSE; return SUCCESS; } event result_t SendLinkEstimate.sendDone(TOS_MsgPtr m, result_t success) { dbg(DBG_USR2, "MultihopLinkEstimatorM: sent ping 0x%x\n", success); #ifdef MHOP_LEDS call Leds.yellowOff(); #endif atomic leSendBusy = FALSE; return SUCCESS; } } --- NEW FILE: Makefile --- PFLAGS= -I%T/lib/MultiHopLQI -DSEND_QUEUE_SIZE=8 -DMHOP_LEDS PLATFORMS=telos telosa telosb tmote TINYOS_NP ?= BNP COMPONENT=MultihopLinkEstimator include ${TOSROOT}/tools/make/Makerules --- NEW FILE: MultihopLinkEstimator.h --- // $Id: MultihopLinkEstimator.h,v 1.1 2005/08/06 21:54:20 dantu Exp $ /* tab:4 * "Copyright (c) 2000-2003 The Regents of the University of California. * All rights reserved. * * Permission to use, copy, modify, and distribute this software and its * documentation for any purpose, without fee, and without written agreement is * hereby granted, provided that the above copyright notice, the following * two paragraphs and the author appear in all copies of this software. * * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS." * * Copyright (c) 2002-2003 Intel Corporation * All rights reserved. * * This file is distributed under the terms in the attached INTEL-LICENSE * file. If you do not find these files, copies can be found by writing to * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, * 94704. Attention: Intel License Inquiry. */ /* Surge modified as MultihopLinkEstimator */ int INITIAL_TIMER_RATE = 2048; int FOCUS_TIMER_RATE = 1000; int FOCUS_NOTME_TIMER_RATE = 1000; enum { SURGE_TYPE_SENSORREADING = 0, SURGE_TYPE_ROOTBEACON = 1, SURGE_TYPE_SETRATE = 2, SURGE_TYPE_SLEEP = 3, SURGE_TYPE_WAKEUP = 4, SURGE_TYPE_FOCUS = 5, SURGE_TYPE_UNFOCUS = 6 }; typedef struct LinkEstimatorMsg { uint32_t seqno; uint16_t source; uint16_t dest; uint16_t RSSI; uint16_t LQI; uint32_t source_seqno; } LinkEstimatorMsg; typedef struct PingMsg { uint32_t seqno; uint16_t source; } PingMsg; typedef struct SurgeMsg { uint16_t type; uint16_t reading; uint16_t parentaddr; uint32_t seq_no; } SurgeMsg; enum { AM_SURGEMSG = 17, AM_LEMSG = 18, AM_PINGMSG = 19 }; |
|
From: Karthik D. <da...@us...> - 2005-08-06 21:54:02
|
Update of /cvsroot/firebug/fireboard/beta/fireworks/apps/MultihopLinkEstimator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5252/MultihopLinkEstimator Log Message: Directory /cvsroot/firebug/fireboard/beta/fireworks/apps/MultihopLinkEstimator added to the repository |
|
From: Karthik D. <da...@us...> - 2005-08-02 20:10:59
|
Update of /cvsroot/firebug/fireboard/beta/fireworks/apps/TestLink In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5669 Modified Files: TestLinkC.nc TestLinkM.nc Log Message: changed linkmsg am type Index: TestLinkC.nc =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/fireworks/apps/TestLink/TestLinkC.nc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TestLinkC.nc 30 Jul 2005 03:36:32 -0000 1.2 --- TestLinkC.nc 2 Aug 2005 20:10:40 -0000 1.3 *************** *** 9,20 **** TestLinkM, LedsC, CC2420RadioC; Main.StdControl -> TestLinkM.StdControl; Main.StdControl -> GenericComm; TestLinkM.CommControl -> GenericComm; TestLinkM.CommControl -> GenericComm; ! TestLinkM.SendLinkMsg -> GenericComm.SendMsg[0xfb]; TestLinkM.ReceiveLinkMsg -> GenericComm.ReceiveMsg[AM_LINKREQUESTMSG]; TestLinkM.Leds -> LedsC; --- 9,22 ---- TestLinkM, LedsC, + DelugeC, CC2420RadioC; Main.StdControl -> TestLinkM.StdControl; Main.StdControl -> GenericComm; + Main.StdControl -> DelugeC; TestLinkM.CommControl -> GenericComm; TestLinkM.CommControl -> GenericComm; ! TestLinkM.SendLinkMsg -> GenericComm.SendMsg[AM_LINKMSG]; TestLinkM.ReceiveLinkMsg -> GenericComm.ReceiveMsg[AM_LINKREQUESTMSG]; TestLinkM.Leds -> LedsC; Index: TestLinkM.nc =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/fireworks/apps/TestLink/TestLinkM.nc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TestLinkM.nc 30 Jul 2005 03:36:32 -0000 1.2 --- TestLinkM.nc 2 Aug 2005 20:10:41 -0000 1.3 *************** *** 60,64 **** lMsg->header.am_type = AM_LINKMSG; lMsg->header.seqno = seqno++; ! lMsg->moteid = 0xAFFA; lMsg->tstamp = 0xBBBB; lMsg->RSSI = lastRSSI; --- 60,64 ---- lMsg->header.am_type = AM_LINKMSG; lMsg->header.seqno = seqno++; ! lMsg->moteid = TOS_LOCAL_ADDRESS; lMsg->tstamp = 0xBBBB; lMsg->RSSI = lastRSSI; |
|
From: David M. D. <do...@us...> - 2005-08-02 17:37:51
|
Update of /cvsroot/firebug/fireboard/beta/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27843 Modified Files: fbusers.sh Log Message: Updated user script. Index: fbusers.sh =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/bin/fbusers.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** fbusers.sh 2 Aug 2005 17:16:55 -0000 1.1 --- fbusers.sh 2 Aug 2005 17:37:41 -0000 1.2 *************** *** 1,7 **** #!/bin/sh ! psql -c "create user dave" template1 -U postgres ! psql -c "create user kar" template1 -U postgres ! psql -c "create user firebug" template1 -U postgres ! psql -c "create user test" template1 -U postgres --- 1,6 ---- #!/bin/sh ! createuser dave --echo --adduser --createdb #--pwprompt ! createuser kar --echo --adduser --createdb #--pwprompt ! createuser test --echo --adduser --createdb #--pwprompt |
|
From: David M. D. <do...@us...> - 2005-08-02 17:17:05
|
Update of /cvsroot/firebug/fireboard/beta/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22482 Added Files: fbusers.sh Log Message: Added a script for creating pg users. --- NEW FILE: fbusers.sh --- #!/bin/sh psql -c "create user dave" template1 -U postgres psql -c "create user kar" template1 -U postgres psql -c "create user firebug" template1 -U postgres psql -c "create user test" template1 -U postgres |
