dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

analog_measurement: Scale values by ADC ref voltage

This commit is contained in:
JacobCrabill 2020-08-28 08:58:50 -07:00
parent e4b28ee98a
commit 49d241245e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/analog_measurement/analog_measurement.cpp
View File

@ -71,23 +71,25 @@ AnalogMeasurement::Run()
int adc4_unit = _adc4_unit.get(); int adc4_unit = _adc4_unit.get();
// TODO: determine size. Only read first 4 ADCs for now. // TODO: determine size. Only read first 4 ADCs for now.
const float adc_raw_scale = report.v_ref / (float)report.resolution;
if (adc1_unit) { if (adc1_unit) {
measurement.values[0] = report.raw_data[0] *_adc1_scale.get(); measurement.values[0] = report.raw_data[0] * adc_raw_scale * _adc1_scale.get();
measurement.unit_type[0] = adc1_unit; measurement.unit_type[0] = adc1_unit;
} }
if (adc2_unit) { if (adc2_unit) {
measurement.values[1] = report.raw_data[1] *_adc2_scale.get(); measurement.values[1] = report.raw_data[1] * adc_raw_scale * _adc2_scale.get();
measurement.unit_type[1] = adc2_unit; measurement.unit_type[1] = adc2_unit;
} }
if (adc3_unit) { if (adc3_unit) {
measurement.values[2] = report.raw_data[2] *_adc3_scale.get(); measurement.values[2] = report.raw_data[2] * adc_raw_scale * _adc3_scale.get();
measurement.unit_type[2] = adc3_unit; measurement.unit_type[2] = adc3_unit;
} }
if (adc4_unit) { if (adc4_unit) {
measurement.values[3] = report.raw_data[3] *_adc4_scale.get(); measurement.values[3] = report.raw_data[3] * adc_raw_scale * _adc4_scale.get();
measurement.unit_type[3] = adc4_unit; measurement.unit_type[3] = adc4_unit;
} }
@ -148,4 +150,4 @@ scale factor ADC[N]_SCALE.
int analog_measurement_main(int argc, char *argv[]) int analog_measurement_main(int argc, char *argv[])
{ {
return AnalogMeasurement::main(argc, argv); return AnalogMeasurement::main(argc, argv);
} }