Update of /cvsroot/playerstage/code/player/server/drivers/mixed/rflex
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10920/server/drivers/mixed/rflex
Modified Files:
rflex.cc
Log Message:
removed old asserts from rflex
Index: rflex.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/mixed/rflex/rflex.cc,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** rflex.cc 2 Dec 2007 09:11:13 -0000 1.41
--- rflex.cc 23 Jan 2008 03:43:59 -0000 1.42
***************
*** 360,369 ****
{
assert(hdr);
- assert(data);
if(Message::MatchMessage(hdr, PLAYER_MSGTYPE_REQ, PLAYER_SONAR_REQ_POWER,
sonar_id))
{
- assert(hdr->size == sizeof(player_sonar_power_config));
Lock();
if(reinterpret_cast<player_sonar_power_config_t *> (data)->state==0)
--- 360,367 ----
***************
*** 378,382 ****
sonar_id_2))
{
- assert(hdr->size == sizeof(player_sonar_power_config));
Lock();
if(reinterpret_cast<player_sonar_power_config_t *> (data)->state==0)
--- 376,379 ----
***************
*** 391,396 ****
sonar_id))
{
- assert(hdr->size == 0);
-
player_sonar_geom_t geom;
Lock();
--- 388,391 ----
***************
*** 409,414 ****
sonar_id_2))
{
- assert(hdr->size == 0);
-
player_sonar_geom_t geom;
Lock();
--- 404,407 ----
***************
*** 427,432 ****
bumper_id))
{
- assert(hdr->size == 0);
-
player_bumper_geom_t geom;
Lock();
--- 420,423 ----
***************
*** 451,455 ****
else if(Message::MatchMessage(hdr, PLAYER_MSGTYPE_REQ, PLAYER_IR_REQ_POWER,
ir_id))
{
- assert(hdr->size == sizeof(player_ir_power_req_t));
player_ir_power_req_t * req = reinterpret_cast<player_ir_power_req_t*>
(data);
Lock();
--- 442,445 ----
***************
*** 464,469 ****
else if(Message::MatchMessage(hdr, PLAYER_MSGTYPE_REQ,
PLAYER_POSITION2D_REQ_SET_ODOM, position_id))
{
- assert(hdr->size == sizeof(player_position2d_set_odom_req));
-
player_position2d_set_odom_req * set_odom_req =
reinterpret_cast<player_position2d_set_odom_req*> (data);
Lock();
--- 454,457 ----
***************
*** 475,480 ****
else if(Message::MatchMessage(hdr, PLAYER_MSGTYPE_REQ,
PLAYER_POSITION2D_REQ_MOTOR_POWER, position_id))
{
- assert(hdr->size == sizeof(player_position2d_power_config_t));
-
Lock();
if(((player_position2d_power_config_t*)data)->state==0)
--- 463,466 ----
***************
*** 488,492 ****
else if(Message::MatchMessage(hdr, PLAYER_MSGTYPE_REQ,
PLAYER_POSITION2D_REQ_VELOCITY_MODE, position_id))
{
- assert(hdr->size == sizeof(player_position2d_velocity_mode_config_t));
// Does nothing, needs to be implemented
Publish(position_id, resp_queue, PLAYER_MSGTYPE_RESP_ACK, hdr->subtype);
--- 474,477 ----
***************
*** 503,508 ****
else if(Message::MatchMessage(hdr, PLAYER_MSGTYPE_REQ,
PLAYER_POSITION2D_REQ_GET_GEOM, position_id))
{
- assert(hdr->size == 0);
-
player_position2d_geom_t geom={{0}};
Lock();
--- 488,491 ----
***************
*** 515,519 ****
else if(Message::MatchMessage(hdr, PLAYER_MSGTYPE_CMD,
PLAYER_POSITION2D_CMD_VEL, position_id))
{
- assert(hdr->size == sizeof(player_position2d_cmd_vel_t));
Lock();
command = *reinterpret_cast<player_position2d_cmd_vel_t *> (data);
--- 498,501 ----
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
