Revision: 6565
          http://playerstage.svn.sourceforge.net/playerstage/?rev=6565&view=rev
Author:   thjc
Date:     2008-06-13 17:03:05 -0700 (Fri, 13 Jun 2008)

Log Message:
-----------
applied patch [ 1965582 ] Fix laser in dummy driver (2.1.0rc2)

Modified Paths:
--------------
    code/player/branches/release-2-1-patches/server/drivers/shell/dummy.cc

Modified: code/player/branches/release-2-1-patches/server/drivers/shell/dummy.cc
===================================================================
--- code/player/branches/release-2-1-patches/server/drivers/shell/dummy.cc      
2008-06-14 00:01:24 UTC (rev 6564)
+++ code/player/branches/release-2-1-patches/server/drivers/shell/dummy.cc      
2008-06-14 00:03:05 UTC (rev 6565)
@@ -246,13 +246,18 @@
                 player_laser_data_t data;
                 data.min_angle  = -1.5707964;
                 data.max_angle  = 1.5707964;
-                data.resolution = 49;
-                data.max_range  = 4.0;
+                data.resolution = .5 * M_PI/180;
+                data.max_range  = 8.0;
                 data.ranges_count    = 361;
                 data.intensity_count = 361;
+                data.ranges = (float *) 
+                              malloc( data.ranges_count * sizeof(float) );
+
+                data.intensity = (uint8_t *) 
+                              malloc( data.ranges_count * sizeof(uint8_t) );
                 for (i = 0; i < data.ranges_count; i++)
                 {
-                    data.ranges[i]    = 1;
+                    data.ranges[i]    = data.max_range;
                     data.intensity[i] = 1;
                 }
                 data.id = 1;
@@ -260,6 +265,8 @@
                 Publish (device_addr, PLAYER_MSGTYPE_DATA, 
                          PLAYER_LASER_DATA_SCAN, (void*)&data, sizeof(data), 
                          NULL);
+                free(data.ranges);
+                free(data.intensity);
                 break;
             }
             case PLAYER_POSITION2D_CODE:


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit

Reply via email to