[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/GGB/apps/zmgent CmdMsg.h, 1.2, 1.3 DataCollector.h, 1.2, 1.3 Makefile, 1.3, 1.4 README, 1.2, 1.3 ReplyMsg.h, 1.2, 1.3 StrawM.nc, 1.2, 1.3

[Sukun Kim]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/GGB/apps/zmgent
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18732

Modified Files:
	CmdMsg.h DataCollector.h Makefile README ReplyMsg.h StrawM.nc 
Log Message:


Index: CmdMsg.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/GGB/apps/zmgent/CmdMsg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CmdMsg.h	1 Mar 2006 23:40:27 -0000	1.2
--- CmdMsg.h	20 Jun 2006 22:12:52 -0000	1.3
***************
*** 32,36 ****
    CMDMSG_LENGTH = TOSH_DATA_LENGTH - DIVERGENCE_HEADER_LENGTH,
    
!   CMDMSG_HEADER_LENGTH = 4,
    CMDMSG_ARG_LENGTH = CMDMSG_LENGTH - CMDMSG_HEADER_LENGTH,
  
--- 32,36 ----
    CMDMSG_LENGTH = TOSH_DATA_LENGTH - DIVERGENCE_HEADER_LENGTH,
    
!   CMDMSG_HEADER_LENGTH = 5,
    CMDMSG_ARG_LENGTH = CMDMSG_LENGTH - CMDMSG_HEADER_LENGTH,
  
***************
*** 72,76 ****
  typedef struct CmdMsg {
    uint16_t dest;
!   uint8_t seqNo;
    uint8_t type;
    union {
--- 72,76 ----
  typedef struct CmdMsg {
    uint16_t dest;
!   uint16_t seqNo;
    uint8_t type;
    union {

Index: DataCollector.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/GGB/apps/zmgent/DataCollector.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DataCollector.h	15 Dec 2005 01:42:01 -0000	1.2
--- DataCollector.h	20 Jun 2006 22:12:52 -0000	1.3
***************
*** 16,20 ****
  
  typedef struct {
!   uint8_t seqNo;
    uint32_t nSamples;
    uint32_t intrv;
--- 16,20 ----
  
  typedef struct {
!   uint16_t seqNo;
    uint32_t nSamples;
    uint32_t intrv;

Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/GGB/apps/zmgent/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	6 Mar 2006 22:24:36 -0000	1.3
--- Makefile	20 Jun 2006 22:12:52 -0000	1.4
***************
*** 12,16 ****
  PFLAGS += -I$(CONTRIBDIR)/GGB/tos/sensorboards/ggbacltst
  
! PFLAGS += -I%T/lib/Queue
  PFLAGS += -I$(CONTRIBDIR)/GGB/tos/lib/Broadcast
  PFLAGS += -I$(CONTRIBDIR)/GGB/tos/lib/MintRoute
--- 12,16 ----
  PFLAGS += -I$(CONTRIBDIR)/GGB/tos/sensorboards/ggbacltst
  
! PFLAGS += -I$(CONTRIBDIR)/GGB/tos/lib/Queue
  PFLAGS += -I$(CONTRIBDIR)/GGB/tos/lib/Broadcast
  PFLAGS += -I$(CONTRIBDIR)/GGB/tos/lib/MintRoute

Index: README
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/GGB/apps/zmgent/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** README	6 Mar 2006 22:24:36 -0000	1.2
--- README	20 Jun 2006 22:12:52 -0000	1.3
***************
*** 1,3 ****
--- 1,5 ----
  Quite stable
+ 16 bit seqNo
+ CRC
  
  

Index: ReplyMsg.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/GGB/apps/zmgent/ReplyMsg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ReplyMsg.h	1 Mar 2006 23:40:27 -0000	1.2
--- ReplyMsg.h	20 Jun 2006 22:12:52 -0000	1.3
***************
*** 33,37 ****
  
  typedef struct {
!   uint8_t seqNo;
    uint32_t nSamples;
    uint32_t intrv;
--- 33,37 ----
  
  typedef struct {
!   uint16_t seqNo;
    uint32_t nSamples;
    uint32_t intrv;

Index: StrawM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/GGB/apps/zmgent/StrawM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StrawM.nc	6 Mar 2006 22:24:36 -0000	1.2
--- StrawM.nc	20 Jun 2006 22:12:52 -0000	1.3
***************
*** 82,86 ****
    }
  
!   
    command result_t Straw.readDone[uint8_t id](result_t success) {
      //  all  //
--- 82,100 ----
    }
  
!  
! 
!   /* 
!   uint8_t getCRC(uint8_t currentCrc, uint8_t byteStream) {
!     uint8_t i;
!     currentCrc = currentCrc ^ byteStream;
!     for (i = 0; i < 8; i++) {
!       if (currentCrc & 0x8000) {
!         currentCrc = currentCrc << 1 ^ 0x07;
!       } else {
!         currentCrc = currentCrc << 1;
!       }
!     }
!     return currentCrc;
!   }*/
    command result_t Straw.readDone[uint8_t id](result_t success) {
      //  all  //