Revision: 8479
http://playerstage.svn.sourceforge.net/playerstage/?rev=8479&view=rev
Author: gerkey
Date: 2009-12-22 16:49:33 +0000 (Tue, 22 Dec 2009)
Log Message:
-----------
Removed ARNL parameters, which were accidentally included.
Modified Paths:
--------------
code/player/trunk/server/drivers/mixed/p2os/robot_params.cc
code/player/trunk/server/drivers/mixed/p2os/robot_params.h
Modified: code/player/trunk/server/drivers/mixed/p2os/robot_params.cc
===================================================================
--- code/player/trunk/server/drivers/mixed/p2os/robot_params.cc 2009-12-22
06:17:23 UTC (rev 8478)
+++ code/player/trunk/server/drivers/mixed/p2os/robot_params.cc 2009-12-22
16:49:33 UTC (rev 8479)
@@ -27,9 +27,6 @@
* Saphira parameter files:
* /Users/gerkey/Desktop/params/params/amigo-sh.p
* /Users/gerkey/Desktop/params/params/amigo.p
- * /Users/gerkey/Desktop/params/params/arnl.p
- * /Users/gerkey/Desktop/params/params/default-arnl.p
- * /Users/gerkey/Desktop/params/params/default-sonarnl.p
* /Users/gerkey/Desktop/params/params/p2at.p
* /Users/gerkey/Desktop/params/params/p2at8+.p
* /Users/gerkey/Desktop/params/params/p2at8.p
@@ -59,7 +56,6 @@
* /Users/gerkey/Desktop/params/params/psos1m.p
* /Users/gerkey/Desktop/params/params/psos1x.p
* /Users/gerkey/Desktop/params/params/psos43m.p
- * /Users/gerkey/Desktop/params/params/sonarnl.p
* /Users/gerkey/Desktop/params/params/wheelchair-sh.p
*/
#include "robot_params.h"
@@ -451,561 +447,6 @@
}
};
-RobotParams_t arnl_params =
-{
- 0,
- 10,
- 10,
- 0,
- 0,
- 10,
- "0",
- 1,
- 2000,
- 0,
- 0.33,
- 0,
- 0.1,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 45,
- 300,
- 300,
- 2000,
- 0,
- 100,
- 1000,
- 100,
- 0,
- 10,
- 200,
- 1000,
- 33,
- 33,
- 33,
- 250,
- 0.4,
- 200,
- 200,
- 1,
- 100,
- 0,
- 0,
- 50,
- 50,
- 50,
- 0.8,
- 0,
- 0,
- 0,
- 15,
- 200,
- 200,
- 0.05,
- 0.0025,
- 0.05,
- 0,
- "0",
- "0",
- 0,
- 0,
- 0,
- 0,
- 0,
- 1000,
- "",
- 0.75,
- 0,
- 100,
- 750,
- 0,
- 200,
- 0,
- 1,
- 8,
- 0,
- 0,
- 2000,
- 1,
- 5,
- 0.2,
- 0.1,
- 10,
- 0.2,
- 1e-06,
- 1,
- 10,
- 10,
- 1,
- 10,
- 10,
- 1,
- 637.5,
- 106.25,
- 1,
- 100,
- 100,
- 0,
- 0,
- 0,
- 1000,
- 45,
- 32000,
- 10000,
- 0,
- 0,
- 2,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 8,
- 0.9,
- 0,
- 0,
- 1000,
- 100,
- 100,
- 2,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 3,
- 50,
- 45,
- 150,
- 30,
- 400,
- 400,
- "0",
- 1000,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0.5,
- 5,
- 200,
- 10000,
- 0,
- 0,
- 0,
- 1,
- 1,
- 1,
- 0,
- 0,
- 0.1,
- {
- },
- {
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- }
-};
-
-RobotParams_t default_arnl_params =
-{
- 0,
- 10,
- 10,
- 0,
- 0,
- 10,
- "0",
- 1,
- 2000,
- 0,
- 0.33,
- 0,
- 0.1,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 45,
- 300,
- 300,
- 2000,
- 0,
- 100,
- 1000,
- 100,
- 0,
- 10,
- 200,
- 1000,
- 33,
- 33,
- 33,
- 250,
- 0.4,
- 200,
- 200,
- 1,
- 100,
- 0,
- 0,
- 50,
- 50,
- 50,
- 0.8,
- 0,
- 0,
- 0,
- 15,
- 200,
- 200,
- 0.05,
- 0.0025,
- 0.05,
- 0,
- "0",
- "0",
- 0,
- 0,
- 0,
- 0,
- 0,
- 1000,
- "",
- 0.75,
- 0,
- 100,
- 750,
- 0,
- 200,
- 0,
- 1,
- 8,
- 0,
- 0,
- 2000,
- 1,
- 5,
- 0.2,
- 0.1,
- 10,
- 0.2,
- 1e-06,
- 1,
- 10,
- 10,
- 1,
- 10,
- 10,
- 1,
- 637.5,
- 106.25,
- 1,
- 100,
- 100,
- 0,
- 0,
- 0,
- 1000,
- 45,
- 32000,
- 10000,
- 0,
- 0,
- 2,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 8,
- 0.9,
- 0,
- 0,
- 1000,
- 100,
- 100,
- 2,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 3,
- 50,
- 45,
- 150,
- 30,
- 400,
- 400,
- "0",
- 1000,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0.5,
- 5,
- 200,
- 10000,
- 0,
- 0,
- 0,
- 1,
- 1,
- 1,
- 0,
- 0,
- 0.1,
- {
- },
- {
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- }
-};
-
-RobotParams_t default_sonarnl_params =
-{
- 0,
- 10,
- 10,
- 0,
- 0,
- 10,
- "0",
- 1,
- 2000,
- 0,
- 0,
- 0,
- 0.1,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 45,
- 300,
- 300,
- 2000,
- 0,
- 100,
- 1000,
- 100,
- 0,
- 10,
- 200,
- 1000,
- 33,
- 33,
- 33,
- 250,
- 0.4,
- 200,
- 200,
- 1,
- 0,
- 0,
- 0,
- 50,
- 50,
- 50,
- 0.8,
- 0,
- 0,
- 0,
- 15,
- 200,
- 200,
- 0.05,
- 0.0025,
- 0.05,
- 0,
- "0",
- "0",
- 0,
- 0,
- 0,
- 0,
- 0,
- 1000,
- "",
- 0.75,
- 0,
- 100,
- 750,
- 0,
- 200,
- 0,
- 1,
- 8,
- 0,
- 0,
- 2000,
- 1,
- 5,
- 0.2,
- 0,
- 10,
- 0.1,
- 0.9,
- 2,
- 100,
- 100,
- 1,
- 10,
- 10,
- 1,
- 637.5,
- 106.25,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 2,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 8,
- 0,
- 0,
- 0,
- 1000,
- 100,
- 100,
- 2,
- 1,
- 30,
- 0.6,
- 0.8,
- 15,
- 2e-05,
- 5e-05,
- 2000,
- 100,
- 0,
- 100,
- 30,
- 3,
- 50,
- 45,
- 150,
- 30,
- 400,
- 400,
- "0",
- 1000,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 5,
- 200,
- 10000,
- 0,
- 0,
- 0,
- 1,
- 0,
- 1,
- 0,
- 0,
- 0.1,
- {
- },
- {
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- }
-};
-
RobotParams_t p2at_params =
{
0,
@@ -6876,191 +6317,6 @@
}
};
-RobotParams_t sonarnl_params =
-{
- 0,
- 10,
- 10,
- 0,
- 0,
- 10,
- "0",
- 1,
- 2000,
- 0,
- 0,
- 0,
- 0.1,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 45,
- 300,
- 300,
- 2000,
- 0,
- 100,
- 1000,
- 100,
- 0,
- 10,
- 200,
- 1000,
- 33,
- 33,
- 33,
- 250,
- 0.4,
- 200,
- 200,
- 1,
- 0,
- 0,
- 0,
- 50,
- 50,
- 50,
- 0.8,
- 0,
- 0,
- 0,
- 15,
- 200,
- 200,
- 0.05,
- 0.0025,
- 0.05,
- 0,
- "0",
- "0",
- 0,
- 0,
- 0,
- 0,
- 0,
- 1000,
- "",
- 0.75,
- 0,
- 100,
- 750,
- 0,
- 200,
- 0,
- 1,
- 8,
- 0,
- 0,
- 2000,
- 1,
- 5,
- 0.2,
- 0,
- 10,
- 0.1,
- 0.9,
- 2,
- 100,
- 100,
- 1,
- 10,
- 10,
- 1,
- 637.5,
- 106.25,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 2,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 8,
- 0,
- 0,
- 0,
- 1000,
- 100,
- 100,
- 2,
- 1,
- 30,
- 0.6,
- 0.8,
- 15,
- 2e-05,
- 5e-05,
- 2000,
- 100,
- 0,
- 100,
- 30,
- 3,
- 50,
- 45,
- 150,
- 30,
- 400,
- 400,
- "0",
- 1000,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 5,
- 200,
- 10000,
- 0,
- 0,
- 0,
- 1,
- 0,
- 1,
- 0,
- 0,
- 0.1,
- {
- },
- {
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- { 0, 0, 0, 0, 0 },
- }
-};
-
RobotParams_t wheelchair_sh_params =
{
0,
@@ -7253,38 +6509,34 @@
{
PlayerRobotParams[0] = amigo_sh_params;
PlayerRobotParams[1] = amigo_params;
- PlayerRobotParams[2] = arnl_params;
- PlayerRobotParams[3] = default_arnl_params;
- PlayerRobotParams[4] = default_sonarnl_params;
- PlayerRobotParams[5] = p2at_params;
- PlayerRobotParams[6] = p2at8plus_params;
- PlayerRobotParams[7] = p2at8_params;
- PlayerRobotParams[8] = p2ce_params;
- PlayerRobotParams[9] = p2d8plus_params;
- PlayerRobotParams[10] = p2d8_params;
- PlayerRobotParams[11] = p2de_params;
- PlayerRobotParams[12] = p2df_params;
- PlayerRobotParams[13] = p2dx_params;
- PlayerRobotParams[14] = p2it_params;
- PlayerRobotParams[15] = p2pb_params;
- PlayerRobotParams[16] = p2pp_params;
- PlayerRobotParams[17] = p3at_sh_params;
- PlayerRobotParams[18] = p3at_params;
- PlayerRobotParams[19] = p3atiw_sh_params;
- PlayerRobotParams[20] = p3dx_sh_params;
- PlayerRobotParams[21] = p3dx_params;
- PlayerRobotParams[22] = patrolbot_sh_params;
- PlayerRobotParams[23] = peoplebot_sh_params;
- PlayerRobotParams[24] = perfpbplus_params;
- PlayerRobotParams[25] = perfpb_params;
- PlayerRobotParams[26] = pion1m_params;
- PlayerRobotParams[27] = pion1x_params;
- PlayerRobotParams[28] = pionat_params;
- PlayerRobotParams[29] = powerbot_sh_params;
- PlayerRobotParams[30] = powerbot_params;
- PlayerRobotParams[31] = psos1m_params;
- PlayerRobotParams[32] = psos1x_params;
- PlayerRobotParams[33] = psos43m_params;
- PlayerRobotParams[34] = sonarnl_params;
- PlayerRobotParams[35] = wheelchair_sh_params;
+ PlayerRobotParams[2] = p2at_params;
+ PlayerRobotParams[3] = p2at8plus_params;
+ PlayerRobotParams[4] = p2at8_params;
+ PlayerRobotParams[5] = p2ce_params;
+ PlayerRobotParams[6] = p2d8plus_params;
+ PlayerRobotParams[7] = p2d8_params;
+ PlayerRobotParams[8] = p2de_params;
+ PlayerRobotParams[9] = p2df_params;
+ PlayerRobotParams[10] = p2dx_params;
+ PlayerRobotParams[11] = p2it_params;
+ PlayerRobotParams[12] = p2pb_params;
+ PlayerRobotParams[13] = p2pp_params;
+ PlayerRobotParams[14] = p3at_sh_params;
+ PlayerRobotParams[15] = p3at_params;
+ PlayerRobotParams[16] = p3atiw_sh_params;
+ PlayerRobotParams[17] = p3dx_sh_params;
+ PlayerRobotParams[18] = p3dx_params;
+ PlayerRobotParams[19] = patrolbot_sh_params;
+ PlayerRobotParams[20] = peoplebot_sh_params;
+ PlayerRobotParams[21] = perfpbplus_params;
+ PlayerRobotParams[22] = perfpb_params;
+ PlayerRobotParams[23] = pion1m_params;
+ PlayerRobotParams[24] = pion1x_params;
+ PlayerRobotParams[25] = pionat_params;
+ PlayerRobotParams[26] = powerbot_sh_params;
+ PlayerRobotParams[27] = powerbot_params;
+ PlayerRobotParams[28] = psos1m_params;
+ PlayerRobotParams[29] = psos1x_params;
+ PlayerRobotParams[30] = psos43m_params;
+ PlayerRobotParams[31] = wheelchair_sh_params;
}
Modified: code/player/trunk/server/drivers/mixed/p2os/robot_params.h
===================================================================
--- code/player/trunk/server/drivers/mixed/p2os/robot_params.h 2009-12-22
06:17:23 UTC (rev 8478)
+++ code/player/trunk/server/drivers/mixed/p2os/robot_params.h 2009-12-22
16:49:33 UTC (rev 8479)
@@ -27,9 +27,6 @@
* Saphira parameter files:
* /Users/gerkey/Desktop/params/params/amigo-sh.p
* /Users/gerkey/Desktop/params/params/amigo.p
- * /Users/gerkey/Desktop/params/params/arnl.p
- * /Users/gerkey/Desktop/params/params/default-arnl.p
- * /Users/gerkey/Desktop/params/params/default-sonarnl.p
* /Users/gerkey/Desktop/params/params/p2at.p
* /Users/gerkey/Desktop/params/params/p2at8+.p
* /Users/gerkey/Desktop/params/params/p2at8.p
@@ -59,7 +56,6 @@
* /Users/gerkey/Desktop/params/params/psos1m.p
* /Users/gerkey/Desktop/params/params/psos1x.p
* /Users/gerkey/Desktop/params/params/psos43m.p
- * /Users/gerkey/Desktop/params/params/sonarnl.p
* /Users/gerkey/Desktop/params/params/wheelchair-sh.p
*/
@@ -69,7 +65,7 @@
void initialize_robot_params(void);
-#define PLAYER_NUM_ROBOT_TYPES 36
+#define PLAYER_NUM_ROBOT_TYPES 32
typedef struct
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 Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
