diff --git a/boards/px4/sitl/default.cmake b/boards/px4/sitl/default.cmake index b960ccce8f3..ec27677890b 100644 --- a/boards/px4/sitl/default.cmake +++ b/boards/px4/sitl/default.cmake @@ -17,6 +17,7 @@ px4_add_board( #magnetometer # all available magnetometer drivers pwm_out_sim #telemetry # all available telemetry drivers + tone_alarm_sim vmount MODULES diff --git a/src/platforms/posix/drivers/tonealrmsim/CMakeLists.txt b/src/drivers/tone_alarm_sim/CMakeLists.txt similarity index 96% rename from src/platforms/posix/drivers/tonealrmsim/CMakeLists.txt rename to src/drivers/tone_alarm_sim/CMakeLists.txt index 0724a7dd4c9..85ae11cee6e 100644 --- a/src/platforms/posix/drivers/tonealrmsim/CMakeLists.txt +++ b/src/drivers/tone_alarm_sim/CMakeLists.txt @@ -31,12 +31,10 @@ # ############################################################################ px4_add_module( - MODULE platforms__posix__drivers__tonealrmsim + MODULE drivers__tone_alarm_sim MAIN tone_alarm - COMPILE_FLAGS SRCS tone_alarm.cpp DEPENDS git_driverframework ) - diff --git a/src/platforms/posix/drivers/tonealrmsim/tone_alarm.cpp b/src/drivers/tone_alarm_sim/tone_alarm.cpp similarity index 93% rename from src/platforms/posix/drivers/tonealrmsim/tone_alarm.cpp rename to src/drivers/tone_alarm_sim/tone_alarm.cpp index 3e738aacc7b..05c5877ff9f 100644 --- a/src/platforms/posix/drivers/tonealrmsim/tone_alarm.cpp +++ b/src/drivers/tone_alarm_sim/tone_alarm.cpp @@ -37,47 +37,24 @@ * timer HW */ +#include +#include +#include +#include +#include +#include #include #include - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include - #include - -#include -#include #include -#include "VirtDevObj.hpp" - -using namespace DriverFramework; - #if !defined(UNUSED) # define UNUSED(a) ((void)(a)) #endif #define CBRK_BUZZER_KEY 782097 -class ToneAlarm : public VirtDevObj +class ToneAlarm : public cdev::CDev { public: ToneAlarm(); @@ -141,7 +118,7 @@ extern "C" __EXPORT int tone_alarm_main(int argc, char *argv[]); ToneAlarm::ToneAlarm() : - VirtDevObj("tone_alarm", TONEALARM0_DEVICE_PATH, nullptr, 0), + CDev(TONEALARM0_DEVICE_PATH), _running(false), _should_run(true), _play_tone(false), @@ -164,9 +141,7 @@ ToneAlarm::~ToneAlarm() int ToneAlarm::init() { - int ret; - - ret = VirtDevObj::init(); + int ret = CDev::init(); if (ret != OK) { return ret;