Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-02 13:27:32 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:paparazzi/paparazzi into hardware_test

Browse Source
This commit is contained in:
Bernard Davison
2012-02-15 14:28:11 +11:00
parent 840d8c5836 d3d897d171
commit 7955766aa4
10 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/arch/lpc21/subsystems/radio_control/ppm_arch.h
+2
View File
@@ -28,6 +28,8 @@
#include "LPC21xx.h" #include "LPC21xx.h"
#include BOARD_CONFIG #include BOARD_CONFIG
#include "mcu_periph/sys_time.h"
/** /**
* On tiny (and booz) the ppm counter is running at the same speed as * On tiny (and booz) the ppm counter is running at the same speed as
* the systic counter. There is no reason for this to be true. * the systic counter. There is no reason for this to be true.
sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.h
+2
View File
@@ -29,6 +29,8 @@
#ifndef PPM_ARCH_H #ifndef PPM_ARCH_H
#define PPM_ARCH_H #define PPM_ARCH_H
#include "mcu_periph/sys_time.h"
/** /**
* On tiny (and booz) the ppm counter is running at the same speed as * On tiny (and booz) the ppm counter is running at the same speed as
* the systic counter. There is no reason for this to be true. * the systic counter. There is no reason for this to be true.
sw/airborne/boards/booz_1.0.h
+1 -1
View File
@@ -142,7 +142,7 @@
#define PWM1_PINSEL_BIT 14 #define PWM1_PINSEL_BIT 14
#define BOARD_HAS_BARO #define BOARD_HAS_BARO 1
/* /*
* Modem * Modem
sw/airborne/boards/lisa_l_1.0.h
+1 -1
View File
@@ -37,6 +37,6 @@
#define BOARD_ADC_CHANNEL_3 ADC_Channel_0 #define BOARD_ADC_CHANNEL_3 ADC_Channel_0
#define BOARD_ADC_CHANNEL_4 ADC_Channel_15 #define BOARD_ADC_CHANNEL_4 ADC_Channel_15
#define BOARD_HAS_BARO #define BOARD_HAS_BARO 1
#endif /* CONFIG_LISA_L_1_0_H */ #endif /* CONFIG_LISA_L_1_0_H */
sw/airborne/boards/lisa_m_1.0.h
+1 -1
View File
@@ -54,7 +54,7 @@
#define BOARD_ADC_CHANNEL_3 ADC_Channel_14 #define BOARD_ADC_CHANNEL_3 ADC_Channel_14
#define BOARD_ADC_CHANNEL_4 ADC_Channel_11 #define BOARD_ADC_CHANNEL_4 ADC_Channel_11
#define BOARD_HAS_BARO #define BOARD_HAS_BARO 1
#define USE_OPENCM3 1 #define USE_OPENCM3 1
sw/airborne/boards/navgo_1.0.h
+1 -1
View File
@@ -76,6 +76,6 @@
#define PWM1_PINSEL_VAL 0x02 #define PWM1_PINSEL_VAL 0x02
#define PWM1_PINSEL_BIT 14 #define PWM1_PINSEL_BIT 14
#define BOARD_HAS_BARO #define BOARD_HAS_BARO 1
#endif /* CONFIG_NAVGO_V1_0_H */ #endif /* CONFIG_NAVGO_V1_0_H */
sw/airborne/boards/umarim_1.0.h
+1 -1
View File
@@ -99,6 +99,6 @@
#define SPI1_DRDY_EINT 0 #define SPI1_DRDY_EINT 0
#define SPI1_DRDY_VIC_IT VIC_EINT0 #define SPI1_DRDY_VIC_IT VIC_EINT0
#define BOARD_HAS_BARO #define BOARD_HAS_BARO 1
#endif /* CONFIG_UMARIM_V1_0_H */ #endif /* CONFIG_UMARIM_V1_0_H */
sw/airborne/firmwares/fixedwing/ap_downlink.h
+3 -1
View File
@@ -245,7 +245,9 @@ extern uint8_t telemetry_mode_Ap_DefaultChannel;
#define PERIODIC_SEND_SCP_STATUS(_trans, _dev) {} #define PERIODIC_SEND_SCP_STATUS(_trans, _dev) {}
#endif #endif
#ifdef BOARD_HAS_BARO //FIXME: we need a better switch here...
#if BOARD_HAS_BARO && USE_BARO_AS_ALTIMETER
#include "subsystems/sensors/baro.h"
#define PERIODIC_SEND_BARO_RAW(_trans, _dev) { \ #define PERIODIC_SEND_BARO_RAW(_trans, _dev) { \
DOWNLINK_SEND_BARO_RAW(_trans, _dev, \ DOWNLINK_SEND_BARO_RAW(_trans, _dev, \
&baro.absolute, \ &baro.absolute, \
sw/airborne/firmwares/fixedwing/main_ap.c
+1 -1
View File
@@ -69,7 +69,7 @@
#include "subsystems/datalink/datalink.h" #include "subsystems/datalink/datalink.h"
#include "subsystems/settings.h" #include "subsystems/settings.h"
#include "subsystems/datalink/xbee.h" #include "subsystems/datalink/xbee.h"
#include "ap_downlink.h" #include "firmwares/fixedwing/ap_downlink.h"
// modules & settings // modules & settings
#include "generated/modules.h" #include "generated/modules.h"
sw/airborne/subsystems/imu/imu_b2.h
+1 -1
View File
@@ -169,7 +169,7 @@
} \ } \
} }
#elif defined IMU_B2_MAG_TYPE && IMU_B2_MAG_TYPE == IMU_B2_MAG_HMC5843 #elif defined IMU_B2_MAG_TYPE && IMU_B2_MAG_TYPE == IMU_B2_MAG_HMC5843
include "peripherals/hmc5843.h" #include "peripherals/hmc5843.h"
#define foo_handler() {} #define foo_handler() {}
#define ImuMagEvent(_mag_handler) { \ #define ImuMagEvent(_mag_handler) { \
MagEvent(foo_handler); \ MagEvent(foo_handler); \