Remove include <log.h> from defines.h

The reason for this is that log.h includes drv_hrt.h which sucks in
half the project's include files with it, which causes strange build
issues

platforms/common/include/px4_platform_common/defines.h

@@ -39,7 +39,7 @@
 
 #pragma once
 
-#include <px4_platform_common/log.h>
+#include <sys/ioctl.h>
 
 /****************************************************************************
  * Defines for all platforms.

platforms/common/include/px4_platform_common/i2c_spi_buses.h

@@ -40,6 +40,7 @@
 #include <containers/List.hpp>
 #include <lib/conversion/rotation.h>
 #include <px4_platform_common/atomic.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 #include <px4_platform_common/sem.h>
 

platforms/common/px4_work_queue/ScheduledWorkItem.cpp

@@ -31,6 +31,7 @@
  *
  ****************************************************************************/
 
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/px4_work_queue/ScheduledWorkItem.hpp>
 
 namespace px4

platforms/common/px4_work_queue/WorkQueue.cpp

@@ -36,6 +36,7 @@
 
 #include <string.h>
 
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/tasks.h>
 #include <px4_platform_common/time.h>
 #include <drivers/drv_hrt.h>

platforms/common/px4_work_queue/WorkQueueManager.cpp

@@ -36,6 +36,7 @@
 #include <px4_platform_common/px4_work_queue/WorkQueue.hpp>
 
 #include <drivers/drv_hrt.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/posix.h>
 #include <px4_platform_common/tasks.h>
 #include <px4_platform_common/time.h>

platforms/common/work_queue/work_thread.c

@@ -39,6 +39,7 @@
 
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/posix.h>
 #include <px4_platform_common/time.h>
 #include <px4_platform_common/tasks.h>

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

@@ -43,6 +43,7 @@
 #include <stdio.h>
 
 #include <px4_platform/cpuload.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/printload.h>
 #include <drivers/drv_hrt.h>
 

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

@@ -32,6 +32,7 @@
  ****************************************************************************/
 
 #include <px4_platform_common/init.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/px4_manifest.h>
 #include <px4_platform_common/console_buffer.h>

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

@@ -37,6 +37,8 @@
  * PX4 Middleware Wrapper NuttX Implementation
  */
 
+#include <cstdio>
+
 #include <px4_platform_common/defines.h>
 #include <drivers/drv_hrt.h>
 

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

@@ -33,6 +33,7 @@
 
 #if defined(PX4_CRYPTO)
 
+#include <px4_platform/board_ctrl.h>
 #include <px4_platform_common/crypto.h>
 #include <px4_platform_common/crypto_backend.h>
 #include <sys/boardctl.h>

platforms/nuttx/src/px4/common/usr_board_ctrl.c

@@ -33,6 +33,8 @@
 
 #include <nuttx/config.h>
 
+#include <stdbool.h>
+
 #include <px4_platform/board_ctrl.h>
 
 #include <sys/boardctl.h>

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

@@ -38,6 +38,7 @@
  */
 
 #include <systemlib/px4_macros.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/defines.h>
 #include <px4_platform/board_determine_hw_info.h>

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

@@ -46,6 +46,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/printload.h>
 #include <drivers/drv_hrt.h>
 

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

@@ -34,6 +34,7 @@
 #include <px4_platform_common/init.h>
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
 #include <drivers/drv_hrt.h>
 #include <lib/parameters/param.h>
 #include <px4_platform_common/px4_work_queue/WorkQueueManager.hpp>

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

@@ -38,6 +38,7 @@
  */
 
 #include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/workqueue.h>
 #include <px4_platform_common/time.h>
 #include <stdint.h>

src/drivers/cyphal/Publishers/Publisher.hpp

@@ -42,6 +42,7 @@
 #pragma once
 
 #include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/log.h>
 
 #include <lib/parameters/param.h>
 #include <containers/List.hpp>

src/drivers/cyphal/Subscribers/BaseSubscriber.hpp

@@ -42,6 +42,7 @@
 #pragma once
 
 #include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/log.h>
 
 #include <lib/parameters/param.h>
 

src/drivers/distance_sensor/broadcom/afbrs50/argus_hal_test.c

