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

WIP Digital PM Support

Browse Source
This commit is contained in:
David Sidrane
2019-06-26 14:34:02 -04:00
committed by Daniel Agar
parent 1cf4a2d953
commit 6fcc4cc6a2
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/boards/common/board_common.h
+5 -3
View File
@@ -178,9 +178,11 @@
# define BOARD_BATT_I_LIST {ADC_BATTERY_CURRENT_CHANNEL}
# define BOARD_BRICK_VALID_LIST {BOARD_ADC_BRICK_VALID}
#elif BOARD_NUMBER_BRICKS == 2
# define BOARD_BATT_V_LIST {ADC_BATTERY1_VOLTAGE_CHANNEL, ADC_BATTERY2_VOLTAGE_CHANNEL}
# define BOARD_BATT_I_LIST {ADC_BATTERY1_CURRENT_CHANNEL, ADC_BATTERY2_CURRENT_CHANNEL}
# define BOARD_BRICK_VALID_LIST {BOARD_ADC_BRICK1_VALID, BOARD_ADC_BRICK2_VALID}
# if !defined(BOARD_NUMBER_DIGITAL_BRICKS)
# define BOARD_BATT_V_LIST {ADC_BATTERY1_VOLTAGE_CHANNEL, ADC_BATTERY2_VOLTAGE_CHANNEL}
# define BOARD_BATT_I_LIST {ADC_BATTERY1_CURRENT_CHANNEL, ADC_BATTERY2_CURRENT_CHANNEL}
# endif
#define BOARD_BRICK_VALID_LIST {BOARD_ADC_BRICK1_VALID, BOARD_ADC_BRICK2_VALID}
#elif BOARD_NUMBER_BRICKS == 3
# define BOARD_BATT_V_LIST {ADC_BATTERY1_VOLTAGE_CHANNEL, ADC_BATTERY2_VOLTAGE_CHANNEL, ADC_BATTERY3_VOLTAGE_CHANNEL}
# define BOARD_BATT_I_LIST {ADC_BATTERY1_CURRENT_CHANNEL, ADC_BATTERY2_CURRENT_CHANNEL, ADC_BATTERY3_CURRENT_CHANNEL}
src/drivers/stm32/adc/adc.cpp
+3 -1
View File
@@ -440,7 +440,7 @@ ADC::update_system_power(hrt_abstime now)
#endif
/* The valid signals (HW dependent) are associated with each brick */
#if !defined(BOARD_NUMBER_DIGITAL_BRICKS)
bool valid_chan[BOARD_NUMBER_BRICKS] = BOARD_BRICK_VALID_LIST;
system_power.brick_valid = 0;
@@ -448,6 +448,8 @@ ADC::update_system_power(hrt_abstime now)
system_power.brick_valid |= valid_chan[b] ? 1 << b : 0;
}
#endif
system_power.servo_valid = BOARD_ADC_SERVO_VALID;
// OC pins are active low