Project

General

Profile

Revision b00761a0

IDb00761a0e88f934a309a939b653d9f441b127ae8

Added by Alex Zirbel over 12 years ago

Updated ButtonControl and SonarControl.

Finally, the behavior compiles. Had to fix a lot of problems involving misunderstandings with Publisher/Client/ServiceServer/ServiceClient confusion.

We can now run priya_behavior as an executable, though the process for generating behavior executables still needs some work.

View differences:

scout/libscout/src/priya_behavior_process.cpp
31 31
 * 
32 32
 * @author Colony Project, CMU Robotics Club
33 33
 * @author Alex Zirbel
34
 **/
34
 */
35 35

  
36 36
#include <ros/ros.h>
37 37
#include "PriyaBehavior.h"
......
42 42
{
43 43
    string scoutname = "";
44 44

  
45
    // Running with no arguments only supports one scout. Check in case
46
    // the user meant to specify a scout in the arguments.
45 47
    if (argc != 2)
46 48
    {
47 49
        cout << "You have started this behavior in hardware mode." << endl
......
54 56
        scoutname = argv[1];
55 57
    }
56 58

  
57
    ros::init(argc, argv, "libscout");
59
    /// @todo Will using argc and argv cause problems? (I don't think so but..)
60
    ros::init(argc, argv, "priya_behavior");
58 61

  
59 62
    PriyaBehavior *behavior = new PriyaBehavior(scoutname);
60 63
    behavior->run();

Also available in: Unified diff