Project

General

Profile

Revision c492be62

IDc492be629f06e3cf71fdf832ce2cd5ac1ec779f8

Added by Alex Zirbel almost 7 years ago

Updated the licensing information in many files.

This is a broken commit because I decided to do this at a bad time. Sorry! The build will be working after next commit, I promise (and I won't push till then). This commit reflects the licensing in the files after I used my auto-add/remove script.

View differences:

scout/libscout/src/Behavior.h
21 21
 * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
22 22
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
23 23
 * OTHER DEALINGS IN THE SOFTWARE.
24
 **/
24
 */
25 25

  
26 26
/**
27 27
 * @file Behavior.h
......
41 41

  
42 42
#include "MotorControl.h"
43 43
#include "HeadlightControl.h"
44
#include "ButtonControl.h"
44 45
#include "SonarControl.h"
45 46
#include "constants.h"
46 47

  
......
50 51
        // Initializes ROS for behavior
51 52
        Behavior(std::string scoutname);
52 53

  
53
        // User implemented behavior
54
        /// Extended by subclasses to actually run the behavior.
54 55
        virtual void run() = 0;
55 56

  
56 57
    protected:
57 58
        ros::NodeHandle node;
59

  
60
        /// @todo Should this really be a pointer, or the object itself somehow?
58 61
        ros::Rate *loop_rate;
59 62

  
60 63
        // Declare all used library controls
61 64
        MotorControl * motors;
62
        //ButtonControl buttons;
63
        //SonarControl sonar;
65
        ButtonControl * buttons;
66
        SonarControl * sonar;
64 67

  
65 68
        // Wrappers for ROS functions
66 69
        bool ok();

Also available in: Unified diff