From 2ffb49b734fad6b6dfd6fcaee79bf31c6cf595a7 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Tue, 22 Jan 2019 11:23:29 -0500
Subject: [PATCH] delete px4_includes.h header and update boards/ to use syslog
---
boards/airmind/mindpx-v2/src/init.c | 30 ++-----
boards/airmind/mindpx-v2/src/spi.c | 3 +-
boards/atmel/same70xplained/src/init.c | 28 ++-----
boards/auav/x21/src/init.c | 32 ++------
boards/auav/x21/src/spi.c | 3 +-
boards/av/x-v1/src/spi.c | 1 -
boards/bitcraze/crazyflie/src/init.c | 18 -----
boards/bitcraze/crazyflie/src/spi.c | 3 +-
boards/emlid/navio2/navio_adc/navio_adc.cpp | 1 +
.../navio2/navio_rgbled/navio_rgbled.cpp | 2 +
.../navio_sysfs_rc_in/navio_sysfs_rc_in.cpp | 2 +
boards/gumstix/aerocore2/src/init.c | 26 +-----
boards/gumstix/aerocore2/src/spi.c | 3 +-
boards/intel/aerofc-v1/src/init.c | 20 +----
boards/nxp/fmuk66-v3/src/init.c | 22 +----
boards/nxp/fmuk66-v3/src/sdhc.c | 2 +-
boards/nxp/fmuk66-v3/src/spi.c | 24 +-----
boards/omnibus/f4sd/src/init.c | 30 ++-----
boards/omnibus/f4sd/src/spi.c | 1 -
boards/parrot/bebop/flow/bebop_flow.cpp | 2 +
boards/parrot/bebop/flow/video_device.cpp | 2 +
boards/px4/fmu-v2/default.cmake | 1 +
boards/px4/fmu-v2/src/init.c | 43 +++-------
boards/px4/fmu-v2/src/spi.c | 8 +-
.../px4/fmu-v3/nuttx-config/include/board.h | 8 +-
boards/px4/fmu-v3/src/init.c | 38 +++------
boards/px4/fmu-v3/src/spi.c | 3 +-
boards/px4/fmu-v4/src/init.c | 32 ++------
boards/px4/fmu-v4/src/spi.c | 3 +-
boards/px4/fmu-v4pro/src/init.c | 36 +++------
boards/px4/fmu-v4pro/src/spi.c | 3 +-
boards/px4/fmu-v5/src/init.c | 2 +-
boards/px4/fmu-v5/src/spi.c | 3 +-
boards/px4/io-v2/src/init.c | 18 -----
boards/stm/32f4discovery/src/init.c | 18 -----
boards/stm/nucleo-F767ZI/src/init.c | 22 +----
boards/stm/nucleo-F767ZI/src/sdio.c | 21 +----
boards/stm/nucleo-F767ZI/src/spi.c | 29 ++-----
platforms/posix/src/main.cpp | 1 +
platforms/posix/src/px4_layer/px4_sem.cpp | 2 +-
src/drivers/barometer/lps22hb/LPS22HB.hpp | 1 +
src/drivers/batt_smbus/batt_smbus.cpp | 2 +
.../ms5525/MS5525_main.cpp | 2 +
.../sdp3x/SDP3X_main.cpp | 3 +
.../distance_sensor/leddar_one/leddar_one.cpp | 1 +
.../distance_sensor/ll40ls/LidarLitePWM.cpp | 2 +-
.../distance_sensor/ulanding/ulanding.cpp | 2 -
src/drivers/imu/adis16477/ADIS16477.hpp | 1 +
src/drivers/imu/bmi055/BMI055.hpp | 1 +
src/drivers/imu/fxas21002c/fxas21002c.cpp | 1 +
src/drivers/imu/fxos8701cq/fxos8701cq.cpp | 1 +
src/drivers/imu/mpu9250/mpu9250.h | 1 +
src/drivers/linux_pwm_out/linux_pwm_out.cpp | 11 +--
src/drivers/linux_sbus/linux_sbus.cpp | 5 ++
src/drivers/magnetometer/lis3mdl/lis3mdl.h | 1 +
.../magnetometer/lsm303agr/LSM303AGR.hpp | 1 +
src/drivers/magnetometer/rm3100/rm3100.h | 1 +
.../snapdragon_pwm_out/snapdragon_pwm_out.cpp | 6 +-
src/drivers/spektrum_rc/spektrum_rc.cpp | 4 +-
src/drivers/uavcan/sensors/sensor_bridge.hpp | 1 +
src/examples/bottle_drop/bottle_drop.cpp | 2 -
src/include/px4.h | 1 -
src/lib/cdev/posix/cdev_platform.hpp | 1 +
src/lib/drivers/linux_gpio/linux_gpio.cpp | 6 +-
.../parameters/flashparams/flashparams.cpp | 2 +
src/lib/tunes/tunes.cpp | 1 +
.../attitude_estimator_q_main.cpp | 2 -
.../GroundRoverAttitudeControl.cpp | 26 +++---
.../GroundRoverPositionControl.cpp | 2 -
src/modules/logger/log_writer_file.cpp | 2 +
src/modules/logger/logger.cpp | 1 -
src/modules/mavlink/mavlink_timesync.cpp | 2 +
src/modules/muorb/adsp/uORBFastRpcChannel.cpp | 1 +
.../muorb/krait/px4muorb_KraitRpcWrapper.cpp | 1 +
.../muorb/krait/uORBKraitFastRpcChannel.cpp | 1 +
src/platforms/common/px4_log.c | 4 +-
src/platforms/common/work_queue/hrt_thread.c | 2 +
.../df_bebop_bus_wrapper.cpp | 8 +-
src/platforms/px4_defines.h | 1 -
src/platforms/px4_includes.h | 80 -------------------
src/platforms/px4_log.h | 1 -
src/systemcmds/led_control/led_control.cpp | 1 +
src/systemcmds/sd_bench/sd_bench.c | 1 -
src/systemcmds/tests/test_mixer.cpp | 6 +-
src/systemcmds/tests/test_parameters.cpp | 2 +
src/systemcmds/tune_control/tune_control.cpp | 2 +
86 files changed, 190 insertions(+), 563 deletions(-)
delete mode 100644 src/platforms/px4_includes.h
diff --git a/boards/airmind/mindpx-v2/src/init.c b/boards/airmind/mindpx-v2/src/init.c
index de16f44165..e9f840b05f 100644
--- a/boards/airmind/mindpx-v2/src/init.c
+++ b/boards/airmind/mindpx-v2/src/init.c
@@ -77,24 +77,6 @@
* Pre-Processor Definitions
****************************************************************************/
-/* Configuration ************************************************************/
-
-/* Debug ********************************************************************/
-
-#ifdef CONFIG_CPP_HAVE_VARARGS
-# ifdef CONFIG_DEBUG
-# define message(...) syslog(__VA_ARGS__)
-# else
-# define message(...) printf(__VA_ARGS__)
-# endif
-#else
-# ifdef CONFIG_DEBUG
-# define message syslog
-# else
-# define message printf
-# endif
-#endif
-
/*
* Ideally we'd be able to get these from up_internal.h,
* but since we want to be able to disable the NuttX use
@@ -237,7 +219,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
/* configure the DMA allocator */
if (board_dma_alloc_init() < 0) {
- message("DMA alloc FAILED");
+ syslog(LOG_ERR, "DMA alloc FAILED\n");
}
/* set up the serial DMA polling */
@@ -270,7 +252,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
spi4 = px4_spibus_initialize(4);
if (!spi4) {
- message("[boot] FAILED to initialize SPI port 4\n");
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port 4\n");
board_autoled_on(LED_AMBER);
return -ENODEV;
}
@@ -290,7 +272,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
spi1 = stm32_spibus_initialize(1);
if (!spi1) {
- message("[boot] FAILED to initialize SPI port 1\n");
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port 1\n");
board_autoled_on(LED_AMBER);
return -ENODEV;
}
@@ -320,8 +302,8 @@ __EXPORT int board_app_initialize(uintptr_t arg)
sdio = sdio_initialize(CONFIG_NSH_MMCSDSLOTNO);
if (!sdio) {
- message("[boot] Failed to initialize SDIO slot %d\n",
- CONFIG_NSH_MMCSDSLOTNO);
+ syslog(LOG_ERR, "[boot] Failed to initialize SDIO slot %d\n",
+ CONFIG_NSH_MMCSDSLOTNO);
return -ENODEV;
}
@@ -329,7 +311,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
int ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, sdio);
if (ret != OK) {
- message("[boot] Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+ syslog(LOG_ERR, "[boot] Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
return ret;
}
diff --git a/boards/airmind/mindpx-v2/src/spi.c b/boards/airmind/mindpx-v2/src/spi.c
index 83cdb9f68e..123c9fd4da 100644
--- a/boards/airmind/mindpx-v2/src/spi.c
+++ b/boards/airmind/mindpx-v2/src/spi.c
@@ -54,7 +54,6 @@
#include <chip.h>
#include <stm32.h>
#include "board_config.h"
-#include <systemlib/err.h>
/************************************************************************************
* Public Functions
@@ -208,7 +207,7 @@ __EXPORT void board_spi_reset(int ms)
//
/* wait for the sensor rail to reach GND */
usleep(ms * 1000);
- warnx("reset done, %d ms", ms);
+ syslog(LOG_DEBUG, "reset done, %d ms\n", ms);
//
// /* re-enable power */
//
diff --git a/boards/atmel/same70xplained/src/init.c b/boards/atmel/same70xplained/src/init.c
index 19a96ebe40..0e26d6e1a7 100644
--- a/boards/atmel/same70xplained/src/init.c
+++ b/boards/atmel/same70xplained/src/init.c
@@ -80,24 +80,6 @@
* Pre-Processor Definitions
****************************************************************************/
-/* Configuration ************************************************************/
-
-/* Debug ********************************************************************/
-
-#ifdef CONFIG_CPP_HAVE_VARARGS
-# ifdef CONFIG_DEBUG
-# define message(...) syslog(LOG_NOTICE, __VA_ARGS__)
-# else
-# define message(...) printf(__VA_ARGS__)
-# endif
-#else
-# ifdef CONFIG_DEBUG
-# define message syslog
-# else
-# define message printf
-# endif
-#endif
-
/*
* Ideally we'd be able to get these from up_internal.h,
* but since we want to be able to disable the NuttX use
@@ -239,7 +221,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
/* configure the DMA allocator */
if (board_dma_alloc_init() < 0) {
- message("DMA alloc FAILED");
+ syslog(LOG_ERR, "DMA alloc FAILED\n");
}
@@ -253,7 +235,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
spi0 = px4_spibus_initialize(PX4_SPI_BUS_SENSORS);
if (!spi0) {
- message("[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_SENSORS);
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_SENSORS);
board_autoled_on(LED_AMBER);
return -ENODEV;
}
@@ -285,8 +267,8 @@ __EXPORT int board_app_initialize(uintptr_t arg)
sdio = sdio_initialize(CONFIG_NSH_MMCSDSLOTNO);
if (!sdio) {
- message("[boot] Failed to initialize SDIO slot %d\n",
- CONFIG_NSH_MMCSDSLOTNO);
+ syslog(LOG_ERR, "[boot] Failed to initialize SDIO slot %d\n",
+ CONFIG_NSH_MMCSDSLOTNO);
return -ENODEV;
}
@@ -294,7 +276,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
int ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, sdio);
if (ret != OK) {
- message("[boot] Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+ syslog(LOG_ERR, "[boot] Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
return ret;
}
diff --git a/boards/auav/x21/src/init.c b/boards/auav/x21/src/init.c
index 069a32d2da..65e6fa7306 100644
--- a/boards/auav/x21/src/init.c
+++ b/boards/auav/x21/src/init.c
@@ -78,24 +78,6 @@
* Pre-Processor Definitions
****************************************************************************/
-/* Configuration ************************************************************/
-
-/* Debug ********************************************************************/
-
-#ifdef CONFIG_CPP_HAVE_VARARGS
-# ifdef CONFIG_DEBUG
-# define message(...) syslog(__VA_ARGS__)
-# else
-# define message(...) printf(__VA_ARGS__)
-# endif
-#else
-# ifdef CONFIG_DEBUG
-# define message syslog
-# else
-# define message printf
-# endif
-#endif
-
/*
* Ideally we'd be able to get these from up_internal.h,
* but since we want to be able to disable the NuttX use
@@ -160,7 +142,7 @@ __EXPORT void board_peripheral_reset(int ms)
/* wait for the peripheral rail to reach GND */
usleep(ms * 1000);
- warnx("reset done, %d ms", ms);
+ syslog(LOG_DEBUG, "reset done, %d ms\n", ms);
/* re-enable power */
@@ -257,7 +239,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
/* configure the DMA allocator */
if (board_dma_alloc_init() < 0) {
- message("DMA alloc FAILED");
+ syslog(LOG_ERR, "DMA alloc FAILED\n");
}
/* set up the serial DMA polling */
@@ -290,7 +272,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
spi1 = px4_spibus_initialize(1);
if (!spi1) {
- message("[boot] FAILED to initialize SPI port 1\n");
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port 1\n");
led_on(LED_AMBER);
return -ENODEV;
}
@@ -309,7 +291,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
spi2 = px4_spibus_initialize(2);
if (!spi2) {
- message("[boot] FAILED to initialize SPI port 2\n");
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port 2\n");
led_on(LED_AMBER);
return -ENODEV;
}
@@ -330,8 +312,8 @@ __EXPORT int board_app_initialize(uintptr_t arg)
sdio = sdio_initialize(CONFIG_NSH_MMCSDSLOTNO);
if (!sdio) {
- message("[boot] Failed to initialize SDIO slot %d\n",
- CONFIG_NSH_MMCSDSLOTNO);
+ syslog(LOG_ERR, "[boot] Failed to initialize SDIO slot %d\n",
+ CONFIG_NSH_MMCSDSLOTNO);
led_on(LED_AMBER);
return -ENODEV;
}
@@ -340,7 +322,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
int ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, sdio);
if (ret != OK) {
- message("[boot] Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+ syslog(LOG_ERR, "[boot] Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
led_on(LED_AMBER);
return ret;
}
diff --git a/boards/auav/x21/src/spi.c b/boards/auav/x21/src/spi.c
index eaf43a812a..52d14291b3 100644
--- a/boards/auav/x21/src/spi.c
+++ b/boards/auav/x21/src/spi.c
@@ -55,7 +55,6 @@
#include <chip.h>
#include <stm32.h>
#include "board_config.h"
-#include <systemlib/err.h>
/************************************************************************************
@@ -176,7 +175,7 @@ __EXPORT void board_spi_reset(int ms)
/* wait for the sensor rail to reach GND */
usleep(ms * 1000);
- warnx("reset done, %d ms", ms);
+ syslog(LOG_DEBUG, "reset done, %d ms\n", ms);
/* re-enable power */
diff --git a/boards/av/x-v1/src/spi.c b/boards/av/x-v1/src/spi.c
index 6f893684a2..d1fe890255 100644
--- a/boards/av/x-v1/src/spi.c
+++ b/boards/av/x-v1/src/spi.c
@@ -57,7 +57,6 @@
#include <chip.h>
#include <stm32_gpio.h>
#include "board_config.h"
-#include <systemlib/err.h>
/****************************************************************************
* Pre-Processor Definitions
diff --git a/boards/bitcraze/crazyflie/src/init.c b/boards/bitcraze/crazyflie/src/init.c
index 45b317ea6c..14f786d4ba 100644
--- a/boards/bitcraze/crazyflie/src/init.c
+++ b/boards/bitcraze/crazyflie/src/init.c
@@ -73,24 +73,6 @@
* Pre-Processor Definitions
****************************************************************************/
-/* Configuration ************************************************************/
-
-/* Debug ********************************************************************/
-
-#ifdef CONFIG_CPP_HAVE_VARARGS
-# ifdef CONFIG_DEBUG
-# define message(...) syslog(__VA_ARGS__)
-# else
-# define message(...) printf(__VA_ARGS__)
-# endif
-#else
-# ifdef CONFIG_DEBUG
-# define message syslog
-# else
-# define message printf
-# endif
-#endif
-
/*
* Ideally we'd be able to get these from up_internal.h,
* but since we want to be able to disable the NuttX use
diff --git a/boards/bitcraze/crazyflie/src/spi.c b/boards/bitcraze/crazyflie/src/spi.c
index 40df3620be..1be0660c99 100644
--- a/boards/bitcraze/crazyflie/src/spi.c
+++ b/boards/bitcraze/crazyflie/src/spi.c
@@ -19,7 +19,6 @@
#include <chip.h>
#include <stm32_gpio.h>
#include "board_config.h"
-#include <systemlib/err.h>
/****************************************************************************
* Pre-Processor Definitions
@@ -147,7 +146,7 @@ __EXPORT void board_spi_reset(int ms)
/* wait for the sensor rail to reach GND */
usleep(ms * 1000);
- warnx("reset done, %d ms", ms);
+ syslog(LOG_DEBUG, "reset done, %d ms\n", ms);
/* wait a bit before starting SPI, different times didn't influence results */
usleep(100);
diff --git a/boards/emlid/navio2/navio_adc/navio_adc.cpp b/boards/emlid/navio2/navio_adc/navio_adc.cpp
index 57c3c5f137..6614a65eed 100644
--- a/boards/emlid/navio2/navio_adc/navio_adc.cpp
+++ b/boards/emlid/navio2/navio_adc/navio_adc.cpp
@@ -52,6 +52,7 @@
#include <stdio.h>
#include <poll.h>
#include <string.h>
+#include <stdlib.h>
#define ADC_BASE_DEV_PATH "/dev/adc"
#define ADC_SYSFS_PATH "/sys/kernel/rcio/adc/ch0"
diff --git a/boards/emlid/navio2/navio_rgbled/navio_rgbled.cpp b/boards/emlid/navio2/navio_rgbled/navio_rgbled.cpp
index 4a67dea465..5241a40097 100644
--- a/boards/emlid/navio2/navio_rgbled/navio_rgbled.cpp
+++ b/boards/emlid/navio2/navio_rgbled/navio_rgbled.cpp
@@ -34,6 +34,8 @@
#include <px4_posix.h>
#include <drivers/drv_led.h>
+#include <string.h>
+
#include "navio_rgbled.h"
#define RGBLED_BASE_DEVICE_PATH "/dev/rgbled"
diff --git a/boards/emlid/navio2/navio_sysfs_rc_in/navio_sysfs_rc_in.cpp b/boards/emlid/navio2/navio_sysfs_rc_in/navio_sysfs_rc_in.cpp
index 18081a09ff..9233525feb 100644
--- a/boards/emlid/navio2/navio_sysfs_rc_in/navio_sysfs_rc_in.cpp
+++ b/boards/emlid/navio2/navio_sysfs_rc_in/navio_sysfs_rc_in.cpp
@@ -38,6 +38,8 @@
#include <stdio.h>
#include <stdint.h>
#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
#include <px4_config.h>
#include <px4_workqueue.h>
diff --git a/boards/gumstix/aerocore2/src/init.c b/boards/gumstix/aerocore2/src/init.c
index ad1bf89b8c..c77e334b18 100644
--- a/boards/gumstix/aerocore2/src/init.c
+++ b/boards/gumstix/aerocore2/src/init.c
@@ -74,24 +74,6 @@
* Pre-Processor Definitions
****************************************************************************/
-/* Configuration ************************************************************/
-
-/* Debug ********************************************************************/
-
-#ifdef CONFIG_CPP_HAVE_VARARGS
-# ifdef CONFIG_DEBUG
-# define message(...) lowsyslog(__VA_ARGS__)
-# else
-# define message(...) printf(__VA_ARGS__)
-# endif
-#else
-# ifdef CONFIG_DEBUG
-# define message lowsyslog
-# else
-# define message printf
-# endif
-#endif
-
/*
* Ideally we'd be able to get these from up_internal.h,
* but since we want to be able to disable the NuttX use
@@ -125,7 +107,7 @@ __EXPORT void board_peripheral_reset(int ms)
/* wait for the peripheral rail to reach GND */
usleep(ms * 1000);
- warnx("reset done, %d ms", ms);
+ syslog(LOG_DEBUG, "reset done, %d ms\n", ms);
/* re-enable power */
/* switch the peripheral rail back on */
@@ -207,7 +189,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
/* configure the DMA allocator */
if (board_dma_alloc_init() < 0) {
- message("DMA alloc FAILED");
+ syslog(LOG_ERR, "DMA alloc FAILED\n");
}
/* set up the serial DMA polling */
@@ -236,7 +218,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
spi3 = px4_spibus_initialize(3);
if (!spi3) {
- message("[boot] FAILED to initialize SPI port 3\n");
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port 3\n");
led_on(LED_AMBER);
return -ENODEV;
}
@@ -255,7 +237,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
spi4 = px4_spibus_initialize(4);
if (!spi4) {
- message("[boot] FAILED to initialize SPI port 4\n");
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port 4\n");
led_on(LED_AMBER);
return -ENODEV;
}
diff --git a/boards/gumstix/aerocore2/src/spi.c b/boards/gumstix/aerocore2/src/spi.c
index 4695a712ec..00c73debd6 100644
--- a/boards/gumstix/aerocore2/src/spi.c
+++ b/boards/gumstix/aerocore2/src/spi.c
@@ -54,7 +54,6 @@
#include <chip.h>
#include <stm32.h>
#include "board_config.h"
-#include <systemlib/err.h>
/************************************************************************************
* Public Functions
@@ -203,7 +202,7 @@ __EXPORT void board_spi_reset(int ms)
/* wait for the sensor rail to reach GND */
usleep(ms * 1000);
- warnx("reset done, %d ms", ms);
+ syslog(LOG_DEBUG, "reset done, %d ms\n", ms);
/* wait a bit before starting SPI, different times didn't influence results */
usleep(100);
diff --git a/boards/intel/aerofc-v1/src/init.c b/boards/intel/aerofc-v1/src/init.c
index b4ae07bb0a..ee45c6e5bc 100644
--- a/boards/intel/aerofc-v1/src/init.c
+++ b/boards/intel/aerofc-v1/src/init.c
@@ -79,24 +79,6 @@
* Pre-Processor Definitions
****************************************************************************/
-/* Configuration ************************************************************/
-
-/* Debug ********************************************************************/
-
-#ifdef CONFIG_CPP_HAVE_VARARGS
-# ifdef CONFIG_DEBUG
-# define message(...) syslog(__VA_ARGS__)
-# else
-# define message(...) printf(__VA_ARGS__)
-# endif
-#else
-# ifdef CONFIG_DEBUG
-# define message syslog
-# else
-# define message printf
-# endif
-#endif
-
/*
* Ideally we'd be able to get these from up_internal.h,
* but since we want to be able to disable the NuttX use
@@ -226,7 +208,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
result = parameter_flashfs_init(params_sector_map, NULL, 0);
if (result != OK) {
- message("[boot] FAILED to init params in FLASH %d\n", result);
+ syslog(LOG_ERR, "[boot] FAILED to init params in FLASH %d\n", result);
led_on(LED_AMBER);
return -ENODEV;
}
diff --git a/boards/nxp/fmuk66-v3/src/init.c b/boards/nxp/fmuk66-v3/src/init.c
index 9699f32291..e5a4470629 100644
--- a/boards/nxp/fmuk66-v3/src/init.c
+++ b/boards/nxp/fmuk66-v3/src/init.c
@@ -79,24 +79,6 @@
* Pre-Processor Definitions
****************************************************************************/
-/* Configuration ************************************************************/
-
-/* Debug ********************************************************************/
-
-#ifdef CONFIG_CPP_HAVE_VARARGS
-# ifdef CONFIG_DEBUG
-# define message(...) syslog(__VA_ARGS__)
-# else
-# define message(...) printf(__VA_ARGS__)
-# endif
-#else
-# ifdef CONFIG_DEBUG
-# define message syslog
-# else
-# define message printf
-# endif
-#endif
-
/*
* Ideally we'd be able to get these from up_internal.h,
* but since we want to be able to disable the NuttX use
@@ -204,7 +186,7 @@ __EXPORT void board_peripheral_reset(int ms)
/* wait for the peripheral rail to reach GND */
usleep(ms * 1000);
- warnx("reset done, %d ms", ms);
+ syslog(LOG_DEBUG, "reset done, %d ms\n", ms);
/* re-enable power */
@@ -282,7 +264,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
/* configure the DMA allocator */
if (board_dma_alloc_init() < 0) {
- message("DMA alloc FAILED");
+ syslog(LOG_ERR, "DMA alloc FAILED\n");
}
/* set up the serial DMA polling */
diff --git a/boards/nxp/fmuk66-v3/src/sdhc.c b/boards/nxp/fmuk66-v3/src/sdhc.c
index 3b3ce06499..1f39b29529 100644
--- a/boards/nxp/fmuk66-v3/src/sdhc.c
+++ b/boards/nxp/fmuk66-v3/src/sdhc.c
@@ -208,7 +208,7 @@ int fmuk66_sdhc_initialize(void)
return ret;
}
- syslog(LOG_INFO, "Successfully bound SDHC to the MMC/SD driver\n");
+ syslog(LOG_ERR, "Successfully bound SDHC to the MMC/SD driver\n");
/* Handle the initial card state */
diff --git a/boards/nxp/fmuk66-v3/src/spi.c b/boards/nxp/fmuk66-v3/src/spi.c
index f5a6a48f0b..33de9a2140 100644
--- a/boards/nxp/fmuk66-v3/src/spi.c
+++ b/boards/nxp/fmuk66-v3/src/spi.c
@@ -51,25 +51,9 @@
#include "chip.h"
#include <kinetis.h>
#include "board_config.h"
-#include <systemlib/err.h>
#include <systemlib/px4_macros.h>
-#if defined(CONFIG_KINETIS_SPI0) || defined(CONFIG_KINETIS_SPI1) || \
- defined(CONFIG_KINETIS_SPI2)
-
-#ifdef CONFIG_CPP_HAVE_VARARGS
-# ifdef CONFIG_DEBUG
-# define message(...) syslog(__VA_ARGS__)
-# else
-# define message(...) printf(__VA_ARGS__)
-# endif
-#else
-# ifdef CONFIG_DEBUG
-# define message syslog
-# else
-# define message printf
-# endif
-#endif
+#if defined(CONFIG_KINETIS_SPI0) || defined(CONFIG_KINETIS_SPI1) || defined(CONFIG_KINETIS_SPI2)
/* Define CS GPIO array */
static const uint32_t spi0selects_gpio[] = PX4_MEMORY_BUS_CS_GPIO;
@@ -208,7 +192,7 @@ __EXPORT int fmuk66_spi_bus_initialize(void)
spi_sensors = px4_spibus_initialize(PX4_SPI_BUS_SENSORS);
if (!spi_sensors) {
- message("[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_SENSORS);
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_SENSORS);
return -ENODEV;
}
@@ -228,7 +212,7 @@ __EXPORT int fmuk66_spi_bus_initialize(void)
spi_memory = px4_spibus_initialize(PX4_SPI_BUS_MEMORY);
if (!spi_memory) {
- message("[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_MEMORY);
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_MEMORY);
return -ENODEV;
}
@@ -248,7 +232,7 @@ __EXPORT int fmuk66_spi_bus_initialize(void)
spi_ext = px4_spibus_initialize(PX4_SPI_BUS_EXTERNAL);
if (!spi_ext) {
- message("[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_EXTERNAL);
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_EXTERNAL);
return -ENODEV;
}
diff --git a/boards/omnibus/f4sd/src/init.c b/boards/omnibus/f4sd/src/init.c
index 846407ca73..03f7e438b8 100644
--- a/boards/omnibus/f4sd/src/init.c
+++ b/boards/omnibus/f4sd/src/init.c
@@ -82,24 +82,6 @@
* Pre-Processor Definitions
****************************************************************************/
-/* Configuration ************************************************************/
-
-/* Debug ********************************************************************/
-
-#ifdef CONFIG_CPP_HAVE_VARARGS
-# ifdef CONFIG_DEBUG
-# define message(...) syslog(__VA_ARGS__)
-# else
-# define message(...) printf(__VA_ARGS__)
-# endif
-#else
-# ifdef CONFIG_DEBUG
-# define message syslog
-# else
-# define message printf
-# endif
-#endif
-
/*
* Ideally we'd be able to get these from up_internal.h,
* but since we want to be able to disable the NuttX use
@@ -262,7 +244,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
/* configure the DMA allocator */
if (board_dma_alloc_init() < 0) {
- message("DMA alloc FAILED");
+ syslog(LOG_ERR, "DMA alloc FAILED\n");
}
/* set up the serial DMA polling */
@@ -297,7 +279,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
spi1 = stm32_spibus_initialize(1);
if (!spi1) {
- message("[boot] FAILED to initialize SPI port 1\n");
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port 1\n");
led_on(LED_BLUE);
return -ENODEV;
}
@@ -314,7 +296,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
spi2 = stm32_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO);
if (!spi2) {
- message("[boot] FAILED to initialize SPI port %d\n", CONFIG_NSH_MMCSDSPIPORTNO);
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port %d\n", CONFIG_NSH_MMCSDSPIPORTNO);
led_on(LED_BLUE);
return -ENODEV;
}
@@ -324,7 +306,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
if (result != OK) {
led_on(LED_BLUE);
- message("[boot] FAILED to bind SPI port 2 to the MMCSD driver\n");
+ syslog(LOG_ERR, "[boot] FAILED to bind SPI port 2 to the MMCSD driver\n");
return -ENODEV;
}
@@ -335,7 +317,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
spi3 = stm32_spibus_initialize(3);
if (!spi3) {
- message("[boot] FAILED to initialize SPI port 3\n");
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port 3\n");
led_on(LED_BLUE);
return -ENODEV;
}
@@ -362,7 +344,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
result = parameter_flashfs_init(params_sector_map, NULL, 0);
if (result != OK) {
- message("[boot] FAILED to init params in FLASH %d\n", result);
+ syslog(LOG_ERR, "[boot] FAILED to init params in FLASH %d\n", result);
led_on(LED_AMBER);
return -ENODEV;
}
diff --git a/boards/omnibus/f4sd/src/spi.c b/boards/omnibus/f4sd/src/spi.c
index f40a8961ca..16588695b6 100644
--- a/boards/omnibus/f4sd/src/spi.c
+++ b/boards/omnibus/f4sd/src/spi.c
@@ -55,7 +55,6 @@
#include <chip.h>
#include <stm32.h>
#include "board_config.h"
-#include <systemlib/err.h>
/************************************************************************************
* Public Functions
diff --git a/boards/parrot/bebop/flow/bebop_flow.cpp b/boards/parrot/bebop/flow/bebop_flow.cpp
index e99b75c846..f26933302c 100644
--- a/boards/parrot/bebop/flow/bebop_flow.cpp
+++ b/boards/parrot/bebop/flow/bebop_flow.cpp
@@ -38,7 +38,9 @@
* an optical flow computation.
*/
+#include <stdlib.h>
#include <stdint.h>
+#include <string.h>
#include <px4_tasks.h>
#include <px4_getopt.h>
diff --git a/boards/parrot/bebop/flow/video_device.cpp b/boards/parrot/bebop/flow/video_device.cpp
index 80bb06d83e..35c17420a0 100644
--- a/boards/parrot/bebop/flow/video_device.cpp
+++ b/boards/parrot/bebop/flow/video_device.cpp
@@ -40,6 +40,8 @@
#include "video_device.h"
+#include <stdlib.h>
+
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
diff --git a/boards/px4/fmu-v2/default.cmake b/boards/px4/fmu-v2/default.cmake
index 92f958ec45..c83e2ae975 100644
--- a/boards/px4/fmu-v2/default.cmake
+++ b/boards/px4/fmu-v2/default.cmake
@@ -3,6 +3,7 @@ px4_add_board(
PLATFORM nuttx
VENDOR px4
MODEL fmu-v2
+ LABEL default
TOOLCHAIN arm-none-eabi
ARCHITECTURE cortex-m4
ROMFSROOT px4fmu_common
diff --git a/boards/px4/fmu-v2/src/init.c b/boards/px4/fmu-v2/src/init.c
index c61a6467e5..f96ca3ccb6 100644
--- a/boards/px4/fmu-v2/src/init.c
+++ b/boards/px4/fmu-v2/src/init.c
@@ -47,7 +47,6 @@
#include <px4_config.h>
#include <px4_tasks.h>
-#include <px4_time.h>
#include <stdbool.h>
#include <stdio.h>
@@ -79,24 +78,6 @@
* Pre-Processor Definitions
****************************************************************************/
-/* Configuration ************************************************************/
-
-/* Debug ********************************************************************/
-
-#ifdef CONFIG_CPP_HAVE_VARARGS
-# ifdef CONFIG_DEBUG
-# define message(...) syslog(__VA_ARGS__)
-# else
-# define message(...) printf(__VA_ARGS__)
-# endif
-#else
-# ifdef CONFIG_DEBUG
-# define message syslog
-# else
-# define message printf
-# endif
-#endif
-
/*
* Ideally we'd be able to get these from up_internal.h,
* but since we want to be able to disable the NuttX use
@@ -130,8 +111,8 @@ __EXPORT void board_peripheral_reset(int ms)
stm32_gpiowrite(GPIO_VDD_5V_PERIPH_EN, 1);
/* wait for the peripheral rail to reach GND */
- px4_usleep(ms * 1000);
- warnx("reset done, %d ms", ms);
+ usleep(ms * 1000);
+ syslog(LOG_DEBUG, "reset done, %d ms\n", ms);
/* re-enable power */
@@ -382,7 +363,7 @@ static struct sdio_dev_s *sdio;
__EXPORT int board_app_initialize(uintptr_t arg)
{
/* Ensure the power is on 1 ms before we drive the GPIO pins */
- px4_usleep(1000);
+ usleep(1000);
if (OK == determin_hw_version(&hw_version, & hw_revision)) {
switch (hw_version) {
@@ -416,7 +397,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
hw_version = HW_VER_FMUV3_STATE;
hw_type[1]++;
hw_type[2] = '0';
- message("\nPixhack V3 detected, forcing to fmu-v3");
+ syslog(LOG_INFO, "\nPixhack V3 detected, forcing to fmu-v3");
} else {
@@ -431,12 +412,12 @@ __EXPORT int board_app_initialize(uintptr_t arg)
/* questionable px4_fmu-v2 hardware, try forcing regular FMUv2 (not much else we can do) */
- message("\nbad version detected, forcing to fmu-v2");
+ syslog(LOG_ERR, "\nbad version detected, forcing to fmu-v2");
hw_version = HW_VER_FMUV2_STATE;
break;
}
- message("\nFMUv2 ver 0x%1X : Rev %x %s\n", hw_version, hw_revision, hw_type);
+ syslog(LOG_DEBUG, "\nFMUv2 ver 0x%1X : Rev %x %s\n", hw_version, hw_revision, hw_type);
}
/* configure SPI interfaces */
@@ -447,7 +428,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
/* configure the DMA allocator */
if (board_dma_alloc_init() < 0) {
- message("DMA alloc FAILED");
+ syslog(LOG_ERR, "DMA alloc FAILED\n");
}
/* set up the serial DMA polling */
@@ -480,7 +461,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
spi1 = stm32_spibus_initialize(PX4_SPI_BUS_SENSORS);
if (!spi1) {
- message("[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_SENSORS);
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_SENSORS);
led_on(LED_AMBER);
return -ENODEV;
}
@@ -496,7 +477,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
spi2 = stm32_spibus_initialize(PX4_SPI_BUS_RAMTRON);
if (!spi2) {
- message("[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_RAMTRON);
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_RAMTRON);
led_on(LED_AMBER);
return -ENODEV;
}
@@ -512,7 +493,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
spi4 = stm32_spibus_initialize(PX4_SPI_BUS_EXT);
if (!spi4) {
- message("[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_EXT);
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_EXT);
led_on(LED_AMBER);
return -ENODEV;
}
@@ -529,7 +510,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
if (!sdio) {
led_on(LED_AMBER);
- message("[boot] Failed to initialize SDIO slot %d\n", CONFIG_NSH_MMCSDSLOTNO);
+ syslog(LOG_ERR, "[boot] Failed to initialize SDIO slot %d\n", CONFIG_NSH_MMCSDSLOTNO);
return -ENODEV;
}
@@ -538,7 +519,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
if (ret != OK) {
led_on(LED_AMBER);
- message("[boot] Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+ syslog(LOG_ERR, "[boot] Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
return ret;
}
diff --git a/boards/px4/fmu-v2/src/spi.c b/boards/px4/fmu-v2/src/spi.c
index fc2233f30b..4df601639d 100644
--- a/boards/px4/fmu-v2/src/spi.c
+++ b/boards/px4/fmu-v2/src/spi.c
@@ -41,7 +41,6 @@
* Included Files
************************************************************************************/
-#include <px4_time.h>
#include <px4_config.h>
#include <stdint.h>
@@ -56,7 +55,6 @@
#include <chip.h>
#include <stm32.h>
#include "board_config.h"
-#include <systemlib/err.h>
/************************************************************************************
* Public Functions
@@ -421,8 +419,8 @@ __EXPORT void board_spi_reset(int ms)
stm32_gpiowrite(GPIO_VDD_3V3_SENSORS_EN, 0);
/* wait for the sensor rail to reach GND */
- px4_usleep(ms * 1000);
- warnx("reset done, %d ms", ms);
+ usleep(ms * 1000);
+ syslog(LOG_DEBUG, "reset done, %d ms\n", ms);
/* re-enable power */
@@ -430,7 +428,7 @@ __EXPORT void board_spi_reset(int ms)
stm32_gpiowrite(GPIO_VDD_3V3_SENSORS_EN, 1);
/* wait a bit before starting SPI, different times didn't influence results */
- px4_usleep(100);
+ usleep(100);
/* reconfigure the SPI pins */
stm32_configgpio(GPIO_SPI1_SCK);
diff --git a/boards/px4/fmu-v3/nuttx-config/include/board.h b/boards/px4/fmu-v3/nuttx-config/include/board.h
index fd26e2cbca..be9b54dc24 100644
--- a/boards/px4/fmu-v3/nuttx-config/include/board.h
+++ b/boards/px4/fmu-v3/nuttx-config/include/board.h
@@ -259,13 +259,13 @@
#define GPIO_I2C1_SCL GPIO_I2C1_SCL_2
#define GPIO_I2C1_SDA GPIO_I2C1_SDA_2
-#define GPIO_I2C1_SCL_GPIO (GPIO_OUTPUT | GPIO_OPENDRAIN | GPIO_SPEED_50MHz | GPIO_OUTPUT_SET | GPIO_PORTB | GPIO_PIN8)
-#define GPIO_I2C1_SDA_GPIO (GPIO_OUTPUT | GPIO_OPENDRAIN | GPIO_SPEED_50MHz | GPIO_OUTPUT_SET | GPIO_PORTB | GPIO_PIN9)
+#define GPIO_I2C1_SCL_GPIO (GPIO_OUTPUT|GPIO_OPENDRAIN|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTB|GPIO_PIN8)
+#define GPIO_I2C1_SDA_GPIO (GPIO_OUTPUT|GPIO_OPENDRAIN|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTB|GPIO_PIN9)
#define GPIO_I2C2_SCL GPIO_I2C2_SCL_1
#define GPIO_I2C2_SDA GPIO_I2C2_SDA_1
-#define GPIO_I2C2_SCL_GPIO (GPIO_OUTPUT | GPIO_OPENDRAIN | GPIO_SPEED_50MHz | GPIO_OUTPUT_SET | GPIO_PORTB | GPIO_PIN10)
-#define GPIO_I2C2_SDA_GPIO (GPIO_OUTPUT | GPIO_OPENDRAIN | GPIO_SPEED_50MHz | GPIO_OUTPUT_SET | GPIO_PORTB | GPIO_PIN11)
+#define GPIO_I2C2_SCL_GPIO (GPIO_OUTPUT|GPIO_OPENDRAIN|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTB|GPIO_PIN10)
+#define GPIO_I2C2_SDA_GPIO (GPIO_OUTPUT|GPIO_OPENDRAIN|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTB|GPIO_PIN11)
/* SPI
*
diff --git a/boards/px4/fmu-v3/src/init.c b/boards/px4/fmu-v3/src/init.c
index f39dd09a3e..f96ca3ccb6 100644
--- a/boards/px4/fmu-v3/src/init.c
+++ b/boards/px4/fmu-v3/src/init.c
@@ -78,24 +78,6 @@
* Pre-Processor Definitions
****************************************************************************/
-/* Configuration ************************************************************/
-
-/* Debug ********************************************************************/
-
-#ifdef CONFIG_CPP_HAVE_VARARGS
-# ifdef CONFIG_DEBUG
-# define message(...) syslog(__VA_ARGS__)
-# else
-# define message(...) printf(__VA_ARGS__)
-# endif
-#else
-# ifdef CONFIG_DEBUG
-# define message syslog
-# else
-# define message printf
-# endif
-#endif
-
/*
* Ideally we'd be able to get these from up_internal.h,
* but since we want to be able to disable the NuttX use
@@ -130,7 +112,7 @@ __EXPORT void board_peripheral_reset(int ms)
/* wait for the peripheral rail to reach GND */
usleep(ms * 1000);
- warnx("reset done, %d ms", ms);
+ syslog(LOG_DEBUG, "reset done, %d ms\n", ms);
/* re-enable power */
@@ -415,7 +397,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
hw_version = HW_VER_FMUV3_STATE;
hw_type[1]++;
hw_type[2] = '0';
- message("\nPixhack V3 detected, forcing to fmu-v3");
+ syslog(LOG_INFO, "\nPixhack V3 detected, forcing to fmu-v3");
} else {
@@ -430,12 +412,12 @@ __EXPORT int board_app_initialize(uintptr_t arg)
/* questionable px4_fmu-v2 hardware, try forcing regular FMUv2 (not much else we can do) */
- message("\nbad version detected, forcing to fmu-v2");
+ syslog(LOG_ERR, "\nbad version detected, forcing to fmu-v2");
hw_version = HW_VER_FMUV2_STATE;
break;
}
- message("\nFMUv2 ver 0x%1X : Rev %x %s\n", hw_version, hw_revision, hw_type);
+ syslog(LOG_DEBUG, "\nFMUv2 ver 0x%1X : Rev %x %s\n", hw_version, hw_revision, hw_type);
}
/* configure SPI interfaces */
@@ -446,7 +428,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
/* configure the DMA allocator */
if (board_dma_alloc_init() < 0) {
- message("DMA alloc FAILED");
+ syslog(LOG_ERR, "DMA alloc FAILED\n");
}
/* set up the serial DMA polling */
@@ -479,7 +461,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
spi1 = stm32_spibus_initialize(PX4_SPI_BUS_SENSORS);
if (!spi1) {
- message("[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_SENSORS);
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_SENSORS);
led_on(LED_AMBER);
return -ENODEV;
}
@@ -495,7 +477,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
spi2 = stm32_spibus_initialize(PX4_SPI_BUS_RAMTRON);
if (!spi2) {
- message("[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_RAMTRON);
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_RAMTRON);
led_on(LED_AMBER);
return -ENODEV;
}
@@ -511,7 +493,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
spi4 = stm32_spibus_initialize(PX4_SPI_BUS_EXT);
if (!spi4) {
- message("[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_EXT);
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_EXT);
led_on(LED_AMBER);
return -ENODEV;
}
@@ -528,7 +510,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
if (!sdio) {
led_on(LED_AMBER);
- message("[boot] Failed to initialize SDIO slot %d\n", CONFIG_NSH_MMCSDSLOTNO);
+ syslog(LOG_ERR, "[boot] Failed to initialize SDIO slot %d\n", CONFIG_NSH_MMCSDSLOTNO);
return -ENODEV;
}
@@ -537,7 +519,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
if (ret != OK) {
led_on(LED_AMBER);
- message("[boot] Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+ syslog(LOG_ERR, "[boot] Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
return ret;
}
diff --git a/boards/px4/fmu-v3/src/spi.c b/boards/px4/fmu-v3/src/spi.c
index ca29b39c32..4df601639d 100644
--- a/boards/px4/fmu-v3/src/spi.c
+++ b/boards/px4/fmu-v3/src/spi.c
@@ -55,7 +55,6 @@
#include <chip.h>
#include <stm32.h>
#include "board_config.h"
-#include <systemlib/err.h>
/************************************************************************************
* Public Functions
@@ -421,7 +420,7 @@ __EXPORT void board_spi_reset(int ms)
/* wait for the sensor rail to reach GND */
usleep(ms * 1000);
- warnx("reset done, %d ms", ms);
+ syslog(LOG_DEBUG, "reset done, %d ms\n", ms);
/* re-enable power */
diff --git a/boards/px4/fmu-v4/src/init.c b/boards/px4/fmu-v4/src/init.c
index a1c35cc268..c57cd29466 100644
--- a/boards/px4/fmu-v4/src/init.c
+++ b/boards/px4/fmu-v4/src/init.c
@@ -79,24 +79,6 @@
* Pre-Processor Definitions
****************************************************************************/
-/* Configuration ************************************************************/
-
-/* Debug ********************************************************************/
-
-#ifdef CONFIG_CPP_HAVE_VARARGS
-# ifdef CONFIG_DEBUG
-# define message(...) syslog(__VA_ARGS__)
-# else
-# define message(...) printf(__VA_ARGS__)
-# endif
-#else
-# ifdef CONFIG_DEBUG
-# define message syslog
-# else
-# define message printf
-# endif
-#endif
-
/**
* Ideally we'd be able to get these from up_internal.h,
* but since we want to be able to disable the NuttX use
@@ -135,7 +117,7 @@ __EXPORT void board_peripheral_reset(int ms)
// Wait for the peripheral rail to reach GND.
usleep(ms * 1000);
- warnx("reset done, %d ms", ms);
+ syslog(LOG_DEBUG, "reset done, %d ms\n", ms);
// Re-enable power.
// Switch the peripheral rail back on.
@@ -271,7 +253,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
// Configure the DMA allocator.
if (board_dma_alloc_init() < 0) {
- message("DMA alloc FAILED");
+ syslog(LOG_ERR, "DMA alloc FAILED\n");
}
// Set up the serial DMA polling.
@@ -311,7 +293,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
spi1 = stm32_spibus_initialize(1);
if (!spi1) {
- message("[boot] FAILED to initialize SPI port 1\n");
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port 1\n");
led_on(LED_RED);
return -ENODEV;
}
@@ -330,7 +312,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
spi2 = stm32_spibus_initialize(2);
if (!spi2) {
- message("[boot] FAILED to initialize SPI port 2\n");
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port 2\n");
led_on(LED_RED);
return -ENODEV;
}
@@ -354,8 +336,8 @@ __EXPORT int board_app_initialize(uintptr_t arg)
if (!sdio) {
led_on(LED_RED);
- message("[boot] Failed to initialize SDIO slot %d\n",
- CONFIG_NSH_MMCSDSLOTNO);
+ syslog(LOG_ERR, "[boot] Failed to initialize SDIO slot %d\n",
+ CONFIG_NSH_MMCSDSLOTNO);
return -ENODEV;
}
@@ -364,7 +346,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
if (ret != OK) {
led_on(LED_RED);
- message("[boot] Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+ syslog(LOG_ERR, "[boot] Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
return ret;
}
diff --git a/boards/px4/fmu-v4/src/spi.c b/boards/px4/fmu-v4/src/spi.c
index 873cac9556..f376f09231 100644
--- a/boards/px4/fmu-v4/src/spi.c
+++ b/boards/px4/fmu-v4/src/spi.c
@@ -55,7 +55,6 @@
#include <chip.h>
#include <stm32.h>
#include "board_config.h"
-#include <systemlib/err.h>
/************************************************************************************
* Public Functions
@@ -223,7 +222,7 @@ __EXPORT void board_spi_reset(int ms)
/* wait for the sensor rail to reach GND */
usleep(ms * 1000);
- warnx("reset done, %d ms", ms);
+ syslog(LOG_DEBUG, "reset done, %d ms\n", ms);
/* re-enable power */
diff --git a/boards/px4/fmu-v4pro/src/init.c b/boards/px4/fmu-v4pro/src/init.c
index 104f1abc43..8077cab32d 100644
--- a/boards/px4/fmu-v4pro/src/init.c
+++ b/boards/px4/fmu-v4pro/src/init.c
@@ -79,24 +79,6 @@
* Pre-Processor Definitions
****************************************************************************/
-/* Configuration ************************************************************/
-
-/* Debug ********************************************************************/
-
-#ifdef CONFIG_CPP_HAVE_VARARGS
-# ifdef CONFIG_DEBUG
-# define message(...) syslog(__VA_ARGS__)
-# else
-# define message(...) printf(__VA_ARGS__)
-# endif
-#else
-# ifdef CONFIG_DEBUG
-# define message syslog
-# else
-# define message printf
-# endif
-#endif
-
/*
* Ideally we'd be able to get these from up_internal.h,
* but since we want to be able to disable the NuttX use
@@ -137,7 +119,7 @@ __EXPORT void board_peripheral_reset(int ms)
/* wait for the peripheral rail to reach GND */
usleep(ms * 1000);
- warnx("reset done, %d ms", ms);
+ syslog(LOG_DEBUG, "reset done, %d ms\n", ms);
/* re-enable power */
@@ -307,7 +289,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
/* configure the DMA allocator */
if (board_dma_alloc_init() < 0) {
- message("DMA alloc FAILED");
+ syslog(LOG_ERR, "DMA alloc FAILED\n");
}
/* set up the serial DMA polling */
@@ -342,7 +324,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
spi1 = stm32_spibus_initialize(PX4_SPI_BUS_SENSORS);
if (!spi1) {
- message("[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_SENSORS);
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_SENSORS);
led_on(LED_RED);
return -ENODEV;
}
@@ -363,7 +345,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
spi2 = stm32_spibus_initialize(PX4_SPI_BUS_RAMTRON);
if (!spi2) {
- message("[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_RAMTRON);
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_RAMTRON);
led_on(LED_RED);
return -ENODEV;
}
@@ -382,7 +364,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
spi5 = stm32_spibus_initialize(PX4_SPI_BUS_EXT0);
if (!spi5) {
- message("[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_EXT0);
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_EXT0);
led_on(LED_RED);
return -ENODEV;
}
@@ -398,7 +380,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
spi6 = stm32_spibus_initialize(PX4_SPI_BUS_EXT1);
if (!spi6) {
- message("[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_EXT1);
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_EXT1);
led_on(LED_RED);
return -ENODEV;
}
@@ -416,8 +398,8 @@ __EXPORT int board_app_initialize(uintptr_t arg)
if (!sdio) {
led_on(LED_RED);
- message("[boot] Failed to initialize SDIO slot %d\n",
- CONFIG_NSH_MMCSDSLOTNO);
+ syslog(LOG_ERR, "[boot] Failed to initialize SDIO slot %d\n",
+ CONFIG_NSH_MMCSDSLOTNO);
return -ENODEV;
}
@@ -426,7 +408,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
if (ret != OK) {
led_on(LED_RED);
- message("[boot] Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+ syslog(LOG_ERR, "[boot] Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
return ret;
}
diff --git a/boards/px4/fmu-v4pro/src/spi.c b/boards/px4/fmu-v4pro/src/spi.c
index 3cab587a59..262a81d305 100644
--- a/boards/px4/fmu-v4pro/src/spi.c
+++ b/boards/px4/fmu-v4pro/src/spi.c
@@ -55,7 +55,6 @@
#include <chip.h>
#include <stm32.h>
#include "board_config.h"
-#include <systemlib/err.h>
/************************************************************************************
* Public Functions
@@ -258,7 +257,7 @@ __EXPORT void board_spi_reset(int ms)
/* wait for the sensor rail to reach GND */
usleep(ms * 1000);
- warnx("reset done, %d ms", ms);
+ syslog(LOG_DEBUG, "reset done, %d ms\n", ms);
/* re-enable power */
diff --git a/boards/px4/fmu-v5/src/init.c b/boards/px4/fmu-v5/src/init.c
index eda68ebda9..d972ece0d1 100644
--- a/boards/px4/fmu-v5/src/init.c
+++ b/boards/px4/fmu-v5/src/init.c
@@ -162,7 +162,7 @@ __EXPORT void board_peripheral_reset(int ms)
/* wait for the peripheral rail to reach GND */
usleep(ms * 1000);
- warnx("reset done, %d ms", ms);
+ syslog(LOG_DEBUG, "reset done, %d ms\n", ms);
/* re-enable power */
diff --git a/boards/px4/fmu-v5/src/spi.c b/boards/px4/fmu-v5/src/spi.c
index 083adc0de4..b7a610cc60 100644
--- a/boards/px4/fmu-v5/src/spi.c
+++ b/boards/px4/fmu-v5/src/spi.c
@@ -57,7 +57,6 @@
#include <chip.h>
#include <stm32_gpio.h>
#include "board_config.h"
-#include <systemlib/err.h>
/****************************************************************************
* Pre-Processor Definitions
@@ -476,7 +475,7 @@ __EXPORT void board_spi_reset(int ms)
/* wait for the sensor rail to reach GND */
usleep(ms * 1000);
- warnx("reset done, %d ms", ms);
+ syslog(LOG_DEBUG, "reset done, %d ms\n", ms);
/* re-enable power */
diff --git a/boards/px4/io-v2/src/init.c b/boards/px4/io-v2/src/init.c
index 12c0db3fc6..f7ba363580 100644
--- a/boards/px4/io-v2/src/init.c
+++ b/boards/px4/io-v2/src/init.c
@@ -63,24 +63,6 @@
* Pre-Processor Definitions
****************************************************************************/
-/* Configuration ************************************************************/
-
-/* Debug ********************************************************************/
-
-#ifdef CONFIG_CPP_HAVE_VARARGS
-# ifdef CONFIG_DEBUG
-# define message(...) syslog(__VA_ARGS__)
-# else
-# define message(...) printf(__VA_ARGS__)
-# endif
-#else
-# ifdef CONFIG_DEBUG
-# define message syslog
-# else
-# define message printf
-# endif
-#endif
-
/****************************************************************************
* Protected Functions
****************************************************************************/
diff --git a/boards/stm/32f4discovery/src/init.c b/boards/stm/32f4discovery/src/init.c
index e84b102581..eae7cf41b0 100644
--- a/boards/stm/32f4discovery/src/init.c
+++ b/boards/stm/32f4discovery/src/init.c
@@ -75,24 +75,6 @@
* Pre-Processor Definitions
****************************************************************************/
-/* Configuration ************************************************************/
-
-/* Debug ********************************************************************/
-
-#ifdef CONFIG_CPP_HAVE_VARARGS
-# ifdef CONFIG_DEBUG
-# define message(...) syslog(__VA_ARGS__)
-# else
-# define message(...) printf(__VA_ARGS__)
-# endif
-#else
-# ifdef CONFIG_DEBUG
-# define message syslog
-# else
-# define message printf
-# endif
-#endif
-
/****************************************************************************
* Protected Functions
****************************************************************************/
diff --git a/boards/stm/nucleo-F767ZI/src/init.c b/boards/stm/nucleo-F767ZI/src/init.c
index 8f43bd5717..347bbf786d 100644
--- a/boards/stm/nucleo-F767ZI/src/init.c
+++ b/boards/stm/nucleo-F767ZI/src/init.c
@@ -80,24 +80,6 @@
* Pre-Processor Definitions
****************************************************************************/
-/* Configuration ************************************************************/
-
-/* Debug ********************************************************************/
-
-#ifdef CONFIG_CPP_HAVE_VARARGS
-# ifdef CONFIG_DEBUG
-# define message(...) syslog(__VA_ARGS__)
-# else
-# define message(...) printf(__VA_ARGS__)
-# endif
-#else
-# ifdef CONFIG_DEBUG
-# define message syslog
-# else
-# define message printf
-# endif
-#endif
-
/*
* Ideally we'd be able to get these from up_internal.h,
* but since we want to be able to disable the NuttX use
@@ -136,7 +118,7 @@ __EXPORT void board_peripheral_reset(int ms)
/* wait for the peripheral rail to reach GND */
usleep(ms * 1000);
- warnx("reset done, %d ms", ms);
+ syslog(LOG_DEBUG, "reset done, %d ms\n", ms);
/* re-enable power */
@@ -238,7 +220,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
/* configure the DMA allocator */
if (board_dma_alloc_init() < 0) {
- message("DMA alloc FAILED");
+ syslog(LOG_ERR, "DMA alloc FAILED\n");
}
/* set up the serial DMA polling */
diff --git a/boards/stm/nucleo-F767ZI/src/sdio.c b/boards/stm/nucleo-F767ZI/src/sdio.c
index a60a4df6b9..c06e515e09 100644
--- a/boards/stm/nucleo-F767ZI/src/sdio.c
+++ b/boards/stm/nucleo-F767ZI/src/sdio.c
@@ -58,23 +58,6 @@
* Pre-processor Definitions
****************************************************************************/
-/* Configuration ************************************************************/
-/* Debug ********************************************************************/
-
-#ifdef CONFIG_CPP_HAVE_VARARGS
-# ifdef CONFIG_DEBUG
-# define message(...) syslog(__VA_ARGS__)
-# else
-# define message(...) printf(__VA_ARGS__)
-# endif
-#else
-# ifdef CONFIG_DEBUG
-# define message syslog
-# else
-# define message printf
-# endif
-#endif
-
/* Card detections requires card support and a card detection GPIO */
#define HAVE_NCD 1
@@ -157,7 +140,7 @@ int stm32_sdio_initialize(void)
sdio_dev = sdio_initialize(SDIO_SLOTNO);
if (!sdio_dev) {
- message("[boot] Failed to initialize SDIO slot %d\n", SDIO_SLOTNO);
+ syslog(LOG_ERR, "[boot] Failed to initialize SDIO slot %d\n", SDIO_SLOTNO);
return -ENODEV;
}
@@ -168,7 +151,7 @@ int stm32_sdio_initialize(void)
ret = mmcsd_slotinitialize(SDIO_MINOR, sdio_dev);
if (ret != OK) {
- message("[boot] Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+ syslog(LOG_ERR, "[boot] Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
return ret;
}
diff --git a/boards/stm/nucleo-F767ZI/src/spi.c b/boards/stm/nucleo-F767ZI/src/spi.c
index 9f34b6d5c1..b7b3388590 100644
--- a/boards/stm/nucleo-F767ZI/src/spi.c
+++ b/boards/stm/nucleo-F767ZI/src/spi.c
@@ -56,30 +56,11 @@
#include <chip.h>
#include <stm32_gpio.h>
#include "board_config.h"
-#include <systemlib/err.h>
/****************************************************************************
* Pre-Processor Definitions
****************************************************************************/
-/* Configuration ************************************************************/
-
-/* Debug ********************************************************************/
-
-#ifdef CONFIG_CPP_HAVE_VARARGS
-# ifdef CONFIG_DEBUG
-# define message(...) syslog(__VA_ARGS__)
-# else
-# define message(...) printf(__VA_ARGS__)
-# endif
-#else
-# ifdef CONFIG_DEBUG
-# define message syslog
-# else
-# define message printf
-# endif
-#endif
-
/************************************************************************************
* Public Functions
************************************************************************************/
@@ -140,7 +121,7 @@ __EXPORT int stm32_spi_bus_initialize(void)
spi_sensors = stm32_spibus_initialize(PX4_SPI_BUS_SENSORS);
if (!spi_sensors) {
- message("[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_SENSORS);
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_SENSORS);
return -ENODEV;
}
@@ -158,7 +139,7 @@ __EXPORT int stm32_spi_bus_initialize(void)
spi_fram = stm32_spibus_initialize(PX4_SPI_BUS_RAMTRON);
if (!spi_fram) {
- message("[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_RAMTRON);
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_RAMTRON);
return -ENODEV;
}
@@ -178,7 +159,7 @@ __EXPORT int stm32_spi_bus_initialize(void)
spi_baro = stm32_spibus_initialize(PX4_SPI_BUS_BARO);
if (!spi_baro) {
- message("[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_BARO);
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_BARO);
return -ENODEV;
}
@@ -198,7 +179,7 @@ __EXPORT int stm32_spi_bus_initialize(void)
spi_icm = stm32_spibus_initialize(PX4_SPI_BUS_ICM);
if (!spi_icm) {
- message("[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_ICM);
+ syslog(LOG_ERR, "[boot] FAILED to initialize SPI port %d\n", PX4_SPI_BUS_ICM);
return -ENODEV;
}
@@ -371,7 +352,7 @@ __EXPORT void board_spi_reset(int ms)
/* wait for the sensor rail to reach GND */
usleep(ms * 1000);
- warnx("reset done, %d ms", ms);
+ syslog(LOG_DEBUG, "reset done, %d ms\n", ms);
/* re-enable power */
diff --git a/platforms/posix/src/main.cpp b/platforms/posix/src/main.cpp
index ff2acaf2bc..3605f8884f 100644
--- a/platforms/posix/src/main.cpp
+++ b/platforms/posix/src/main.cpp
@@ -60,6 +60,7 @@
#include <fcntl.h>
#include <sys/stat.h>
#include <stdlib.h>
+#include <string.h>
#include <px4_time.h>
#include <px4_log.h>
diff --git a/platforms/posix/src/px4_layer/px4_sem.cpp b/platforms/posix/src/px4_layer/px4_sem.cpp
index d60d1cb813..e579c9222f 100644
--- a/platforms/posix/src/px4_layer/px4_sem.cpp
+++ b/platforms/posix/src/px4_layer/px4_sem.cpp
@@ -148,7 +148,7 @@ int px4_sem_timedwait(px4_sem_t *s, const struct timespec *abstime)
const unsigned NAMELEN = 32;
char thread_name[NAMELEN] = {};
(void)pthread_getname_np(pthread_self(), thread_name, NAMELEN);
- PX4_WARN("%s: px4_sem_timedwait failure: ret: %d, %s", thread_name, ret, strerror(ret));
+ PX4_WARN("%s: px4_sem_timedwait failure: ret: %d", thread_name, ret);
}
int mret = pthread_mutex_unlock(&(s->lock));
diff --git a/src/drivers/barometer/lps22hb/LPS22HB.hpp b/src/drivers/barometer/lps22hb/LPS22HB.hpp
index 559fa564bd..4ffa342dc7 100644
--- a/src/drivers/barometer/lps22hb/LPS22HB.hpp
+++ b/src/drivers/barometer/lps22hb/LPS22HB.hpp
@@ -44,6 +44,7 @@
#include <drivers/drv_hrt.h>
#include <drivers/device/ringbuffer.h>
#include <drivers/drv_device.h>
+#include <systemlib/err.h>
#include <uORB/uORB.h>
diff --git a/src/drivers/batt_smbus/batt_smbus.cpp b/src/drivers/batt_smbus/batt_smbus.cpp
index 0a033453c3..a9e856fc4f 100644
--- a/src/drivers/batt_smbus/batt_smbus.cpp
+++ b/src/drivers/batt_smbus/batt_smbus.cpp
@@ -43,6 +43,8 @@
#include "batt_smbus.h"
+#include <stdlib.h>
+
extern "C" __EXPORT int batt_smbus_main(int argc, char *argv[]);
struct work_s BATT_SMBUS::_work = {};
diff --git a/src/drivers/differential_pressure/ms5525/MS5525_main.cpp b/src/drivers/differential_pressure/ms5525/MS5525_main.cpp
index b718a7f585..e720a8c32a 100644
--- a/src/drivers/differential_pressure/ms5525/MS5525_main.cpp
+++ b/src/drivers/differential_pressure/ms5525/MS5525_main.cpp
@@ -35,6 +35,8 @@
#include <px4_getopt.h>
+#include <stdlib.h>
+
// Driver 'main' command.
extern "C" __EXPORT int ms5525_airspeed_main(int argc, char *argv[]);
diff --git a/src/drivers/differential_pressure/sdp3x/SDP3X_main.cpp b/src/drivers/differential_pressure/sdp3x/SDP3X_main.cpp
index f6b65b0847..4bf604ca87 100644
--- a/src/drivers/differential_pressure/sdp3x/SDP3X_main.cpp
+++ b/src/drivers/differential_pressure/sdp3x/SDP3X_main.cpp
@@ -32,8 +32,11 @@
****************************************************************************/
#include "SDP3X.hpp"
+
#include <px4_getopt.h>
+#include <stdlib.h>
+
// Driver 'main' command.
extern "C" __EXPORT int sdp3x_airspeed_main(int argc, char *argv[]);
diff --git a/src/drivers/distance_sensor/leddar_one/leddar_one.cpp b/src/drivers/distance_sensor/leddar_one/leddar_one.cpp
index c0a9b68eca..e85a55a02c 100644
--- a/src/drivers/distance_sensor/leddar_one/leddar_one.cpp
+++ b/src/drivers/distance_sensor/leddar_one/leddar_one.cpp
@@ -36,6 +36,7 @@
#include <px4_getopt.h>
#include <px4_defines.h>
+#include <stdlib.h>
#include <string.h>
#include <termios.h>
diff --git a/src/drivers/distance_sensor/ll40ls/LidarLitePWM.cpp b/src/drivers/distance_sensor/ll40ls/LidarLitePWM.cpp
index 209953fed7..be1281c6a7 100644
--- a/src/drivers/distance_sensor/ll40ls/LidarLitePWM.cpp
+++ b/src/drivers/distance_sensor/ll40ls/LidarLitePWM.cpp
@@ -122,7 +122,7 @@ void LidarLitePWM::print_info()
perf_print_counter(_sample_perf);
perf_print_counter(_read_errors);
perf_print_counter(_sensor_zero_resets);
- warnx("poll interval: %u ticks", getMeasureTicks());
+ PX4_INFO("poll interval: %u ticks", getMeasureTicks());
print_message(_range);
}
diff --git a/src/drivers/distance_sensor/ulanding/ulanding.cpp b/src/drivers/distance_sensor/ulanding/ulanding.cpp
index f357aa9143..9c3e870310 100644
--- a/src/drivers/distance_sensor/ulanding/ulanding.cpp
+++ b/src/drivers/distance_sensor/ulanding/ulanding.cpp
@@ -303,8 +303,6 @@ Radar::task_main_trampoline(int argc, char *argv[])
int
Radar::start()
{
- ASSERT(_task_handle == -1);
-
/* start the task */
_task_handle = px4_task_spawn_cmd("ulanding_radar",
SCHED_DEFAULT,
diff --git a/src/drivers/imu/adis16477/ADIS16477.hpp b/src/drivers/imu/adis16477/ADIS16477.hpp
index 931a2f0efc..0c5f875224 100644
--- a/src/drivers/imu/adis16477/ADIS16477.hpp
+++ b/src/drivers/imu/adis16477/ADIS16477.hpp
@@ -49,6 +49,7 @@
#include <lib/conversion/rotation.h>
#include <perf/perf_counter.h>
#include <ecl/geo/geo.h>
+#include <systemlib/err.h>
#define ADIS16477_GYRO_DEFAULT_RATE 250
#define ADIS16477_GYRO_DEFAULT_DRIVER_FILTER_FREQ 30
diff --git a/src/drivers/imu/bmi055/BMI055.hpp b/src/drivers/imu/bmi055/BMI055.hpp
index 7808d43e41..54fb3403c1 100644
--- a/src/drivers/imu/bmi055/BMI055.hpp
+++ b/src/drivers/imu/bmi055/BMI055.hpp
@@ -40,6 +40,7 @@
#include <lib/perf/perf_counter.h>
#include <px4_config.h>
#include <systemlib/conversions.h>
+#include <systemlib/err.h>
#define DIR_READ 0x80
#define DIR_WRITE 0x00
diff --git a/src/drivers/imu/fxas21002c/fxas21002c.cpp b/src/drivers/imu/fxas21002c/fxas21002c.cpp
index d3f9bbfb25..31213bcba9 100644
--- a/src/drivers/imu/fxas21002c/fxas21002c.cpp
+++ b/src/drivers/imu/fxas21002c/fxas21002c.cpp
@@ -73,6 +73,7 @@
#include <mathlib/math/filter/LowPassFilter2p.hpp>
#include <lib/conversion/rotation.h>
#include <platforms/px4_getopt.h>
+#include <systemlib/err.h>
/* SPI protocol address bits */
#define DIR_READ(a) ((a) | (1 << 7))
diff --git a/src/drivers/imu/fxos8701cq/fxos8701cq.cpp b/src/drivers/imu/fxos8701cq/fxos8701cq.cpp
index b9f5580629..c3d7876af8 100644
--- a/src/drivers/imu/fxos8701cq/fxos8701cq.cpp
+++ b/src/drivers/imu/fxos8701cq/fxos8701cq.cpp
@@ -77,6 +77,7 @@
#include <mathlib/math/filter/LowPassFilter2p.hpp>
#include <lib/conversion/rotation.h>
#include <platforms/px4_getopt.h>
+#include <systemlib/err.h>
/* SPI protocol address bits */
#define DIR_READ(a) ((a) & 0x7f)
diff --git a/src/drivers/imu/mpu9250/mpu9250.h b/src/drivers/imu/mpu9250/mpu9250.h
index 718729758c..2c540aa5b2 100644
--- a/src/drivers/imu/mpu9250/mpu9250.h
+++ b/src/drivers/imu/mpu9250/mpu9250.h
@@ -48,6 +48,7 @@
#include <drivers/drv_mag.h>
#include <mathlib/math/filter/LowPassFilter2p.hpp>
#include <lib/conversion/rotation.h>
+#include <systemlib/err.h>
#include <uORB/uORB.h>
#include <uORB/topics/debug_key_value.h>
diff --git a/src/drivers/linux_pwm_out/linux_pwm_out.cpp b/src/drivers/linux_pwm_out/linux_pwm_out.cpp
index 181ab7f3f0..c8112dd9a0 100644
--- a/src/drivers/linux_pwm_out/linux_pwm_out.cpp
+++ b/src/drivers/linux_pwm_out/linux_pwm_out.cpp
@@ -31,13 +31,16 @@
*
****************************************************************************/
+#include <errno.h>
#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <cmath>
#include <px4_tasks.h>
#include <px4_getopt.h>
#include <px4_posix.h>
-#include <errno.h>
-#include <cmath> // NAN
#include <uORB/uORB.h>
#include <uORB/topics/actuator_controls.h>
@@ -461,8 +464,6 @@ void task_main_trampoline(int argc, char *argv[])
void start()
{
- ASSERT(_task_handle == -1);
-
_task_should_exit = false;
/* start the task */
@@ -474,7 +475,7 @@ void start()
nullptr);
if (_task_handle < 0) {
- warn("task start failed");
+ PX4_ERR("task start failed");
return;
}
diff --git a/src/drivers/linux_sbus/linux_sbus.cpp b/src/drivers/linux_sbus/linux_sbus.cpp
index dc438d4bbd..b075832480 100644
--- a/src/drivers/linux_sbus/linux_sbus.cpp
+++ b/src/drivers/linux_sbus/linux_sbus.cpp
@@ -33,7 +33,12 @@
*
****************************************************************************/
#include "linux_sbus.h"
+
+#include <stdlib.h>
+#include <string.h>
+
using namespace linux_sbus;
+
//---------------------------------------------------------------------------------------------------------//
int RcInput::init()
{
diff --git a/src/drivers/magnetometer/lis3mdl/lis3mdl.h b/src/drivers/magnetometer/lis3mdl/lis3mdl.h
index d27520e034..febfbb216c 100644
--- a/src/drivers/magnetometer/lis3mdl/lis3mdl.h
+++ b/src/drivers/magnetometer/lis3mdl/lis3mdl.h
@@ -47,6 +47,7 @@
#include <drivers/drv_mag.h>
#include <lib/conversion/rotation.h>
+#include <systemlib/err.h>
#include <perf/perf_counter.h>
#include <px4_defines.h>
diff --git a/src/drivers/magnetometer/lsm303agr/LSM303AGR.hpp b/src/drivers/magnetometer/lsm303agr/LSM303AGR.hpp
index 89e91e8ec2..3a7d61f5b5 100644
--- a/src/drivers/magnetometer/lsm303agr/LSM303AGR.hpp
+++ b/src/drivers/magnetometer/lsm303agr/LSM303AGR.hpp
@@ -43,6 +43,7 @@
#include <lib/conversion/rotation.h>
#include <perf/perf_counter.h>
#include <px4_workqueue.h>
+#include <systemlib/err.h>
// Register mapping
static constexpr uint8_t WHO_AM_I_M = 0x4F;
diff --git a/src/drivers/magnetometer/rm3100/rm3100.h b/src/drivers/magnetometer/rm3100/rm3100.h
index 23aa3d5d51..872fce4297 100644
--- a/src/drivers/magnetometer/rm3100/rm3100.h
+++ b/src/drivers/magnetometer/rm3100/rm3100.h
@@ -50,6 +50,7 @@
#include <perf/perf_counter.h>
#include <px4_defines.h>
+#include <systemlib/err.h>
#ifndef CONFIG_SCHED_WORKQUEUE
# error This requires CONFIG_SCHED_WORKQUEUE.
diff --git a/src/drivers/snapdragon_pwm_out/snapdragon_pwm_out.cpp b/src/drivers/snapdragon_pwm_out/snapdragon_pwm_out.cpp
index 087e609c0e..5e38fed10f 100644
--- a/src/drivers/snapdragon_pwm_out/snapdragon_pwm_out.cpp
+++ b/src/drivers/snapdragon_pwm_out/snapdragon_pwm_out.cpp
@@ -38,7 +38,7 @@
#include <px4_posix.h>
#include <errno.h>
#include <cmath> // NAN
-
+#include <string.h>
#include <uORB/uORB.h>
#include <uORB/topics/actuator_controls.h>
@@ -505,8 +505,6 @@ void task_main_trampoline(int argc, char *argv[])
void start()
{
- ASSERT(_task_handle == -1);
-
_task_should_exit = false;
/* start the task */
@@ -518,7 +516,7 @@ void start()
nullptr);
if (_task_handle < 0) {
- warn("task start failed");
+ PX4_ERR("task start failed");
return;
}
diff --git a/src/drivers/spektrum_rc/spektrum_rc.cpp b/src/drivers/spektrum_rc/spektrum_rc.cpp
index 780c0146af..c12019e9ef 100644
--- a/src/drivers/spektrum_rc/spektrum_rc.cpp
+++ b/src/drivers/spektrum_rc/spektrum_rc.cpp
@@ -39,6 +39,8 @@
* on the serial port. By default port J12 (next to J13, power module side) is used.
*/
+#include <string.h>
+
#include <px4_tasks.h>
#include <px4_posix.h>
#include <px4_getopt.h>
@@ -212,8 +214,6 @@ int start(int argc, char *argv[])
return -1;
}
- ASSERT(_task_handle == -1);
-
_task_should_exit = false;
_task_handle = px4_task_spawn_cmd("spektrum_rc_main",
diff --git a/src/drivers/uavcan/sensors/sensor_bridge.hpp b/src/drivers/uavcan/sensors/sensor_bridge.hpp
index 7138ec337b..f2bde22958 100644
--- a/src/drivers/uavcan/sensors/sensor_bridge.hpp
+++ b/src/drivers/uavcan/sensors/sensor_bridge.hpp
@@ -41,6 +41,7 @@
#include <uavcan/uavcan.hpp>
#include <drivers/device/device.h>
#include <drivers/drv_orb_dev.h>
+#include <uORB/uORB.h>
/**
* A sensor bridge class must implement this interface.
diff --git a/src/examples/bottle_drop/bottle_drop.cpp b/src/examples/bottle_drop/bottle_drop.cpp
index eca17abc9c..5b32587e44 100644
--- a/src/examples/bottle_drop/bottle_drop.cpp
+++ b/src/examples/bottle_drop/bottle_drop.cpp
@@ -222,8 +222,6 @@ BottleDrop::~BottleDrop()
int
BottleDrop::start()
{
- ASSERT(_main_task == -1);
-
/* start the task */
_main_task = px4_task_spawn_cmd("bottle_drop",
SCHED_DEFAULT,
diff --git a/src/include/px4.h b/src/include/px4.h
index 34137ee6f4..fd1f72fba3 100644
--- a/src/include/px4.h
+++ b/src/include/px4.h
@@ -39,7 +39,6 @@
#pragma once
-#include "../platforms/px4_includes.h"
#include "../platforms/px4_defines.h"
#ifdef __cplusplus
#include "../platforms/px4_middleware.h"
diff --git a/src/lib/cdev/posix/cdev_platform.hpp b/src/lib/cdev/posix/cdev_platform.hpp
index 92edf12625..c78d21c7a7 100644
--- a/src/lib/cdev/posix/cdev_platform.hpp
+++ b/src/lib/cdev/posix/cdev_platform.hpp
@@ -2,6 +2,7 @@
#pragma once
#include <inttypes.h>
+#include <string.h>
#define ATOMIC_ENTER lock()
#define ATOMIC_LEAVE unlock()
diff --git a/src/lib/drivers/linux_gpio/linux_gpio.cpp b/src/lib/drivers/linux_gpio/linux_gpio.cpp
index dfc6a3be76..79b7129c2f 100644
--- a/src/lib/drivers/linux_gpio/linux_gpio.cpp
+++ b/src/lib/drivers/linux_gpio/linux_gpio.cpp
@@ -33,10 +33,14 @@
#include "linux_gpio.h"
-#include <px4_posix.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <px4_posix.h>
#define PIN_INDEX_BUFFER_MAX (16)
#define PIN_DIRECTION_BUFFER_MAX (30 + PIN_INDEX_BUFFER_MAX)
diff --git a/src/lib/parameters/flashparams/flashparams.cpp b/src/lib/parameters/flashparams/flashparams.cpp
index 5e5e61d373..db2fdb17ce 100644
--- a/src/lib/parameters/flashparams/flashparams.cpp
+++ b/src/lib/parameters/flashparams/flashparams.cpp
@@ -45,9 +45,11 @@
#include <px4_defines.h>
#include <px4_posix.h>
#include <px4_shutdown.h>
+
#include <string.h>
#include <stdbool.h>
#include <stdint.h>
+#include <errno.h>
#include <parameters/param.h>
diff --git a/src/lib/tunes/tunes.cpp b/src/lib/tunes/tunes.cpp
index c3b73f91d6..b1dcc44dcf 100644
--- a/src/lib/tunes/tunes.cpp
+++ b/src/lib/tunes/tunes.cpp
@@ -40,6 +40,7 @@
#include <px4_log.h>
#include <math.h>
#include <ctype.h>
+#include <errno.h>
#define TUNE_ERROR -1
#define TUNE_STOP 0
diff --git a/src/modules/attitude_estimator_q/attitude_estimator_q_main.cpp b/src/modules/attitude_estimator_q/attitude_estimator_q_main.cpp
index d18c995c88..9183d6f21e 100644
--- a/src/modules/attitude_estimator_q/attitude_estimator_q_main.cpp
+++ b/src/modules/attitude_estimator_q/attitude_estimator_q_main.cpp
@@ -229,8 +229,6 @@ AttitudeEstimatorQ::~AttitudeEstimatorQ()
int AttitudeEstimatorQ::start()
{
- ASSERT(_control_task == -1);
-
/* start the task */
_control_task = px4_task_spawn_cmd("attitude_estimator_q",
SCHED_DEFAULT,
diff --git a/src/modules/gnd_att_control/GroundRoverAttitudeControl.cpp b/src/modules/gnd_att_control/GroundRoverAttitudeControl.cpp
index 3288ed8194..95d1b8e555 100644
--- a/src/modules/gnd_att_control/GroundRoverAttitudeControl.cpp
+++ b/src/modules/gnd_att_control/GroundRoverAttitudeControl.cpp
@@ -223,7 +223,7 @@ GroundRoverAttitudeControl::task_main()
/* this is undesirable but not much we can do - might want to flag unhappy status */
if (pret < 0) {
- warn("poll error %d, %d", pret, errno);
+ PX4_ERR("poll error %d, %d", pret, errno);
continue;
}
@@ -298,7 +298,7 @@ GroundRoverAttitudeControl::task_main()
perf_count(_nonfinite_output_perf);
if (_debug && loop_counter % 10 == 0) {
- warnx("yaw_u %.4f", (double)yaw_u);
+ PX4_INFO("yaw_u %.4f", (double)yaw_u);
}
}
@@ -343,7 +343,7 @@ GroundRoverAttitudeControl::task_main()
perf_end(_loop_perf);
}
- warnx("exiting.\n");
+ PX4_INFO("exiting.");
_control_task = -1;
_task_running = false;
@@ -352,8 +352,6 @@ GroundRoverAttitudeControl::task_main()
int
GroundRoverAttitudeControl::start()
{
- ASSERT(_control_task == -1);
-
/* start the task */
_control_task = px4_task_spawn_cmd("gnd_att_control",
SCHED_DEFAULT,
@@ -363,7 +361,7 @@ GroundRoverAttitudeControl::start()
nullptr);
if (_control_task < 0) {
- warn("task start failed");
+ PX4_ERR("task start failed");
return -errno;
}
@@ -373,28 +371,28 @@ GroundRoverAttitudeControl::start()
int gnd_att_control_main(int argc, char *argv[])
{
if (argc < 2) {
- warnx("usage: gnd_att_control {start|stop|status}");
+ PX4_INFO("usage: gnd_att_control {start|stop|status}");
return 1;
}
if (!strcmp(argv[1], "start")) {
if (att_gnd_control::g_control != nullptr) {
- warnx("already running");
+ PX4_WARN("already running");
return 1;
}
att_gnd_control::g_control = new GroundRoverAttitudeControl;
if (att_gnd_control::g_control == nullptr) {
- warnx("alloc failed");
+ PX4_ERR("alloc failed");
return 1;
}
if (PX4_OK != att_gnd_control::g_control->start()) {
delete att_gnd_control::g_control;
att_gnd_control::g_control = nullptr;
- warn("start failed");
+ PX4_ERR("start failed");
return 1;
}
@@ -416,7 +414,7 @@ int gnd_att_control_main(int argc, char *argv[])
if (!strcmp(argv[1], "stop")) {
if (att_gnd_control::g_control == nullptr) {
- warnx("not running");
+ PX4_WARN("not running");
return 1;
}
@@ -427,15 +425,15 @@ int gnd_att_control_main(int argc, char *argv[])
if (!strcmp(argv[1], "status")) {
if (att_gnd_control::g_control) {
- warnx("running");
+ PX4_INFO("running");
return 0;
} else {
- warnx("not running");
+ PX4_INFO("not running");
return 1;
}
}
- warnx("unrecognized command");
+ PX4_WARN("unrecognized command");
return 1;
}
diff --git a/src/modules/gnd_pos_control/GroundRoverPositionControl.cpp b/src/modules/gnd_pos_control/GroundRoverPositionControl.cpp
index e3013956ca..10cf8e40af 100644
--- a/src/modules/gnd_pos_control/GroundRoverPositionControl.cpp
+++ b/src/modules/gnd_pos_control/GroundRoverPositionControl.cpp
@@ -484,8 +484,6 @@ GroundRoverPositionControl::task_main_trampoline(int argc, char *argv[])
int
GroundRoverPositionControl::start()
{
- ASSERT(_control_task == -1);
-
/* start the task */
_control_task = px4_task_spawn_cmd("gnd_pos_ctrl",
SCHED_DEFAULT,
diff --git a/src/modules/logger/log_writer_file.cpp b/src/modules/logger/log_writer_file.cpp
index 435f8c1652..c47cf5cda2 100644
--- a/src/modules/logger/log_writer_file.cpp
+++ b/src/modules/logger/log_writer_file.cpp
@@ -33,8 +33,10 @@
#include "log_writer_file.h"
#include "messages.h"
+
#include <fcntl.h>
#include <string.h>
+#include <errno.h>
#include <mathlib/mathlib.h>
#include <px4_posix.h>
diff --git a/src/modules/logger/logger.cpp b/src/modules/logger/logger.cpp
index 5b071aac43..ae7a2b0040 100644
--- a/src/modules/logger/logger.cpp
+++ b/src/modules/logger/logger.cpp
@@ -52,7 +52,6 @@
#include <uORB/topics/vehicle_command_ack.h>
#include <drivers/drv_hrt.h>
-#include <px4_includes.h>
#include <px4_getopt.h>
#include <px4_log.h>
#include <px4_posix.h>
diff --git a/src/modules/mavlink/mavlink_timesync.cpp b/src/modules/mavlink/mavlink_timesync.cpp
index 41c23a3068..abd12f621f 100644
--- a/src/modules/mavlink/mavlink_timesync.cpp
+++ b/src/modules/mavlink/mavlink_timesync.cpp
@@ -41,6 +41,8 @@
#include "mavlink_timesync.h"
#include "mavlink_main.h"
+#include <stdlib.h>
+
MavlinkTimesync::MavlinkTimesync(Mavlink *mavlink) :
_mavlink(mavlink)
{
diff --git a/src/modules/muorb/adsp/uORBFastRpcChannel.cpp b/src/modules/muorb/adsp/uORBFastRpcChannel.cpp
index c91c7f2e20..e7c0cc2494 100644
--- a/src/modules/muorb/adsp/uORBFastRpcChannel.cpp
+++ b/src/modules/muorb/adsp/uORBFastRpcChannel.cpp
@@ -33,6 +33,7 @@
#include "uORBFastRpcChannel.hpp"
#include "px4_log.h"
#include <algorithm>
+#include <string.h>
#include <drivers/drv_hrt.h>
// static initialization.
diff --git a/src/modules/muorb/krait/px4muorb_KraitRpcWrapper.cpp b/src/modules/muorb/krait/px4muorb_KraitRpcWrapper.cpp
index d697a97373..f4a70e8e7d 100644
--- a/src/modules/muorb/krait/px4muorb_KraitRpcWrapper.cpp
+++ b/src/modules/muorb/krait/px4muorb_KraitRpcWrapper.cpp
@@ -40,6 +40,7 @@
#include "px4_log.h"
#include <shmem.h>
#include <drivers/drv_hrt.h>
+#include <string.h>
using namespace px4muorb;
diff --git a/src/modules/muorb/krait/uORBKraitFastRpcChannel.cpp b/src/modules/muorb/krait/uORBKraitFastRpcChannel.cpp
index a441522d42..dae0d0260e 100644
--- a/src/modules/muorb/krait/uORBKraitFastRpcChannel.cpp
+++ b/src/modules/muorb/krait/uORBKraitFastRpcChannel.cpp
@@ -37,6 +37,7 @@
#include <drivers/drv_hrt.h>
#include <cstdio>
#include <pthread.h>
+#include <string.h>
#define LOG_TAG "uORBKraitFastRpcChannel.cpp"
diff --git a/src/platforms/common/px4_log.c b/src/platforms/common/px4_log.c
index 850710121a..ab58acdfbb 100644
--- a/src/platforms/common/px4_log.c
+++ b/src/platforms/common/px4_log.c
@@ -31,9 +31,11 @@
*
****************************************************************************/
+#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+
#include <px4_log.h>
#if defined(__PX4_POSIX)
#if !defined(__PX4_CYGWIN)
@@ -55,7 +57,7 @@ __EXPORT const char *__px4_log_level_color[_PX4_LOG_LEVEL_PANIC + 1] =
void px4_log_initialize(void)
{
- ASSERT(orb_log_message_pub == NULL);
+ assert(orb_log_message_pub == NULL);
/* we need to advertise with a valid message */
struct log_message_s log_message;
diff --git a/src/platforms/common/work_queue/hrt_thread.c b/src/platforms/common/work_queue/hrt_thread.c
index df1f0bd75e..d1a94f96da 100644
--- a/src/platforms/common/work_queue/hrt_thread.c
+++ b/src/platforms/common/work_queue/hrt_thread.c
@@ -52,6 +52,8 @@
#include <drivers/drv_hrt.h>
#include "hrt_work.h"
+#include <string.h>
+
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
diff --git a/src/platforms/posix/drivers/df_bebop_bus_wrapper/df_bebop_bus_wrapper.cpp b/src/platforms/posix/drivers/df_bebop_bus_wrapper/df_bebop_bus_wrapper.cpp
index 4daac7de24..868ce3c818 100644
--- a/src/platforms/posix/drivers/df_bebop_bus_wrapper/df_bebop_bus_wrapper.cpp
+++ b/src/platforms/posix/drivers/df_bebop_bus_wrapper/df_bebop_bus_wrapper.cpp
@@ -39,6 +39,7 @@
* motor and contol commands to the Bebop and reads its status and informations.
*/
+#include <stdlib.h>
#include <stdint.h>
#include <px4_tasks.h>
@@ -300,7 +301,7 @@ int initialize_mixers(const char *mixers_filename)
PX4_INFO("Trying to initialize mixers from config file %s", mixers_filename);
if (load_mixer_file(mixers_filename, &buf[0], sizeof(buf)) < 0) {
- warnx("can't load mixer: %s", mixers_filename);
+ PX4_ERR("can't load mixer: %s", mixers_filename);
return -1;
}
@@ -484,9 +485,6 @@ int start()
DevMgr::releaseHandle(h);
// Start the task to forward the motor control commands
- ASSERT(_task_handle == -1);
-
- /* start the task */
_task_handle = px4_task_spawn_cmd("bebop_bus_esc_main",
SCHED_DEFAULT,
SCHED_PRIORITY_MAX,
@@ -495,7 +493,7 @@ int start()
nullptr);
if (_task_handle < 0) {
- warn("task start failed");
+ PX4_ERR("task start failed");
return -1;
}
diff --git a/src/platforms/px4_defines.h b/src/platforms/px4_defines.h
index a75eaca6ce..28a25350de 100644
--- a/src/platforms/px4_defines.h
+++ b/src/platforms/px4_defines.h
@@ -77,7 +77,6 @@
* Building for NuttX or POSIX.
****************************************************************************/
-#include <platforms/px4_includes.h>
/* Main entry point */
#define PX4_MAIN_FUNCTION(_prefix) int _prefix##_task_main(int argc, char *argv[])
diff --git a/src/platforms/px4_includes.h b/src/platforms/px4_includes.h
deleted file mode 100644
index 38d5e455a4..0000000000
--- a/src/platforms/px4_includes.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/****************************************************************************
- *
- * Copyright (c) 2014 PX4 Development Team. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name PX4 nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/**
- * @file px4_includes.h
- *
- * Includes headers depending on the build target
- */
-
-#pragma once
-
-#if defined(__PX4_NUTTX)
-/*
- * Building for NuttX
- */
-#include <nuttx/config.h>
-#include <uORB/uORB.h>
-
-#include <systemlib/err.h>
-#include <parameters/param.h>
-
-#elif defined(__PX4_POSIX) && !defined(__PX4_QURT)
-/*
- * Building for Posix
- */
-#include <string.h>
-#include <assert.h>
-#include <uORB/uORB.h>
-
-#define ASSERT(x) assert(x)
-
-#include <systemlib/err.h>
-#include <parameters/param.h>
-
-#elif defined(__PX4_QURT)
-/*
- * Building for QuRT
- */
-#include <string.h>
-#include <assert.h>
-#include <uORB/uORB.h>
-
-#define ASSERT(x) assert(x)
-
-#include <systemlib/err.h>
-#include <parameters/param.h>
-
-#else
-#error "No target platform defined"
-#endif
diff --git a/src/platforms/px4_log.h b/src/platforms/px4_log.h
index b91e957c53..b0f394ee52 100644
--- a/src/platforms/px4_log.h
+++ b/src/platforms/px4_log.h
@@ -38,7 +38,6 @@
#pragma once
-
#define _PX4_LOG_LEVEL_DEBUG 0
#define _PX4_LOG_LEVEL_INFO 1
#define _PX4_LOG_LEVEL_WARN 2
diff --git a/src/systemcmds/led_control/led_control.cpp b/src/systemcmds/led_control/led_control.cpp
index 94f4e274ed..fa502fa546 100644
--- a/src/systemcmds/led_control/led_control.cpp
+++ b/src/systemcmds/led_control/led_control.cpp
@@ -39,6 +39,7 @@
#include <px4_module.h>
#include <px4_log.h>
+#include <stdlib.h>
#include <unistd.h>
#include <drivers/drv_hrt.h>
diff --git a/src/systemcmds/sd_bench/sd_bench.c b/src/systemcmds/sd_bench/sd_bench.c
index 260225ccb4..b931f86dec 100644
--- a/src/systemcmds/sd_bench/sd_bench.c
+++ b/src/systemcmds/sd_bench/sd_bench.c
@@ -44,7 +44,6 @@
#include <px4_config.h>
#include <px4_module.h>
-#include <px4_includes.h>
#include <px4_getopt.h>
#include <px4_log.h>
diff --git a/src/systemcmds/tests/test_mixer.cpp b/src/systemcmds/tests/test_mixer.cpp
index 714a91d6d9..7d0d3bd3e9 100644
--- a/src/systemcmds/tests/test_mixer.cpp
+++ b/src/systemcmds/tests/test_mixer.cpp
@@ -38,8 +38,10 @@
*/
#include <dirent.h>
+#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <math.h>
#include <px4_config.h>
#include <mixer/mixer.h>
@@ -397,13 +399,13 @@ bool MixerTest::mixerTest()
if (i != actuator_controls_s::INDEX_THROTTLE) {
if (r_page_servos[i] < r_page_servo_control_min[i]) {
- warnx("active servo < min");
+ PX4_ERR("active servo < min");
return false;
}
} else {
if (r_page_servos[i] != r_page_servo_disarmed[i]) {
- warnx("throttle output != 0 (this check assumed the IO pass mixer!)");
+ PX4_ERR("throttle output != 0 (this check assumed the IO pass mixer!)");
return false;
}
}
diff --git a/src/systemcmds/tests/test_parameters.cpp b/src/systemcmds/tests/test_parameters.cpp
index 317309fc8d..45cefe5414 100644
--- a/src/systemcmds/tests/test_parameters.cpp
+++ b/src/systemcmds/tests/test_parameters.cpp
@@ -1,6 +1,8 @@
#include <unit_test.h>
#include <px4_defines.h>
+
+#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
diff --git a/src/systemcmds/tune_control/tune_control.cpp b/src/systemcmds/tune_control/tune_control.cpp
index cd1a69a176..b47dc61d7a 100644
--- a/src/systemcmds/tune_control/tune_control.cpp
+++ b/src/systemcmds/tune_control/tune_control.cpp
@@ -41,8 +41,10 @@
#include <px4_getopt.h>
#include <px4_log.h>
+#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <errno.h>
#include <px4_module.h>
--
GitLab