delete px4_includes.h header and update boards/ to use syslog

This commit is contained in:
Daniel Agar
2019-01-22 11:23:29 -05:00
parent 376e078c24
commit 2ffb49b734
86 changed files with 190 additions and 563 deletions
+3 -1
View File
@@ -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;
@@ -52,6 +52,8 @@
#include <drivers/drv_hrt.h>
#include "hrt_work.h"
#include <string.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
@@ -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;
}
-1
View File
@@ -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[])
-80
View File
@@ -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
-1
View File
@@ -38,7 +38,6 @@
#pragma once
#define _PX4_LOG_LEVEL_DEBUG 0
#define _PX4_LOG_LEVEL_INFO 1
#define _PX4_LOG_LEVEL_WARN 2