dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Allow to set the UART via start argument, cleanups

This commit is contained in:
Lorenz Meier 2014-03-08 21:45:22 +01:00
parent 7cc33b9ca6
commit 171af566f7
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/drivers/sf0x/sf0x.cpp
View File

@ -87,11 +87,12 @@ static const int ERROR = -1;
#define SF0X_TAKE_RANGE_REG 'D' #define SF0X_TAKE_RANGE_REG 'D'
#define SF02F_MIN_DISTANCE 0.0f #define SF02F_MIN_DISTANCE 0.0f
#define SF02F_MAX_DISTANCE 40.0f #define SF02F_MAX_DISTANCE 40.0f
#define SF0X_DEFAULT_PORT "/dev/ttyS2"
class SF0X : public device::CDev class SF0X : public device::CDev
{ {
public: public:
SF0X(const char* port="/dev/ttyS1"); SF0X(const char* port=SF0X_DEFAULT_PORT);
virtual ~SF0X(); virtual ~SF0X();
virtual int init(); virtual int init();
@ -628,7 +629,7 @@ void info();
* Start the driver. * Start the driver.
*/ */
void void
start() start(const char* port)
{ {
int fd; int fd;
@ -637,7 +638,7 @@ start()
} }
/* create the driver */ /* create the driver */
g_dev = new SF0X(); g_dev = new SF0X(port);
if (g_dev == nullptr) { if (g_dev == nullptr) {
goto fail; goto fail;
@ -795,7 +796,11 @@ sf0x_main(int argc, char *argv[])
* Start/load the driver. * Start/load the driver.
*/ */
if (!strcmp(argv[1], "start")) { if (!strcmp(argv[1], "start")) {
sf0x::start(); if (argc > 2) {
sf0x::start(argv[2]);
} else {
sf0x::start(SF0X_DEFAULT_PORT);
}
} }
/* /*