Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-30 11:37:06 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

[baro] Fix Bebop barometer configuration (#2849)

Browse Source
This commit is contained in:
Freek van Tienen
2022-03-26 10:25:58 +01:00
committed by GitHub
parent 0001342ec6
commit 8063838898
6 changed files with 4 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/modules/boards/bebop.xml
+1 -1
View File
@@ -11,7 +11,7 @@
</dep>
<makefile target="!sim|nps|fbw">
<configure name="MS5611_I2C_DEV" value="i2c1"/>
<define name="BARO_BOARD" value="BARO_MS5611_I2C"/>
<define name="MS5611_TYPE_MS5607" value="TRUE"/>
</makefile>
</module>
conf/modules/boards/bebop2.xml
+1 -1
View File
@@ -11,7 +11,7 @@
</dep>
<makefile target="!sim|nps|fbw">
<configure name="MS5611_I2C_DEV" value="i2c1"/>
<define name="BARO_BOARD" value="BARO_MS5611_I2C"/>
<define name="MS5611_TYPE_MS5607" value="TRUE"/>
</makefile>
</module>
conf/modules/boards/disco.xml
+1
View File
@@ -10,6 +10,7 @@
<depends>baro_ms5611_i2c</depends>
</dep>
<makefile target="!sim|nps|fbw">
<define name="MS5611_TYPE_MS5607" value="TRUE"/>
</makefile>
</module>
sw/airborne/boards/bebop/baro_board.h
-41
View File
@@ -1,41 +0,0 @@
/*
* Copyright (C) 2014 Freek van Tienen <freek.v.tienen@gmail.com>
*
* This file is part of Paparazzi.
*
* Paparazzi is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* Paparazzi is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Paparazzi; see the file COPYING. If not, write to
* the Free Software Foundation, 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/**
* @file boards/bebop/baro_board.h
* Paparazzi Bebop Baro Sensor implementation for the MS5607.
* Actually uses the MS5611 driver, but sets BB_MS5611_TYPE_MS5607 to TRUE.
*/
#ifndef BOARDS_BEBOP_BARO_H
#define BOARDS_BEBOP_BARO_H
#define BB_MS5611_TYPE_MS5607 TRUE
// only for printing the baro type during compilation
#ifndef BARO_BOARD
#define BARO_BOARD BARO_MS5611_I2C
#endif
extern void baro_event(void);
#define BaroEvent baro_event
#endif /* BOARDS_BEBOP_BARO_H */
sw/airborne/boards/disco/baro_board.h
-41
View File
@@ -1,41 +0,0 @@
/*
* Copyright (C) 2018 OpenUAS <info@openuas.org>
*
* This file is part of Paparazzi.
*
* Paparazzi is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* Paparazzi is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Paparazzi; see the file COPYING. If not, write to
* the Free Software Foundation, 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/**
* @file boards/disco/baro_board.h
* Paparazzi Disco Baro Sensor implementation for the MS5607.
* Actually uses the MS5611 driver, but sets BB_MS5611_TYPE_MS5607 to TRUE.
*/
#ifndef BOARDS_DISCO_BARO_H
#define BOARDS_DISCO_BARO_H
#define BB_MS5611_TYPE_MS5607 TRUE
// only for printing the baro type during compilation
#ifndef BARO_BOARD
#define BARO_BOARD BARO_MS5611_I2C
#endif
extern void baro_event(void);
#define BaroEvent baro_event
#endif /* BOARDS_DISCO_BARO_H */
sw/airborne/modules/sensors/baro_ms5611_i2c.c
+1 -1
View File
@@ -50,7 +50,7 @@
#ifndef MS5611_TYPE_MS5607
#define MS5611_TYPE_MS5607 FALSE
#endif
PRINT_CONFIG_VAR(BB_MS5611_TYPE_MS5607)
PRINT_CONFIG_VAR(MS5611_TYPE_MS5607)
struct Ms5611_I2c baro_ms5611;