Revision: 6956
http://playerstage.svn.sourceforge.net/playerstage/?rev=6956&view=rev
Author: thjc
Date: 2008-08-17 03:34:26 +0000 (Sun, 17 Aug 2008)
Log Message:
-----------
Merged 6930 from 2-1 fix for Cmucam2 which was not matching command
messages correctly, and incorrectly acking commands
Modified Paths:
--------------
code/player/trunk/server/drivers/mixed/cmucam2/cmucam2.cc
Property Changed:
----------------
code/player/trunk/
Property changes on: code/player/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /code/player/branches/release-2-1-patches:6672-6673,6738,6834,6886,6905
+
/code/player/branches/release-2-1-patches:6672-6673,6738,6834,6886,6905,6930
Modified: code/player/trunk/server/drivers/mixed/cmucam2/cmucam2.cc
===================================================================
--- code/player/trunk/server/drivers/mixed/cmucam2/cmucam2.cc 2008-08-16
00:01:56 UTC (rev 6955)
+++ code/player/trunk/server/drivers/mixed/cmucam2/cmucam2.cc 2008-08-17
03:34:26 UTC (rev 6956)
@@ -311,7 +311,7 @@
assert(hdr);
assert(data);
- if (Message::MatchMessage(hdr, PLAYER_MSGTYPE_CMD, 0, ptz_id))
+ if (Message::MatchMessage(hdr, PLAYER_MSGTYPE_CMD,
PLAYER_PTZ_CMD_STATE, ptz_id))
{
player_ptz_cmd_t & command =
*reinterpret_cast<player_ptz_cmd_t * > (data);
@@ -331,9 +331,6 @@
set_servo_position(fd, 1, -1*tilt_position);
}
- Publish (this->ptz_id, resp_queue,
- PLAYER_MSGTYPE_RESP_ACK,
- hdr->subtype);
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
