add DOWNLINK_DEVICE for transparent telemetry

This commit is contained in:
Martin Mueller
2010-12-13 09:04:10 +01:00
parent a5ff37bce4
commit 140dac3847
15 changed files with 60 additions and 1 deletions
+4
View File
@@ -18,6 +18,10 @@ uint16_t adc_generic_val2;
#define ADC_CHANNEL_GENERIC_NB_SAMPLES DEFAULT_AV_NB_SAMPLE
#endif
#ifndef DOWNLINK_DEVICE
#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
#endif
#ifdef ADC_CHANNEL_GENERIC1
static struct adc_buf buf_generic1;
#endif
+4
View File
@@ -43,6 +43,10 @@ float dust_gp2y_density_f;
struct i2c_transaction gp2y_trans;
#ifndef DOWNLINK_DEVICE
#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
#endif
#ifndef GP2Y_I2C_DEV
#define GP2Y_I2C_DEV i2c0
#endif
+4
View File
@@ -13,6 +13,10 @@
#include "messages.h"
#include "downlink.h"
#ifndef DOWNLINK_DEVICE
#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
#endif
#ifndef DPICCO_I2C_DEV
#define DPICCO_I2C_DEV i2c0
#endif
+4
View File
@@ -36,6 +36,10 @@
#include "messages.h"
#include "downlink.h"
#ifndef DOWNLINK_DEVICE
#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
#endif
#ifndef ADC_CHANNEL_HUMID_HIH
#define ADC_CHANNEL_HUMID_HIH ADC_3
#endif
+4
View File
@@ -15,6 +15,10 @@
#include "led.h"
#ifndef DOWNLINK_DEVICE
#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
#endif
uint16_t humidsht, tempsht;
float fhumidsht, ftempsht;
bool_t humid_sht_available;
+4
View File
@@ -38,6 +38,10 @@
#include "messages.h"
#include "downlink.h"
#ifndef DOWNLINK_DEVICE
#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
#endif
#ifndef MLX_I2C_DEV
#define MLX_I2C_DEV i2c0
#endif
+4
View File
@@ -43,6 +43,10 @@
#define ADC_CHANNEL_LIGHT_NB_SAMPLES 16
#endif
#ifndef DOWNLINK_DEVICE
#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
#endif
uint16_t adc_light_temt;
static struct adc_buf buf_light_temt;
+4
View File
@@ -37,6 +37,10 @@
#include "messages.h"
#include "downlink.h"
#ifndef DOWNLINK_DEVICE
#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
#endif
uint8_t lm75_meas_started;
struct i2c_transaction lm75_trans;
+4 -1
View File
@@ -38,6 +38,10 @@
float ftmd_temperature;
struct i2c_transaction tmd_trans;
#ifndef DOWNLINK_DEVICE
#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
#endif
#ifndef TEMOD_I2C_DEV
#define TEMOD_I2C_DEV i2c0
#endif
@@ -48,7 +52,6 @@ struct i2c_transaction tmd_trans;
#define TEMOD_SLAVE_ADDR 0xF0
void temod_init(void) {
tmd_trans.status = I2CTransDone;
}
+4
View File
@@ -37,6 +37,10 @@
#include "messages.h"
#include "downlink.h"
#ifndef DOWNLINK_DEVICE
#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
#endif
uint8_t tmp_meas_started;
float ftmp_temperature;
struct i2c_transaction tmp_trans;
@@ -65,6 +65,10 @@
#define AIRSPEED_ETS_I2C_DEV i2c0
#endif
#ifndef DOWNLINK_DEVICE
#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
#endif
// Global variables
uint16_t airspeed_ets_raw;
uint16_t airspeed_ets_offset;
+4
View File
@@ -34,6 +34,10 @@
#include "downlink.h"
#include "led.h"
#ifndef DOWNLINK_DEVICE
#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
#endif
#ifndef SRF08_I2C_DEV
#define SRF08_I2C_DEV i2c0
#endif
+4
View File
@@ -38,6 +38,10 @@
#include "messages.h"
#include "downlink.h"
#ifndef DOWNLINK_DEVICE
#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
#endif
#ifndef SENSOR_SYNC_SEND
#warning set SENSOR_SYNC_SEND to use baro_bmp
#endif
+4
View File
@@ -18,6 +18,10 @@
#warning set SENSOR_SYNC_SEND to use baro_scp
#endif
#ifndef DOWNLINK_DEVICE
#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
#endif
#define STA_UNINIT 0
#define STA_INITIALISING 1
#define STA_IDLE 2
@@ -22,6 +22,10 @@
#warning set SENSOR_SYNC_SEND to use baro_scp_i2c
#endif
#ifndef DOWNLINK_DEVICE
#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
#endif
uint8_t baro_scp_status;
uint32_t baro_scp_pressure;
uint16_t baro_scp_temperature;