fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-19 09:43:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'px4/paul_estimator_numeric' into test_bottle_drop_paul

Browse Source 
Conflicts:
	src/modules/uORB/topics/vehicle_command.h
This commit is contained in:
Julian Oes
2014-03-30 13:40:06 +02:00
parent 1d75f3eb8a 60728bb6a6
commit 5d3660b6a9
43 changed files with 4230 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/ets_airspeed/ets_airspeed.cpp
+4 -1
View File
@@ -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;
src/drivers/stm32/adc/adc.cpp
+1 -1
View File
@@ -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)