fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-04 20:01:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

ulanding cleanup unnecessary Device CDev usage

Browse Source
This commit is contained in:
Daniel Agar
2018-08-27 13:14:15 -04:00
parent f2ef8708b2
commit fa9b968a16
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/distance_sensor/ulanding/ulanding.cpp
+4 -9
View File
@@ -99,7 +99,7 @@ namespace ulanding
extern "C" __EXPORT int ulanding_radar_main(int argc, char *argv[]); extern "C" __EXPORT int ulanding_radar_main(int argc, char *argv[]);
class Radar : public device::CDev class Radar : public cdev::CDev
{ {
public: public:
Radar(uint8_t rotation = distance_sensor_s::ROTATION_DOWNWARD_FACING, const char *port = RADAR_DEFAULT_PORT); Radar(uint8_t rotation = distance_sensor_s::ROTATION_DOWNWARD_FACING, const char *port = RADAR_DEFAULT_PORT);
@@ -120,7 +120,7 @@ private:
unsigned _head; unsigned _head;
unsigned _tail; unsigned _tail;
uint8_t _buf[BUF_LEN]; uint8_t _buf[BUF_LEN] {};
static int task_main_trampoline(int argc, char *argv[]); static int task_main_trampoline(int argc, char *argv[]);
void task_main(); void task_main();
@@ -136,7 +136,7 @@ Radar *g_dev;
} }
Radar::Radar(uint8_t rotation, const char *port) : Radar::Radar(uint8_t rotation, const char *port) :
CDev("Radar", RANGE_FINDER0_DEVICE_PATH), CDev(RANGE_FINDER0_DEVICE_PATH),
_rotation(rotation), _rotation(rotation),
_task_should_exit(false), _task_should_exit(false),
_task_handle(-1), _task_handle(-1),
@@ -151,11 +151,6 @@ Radar::Radar(uint8_t rotation, const char *port) :
strncpy(_port, port, sizeof(_port)); strncpy(_port, port, sizeof(_port));
/* enforce null termination */ /* enforce null termination */
_port[sizeof(_port) - 1] = '\0'; _port[sizeof(_port) - 1] = '\0';
// disable debug() calls
_debug_enabled = false;
memset(&_buf[0], 0, sizeof(_buf));
} }
Radar::~Radar() Radar::~Radar()
@@ -289,7 +284,7 @@ Radar::init()
&_orb_class_instance, ORB_PRIO_HIGH); &_orb_class_instance, ORB_PRIO_HIGH);
if (_distance_sensor_topic == nullptr) { if (_distance_sensor_topic == nullptr) {
DEVICE_LOG("failed to create distance_sensor object. Did you start uOrb?"); PX4_ERR("failed to create distance_sensor object");
ret = 1; ret = 1;
break; break;
} }