Revision 6d488cf1
Only added libbuttons files. Adding changes to libscout that make libbuttons work.
| scout/libscout/CMakeLists.txt | ||
|---|---|---|
| 29 | 29 |
#rosbuild_add_executable(example examples/example.cpp) |
| 30 | 30 |
#target_link_libraries(example ${PROJECT_NAME})
|
| 31 | 31 |
|
| 32 |
rosbuild_add_executable(libscout_node src/behavior.cpp src/libscout.cpp src/libmotors.cpp src/libheadlights.cpp) |
|
| 32 |
rosbuild_add_executable(libscout_node src/behavior.cpp src/libscout.cpp src/libmotors.cpp src/libheadlights.cpp src/libbuttons.cpp) |
|
| scout/libscout/manifest.xml | ||
|---|---|---|
| 12 | 12 |
<depend package="roscpp"/> |
| 13 | 13 |
<depend package="motors"/> |
| 14 | 14 |
<depend package="headlights"/> |
| 15 |
<depend package="buttons"/> |
|
| 15 | 16 |
|
| 16 | 17 |
</package> |
| 17 | 18 |
|
| scout/libscout/src/constants.h | ||
|---|---|---|
| 47 | 47 |
#define LIB_SONAR 0x2 |
| 48 | 48 |
#define LIB_CLIFFSENSORS 0x4 |
| 49 | 49 |
#define LIB_HEADLIGHTS 0x8 |
| 50 |
#define LIB_BUTTONS 0x10 |
|
| 50 | 51 |
|
| 51 | 52 |
/* Status defines */ |
| 52 | 53 |
//TODO MAKE ENUMS |
| scout/libscout/src/libscout.cpp | ||
|---|---|---|
| 69 | 69 |
if(modules & LIB_HEADLIGHTS){
|
| 70 | 70 |
libheadlights_init(); |
| 71 | 71 |
} |
| 72 |
if(modules & LIB_BUTTONS){
|
|
| 73 |
libbuttons_init(); |
|
| 74 |
} |
|
| 72 | 75 |
/** \todo Add other lib inits **/ |
| 73 | 76 |
return 0; |
| 74 | 77 |
} |
| scout/libscout/src/libscout.h | ||
|---|---|---|
| 45 | 45 |
#include "constants.h" |
| 46 | 46 |
#include "libmotors.h" |
| 47 | 47 |
#include "libheadlights.h" |
| 48 |
#include "libbuttons.h" |
|
| 48 | 49 |
|
| 49 | 50 |
/* Libscout functions */ |
| 50 | 51 |
int init(int modules, int argc, char **argv); |
Also available in: Unified diff