diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-31 08:51:31 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-31 08:51:31 +0200 |
| commit | 87af70b07a27f8eadd672582563e19be0cafe951 (patch) | |
| tree | 85df699277cca239d79015c76421651803840350 /src/drivers | |
| parent | 5f79baaafa3d9388b77946baf9eb28e94ccf261d (diff) | |
| parent | 078608f87e628162ad6303d2aa41a0b668f6a166 (diff) | |
| download | px4-firmware-87af70b07a27f8eadd672582563e19be0cafe951.tar.gz px4-firmware-87af70b07a27f8eadd672582563e19be0cafe951.tar.bz2 px4-firmware-87af70b07a27f8eadd672582563e19be0cafe951.zip | |
Merge pull request #772 from PX4/paul_estimator_numeric
Paul's Estimator
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/ets_airspeed/ets_airspeed.cpp | 5 | ||||
| -rw-r--r-- | src/drivers/stm32/adc/adc.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/drivers/ets_airspeed/ets_airspeed.cpp b/src/drivers/ets_airspeed/ets_airspeed.cpp index d27ab9727..d873a1132 100644 --- a/src/drivers/ets_airspeed/ets_airspeed.cpp +++ b/src/drivers/ets_airspeed/ets_airspeed.cpp @@ -176,11 +176,14 @@ ETSAirspeed::collect() _max_differential_pressure_pa = diff_pres_pa; } - // XXX we may want to smooth out the readings to remove noise. differential_pressure_s report; report.timestamp = hrt_absolute_time(); report.error_count = perf_event_count(_comms_errors); report.differential_pressure_pa = (float)diff_pres_pa; + + // XXX we may want to smooth out the readings to remove noise. + report.differential_pressure_filtered_pa = (float)diff_pres_pa; + report.temperature = -1000.0f; report.voltage = 0; report.max_differential_pressure_pa = _max_differential_pressure_pa; diff --git a/src/drivers/stm32/adc/adc.cpp b/src/drivers/stm32/adc/adc.cpp index 00e46d6b8..0b8a275e6 100644 --- a/src/drivers/stm32/adc/adc.cpp +++ b/src/drivers/stm32/adc/adc.cpp @@ -341,7 +341,7 @@ test(void) err(1, "can't open ADC device"); for (unsigned i = 0; i < 50; i++) { - adc_msg_s data[10]; + adc_msg_s data[12]; ssize_t count = read(fd, data, sizeof(data)); if (count < 0) |