diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-08 21:45:22 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-08 21:45:22 +0100 |
| commit | 171af566f716a99b078eaa4ef0f90405091e8d19 (patch) | |
| tree | 6376c23864e9bb2e4713e1e58f437870e9948912 /src/drivers/sf0x/sf0x.cpp | |
| parent | 7cc33b9ca6c0facd6e2f38f0bc515e9769e13073 (diff) | |
| download | px4-firmware-171af566f716a99b078eaa4ef0f90405091e8d19.tar.gz px4-firmware-171af566f716a99b078eaa4ef0f90405091e8d19.tar.bz2 px4-firmware-171af566f716a99b078eaa4ef0f90405091e8d19.zip | |
Allow to set the UART via start argument, cleanups
Diffstat (limited to 'src/drivers/sf0x/sf0x.cpp')
| -rw-r--r-- | src/drivers/sf0x/sf0x.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/drivers/sf0x/sf0x.cpp b/src/drivers/sf0x/sf0x.cpp index d3043a26b..f25856689 100644 --- a/src/drivers/sf0x/sf0x.cpp +++ b/src/drivers/sf0x/sf0x.cpp @@ -87,11 +87,12 @@ static const int ERROR = -1; #define SF0X_TAKE_RANGE_REG 'D' #define SF02F_MIN_DISTANCE 0.0f #define SF02F_MAX_DISTANCE 40.0f +#define SF0X_DEFAULT_PORT "/dev/ttyS2" class SF0X : public device::CDev { public: - SF0X(const char* port="/dev/ttyS1"); + SF0X(const char* port=SF0X_DEFAULT_PORT); virtual ~SF0X(); virtual int init(); @@ -628,7 +629,7 @@ void info(); * Start the driver. */ void -start() +start(const char* port) { int fd; @@ -637,7 +638,7 @@ start() } /* create the driver */ - g_dev = new SF0X(); + g_dev = new SF0X(port); if (g_dev == nullptr) { goto fail; @@ -795,7 +796,11 @@ sf0x_main(int argc, char *argv[]) * Start/load the driver. */ if (!strcmp(argv[1], "start")) { - sf0x::start(); + if (argc > 2) { + sf0x::start(argv[2]); + } else { + sf0x::start(SF0X_DEFAULT_PORT); + } } /* |