src/platforms/common: move to platforms/common

Script to update include paths:
for i in $(grep -rl 'include <px4_work_queue' src platforms); do sed -i 's/#include <px4_work_queue/#include <px4_platform_common\/px4_work_queue/' $i; done

CMakeLists.txt

@@ -463,7 +463,7 @@ include(px4_add_library)
 add_subdirectory(src/lib EXCLUDE_FROM_ALL)
 
 add_subdirectory(platforms/${PX4_PLATFORM}/src/px4)
-add_subdirectory(src/platforms EXCLUDE_FROM_ALL)
+add_subdirectory(platforms EXCLUDE_FROM_ALL)
 add_subdirectory(src/modules/uORB EXCLUDE_FROM_ALL) # TODO: platform layer
 add_subdirectory(src/drivers/boards EXCLUDE_FROM_ALL)
 

cmake/px4_add_common_flags.cmake

@@ -184,7 +184,6 @@ function(px4_add_common_flags)
 		${PX4_SOURCE_DIR}/src/lib/matrix
 		${PX4_SOURCE_DIR}/src/modules
 		${PX4_SOURCE_DIR}/src/platforms
-		${PX4_SOURCE_DIR}/src/platforms/common
 		)
 
 	add_definitions(

platforms/CMakeLists.txt

@@ -33,3 +33,4 @@
 
 add_subdirectory(common)
 
+

platforms/common/px4_work_queue/ScheduledWorkItem.cpp

@@ -31,7 +31,7 @@
  *
  ****************************************************************************/
 
-#include "ScheduledWorkItem.hpp"
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 namespace px4
 {

platforms/common/px4_work_queue/WorkItem.cpp

@@ -31,10 +31,10 @@
  *
  ****************************************************************************/
 
-#include "WorkItem.hpp"
+#include <px4_platform_common/px4_work_queue/WorkItem.hpp>
 
-#include "WorkQueue.hpp"
-#include "WorkQueueManager.hpp"
+#include <px4_platform_common/px4_work_queue/WorkQueue.hpp>
+#include <px4_platform_common/px4_work_queue/WorkQueueManager.hpp>
 
 #include <px4_log.h>
 #include <drivers/drv_hrt.h>

platforms/common/px4_work_queue/WorkQueue.cpp

@@ -31,8 +31,8 @@
  *
  ****************************************************************************/
 
-#include "WorkQueue.hpp"
-#include "WorkItem.hpp"
+#include <px4_platform_common/px4_work_queue/WorkQueue.hpp>
+#include <px4_platform_common/px4_work_queue/WorkItem.hpp>
 
 #include <string.h>
 

platforms/common/px4_work_queue/WorkQueueManager.cpp

@@ -31,9 +31,9 @@
  *
  ****************************************************************************/
 
-#include "WorkQueueManager.hpp"
+#include <px4_platform_common/px4_work_queue/WorkQueueManager.hpp>
 
-#include "WorkQueue.hpp"
+#include <px4_platform_common/px4_work_queue/WorkQueue.hpp>
 
 #include <drivers/drv_hrt.h>
 #include <px4_posix.h>

platforms/common/px4_work_queue/test/wqueue_scheduled_test.h

@@ -34,7 +34,7 @@
 #pragma once
 
 #include <px4_app.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <string.h>
 
 using namespace px4;

platforms/common/px4_work_queue/test/wqueue_test.h

@@ -34,7 +34,7 @@
 #pragma once
 
 #include <px4_app.h>
-#include <px4_work_queue/WorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/WorkItem.hpp>
 #include <string.h>
 
 using namespace px4;

platforms/nuttx/src/px4/common/px4_init.cpp

@@ -38,7 +38,7 @@
 #include <px4_defines.h>
 #include <drivers/drv_hrt.h>
 #include <lib/parameters/param.h>
-#include <px4_work_queue/WorkQueueManager.hpp>
+#include <px4_platform_common/px4_work_queue/WorkQueueManager.hpp>
 #include <systemlib/cpuload.h>
 
 #include <fcntl.h>

platforms/posix/src/px4/common/px4_init.cpp

@@ -37,7 +37,7 @@
 #include <px4_defines.h>
 #include <drivers/drv_hrt.h>
 #include <lib/parameters/param.h>
-#include <px4_work_queue/WorkQueueManager.hpp>
+#include <px4_platform_common/px4_work_queue/WorkQueueManager.hpp>
 
 int px4_platform_init(void)
 {

platforms/qurt/src/px4/common/px4_init.cpp

@@ -37,7 +37,7 @@
 #include <px4_defines.h>
 #include <drivers/drv_hrt.h>
 #include <lib/parameters/param.h>
-#include <px4_work_queue/WorkQueueManager.hpp>
+#include <px4_platform_common/px4_work_queue/WorkQueueManager.hpp>
 
 int px4_platform_init(void)
 {

src/drivers/adc/adc.cpp

@@ -45,7 +45,7 @@
 #include <px4_arch/adc.h>
 #include <px4_config.h>
 #include <px4_log.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/Publication.hpp>
 #include <uORB/topics/adc_report.h>
 #include <uORB/topics/system_power.h>

src/drivers/barometer/bmp280/bmp280.h

@@ -50,7 +50,7 @@
 #include <perf/perf_counter.h>
 #include <px4_config.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 #include "board_config.h"
 

src/drivers/barometer/lps22hb/LPS22HB.hpp

@@ -42,7 +42,7 @@
 #include <lib/cdev/CDev.hpp>
 #include <perf/perf_counter.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 #include <uORB/uORB.h>
 

src/drivers/barometer/lps25h/lps25h.h

@@ -49,7 +49,7 @@
 #include <lib/cdev/CDev.hpp>
 #include <perf/perf_counter.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 #include <uORB/uORB.h>
 

src/drivers/barometer/mpl3115a2/mpl3115a2.h

@@ -68,7 +68,7 @@
 #include <px4_defines.h>
 #include <px4_getopt.h>
 #include <px4_log.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 
 #include "board_config.h"

src/drivers/barometer/ms5611/ms5611.h

@@ -49,7 +49,7 @@
 #include <lib/cdev/CDev.hpp>
 #include <lib/perf/perf_counter.h>
 #include <platforms/px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 #include <uORB/uORB.h>
 

src/drivers/batt_smbus/batt_smbus.h

@@ -49,7 +49,7 @@
 #include <perf/perf_counter.h>
 #include <platforms/px4_module.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/topics/battery_status.h>
 
 #include "board_config.h"

src/drivers/camera_capture/camera_capture.hpp

@@ -48,7 +48,7 @@
 #include <px4_module.h>
 #include <px4_tasks.h>
 #include <px4_workqueue.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/Publication.hpp>
 #include <uORB/PublicationQueued.hpp>
 #include <uORB/Subscription.hpp>

src/drivers/camera_trigger/camera_trigger.cpp

@@ -50,7 +50,7 @@
 #include <poll.h>
 #include <mathlib/mathlib.h>
 #include <matrix/math.hpp>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 #include <parameters/param.h>
 #include <systemlib/mavlink_log.h>

src/drivers/distance_sensor/cm8jl65/cm8jl65.cpp

@@ -45,7 +45,7 @@
 #include <px4_cli.h>
 #include <px4_config.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>

src/drivers/distance_sensor/leddar_one/leddar_one.cpp

@@ -32,7 +32,7 @@
  ****************************************************************************/
 
 #include <px4_config.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <px4_getopt.h>
 #include <px4_defines.h>
 #include <px4_module.h>

src/drivers/distance_sensor/ll40ls/LidarLiteI2C.h

@@ -42,7 +42,7 @@
 
 #include "LidarLite.h"
 
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 #include <drivers/device/i2c.h>
 

src/drivers/distance_sensor/ll40ls/LidarLitePWM.h

@@ -45,7 +45,7 @@
 
 #include "LidarLite.h"
 
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/topics/pwm_input.h>
 
 class LidarLitePWM : public LidarLite, public px4::ScheduledWorkItem

src/drivers/distance_sensor/mappydot/MappyDot.cpp

@@ -47,7 +47,7 @@
 #include <perf/perf_counter.h>
 #include <px4_getopt.h>
 #include <px4_module_params.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/topics/distance_sensor.h>
 
 /* MappyDot Registers */

src/drivers/distance_sensor/mb12xx/mb12xx.cpp

@@ -63,7 +63,7 @@
 #include <px4_config.h>
 #include <px4_getopt.h>
 #include <px4_module_params.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/uORB.h>
 #include <uORB/topics/distance_sensor.h>
 

src/drivers/distance_sensor/sf0x/sf0x.cpp

@@ -41,7 +41,7 @@
 
 #include <px4_config.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 #include <sys/types.h>
 #include <stdint.h>

src/drivers/distance_sensor/sf1xx/sf1xx.cpp

@@ -44,7 +44,7 @@
 #include <px4_config.h>
 #include <px4_defines.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <px4_module.h>
 
 #include <drivers/device/i2c.h>

src/drivers/distance_sensor/srf02/srf02.cpp

@@ -40,7 +40,7 @@
 #include <px4_config.h>
 #include <px4_defines.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <containers/Array.hpp>
 
 #include <drivers/device/i2c.h>

src/drivers/distance_sensor/teraranger/teraranger.cpp

@@ -41,7 +41,7 @@
 #include <px4_config.h>
 #include <px4_defines.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <px4_module.h>
 
 #include <drivers/device/i2c.h>

src/drivers/distance_sensor/tfmini/tfmini.cpp

@@ -66,7 +66,7 @@
 #include <px4_config.h>
 #include <px4_getopt.h>
 #include <px4_module.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 #include <uORB/uORB.h>
 #include <uORB/topics/distance_sensor.h>

src/drivers/distance_sensor/ulanding/ulanding.cpp

@@ -63,7 +63,7 @@
 #include <px4_defines.h>
 #include <px4_getopt.h>
 #include <px4_workqueue.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 #include <uORB/topics/distance_sensor.h>
 #include <uORB/uORB.h>

src/drivers/distance_sensor/vl53lxx/vl53lxx.cpp

@@ -48,7 +48,7 @@
 #include <drivers/drv_range_finder.h>
 #include <perf/perf_counter.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/topics/distance_sensor.h>
 
 /* Configuration Constants */

src/drivers/heater/heater.h

@@ -45,7 +45,7 @@
 #include <px4_getopt.h>
 #include <px4_module.h>
 #include <px4_module_params.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/Subscription.hpp>
 #include <uORB/topics/parameter_update.h>
 #include <uORB/topics/sensor_accel.h>

src/drivers/imu/adis16448/ADIS16448.h

@@ -50,7 +50,7 @@
 #include <lib/drivers/gyroscope/PX4Gyroscope.hpp>
 #include <lib/drivers/magnetometer/PX4Magnetometer.hpp>
 #include <perf/perf_counter.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 using namespace time_literals;
 

src/drivers/imu/adis16477/ADIS16477.hpp

@@ -45,7 +45,7 @@
 #include <lib/drivers/gyroscope/PX4Gyroscope.hpp>
 #include <perf/perf_counter.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 class ADIS16477 : public device::SPI, public px4::ScheduledWorkItem
 {

src/drivers/imu/adis16497/ADIS16497.hpp

@@ -45,7 +45,7 @@
 #include <lib/drivers/gyroscope/PX4Gyroscope.hpp>
 #include <perf/perf_counter.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 // TODO : This is a copy of the NuttX CRC32 table
 static constexpr uint32_t crc32_tab[] = {

src/drivers/imu/bma180/bma180.cpp

@@ -57,7 +57,7 @@
 #include <perf/perf_counter.h>
 #include <systemlib/err.h>
 #include <nuttx/arch.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <nuttx/clock.h>
 
 #include <drivers/drv_hrt.h>
@@ -66,7 +66,7 @@
 #include <drivers/device/spi.h>
 #include <drivers/drv_accel.h>
 #include <drivers/device/ringbuffer.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 #define ACCEL_DEVICE_PATH	"/dev/bma180"
 

src/drivers/imu/bmi055/BMI055.hpp

@@ -37,7 +37,7 @@
 #include <ecl/geo/geo.h>
 #include <lib/perf/perf_counter.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 #define DIR_READ                0x80
 #define DIR_WRITE               0x00

src/drivers/imu/bmi088/BMI088.hpp

@@ -38,7 +38,7 @@
 #include <lib/conversion/rotation.h>
 #include <lib/perf/perf_counter.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 #define DIR_READ                0x80
 #define DIR_WRITE               0x00

src/drivers/imu/bmi160/bmi160.hpp

@@ -40,7 +40,7 @@
 #include <lib/drivers/gyroscope/PX4Gyroscope.hpp>
 #include <perf/perf_counter.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/conversions.h>
 
 #define DIR_READ                0x80

src/drivers/imu/fxas21002c/FXAS21002C.hpp

@@ -43,7 +43,7 @@
 #include <lib/drivers/gyroscope/PX4Gyroscope.hpp>
 #include <perf/perf_counter.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 
 class FXAS21002C : public device::SPI, public px4::ScheduledWorkItem

src/drivers/imu/fxos8701cq/fxos8701cq.cpp

@@ -46,7 +46,7 @@
 #include <mathlib/math/filter/LowPassFilter2p.hpp>
 #include <perf/perf_counter.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 
 #if !defined(BOARD_HAS_NOISY_FXOS8700_MAG)

src/drivers/imu/icm20948/icm20948.h

@@ -44,7 +44,7 @@
 #include <lib/drivers/gyroscope/PX4Gyroscope.hpp>
 #include <lib/conversion/rotation.h>
 #include <systemlib/err.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 #include <uORB/uORB.h>
 

src/drivers/imu/l3gd20/l3gd20.cpp

@@ -44,7 +44,7 @@
 #include <lib/drivers/gyroscope/PX4Gyroscope.hpp>
 #include <perf/perf_counter.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 #define L3GD20_DEVICE_PATH "/dev/l3gd20"
 

src/drivers/imu/lsm303d/LSM303D.hpp

@@ -41,7 +41,7 @@
 #include <drivers/device/spi.h>
 #include <ecl/geo/geo.h>
 #include <perf/perf_counter.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <lib/drivers/accelerometer/PX4Accelerometer.hpp>
 #include <lib/drivers/magnetometer/PX4Magnetometer.hpp>
 

src/drivers/imu/mpu6000/MPU6000.hpp

@@ -63,7 +63,7 @@
 #include <lib/ecl/geo/geo.h>
 #include <lib/perf/perf_counter.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/conversions.h>
 #include <systemlib/px4_macros.h>
 

src/drivers/imu/mpu9250/mpu9250.h

@@ -35,7 +35,7 @@
 #include <lib/drivers/gyroscope/PX4Gyroscope.hpp>
 #include <lib/ecl/geo/geo.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/conversions.h>
 #include <systemlib/px4_macros.h>
 

src/drivers/irlock/irlock.cpp

@@ -46,7 +46,7 @@
 #include <drivers/device/ringbuffer.h>
 
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 
 #include <uORB/uORB.h>

src/drivers/lights/blinkm/blinkm.cpp

@@ -99,7 +99,7 @@
 
 #include <drivers/device/i2c.h>
 #include <drivers/drv_blinkm.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 #include <uORB/topics/actuator_armed.h>
 #include <uORB/topics/battery_status.h>

src/drivers/lights/oreoled/oreoled.cpp

@@ -47,7 +47,7 @@
 #include <drivers/drv_oreoled.h>
 #include <perf/perf_counter.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 
 #define OREOLED_NUM_LEDS		4			///< maximum number of LEDs the oreo led driver can support

src/drivers/lights/pca8574/pca8574.cpp

@@ -46,7 +46,7 @@
 #include <drivers/device/i2c.h>
 #include <drivers/drv_io_expander.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 
 

src/drivers/lights/rgbled/rgbled.cpp

@@ -45,7 +45,7 @@
 #include <drivers/device/i2c.h>
 #include <lib/led/led.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/Subscription.hpp>
 #include <uORB/topics/parameter_update.h>
 

src/drivers/lights/rgbled_ncp5623c/rgbled_ncp5623c.cpp

@@ -44,7 +44,7 @@
 #include <drivers/device/i2c.h>
 #include <lib/led/led.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <uORB/Subscription.hpp>
 #include <uORB/topics/parameter_update.h>
 

src/drivers/lights/rgbled_pwm/rgbled_pwm.cpp

@@ -44,7 +44,7 @@
 #include <drivers/device/device.h>
 #include <lib/led/led.h>
 #include <px4_getopt.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 class RGBLED_PWM : public device::CDev, public px4::ScheduledWorkItem
 {

src/drivers/linux_sbus/linux_sbus.h

@@ -48,7 +48,7 @@
 #include <asm-generic/termbits.h>
 #include <errno.h>
 #include <px4_config.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <px4_defines.h>
 #include <drivers/drv_hrt.h>
 #include <uORB/uORB.h>

src/drivers/magnetometer/ak09916/ak09916.hpp

@@ -39,7 +39,7 @@
 #include <systemlib/conversions.h>
 #include <drivers/drv_hrt.h>
 #include <drivers/device/i2c.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <lib/drivers/magnetometer/PX4Magnetometer.hpp>
 
 #define AK09916_DEVICE_PATH_MAG              "/dev/ak09916_i2c_int"

src/drivers/magnetometer/bmm150/bmm150.hpp

@@ -20,7 +20,7 @@
 
 #include <perf/perf_counter.h>
 #include <systemlib/err.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/conversions.h>
 
 #include <nuttx/arch.h>

src/drivers/magnetometer/hmc5883/hmc5883.cpp

@@ -57,7 +57,7 @@
 #include <unistd.h>
 
 #include <nuttx/arch.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <nuttx/clock.h>
 
 #include <board_config.h>

src/drivers/magnetometer/ist8310/ist8310.cpp

@@ -76,7 +76,7 @@
 #include <float.h>
 #include <lib/conversion/rotation.h>
 
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 /*
  * IST8310 internal constants and data structures.

src/drivers/magnetometer/lis3mdl/lis3mdl.h

@@ -48,7 +48,7 @@
 
 #include <lib/conversion/rotation.h>
 #include <systemlib/err.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 #include <perf/perf_counter.h>
 #include <px4_defines.h>

src/drivers/magnetometer/lsm303agr/LSM303AGR.hpp

@@ -42,7 +42,7 @@
 #include <mathlib/math/filter/LowPassFilter2p.hpp>
 #include <lib/conversion/rotation.h>
 #include <perf/perf_counter.h>
-#include <px4_work_queue/ScheduledWorkItem.hpp>
+#include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <systemlib/err.h>
 
 // Register mapping