Project

General

Profile

Revision 6761a531

ID6761a53177d5f8d6771f18a6f948abccc4365076

Added by Priya about 12 years ago

Pushing modified behavior process that requires less arguments and appends scoutname to ros node name. and a compiling but not tested version of test_behaviors (scheduler and wh_robot)

View differences:

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 != 4)
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]
50
             << " <scoutname> <behavior#> <behaviorname>" << endl;
50
             << " <scoutname> <behavior#> " << endl;
51 51
    }
52 52
    else
53 53
    {
54 54
        // Use the provided scoutname for simulator messages
55 55
        scoutname = argv[1];
56 56
        behavior_num = atoi(argv[2]);
57
        behavior_name = argv[3];
58 57

  
59
        ros::init(argc, argv, behavior_name);
58
        ros::init(argc, argv, scoutname + "_behavior");
60 59

  
61 60
        BehaviorList* list = new BehaviorList(scoutname);
62 61
        vector<Behavior*> behavior_list = list->behavior_list;

Also available in: Unified diff