Revision: 7749
http://playerstage.svn.sourceforge.net/playerstage/?rev=7749&view=rev
Author: thjc
Date: 2009-06-01 09:30:31 +0000 (Mon, 01 Jun 2009)
Log Message:
-----------
removed loop that wasnt being used
Modified Paths:
--------------
code/player/trunk/server/drivers/laser/sicklms200.cc
Modified: code/player/trunk/server/drivers/laser/sicklms200.cc
===================================================================
--- code/player/trunk/server/drivers/laser/sicklms200.cc 2009-05-30
09:46:23 UTC (rev 7748)
+++ code/player/trunk/server/drivers/laser/sicklms200.cc 2009-06-01
09:30:31 UTC (rev 7749)
@@ -1190,39 +1190,35 @@
RETURN_ERROR(1,"request for config mode failed");
}
- for (tries = 0; tries < DEFAULT_LASER_RETRIES; tries++)
- {
- packet[0] = 0x20;
- packet[1] = (speed == 9600 ? 0x42 : (speed == 38400 ? 0x40 : 0x48));
- len = 2;
+ packet[0] = 0x20;
+ packet[1] = (speed == 9600 ? 0x42 : (speed == 38400 ? 0x40 : 0x48));
+ len = 2;
- //PLAYER_MSG0(2, "sending baud rate request to laser");
- if (WriteToLaser(packet, len) < 0)
- return 1;
+ //PLAYER_MSG0(2, "sending baud rate request to laser");
+ if (WriteToLaser(packet, len) < 0)
+ return 1;
- // Wait for laser to return ack
- //PLAYER_MSG0(2, "waiting for acknowledge");
- len = ReadFromLaser(packet, sizeof(packet), true, 20000, 5000);
- if (len < 0)
- return 1;
- else if (len < 1)
- {
- PLAYER_ERROR("SetLaserSpeed(): no reply from laser");
- return 1;
- }
- else if (packet[0] == NACK)
- {
- PLAYER_ERROR("SetLaserSpeed(): request denied by laser");
- return 1;
- }
- else if (packet[0] != ACK)
- {
- PLAYER_ERROR("SetLaserSpeed(): unexpected packet type");
- return 1;
- }
- break;
+ // Wait for laser to return ack
+ //PLAYER_MSG0(2, "waiting for acknowledge");
+ len = ReadFromLaser(packet, sizeof(packet), true, 20000, 5000);
+ if (len < 0)
+ return 1;
+ else if (len < 1)
+ {
+ PLAYER_ERROR("SetLaserSpeed(): no reply from laser");
+ return 1;
}
- return (tries >= DEFAULT_LASER_RETRIES);
+ else if (packet[0] == NACK)
+ {
+ PLAYER_ERROR("SetLaserSpeed(): request denied by laser");
+ return 1;
+ }
+ else if (packet[0] != ACK)
+ {
+ PLAYER_ERROR("SetLaserSpeed(): unexpected packet type");
+ return 1;
+ }
+ return 0;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, &
iPhoneDevCamp as they present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://p.sf.net/sfu/creativitycat-com
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
