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

sensors: Fix usage of offset for measurements

Browse Source
This commit is contained in:
Lorenz Meier
2014-07-11 22:09:47 +02:00
parent 899657613e
commit e3afb669ca
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/sensors/sensor_params.c
+1 -1
View File
@@ -205,7 +205,7 @@ PARAM_DEFINE_FLOAT(SENS_DPRES_OFF, 0.0f);
* *
* Pick the appropriate scaling from the datasheet. * Pick the appropriate scaling from the datasheet.
* this number defines the (linear) conversion from voltage * this number defines the (linear) conversion from voltage
* to Pascal (pa). * to Pascal (pa). For the MPXV7002DP this is 1000.
* *
* @group Sensor Calibration * @group Sensor Calibration
*/ */
src/modules/sensors/sensors.cpp
+3 -3
View File
@@ -1330,12 +1330,12 @@ Sensors::adc_poll(struct sensor_combined_s &raw)
* a valid voltage from a connected sensor. Also assume a non- * a valid voltage from a connected sensor. Also assume a non-
* zero offset from the sensor if its connected. * zero offset from the sensor if its connected.
*/ */
if (voltage > 0.4f && (_parameters.diff_pres_analog_scale > 0)) { if (voltage > 0.4f && (_parameters.diff_pres_analog_scale > 0.0f)) {
float diff_pres_pa = voltage * _parameters.diff_pres_analog_scale; float diff_pres_pa = voltage * _parameters.diff_pres_analog_scale - _parameters.diff_pres_offset_pa;
_diff_pres.timestamp = t; _diff_pres.timestamp = t;
_diff_pres.differential_pressure_pa = diff_pres_pa - _parameters.diff_pres_offset_pa; _diff_pres.differential_pressure_pa = diff_pres_pa;
_diff_pres.differential_pressure_raw_pa = diff_pres_pa; _diff_pres.differential_pressure_raw_pa = diff_pres_pa;
_diff_pres.differential_pressure_filtered_pa = diff_pres_pa; _diff_pres.differential_pressure_filtered_pa = diff_pres_pa;
_diff_pres.temperature = -1000.0f; _diff_pres.temperature = -1000.0f;