fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-03 11:38:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

adc: add support for multiple sensor voltage channels

Browse Source
This commit is contained in:
Beat Küng
2021-01-15 10:57:20 -05:00
committed by Daniel Agar
parent e2337a34eb
commit ade3871bee
3 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/adc/board_adc/ADC.cpp
+12 -6
View File
@@ -198,7 +198,7 @@ void ADC::update_system_power(hrt_abstime now)
int cnt = 1;
/* HW provides both ADC_SCALED_V5_SENSE and ADC_SCALED_V3V3_SENSORS_SENSE */
# if defined(ADC_SCALED_V5_SENSE) && defined(ADC_SCALED_V3V3_SENSORS_SENSE)
cnt++;
cnt += ADC_SCALED_V3V3_SENSORS_COUNT;
# endif
for (unsigned i = 0; i < _channel_count; i++) {
@@ -213,11 +213,17 @@ void ADC::update_system_power(hrt_abstime now)
# endif
# if defined(ADC_SCALED_V3V3_SENSORS_SENSE)
{
if (_samples[i].am_channel == ADC_SCALED_V3V3_SENSORS_SENSE) {
// it is 2:1 scaled
system_power.voltage3v3_v = _samples[i].am_data * (ADC_3V3_SCALE * (3.3f / px4_arch_adc_dn_fullcount()));
system_power.v3v3_valid = 1;
cnt--;
const int sensors_channels[ADC_SCALED_V3V3_SENSORS_COUNT] = ADC_SCALED_V3V3_SENSORS_SENSE;
static_assert(sizeof(system_power.sensors3v3) / sizeof(system_power.sensors3v3[0]) >= ADC_SCALED_V3V3_SENSORS_COUNT,
"array too small");
for (int j = 0; j < ADC_SCALED_V3V3_SENSORS_COUNT; ++j) {
if (_samples[i].am_channel == sensors_channels[j]) {
// it is 2:1 scaled
system_power.sensors3v3[j] = _samples[i].am_data * (ADC_3V3_SCALE * (3.3f / px4_arch_adc_dn_fullcount()));
system_power.sensors3v3_valid |= 1 << j;
cnt--;
}
}
}