@@ -48,6 +48,7 @@
 
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
 
 /*******************************************************************************
  * Definitions

src/drivers/gps/definitions.h

@@ -41,6 +41,7 @@
 
 #include <drivers/drv_hrt.h>
 #include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
 #include <uORB/topics/satellite_info.h>
 #include <uORB/topics/sensor_gps.h>
 #include <uORB/topics/sensor_gnss_relative.h>

src/drivers/magnetometer/hmc5883/HMC5883.hpp

@@ -35,6 +35,7 @@
 
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/time.h>
 #include <drivers/device/i2c.h>
 #include <px4_platform_common/i2c_spi_buses.h>

src/drivers/magnetometer/hmc5883/hmc5883_i2c.cpp

@@ -38,6 +38,7 @@
  */
 
 #include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/log.h>
 #include <drivers/device/i2c.h>
 
 #include "hmc5883.h"

src/drivers/magnetometer/hmc5883/hmc5883_spi.cpp

@@ -38,6 +38,7 @@
  */
 
 #include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/log.h>
 #include <drivers/device/spi.h>
 
 #include "hmc5883.h"

src/drivers/tap_esc/tap_esc_common.cpp

@@ -44,6 +44,7 @@
 #include <systemlib/px4_macros.h> // arraySize
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
 
 #ifndef B250000
 #define B250000 250000

src/drivers/uavcan/sensors/battery.cpp

@@ -35,6 +35,7 @@
 
 #include <lib/geo/geo.h>
 #include <px4_defines.h>
+#include <px4_platform_common/log.h>
 
 const char *const UavcanBatteryBridge::NAME = "battery";
 

src/examples/px4_simple_app/px4_simple_app.c

@@ -39,6 +39,7 @@
  */
 
 #include <px4_platform_common/px4_config.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/tasks.h>
 #include <px4_platform_common/posix.h>
 #include <unistd.h>

src/lib/cdev/CDev.cpp

@@ -41,6 +41,7 @@
 
 #include <cstring>
 
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/posix.h>
 
 namespace cdev

src/lib/cdev/test/cdevtest_example.cpp

@@ -41,6 +41,7 @@
 
 #include "cdevtest_example.h"
 
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/tasks.h>
 #include <px4_platform_common/time.h>
 #include <lib/cdev/CDev.hpp>

src/lib/controllib/block/Block.cpp

@@ -40,8 +40,11 @@
 #include "Block.hpp"
 #include "BlockParam.hpp"
 
+#include <cstdio>
 #include <cstring>
 
