Revision cc558a8d
ID | cc558a8d1299b6a5034be4ea7035b58fe09581b8 |
Modified the Behaviors to take a scoutname.
Scoutname now specifies which scout the behavior will affect. Scoutname must be passed to the constructors of each control module (some of which are now in need of modification), so that they can publish to the correct topic.
I also modified the constants file so that it is no longer exported. We should consider making this a full class with static exported functions (or a namespace).
scout/libscout/src/HeadlightControl.h | ||
---|---|---|
39 | 39 |
#define _HEADLIGHT_CONTROL_H_ |
40 | 40 |
|
41 | 41 |
#include <ros/ros.h> |
42 |
#include <libscout/constants.h> |
|
43 | 42 |
#include <headlights/set_headlights.h> |
44 | 43 |
|
44 |
#include "constants.h" |
|
45 |
|
|
45 | 46 |
/* Defines */ |
46 | 47 |
#define WHITE 0xFFFFFF |
47 | 48 |
#define OFF 0x000000 |
... | ... | |
65 | 66 |
class HeadlightControl |
66 | 67 |
{ |
67 | 68 |
public: |
68 |
HeadlightControl(const ros::NodeHandle& libscout_node); |
|
69 |
HeadlightControl(const ros::NodeHandle& libscout_node, |
|
70 |
std::string scoutname); |
|
69 | 71 |
|
70 | 72 |
void set(int color, int which); |
71 | 73 |
void set_rgb(int red, int green, int blue, int which); |
Also available in: Unified diff