[Tinyos-beta-commits] CVS: tinyos-1.x/beta/SystemCore/Drip DripC.nc, 1.9, 1.10 DripM.nc, 1.18, 1.19

[Gilman Tolle]

Update of /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/Drip
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28859/Drip

Modified Files:
	DripC.nc DripM.nc 
Log Message:
Added XSM Sounder to Deployer Response
Debug/Testing code for Drip and PowerMgmt
Cleanups

Added a copy of the most recent compiled XSM binary.



Index: DripC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/Drip/DripC.nc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DripC.nc	1 Sep 2004 01:32:28 -0000	1.9
--- DripC.nc	7 Sep 2004 22:15:38 -0000	1.10
***************
*** 52,56 ****
      RandomLFSR, 
      NoLeds as Leds;
!   
    StdControl = DripM;
    Receive = DripM.Receive;
--- 52,60 ----
      RandomLFSR, 
      NoLeds as Leds;
! 
! #ifdef DBG_DRIP
!   components EventLoggerC;
! #endif
! 
    StdControl = DripM;
    Receive = DripM.Receive;
***************
*** 71,74 ****
--- 75,82 ----
  
    DripM.SharedMsgBuf -> SharedMsgBufM.SharedMsgBuf[BUF_SNMS];
+ 
+ #ifdef DBG_DRIP
+   DripM.EventLogger -> EventLoggerC;
+ #endif
  }
  

Index: DripM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/Drip/DripM.nc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** DripM.nc	6 Sep 2004 21:51:25 -0000	1.18
--- DripM.nc	7 Sep 2004 22:15:38 -0000	1.19
***************
*** 36,39 ****
--- 36,43 ----
  includes Drip;
  
+ #ifdef DBG_DRIP
+ includes EventLoggerPerl;
+ #endif
+ 
  module DripM {
    provides {
***************
*** 50,53 ****
--- 54,60 ----
      interface Leds;
      interface SharedMsgBuf;
+ #ifdef DBG_DRIP
+     interface EventLogger;
+ #endif
    }
  }
***************
*** 181,189 ****
      
      dripEntry->metadata.id = id;
!     if (TOS_LOCAL_ADDRESS == 0) {
!       dripEntry->metadata.seqno = 0x87;
!     } else {
!       dripEntry->metadata.seqno = 0x7;
!     }
  
      trickleReset(dripEntry);
--- 188,192 ----
      
      dripEntry->metadata.id = id;
!     dripEntry->metadata.seqno = 1;
  
      trickleReset(dripEntry);
***************
*** 392,395 ****
--- 395,405 ----
        }
  
+ #ifdef DBG_DRIP
+       <snms>
+         logEvent("DRIP: Received(key=%1d, seqno=%1d)\n", 
+ 		 dripMsg->metadata.id, dripMsg->metadata.seqno);
+       </snms>
+ #endif
+ 
        dbg(DBG_USR1, "AFTER: (myseqno=%d, diff=%d)\n",
  	  dripEntry->metadata.seqno,