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

px4io: handle errors from adc_measure() 

don't update the voltage/current values on error
This commit is contained in:
Andrew Tridgell 2013-05-02 21:29:30 +10:00
parent d7e04a3619
commit 5b75519925
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/modules/px4iofirmware/registers.c
View File

@ -506,10 +506,12 @@ registers_get(uint8_t page, uint8_t offset, uint16_t **values, unsigned *num_val
* Intercept corrected for best results @ 12V. * Intercept corrected for best results @ 12V.
*/ */
unsigned counts = adc_measure(ADC_VBATT); unsigned counts = adc_measure(ADC_VBATT);
unsigned mV = (4150 + (counts * 46)) / 10 - 200; if (counts != 0xffff) {
unsigned corrected = (mV * r_page_setup[PX4IO_P_SETUP_VBATT_SCALE]) / 10000; unsigned mV = (4150 + (counts * 46)) / 10 - 200;
unsigned corrected = (mV * r_page_setup[PX4IO_P_SETUP_VBATT_SCALE]) / 10000;
r_page_status[PX4IO_P_STATUS_VBATT] = corrected; r_page_status[PX4IO_P_STATUS_VBATT] = corrected;
}
} }
/* PX4IO_P_STATUS_IBATT */ /* PX4IO_P_STATUS_IBATT */
@ -521,7 +523,10 @@ registers_get(uint8_t page, uint8_t offset, uint16_t **values, unsigned *num_val
FMU sort it out, with user selectable FMU sort it out, with user selectable
configuration for their sensor configuration for their sensor
*/ */
r_page_status[PX4IO_P_STATUS_IBATT] = adc_measure(ADC_IN5); unsigned counts = adc_measure(ADC_IN5);
if (counts != 0xffff) {
r_page_status[PX4IO_P_STATUS_IBATT] = counts;
}
} }
SELECT_PAGE(r_page_status); SELECT_PAGE(r_page_status);