Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-08 17:08:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_ChibiOS: fix voltage sensor connected to fmu adc

Browse Source
This commit is contained in:
Alexey Kozin 2019-06-23 23:05:28 +03:00 committed by Andrew Tridgell
parent e36231d547
commit e5988f7153
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/AP_HAL_ChibiOS/AnalogIn.cpp
View File

@ -297,6 +297,11 @@ void AnalogIn::_timer_tick(void)
// voltage_average_ratiometric() // voltage_average_ratiometric()
_board_voltage = buf_adc[i] * pin_config[i].scaling; _board_voltage = buf_adc[i] * pin_config[i].scaling;
} }
#endif
#ifdef FMU_SERVORAIL_ADC_CHAN
if (pin_config[i].channel == FMU_SERVORAIL_ADC_CHAN) {
_servorail_voltage = buf_adc[i] * pin_config[i].scaling;
}
#endif #endif
} }

3
libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py
View File

@ -1204,6 +1204,9 @@ def write_ADC_config(f):
if p.label == 'VDD_5V_SENS': if p.label == 'VDD_5V_SENS':
f.write('#define ANALOG_VCC_5V_PIN %u\n' % chan) f.write('#define ANALOG_VCC_5V_PIN %u\n' % chan)
f.write('#define HAL_HAVE_BOARD_VOLTAGE 1\n') f.write('#define HAL_HAVE_BOARD_VOLTAGE 1\n')
if p.label == 'FMU_SERVORAIL_VCC_SENS':
f.write('#define FMU_SERVORAIL_ADC_CHAN %u\n' % chan)
f.write('#define HAL_HAVE_SERVO_VOLTAGE 1\n')
adc_chans.append((chan, scale, p.label, p.portpin)) adc_chans.append((chan, scale, p.label, p.portpin))
adc_chans = sorted(adc_chans) adc_chans = sorted(adc_chans)
vdd = get_config('STM32_VDD') vdd = get_config('STM32_VDD')