Revision da08d580
ID | da08d5802cc33e68cb62e79cb31686faa907a34f |
Added launch files for the demo and made a little change to the
argument checker to make them work.
scout/libscout/kickstart | ||
---|---|---|
1 |
#!/bin/bash |
|
2 |
rosservice call /spawn 9.6 2.8 3.14 scout2 & |
|
3 |
exec "$@" |
|
4 |
|
|
5 |
#rostopic pub /scout2_topic std_msgs/String "REG_SUCCESS 1" |
scout/libscout/launch/demo.launch | ||
---|---|---|
1 |
<launch> |
|
2 |
|
|
3 |
<node name="scoutsim" pkg="scoutsim" type="scoutsim_node" args="warehouse" /> |
|
4 |
<node name="scout1" pkg="libscout" type="libscout" args="scout1 4" /> |
|
5 |
<node name="scout2" pkg="libscout" type="libscout" args="scout2 5" launch-prefix="$(find libscout)/kickstart" /> |
|
6 |
|
|
7 |
</launch> |
scout/libscout/launch/scoutsim.launch | ||
---|---|---|
1 |
<launch> |
|
2 |
</launch> |
scout/libscout/src/BehaviorProcess.cpp | ||
---|---|---|
43 | 43 |
|
44 | 44 |
// Running with no arguments only supports one scout. Check in case |
45 | 45 |
// the user meant to specify a scout in the arguments. |
46 |
if (argc != 3)
|
|
46 |
if (argc < 3)
|
|
47 | 47 |
{ |
48 | 48 |
cout << "You have started this behavior in hardware mode." << endl |
49 | 49 |
<< "To start in software mode, use: " << argv[0] |
scout/scoutsim/src/scoutsim.cpp | ||
---|---|---|
89 | 89 |
} |
90 | 90 |
|
91 | 91 |
// Check for incorrect usage |
92 |
if (argc != 2)
|
|
92 |
if (argc < 2)
|
|
93 | 93 |
{ |
94 | 94 |
cout << endl << "Error." << endl << endl; |
95 | 95 |
cout << "Usage: " << local_argv[0] << " <map name>" << endl; |
Also available in: Unified diff