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

wrap some includes and functions for nps in #if USE_NPS

Browse Source
This commit is contained in:
Felix Ruess
2012-02-11 02:21:38 +01:00
parent 2e9faab0a7
commit f25e5df094
6 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/arch/sim/subsystems/imu/imu_aspirin_arch.c
+2
View File
@@ -33,6 +33,7 @@ void imu_periodic(void) {
} }
#if USE_NPS
#include "nps_sensors.h" #include "nps_sensors.h"
void imu_feed_gyro_accel(void) { void imu_feed_gyro_accel(void) {
@@ -56,3 +57,4 @@ void imu_feed_mag(void) {
hmc5843.data.value[IMU_MAG_Z_CHAN] = sensors.mag.value.z; hmc5843.data.value[IMU_MAG_Z_CHAN] = sensors.mag.value.z;
hmc5843.data_available = TRUE; hmc5843.data_available = TRUE;
} }
#endif
sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
+1 -1
View File
@@ -35,7 +35,7 @@ void imu_periodic(void) {
} }
#ifdef USE_NPS #if USE_NPS
#include "nps_sensors.h" #include "nps_sensors.h"
void imu_feed_gyro_accel(void) { void imu_feed_gyro_accel(void) {
sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.h
+1 -1
View File
@@ -31,7 +31,7 @@
extern int imu_overrun; extern int imu_overrun;
#ifdef USE_NPS #if USE_NPS
extern void imu_feed_gyro_accel(void); extern void imu_feed_gyro_accel(void);
extern void imu_feed_mag(void); extern void imu_feed_mag(void);
#endif #endif
sw/airborne/arch/sim/subsystems/imu/imu_crista_arch.c
+2 -1
View File
@@ -10,7 +10,7 @@ void imu_crista_arch_init(void) {
} }
#if USE_NPS
#include "nps_sensors.h" #include "nps_sensors.h"
void imu_feed_gyro_accel(void) { void imu_feed_gyro_accel(void) {
@@ -29,3 +29,4 @@ void imu_feed_mag(void) {
ami601_values[IMU_MAG_Z_CHAN] = sensors.mag.value.z; ami601_values[IMU_MAG_Z_CHAN] = sensors.mag.value.z;
ami601_status = AMI601_DATA_AVAILABLE; ami601_status = AMI601_DATA_AVAILABLE;
} }
#endif
sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c
+3 -3
View File
@@ -28,7 +28,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <caml/mlvalues.h> #include <caml/mlvalues.h>
#ifdef USE_NPS #if USE_NPS
#include "nps_radio_control.h" #include "nps_radio_control.h"
#endif #endif
@@ -55,7 +55,7 @@ value send_ppm(value unit) {
return unit; return unit;
} }
#ifdef USE_NPS #if USE_NPS
#define PPM_OF_NPS(_nps, _neutral, _min, _max) \ #define PPM_OF_NPS(_nps, _neutral, _min, _max) \
((_nps) >= 0 ? (_neutral) + (_nps) * ((_max)-(_neutral)) : (_neutral) + (_nps) * ((_neutral)- (_min))) ((_nps) >= 0 ? (_neutral) + (_nps) * ((_max)-(_neutral)) : (_neutral) + (_nps) * ((_neutral)- (_min)))
@@ -94,7 +94,7 @@ value send_ppm(value unit) {
return unit; return unit;
} }
#ifdef USE_NPS #if USE_NPS
void radio_control_feed(void) {} void radio_control_feed(void) {}
#endif #endif
sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h
+1 -1
View File
@@ -36,7 +36,7 @@
#define PPM_NB_CHANNEL RADIO_CONTROL_NB_CHANNEL #define PPM_NB_CHANNEL RADIO_CONTROL_NB_CHANNEL
#ifdef USE_NPS #if USE_NPS
extern void radio_control_feed(void); extern void radio_control_feed(void);
#endif #endif