[Tinyos-beta-commits] CVS: tinyos-1.x/beta/SystemCore/Drip Drip.h, 1.7, 1.7.4.1 DripM.nc, 1.21, 1.21.2.1

[Kristin Wright]

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

Modified Files:
      Tag: tos-1-1-8-candidate
	Drip.h DripM.nc 
Log Message:
merge with trunk using the tos-1-1-8-postbugfix trunk snapshot

Index: Drip.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/Drip/Drip.h,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -C2 -d -r1.7 -r1.7.4.1
*** Drip.h	10 Sep 2004 20:31:32 -0000	1.7
--- Drip.h	11 Nov 2004 13:43:25 -0000	1.7.4.1
***************
*** 55,65 ****
  } DripMetadata;
  
  enum {
    MAX_DATA_SIZE = (TOSH_DATA_LENGTH - sizeof(DripMetadata)),
  };
  
  typedef struct DripMsg {
    DripMetadata metadata;
!   uint8_t      data[MAX_DATA_SIZE];
  } DripMsg;
  
--- 55,67 ----
  } DripMetadata;
  
+ /*
  enum {
    MAX_DATA_SIZE = (TOSH_DATA_LENGTH - sizeof(DripMetadata)),
  };
+ */
  
  typedef struct DripMsg {
    DripMetadata metadata;
!   uint8_t      data[0];
  } DripMsg;
  

Index: DripM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/Drip/DripM.nc,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -C2 -d -r1.21 -r1.21.2.1
*** DripM.nc	21 Sep 2004 03:57:53 -0000	1.21
--- DripM.nc	11 Nov 2004 13:43:25 -0000	1.21.2.1
***************
*** 88,92 ****
    enum {
      DRIP_CACHE_ENTRIES = uniqueCount("Drip"),
!     TIMER_PERIOD = 1024,
      MIN_SEND_INTERVAL = 0,
      MAX_SEND_INTERVAL = 10,
--- 88,92 ----
    enum {
      DRIP_CACHE_ENTRIES = uniqueCount("Drip"),
!     TIMER_PERIOD = 100,
      MIN_SEND_INTERVAL = 0,
      MAX_SEND_INTERVAL = 10,
***************
*** 363,366 ****
--- 363,368 ----
      dbg(DBG_USR1, "Received msg(id=%d, seqno=%d)\n",
  	dripMsg->metadata.id, dripMsg->metadata.seqno);
+ 
+     //    call Leds.yellowToggle();
      
      if (dripStarted == FALSE && dripMsg->metadata.id != DRIP_WAKEUPID)