+#include <px4_platform_common/log.h>
+
 namespace control
 {
 

src/lib/controllib/block/BlockParam.cpp

@@ -39,10 +39,13 @@
 
 #include "BlockParam.hpp"
 
+#include <cstdio>
 #include <cstring>
 
 #include <containers/List.hpp>
 
+#include <px4_platform_common/log.h>
+
 namespace control
 {
 

src/lib/drivers/device/CDev.cpp

@@ -41,6 +41,7 @@
 
 #include <cstring>
 
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/posix.h>
 
 namespace device

src/lib/drivers/device/Device.hpp

@@ -40,9 +40,12 @@
 #ifndef _DEVICE_DEVICE_HPP
 #define _DEVICE_DEVICE_HPP
 
+#include <cstdio>
+
 /*
  * Includes here should only cover the needs of the framework definitions.
  */
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/posix.h>
 

src/lib/drivers/led/led.cpp

@@ -37,6 +37,7 @@
  * LED driver to control the onboard LED(s) via ioctl interface.
  */
 
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/px4_config.h>
 #include <lib/cdev/CDev.hpp>
 #include <drivers/drv_board_led.h>

src/lib/geo/geo.h

@@ -48,6 +48,8 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include <drivers/drv_hrt.h>
+
 #include <lib/mathlib/mathlib.h>
 #include <lib/matrix/matrix/math.hpp>
 

src/lib/parameters/flashparams/flashparams.cpp

@@ -43,6 +43,7 @@
  */
 
 #include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/posix.h>
 #include <px4_platform_common/shutdown.h>
 

src/lib/parameters/parameters_common.cpp

@@ -31,6 +31,8 @@
  *
  ****************************************************************************/
 
+#include <string.h>
+
 /**
  * @file parameters_common.cpp
  *

src/lib/parameters/parameters_ioctl.cpp

@@ -38,6 +38,9 @@
  */
 
 #define PARAM_IMPLEMENTATION
+
+#include <errno.h>
+
 #include "param.h"
 #include "parameters_ioctl.h"
 #include <px4_platform_common/defines.h>

src/lib/parameters/parameters_ioctl.h

@@ -42,6 +42,7 @@
 #define PARAM_IMPLEMENTATION
 #include "param.h"
 #include <px4_platform/board_ctrl.h>
+#include <px4_platform_common/defines.h>
 
 #define _PARAMIOC(_n) (_PX4_IOC(_PARAMIOCBASE, _n))
 

src/lib/parameters/usr_parameters_if.cpp

@@ -42,6 +42,7 @@
 #include <parameters/px4_parameters.hpp>
 #include <sys/boardctl.h>
 #include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
 
 #include "parameters_common.cpp"
 

src/lib/rc/dsm.cpp

@@ -42,6 +42,7 @@
 #include <px4_platform_common/px4_config.h>
 #include <board_config.h>
 #include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
 
 #include <fcntl.h>
 #include <math.h>

src/lib/wind_estimator/WindEstimator.hpp

@@ -38,6 +38,8 @@
 
 #pragma once
 
+#include <drivers/drv_hrt.h>
+
 #include <mathlib/mathlib.h>
 #include <matrix/math.hpp>
 

src/modules/commander/lm_fit.hpp

@@ -33,6 +33,8 @@
 
 #pragma once
 
+#include <stdint.h>
+
 #include <matrix/matrix/math.hpp>
 #include <px4_platform_common/defines.h>
 

src/modules/ekf2/EKF/estimator_interface.h

@@ -43,6 +43,7 @@
 #define EKF_ESTIMATOR_INTERFACE_H
 
 #if defined(MODULE_NAME)
+#include <px4_platform_common/log.h>
 # define ECL_INFO PX4_DEBUG
 # define ECL_WARN PX4_DEBUG
 # define ECL_ERR  PX4_DEBUG

src/modules/gimbal/input_rc.cpp

@@ -40,7 +40,7 @@
 #include <matrix/matrix/math.hpp>
 #include <px4_platform_common/posix.h>
 #include <px4_platform_common/defines.h>
-
+#include <px4_platform_common/log.h>
 
 namespace gimbal
 {

src/modules/gimbal/input_test.cpp

@@ -34,6 +34,7 @@
 #include "input_test.h"
 
 #include <px4_platform_common/posix.h>
+#include <px4_platform_common/log.h>
 #include <lib/matrix/matrix/math.hpp>
 #include <lib/mathlib/mathlib.h>
 

src/modules/logger/log_writer_file.cpp

@@ -41,6 +41,7 @@
 #include <mathlib/mathlib.h>
 #include <px4_platform_common/posix.h>
 #include <px4_platform_common/crypto.h>
+#include <px4_platform_common/log.h>
 #ifdef __PX4_NUTTX
 #include <systemlib/hardfault_log.h>
 #endif /* __PX4_NUTTX */

src/modules/mavlink/mavlink_shell.cpp

@@ -40,6 +40,8 @@
 
 #include "mavlink_shell.h"
 #include <px4_platform_common/defines.h>
+#include <px4_platform_common/log.h>
+#include <px4_platform_common/posix.h>
 
 #include <unistd.h>
 #include <errno.h>

src/systemcmds/tests/test_dataman.c

@@ -36,6 +36,7 @@
  * Tests for the data manager.
  */
 
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/posix.h>
 

src/systemcmds/tests/test_hrt.cpp

@@ -37,6 +37,7 @@
  */
 
 #include <drivers/drv_hrt.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/posix.h>
 #include <sys/time.h>
 

src/systemcmds/tests/test_perf.c

@@ -36,6 +36,7 @@
  * Tests related to the performance counter.
  */
 
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/posix.h>
 

src/systemcmds/tests/test_sleep.c

@@ -36,6 +36,8 @@
  * Tests the px4_usleep() method.
  */
 
+#include <drivers/drv_hrt.h>
+#include <px4_platform_common/log.h>
 #include <px4_platform_common/time.h>
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/defines.h>