Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-11 02:18:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Battery: fixed parameter name and default voltage ratio

Browse Source 
also setup SITL with right pins
This commit is contained in:
Andrew Tridgell 2013-09-30 15:35:19 +10:00 committed by Randy Mackay
parent c7df0eaf2a
commit 366d73124a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_BattMonitor/AP_BattMonitor.cpp
View File

@ -29,7 +29,7 @@ const AP_Param::GroupInfo AP_BattMonitor::var_info[] PROGMEM = {
// @DisplayName: Voltage Multiplier // @DisplayName: Voltage Multiplier
// @Description: Used to convert the voltage of the voltage sensing pin (BATT_VOLT_PIN) to the actual battery's voltage (pin_voltage * VOLT_MULT). For the 3DR Power brick on APM2 or Pixhawk, this should be set to 10.1. For the PX4 using the PX4IO power supply this should be set to 1. // @Description: Used to convert the voltage of the voltage sensing pin (BATT_VOLT_PIN) to the actual battery's voltage (pin_voltage * VOLT_MULT). For the 3DR Power brick on APM2 or Pixhawk, this should be set to 10.1. For the PX4 using the PX4IO power supply this should be set to 1.
// @User: Advanced // @User: Advanced
AP_GROUPINFO("BATT_VOLT_MULT", 3, AP_BattMonitor, _volt_multiplier, AP_BATT_VOLTDIVIDER_DEFAULT), AP_GROUPINFO("VOLT_MULT", 3, AP_BattMonitor, _volt_multiplier, AP_BATT_VOLTDIVIDER_DEFAULT),
// @Param: BATT_APM_PERVOLT // @Param: BATT_APM_PERVOLT
// @DisplayName: Apms per volt // @DisplayName: Apms per volt

14
libraries/AP_BattMonitor/AP_BattMonitor.h
View File

@ -23,7 +23,7 @@
#elif CONFIG_HAL_BOARD == HAL_BOARD_APM2 #elif CONFIG_HAL_BOARD == HAL_BOARD_APM2
# define AP_BATT_VOLT_PIN 13 // APM2.5/2.6 with 3dr power module # define AP_BATT_VOLT_PIN 13 // APM2.5/2.6 with 3dr power module
# define AP_BATT_CURR_PIN 12 # define AP_BATT_CURR_PIN 12
# define AP_BATT_VOLTDIVIDER_DEFAULT 10.0 # define AP_BATT_VOLTDIVIDER_DEFAULT 10.1
# define AP_BATT_CURR_AMP_PERVOLT_DEFAULT 0 # define AP_BATT_CURR_AMP_PERVOLT_DEFAULT 0
#elif CONFIG_HAL_BOARD == HAL_BOARD_FLYMAPLE #elif CONFIG_HAL_BOARD == HAL_BOARD_FLYMAPLE
// Flymaple board pin 20 is connected to the external battery supply // Flymaple board pin 20 is connected to the external battery supply
@ -37,17 +37,17 @@
#elif CONFIG_HAL_BOARD == HAL_BOARD_PX4 #elif CONFIG_HAL_BOARD == HAL_BOARD_PX4
# define AP_BATT_VOLT_PIN 2 # define AP_BATT_VOLT_PIN 2
# define AP_BATT_CURR_PIN 3 # define AP_BATT_CURR_PIN 3
# define AP_BATT_VOLTDIVIDER_DEFAULT 10.0 # define AP_BATT_VOLTDIVIDER_DEFAULT 10.1
# define AP_BATT_CURR_AMP_PERVOLT_DEFAULT 17 # define AP_BATT_CURR_AMP_PERVOLT_DEFAULT 17
#elif CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL #elif CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL
# define AP_BATT_VOLT_PIN 1 # define AP_BATT_VOLT_PIN 13
# define AP_BATT_CURR_PIN 2 # define AP_BATT_CURR_PIN 12
# define AP_BATT_VOLTDIVIDER_DEFAULT 10.0 # define AP_BATT_VOLTDIVIDER_DEFAULT 10.1
# define AP_BATT_CURR_AMP_PERVOLT_DEFAULT 0 # define AP_BATT_CURR_AMP_PERVOLT_DEFAULT 17
#else #else
# define AP_BATT_VOLT_PIN -1 # define AP_BATT_VOLT_PIN -1
# define AP_BATT_CURR_PIN -1 # define AP_BATT_CURR_PIN -1
# define AP_BATT_VOLTDIVIDER_DEFAULT 10.0 # define AP_BATT_VOLTDIVIDER_DEFAULT 10.1
# define AP_BATT_CURR_AMP_PERVOLT_DEFAULT 0 # define AP_BATT_CURR_AMP_PERVOLT_DEFAULT 0
#endif #endif