diff --git a/sw/airborne/dpicco.c b/sw/airborne/dpicco.c index 7d59a8208d..6b5bd80536 100644 --- a/sw/airborne/dpicco.c +++ b/sw/airborne/dpicco.c @@ -17,6 +17,9 @@ uint8_t dpicco_status; uint16_t dpicco_val[DPICCO_NB_SENSOR]; +float dpicco_humid; +float dpicco_temp; + #define DPICCO_SLAVE_ADDR 0xF0 @@ -39,7 +42,7 @@ void dpicco_periodic( void ) { dpicco_i2c_done = FALSE; i2c_receive(DPICCO_SLAVE_ADDR, 4, &dpicco_i2c_done); - LED_ON(2); +// LED_ON(2); } else if (dpicco_status == DPICCO_MEASURING_RD) { /* get data */ @@ -50,7 +53,7 @@ void dpicco_periodic( void ) { dpicco_i2c_done = FALSE; i2c_receive(DPICCO_SLAVE_ADDR, 4, &dpicco_i2c_done); - LED_TOGGLE(2); +// LED_TOGGLE(2); } } } diff --git a/sw/airborne/dpicco.h b/sw/airborne/dpicco.h index d2d4318029..0dcbdfe622 100644 --- a/sw/airborne/dpicco.h +++ b/sw/airborne/dpicco.h @@ -7,11 +7,20 @@ extern uint16_t dpicco_val[DPICCO_NB_SENSOR]; +extern float dpicco_humid; +extern float dpicco_temp; + #define DPICCO_IDLE 0 #define DPICCO_SETTINGS 1 #define DPICCO_MEASURING_WR 2 #define DPICCO_MEASURING_RD 3 +#define DPICCO_HUMID_MAX 0x7FFF +#define DPICCO_HUMID_RANGE 100.0 + +#define DPICCO_TEMP_MAX 0x7FFF +#define DPICCO_TEMP_RANGE 165.0 +#define DPICCO_TEMP_OFFS -40.0 extern uint8_t dpicco_status;