mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-20 15:33:35 +08:00
canbootloader:Remove duplicated file from bring it back to repo
This commit is contained in:
David Sidrane
committed by
Lorenz Meier
Lorenz Meier
parent
500fe5c98c
commit
944536fa50
@@ -46,7 +46,7 @@
|
||||
#include "nvic.h"
|
||||
|
||||
#include "board.h"
|
||||
#include "px4_macros.h"
|
||||
#include <systemlib/px4_macros.h>
|
||||
#include "can.h"
|
||||
#include "timer.h"
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
#include "nvic.h"
|
||||
|
||||
#include "board.h"
|
||||
#include "px4_macros.h"
|
||||
#include <systemlib/px4_macros.h>
|
||||
#include "can.h"
|
||||
#include "timer.h"
|
||||
|
||||
|
||||
@@ -1,116 +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_macros.h
|
||||
*
|
||||
* A set of useful macros for enhanced runtime and compile time
|
||||
* error detection and warning suppression.
|
||||
*
|
||||
* Define NO_BLOAT to reduce bloat from file name inclusion.
|
||||
*
|
||||
* The arraySize() will compute the size of an array regardless
|
||||
* it's type
|
||||
*
|
||||
* INVALID_CASE(c) should be used is case statements to ferret out
|
||||
* unintended behavior
|
||||
*
|
||||
* UNUSED(var) will suppress compile time warnings of unused
|
||||
* variables
|
||||
*
|
||||
* CCASSERT(predicate) Will generate a compile time error it the
|
||||
* predicate is false
|
||||
*/
|
||||
#include <assert.h>
|
||||
|
||||
#ifndef _PX4_MACROS_H
|
||||
#define _PX4_MACROS_H
|
||||
|
||||
|
||||
#if !defined(arraySize)
|
||||
#define arraySize(a) (sizeof((a))/sizeof((a[0])))
|
||||
#endif
|
||||
|
||||
#if !defined(NO_BLOAT)
|
||||
#if defined(__BASE_FILE__)
|
||||
#define _FILE_NAME_ __BASE_FILE__
|
||||
#else
|
||||
#define _FILE_NAME_ __FILE__
|
||||
#endif
|
||||
#else
|
||||
#define _FILE_NAME_ ""
|
||||
#endif
|
||||
|
||||
#if !defined(INVALID_CASE)
|
||||
#define INVALID_CASE(c) printf("Invalid Case %d, %s:%d",(c),__BASE_FILE__,__LINE__) /* todo use PANIC */
|
||||
#endif
|
||||
|
||||
#if !defined(UNUSED)
|
||||
#define UNUSED(var) (void)(var)
|
||||
#endif
|
||||
|
||||
#if !defined(CAT)
|
||||
#if !defined(_CAT)
|
||||
#define _CAT(a, b) a ## b
|
||||
#endif
|
||||
#define CAT(a, b) _CAT(a, b)
|
||||
#endif
|
||||
|
||||
#if !defined(FREEZE_STR)
|
||||
# define FREEZE_STR(s) #s
|
||||
#endif
|
||||
|
||||
#if !defined(STRINGIFY)
|
||||
#define STRINGIFY(s) FREEZE_STR(s)
|
||||
#endif
|
||||
|
||||
#if !defined(CCASSERT)
|
||||
#if defined(static_assert)
|
||||
# define CCASSERT(predicate) static_assert(predicate, STRINGIFY(predicate))
|
||||
# else
|
||||
# define CCASSERT(predicate) _x_CCASSERT_LINE(predicate, __LINE__)
|
||||
# if !defined(_x_CCASSERT_LINE)
|
||||
# define _x_CCASSERT_LINE(predicate, line) typedef char CAT(constraint_violated_on_line_,line)[2*((predicate)!=0)-1] __attribute__ ((unused)) ;
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if !defined(DO_PRAGMA)
|
||||
# define DO_PRAGMA(x) _Pragma (#x)
|
||||
#endif
|
||||
|
||||
#if !defined(TODO)
|
||||
# define TODO(x) DO_PRAGMA(message ("TODO - " #x))
|
||||
#endif
|
||||
|
||||
#endif /* _PX4_MACROS_H */
|
||||
@@ -111,7 +111,7 @@
|
||||
|
||||
#include "bitminip.h"
|
||||
#include "can.h"
|
||||
#include "px4_macros.h"
|
||||
#include <systemlib/px4_macros.h>
|
||||
|
||||
/****************************************************************************
|
||||
* Pre-processor Definitions
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
#include <arch/irq.h>
|
||||
#include <arch/board/board.h>
|
||||
|
||||
#include "px4_macros.h"
|
||||
#include <systemlib/px4_macros.h>
|
||||
#include "timer.h"
|
||||
#include "nvic.h"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user