[Firebug-cvs] firebug/project/src/multihop CollectDataMFB.nc,1.2,1.3

[<che...@us...>]

Update of /cvsroot/firebug/firebug/project/src/multihop
In directory sc8-pr-cvs1:/tmp/cvs-serv6463

Modified Files:
	CollectDataMFB.nc 
Log Message:
add temp into packet

Index: CollectDataMFB.nc
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/multihop/CollectDataMFB.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CollectDataMFB.nc	19 May 2003 07:06:46 -0000	1.2
--- CollectDataMFB.nc	21 May 2003 22:39:15 -0000	1.3
***************
*** 42,47 ****
    struct DataFormat_t {
      uint8_t addr;
!     uint8_t cnt;
!     uint8_t sampledata;
    };
  
--- 42,51 ----
    struct DataFormat_t {
      uint8_t addr;
!     //uint8_t cnt;
!     //uint8_t sampledata;
!     uint16_t temp;
!     //uint16_t rel_hum;
!     //uint16_t baro;
! 
    };
  
***************
*** 90,100 ****
      
      dataPortion = call MultiHopSend.getUsablePortion(msgToSend.data);
- 
      df = (struct DataFormat_t *) dataPortion;
      df->addr = TOS_LOCAL_ADDRESS;
!     df->cnt = counter++;
!     df->sampledata=TOS_LOCAL_ADDRESS;
      //more sensor data put here
      //....
      sending = 1;
      result = call MultiHopSend.send(&msgToSend, sizeof(struct DataFormat_t));
--- 94,105 ----
      
      dataPortion = call MultiHopSend.getUsablePortion(msgToSend.data);
      df = (struct DataFormat_t *) dataPortion;
      df->addr = TOS_LOCAL_ADDRESS;
!     //df->cnt = counter++;
!     //df->sampledata=TOS_LOCAL_ADDRESS;
      //more sensor data put here
      //....
+     df->temp=0x04CE;
+ 
      sending = 1;
      result = call MultiHopSend.send(&msgToSend, sizeof(struct DataFormat_t));