[Playerstage-commit] code/player/server/drivers/wsn accel_calib.cc, 1.1, 1.2 mica2.cc, 1.8, 1.9

[Toby C. <th...@us...>]

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

Modified Files:
	accel_calib.cc mica2.cc 
Log Message:
overhaul of the player interface definitions
interfaces are now defined with a very light weight IDL allowing them to be edited in a single file
some subtype names were also modified as a side effect, making them more consistent globally


Index: mica2.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/wsn/mica2.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** mica2.cc	12 Nov 2006 00:22:47 -0000	1.8
--- mica2.cc	20 Aug 2007 06:37:30 -0000	1.9
***************
*** 178,182 ****
  	// RFID interface
  	player_devaddr_t   rfid_addr;
! 	player_rfid_cmd_t  rfid_cmd;
  	bool               provideRFID;
  	int                rfid_subscriptions;
--- 178,182 ----
  	// RFID interface
  	player_devaddr_t   rfid_addr;
! 	player_rfid_data_t  rfid_cmd;
  	bool               provideRFID;
  	int                rfid_subscriptions;
***************
*** 1122,1131 ****
      if ((provideRFID) && (rfidPacket))
  	// Write the RFID data
! 	Publish (rfid_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_RFID_DATA,
  		&rfid_data, sizeof (player_rfid_data_t), NULL);
  
      if ((provideWSN) && (wsnPacket))
  	// Write the WSN data
! 	Publish (wsn_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_WSN_DATA,
  		&wsn_data, sizeof (player_wsn_data_t), NULL);
  
--- 1122,1131 ----
      if ((provideRFID) && (rfidPacket))
  	// Write the RFID data
! 	Publish (rfid_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_RFID_DATA_TAGS,
  		&rfid_data, sizeof (player_rfid_data_t), NULL);
  
      if ((provideWSN) && (wsnPacket))
  	// Write the WSN data
! 	Publish (wsn_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_WSN_DATA_STATE,
  		&wsn_data, sizeof (player_wsn_data_t), NULL);
  

Index: accel_calib.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/wsn/accel_calib.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** accel_calib.cc	3 Jul 2006 15:22:42 -0000	1.1
--- accel_calib.cc	20 Aug 2007 06:37:30 -0000	1.2
***************
*** 302,306 ****
  
      // Handle new data from the WSN device
!     if (Message::MatchMessage (hdr, PLAYER_MSGTYPE_DATA, PLAYER_WSN_DATA, 
         wsn_addr))
      {
--- 302,306 ----
  
      // Handle new data from the WSN device
!     if (Message::MatchMessage (hdr, PLAYER_MSGTYPE_DATA, PLAYER_WSN_DATA_STATE, 
         wsn_addr))
      {
***************
*** 347,351 ****
  
          // Write the WSN data
!         Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_WSN_DATA, 
                   &new_wsn_data, sizeof (player_wsn_data_t), NULL);
  
--- 347,351 ----
  
          // Write the WSN data
!         Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_WSN_DATA_STATE, 
                   &new_wsn_data, sizeof (player_wsn_data_t), NULL);