Revision 676cbe0e
Integrated paintboard and metal detector control classes more fully.
scout/libscout/src/Sensors.cpp | ||
---|---|---|
48 | 48 |
encoders = new EncodersControl(node, scoutname); |
49 | 49 |
linesensor = new LinesensorControl(node, scoutname); |
50 | 50 |
wl_sender = new WirelessSender(node); |
51 |
paintboard = new PaintBoardControl(node, scoutname); |
|
52 |
metal_detector = new MetalDetectorControl(node, scoutname); |
|
51 | 53 |
} |
52 | 54 |
|
53 | 55 |
// b_stuff stand for behavior control class |
... | ... | |
55 | 57 |
SonarControl ** b_sonar, EncodersControl ** b_encoders, |
56 | 58 |
LinesensorControl ** b_linesensor, |
57 | 59 |
WirelessSender ** b_wl_sender, |
58 |
WirelessReceiver ** b_wl_receiver) |
|
60 |
WirelessReceiver ** b_wl_receiver, |
|
61 |
PaintBoardControl ** b_paintboard, |
|
62 |
MetalDetectorControl ** b_metal_detector) |
|
59 | 63 |
{ |
60 | 64 |
//(MotorControl *)(* b_motors) = motors; |
61 | 65 |
*b_motors = motors; |
... | ... | |
65 | 69 |
*b_linesensor = linesensor; |
66 | 70 |
*b_wl_sender = wl_sender; |
67 | 71 |
*b_wl_receiver = new WirelessReceiver(node); |
72 |
*b_paintboard = paintboard; |
|
73 |
*b_metal_detector = metal_detector; |
|
68 | 74 |
} |
Also available in: Unified diff