Update of /cvsroot/playerstage/code/player/server/drivers/wsn
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27187/server/drivers/wsn

Modified Files:
      Tag: release-2-0-patches
        mica2.h 
Log Message:
backported client lib stuff from HEAD

Index: mica2.h
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/wsn/mica2.h,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** mica2.h     11 Apr 2006 12:57:14 -0000      1.2
--- mica2.h     9 Jun 2006 01:17:52 -0000       1.2.2.1
***************
*** 21,27 ****
  /*
   * TinyOS data structures.
!  * Borrowed from the TinyOS project (http://www.tinyos.net).
!  * Portions copyright (c) 2004 Crossbow Technology, Inc.
!  * Distributed according to the Intel Open Source License.
   */
  
--- 21,26 ----
  /*
   * TinyOS data structures.
!  * Portions borrowed from the TinyOS project (http://www.tinyos.net), 
!  * distributed according to the Intel Open Source License.
   */
  
***************
*** 64,67 ****
--- 63,79 ----
  } MTS510Data;
  
+ // ---[ M1-mini RFID reader command packet structure ]---
+ // (Attn: ASCII mode ! make time to change to BINARY!)
+ typedef struct
+ {
+     unsigned char flags  [2];
+     unsigned char request[2];
+     unsigned char type   [2];
+     unsigned char TID    [16];
+     unsigned char start  [2];
+     unsigned char length [2];
+     unsigned char data   [8];
+ } M1miniCommand;
+ 
  // ---[ Generic sensor data packet structure ]---
  typedef struct
***************
*** 97,102 ****
        struct
        {
!           unsigned short device; // device: LEDs, speaker, etc
!           unsigned short state;  // state : on/off, etc
        } actuate;
      } param;
--- 109,114 ----
        struct
        {
!               unsigned short device; // device: LEDs, speaker, etc
!               unsigned short state;  // state : on/off, etc
        } actuate;
      } param;
***************
*** 111,114 ****
--- 123,137 ----
  } __attribute__ ((packed)) XCommandMsg;
  
+ // ---[ RFID data packet structure] ---
+ typedef struct{
+     TOSMsgHeader   tos;
+     unsigned char  ptotal;                    // num of packets
+     unsigned char  pi;                                // index of current 
packet
+     unsigned short RID;                               // receive id
+     unsigned short SG;                                // signal strength
+     unsigned char  data[23];
+     unsigned short crc;
+ } __attribute__ ((packed)) RFIDMsg;
+ 
  // ---[ Health data packet structure ]---
  /*typedef struct
***************
*** 129,131 ****
  } HealthData;
  */
- 
--- 152,153 ----



_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit

Reply via email to