yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 01:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

sensors: use the empty sensor init for RPi as well

Browse Source 
The RPi build is based on the same DriverFramework base like the QURT
build, therefore it should use the same empty sensor init function.
This commit is contained in:
Julian Oes
2016-04-28 16:13:29 +02:00
committed by Lorenz Meier
parent 1827f78ab7
commit 08f88d006f
3 changed files with 18 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/sensors/CMakeLists.txt
View File

@@ -30,14 +30,6 @@
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
set(SENSORS_SRCS sensors.cpp)
if (${OS} STREQUAL "qurt")
list(APPEND SENSORS_SRCS
sensors_init_qurt.cpp)
else()
list(APPEND SENSORS_SRCS
sensors_init.cpp)
endif()
px4_add_module(
MODULE modules__sensors
@@ -48,7 +40,9 @@ px4_add_module(
-Wno-type-limits
-O3
SRCS
${SENSORS_SRCS}
sensors.cpp
sensors_init.cpp
DEPENDS
platforms__common
)

15
src/modules/sensors/sensors_init.cpp
View File

@@ -52,6 +52,20 @@
using namespace DriverFramework;
#if defined(__PX4_QURT) || defined(__RPI2)
// Sensor initialization is performed automatically when the QuRT sensor drivers
// are loaded.
// The same is true for the Raspberry Pi.
int
sensors_init(void)
{
return 0;
}
#else
/* oddly, ERROR is not defined for c++ */
#ifdef ERROR
# undef ERROR
@@ -203,3 +217,4 @@ baro_init()
return OK;
}
#endif

50
src/modules/sensors/sensors_init_qurt.cpp
View File

@@ -1,50 +0,0 @@
/****************************************************************************
*
* Copyright (c) 2016 James Wilson. 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 sensors_init_qurt.cpp
*
* Sensor initialization code, used only in QuRT platform builds.
*
* @author James Wilson <jywilson99@hotmail.com>
*/
#include "sensors_init.h"
int
sensors_init(void)
{
// Sensor initialization is performed automatically when the QuRT sensor drivers
// are loaded.
return 0;
}