ToneAlarmInterface: move to drivers/drv_tone_alarm

It belongs there since it's not a library providing the implementation, but just declaring the interface.
PX4 · Aug 30, 2019 · 3bdfd8c · 3bdfd8c
1 parent f3fccf5
commit 3bdfd8c
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 93 deletions.
diff --git a/platforms/nuttx/src/px4/nxp/kinetis/tone_alarm/ToneAlarmInterface.cpp b/platforms/nuttx/src/px4/nxp/kinetis/tone_alarm/ToneAlarmInterface.cpp
@@ -39,7 +39,7 @@
 #include "kinetis_tpm.h"
 
 #include <drivers/device/device.h>
-#include <lib/drivers/tone_alarm/ToneAlarmInterface.h>
+#include <drivers/drv_tone_alarm.h>
 #include <px4_defines.h>
 #include <systemlib/px4_macros.h>
 

diff --git a/platforms/nuttx/src/px4/stm/stm32_common/tone_alarm/ToneAlarmInterfaceGPIO.cpp b/platforms/nuttx/src/px4/stm/stm32_common/tone_alarm/ToneAlarmInterfaceGPIO.cpp
@@ -31,7 +31,7 @@
  *
  ****************************************************************************/
 
-#include <lib/drivers/tone_alarm/ToneAlarmInterface.h>
+#include <drivers/drv_tone_alarm.h>
 #include <px4_defines.h>
 #include <board_config.h>
 

diff --git a/platforms/nuttx/src/px4/stm/stm32_common/tone_alarm/ToneAlarmInterfacePWM.cpp b/platforms/nuttx/src/px4/stm/stm32_common/tone_alarm/ToneAlarmInterfacePWM.cpp
@@ -32,7 +32,7 @@
  ****************************************************************************/
 
 #include <drivers/device/device.h>
-#include <lib/drivers/tone_alarm/ToneAlarmInterface.h>
+#include <drivers/drv_tone_alarm.h>
 #include <px4_defines.h>
 #include <cmath>
 

diff --git a/src/drivers/drv_tone_alarm.h b/src/drivers/drv_tone_alarm.h
@@ -91,3 +91,23 @@ enum {
 	TONE_HOME_SET,
 	TONE_NUMBER_OF_TUNES
 };
+
+namespace ToneAlarmInterface
+{
+
+/**
+ * @brief Activates/configures the hardware registers.
+ */
+void init();
+
+/**
+ * @brief Starts playing the note.
+ */
+void start_note(unsigned frequency);
+
+/**
+ * @brief Stops playing the current note and makes the player 'safe'.
+ */
+void stop_note();
+
+} // ToneAlarmInterface
diff --git a/src/drivers/tone_alarm/ToneAlarm.h b/src/drivers/tone_alarm/ToneAlarm.h
@@ -43,7 +43,6 @@
 #include <circuit_breaker/circuit_breaker.h>
 #include <drivers/device/device.h>
 #include <drivers/drv_tone_alarm.h>
-#include <lib/drivers/tone_alarm/ToneAlarmInterface.h>
 #include <lib/tunes/tunes.h>
 #include <px4_defines.h>
 #include <px4_work_queue/ScheduledWorkItem.hpp>

diff --git a/src/lib/drivers/CMakeLists.txt b/src/lib/drivers/CMakeLists.txt
@@ -41,4 +41,3 @@ add_subdirectory(linux_gpio)
 add_subdirectory(magnetometer)
 add_subdirectory(rangefinder)
 add_subdirectory(smbus)
-add_subdirectory(tone_alarm)
diff --git a/src/lib/drivers/tone_alarm/CMakeLists.txt b/src/lib/drivers/tone_alarm/CMakeLists.txt
diff --git a/src/lib/drivers/tone_alarm/ToneAlarmInterface.h b/src/lib/drivers/tone_alarm/ToneAlarmInterface.h