Browse Source

Merge remote-tracking branch 'upstream/master'

sbg
Jean Cyr 12 years ago
parent
commit
7a6a786708
  1. 5
      src/drivers/ets_airspeed/ets_airspeed.cpp
  2. 2
      src/drivers/hott_telemetry/messages.c

5
src/drivers/ets_airspeed/ets_airspeed.cpp

@ -84,8 +84,9 @@
/** /**
* The Eagle Tree Airspeed V3 cannot provide accurate reading below speeds of 15km/h. * The Eagle Tree Airspeed V3 cannot provide accurate reading below speeds of 15km/h.
* You can set this value to 12 if you want a zero reading below 15km/h.
*/ */
#define MIN_ACCURATE_DIFF_PRES_PA 12 #define MIN_ACCURATE_DIFF_PRES_PA 0
/* Measurement rate is 100Hz */ /* Measurement rate is 100Hz */
#define CONVERSION_INTERVAL (1000000 / 100) /* microseconds */ #define CONVERSION_INTERVAL (1000000 / 100) /* microseconds */
@ -463,8 +464,8 @@ ETSAirspeed::collect()
uint16_t diff_pres_pa = val[1] << 8 | val[0]; uint16_t diff_pres_pa = val[1] << 8 | val[0];
// XXX move the parameter read out of the driver.
param_get(param_find("SENS_DPRES_OFF"), &_diff_pres_offset); param_get(param_find("SENS_DPRES_OFF"), &_diff_pres_offset);
if (diff_pres_pa < _diff_pres_offset + MIN_ACCURATE_DIFF_PRES_PA) { if (diff_pres_pa < _diff_pres_offset + MIN_ACCURATE_DIFF_PRES_PA) {
diff_pres_pa = 0; diff_pres_pa = 0;

2
src/drivers/hott_telemetry/messages.c

@ -108,7 +108,7 @@ build_eam_response(uint8_t *buffer, size_t *size)
memset(&airspeed, 0, sizeof(airspeed)); memset(&airspeed, 0, sizeof(airspeed));
orb_copy(ORB_ID(airspeed), airspeed_sub, &airspeed); orb_copy(ORB_ID(airspeed), airspeed_sub, &airspeed);
uint16_t speed = (uint16_t)(airspeed.indicated_airspeed_m_s); uint16_t speed = (uint16_t)(airspeed.indicated_airspeed_m_s * 3.6f);
msg.speed_L = (uint8_t)speed & 0xff; msg.speed_L = (uint8_t)speed & 0xff;
msg.speed_H = (uint8_t)(speed >> 8) & 0xff; msg.speed_H = (uint8_t)(speed >> 8) & 0xff;

Loading…
Cancel
Save