diff --git a/src/modules/rc_loss_alarm/CMakeLists.txt b/src/modules/rc_loss_alarm/CMakeLists.txt index b6c3b2243a..28b1d806e3 100644 --- a/src/modules/rc_loss_alarm/CMakeLists.txt +++ b/src/modules/rc_loss_alarm/CMakeLists.txt @@ -36,7 +36,6 @@ px4_add_module( MAIN rc_loss_alarm STACK_MAIN 512 COMPILE_FLAGS - -Wno-sign-compare # TODO: fix all sign-compare SRCS rc_loss_alarm.cpp DEPENDS diff --git a/src/modules/rc_loss_alarm/rc_loss_alarm.cpp b/src/modules/rc_loss_alarm/rc_loss_alarm.cpp index af73e6488d..1ef26a3abd 100644 --- a/src/modules/rc_loss_alarm/rc_loss_alarm.cpp +++ b/src/modules/rc_loss_alarm/rc_loss_alarm.cpp @@ -38,7 +38,6 @@ #include #include -#include #include #include @@ -50,10 +49,6 @@ bool RC_Loss_Alarm::_had_rc = false; orb_advert_t RC_Loss_Alarm::_tune_control_pub = nullptr; -RC_Loss_Alarm::RC_Loss_Alarm() -{ -} - RC_Loss_Alarm::~RC_Loss_Alarm() { work_cancel(LPWORK, &_work); @@ -162,6 +157,7 @@ void RC_Loss_Alarm::cycle() orb_check(_vehicle_status_sub, &updated); if(updated){ + struct vehicle_status_s _vehicle_status = {}; orb_copy(ORB_ID(vehicle_status), _vehicle_status_sub, &_vehicle_status); if (!_was_armed && diff --git a/src/modules/rc_loss_alarm/rc_loss_alarm.h b/src/modules/rc_loss_alarm/rc_loss_alarm.h index a7424180ed..0a4ae90961 100644 --- a/src/modules/rc_loss_alarm/rc_loss_alarm.h +++ b/src/modules/rc_loss_alarm/rc_loss_alarm.h @@ -46,8 +46,12 @@ class RC_Loss_Alarm: public ModuleBase { public: - RC_Loss_Alarm(); + RC_Loss_Alarm() = default; ~RC_Loss_Alarm(); + RC_Loss_Alarm(const RC_Loss_Alarm &other) = delete; + RC_Loss_Alarm(const RC_Loss_Alarm &&other) = delete; + RC_Loss_Alarm &operator= (const RC_Loss_Alarm &other) = delete; + RC_Loss_Alarm &operator= (const RC_Loss_Alarm &&other) = delete; /** @see ModuleBase */ static int task_spawn(int argc, char *argv[]); @@ -61,7 +65,6 @@ public: private: static struct work_s _work; int _vehicle_status_sub = -1; - struct vehicle_status_s _vehicle_status = {}; static orb_advert_t _tune_control_pub; static bool _was_armed; static bool _had_rc; // Don't trigger alarm for systems without RC @@ -71,10 +74,4 @@ private: static void pub_tune(); static void stop_tune(); static int reset_module(); - - // Hide all but the default constructor - RC_Loss_Alarm(const RC_Loss_Alarm &other); - RC_Loss_Alarm(const RC_Loss_Alarm &&other); - RC_Loss_Alarm &operator= (const RC_Loss_Alarm &other); - RC_Loss_Alarm &operator= (const RC_Loss_Alarm &&other); };