Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 14:38:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_BattMonitor: Use SI units conventions in parameter units

Browse Source 
Follow the rules from:
http://physics.nist.gov/cuu/Units/units.html
http://physics.nist.gov/cuu/Units/outside.html
and
http://physics.nist.gov/cuu/Units/checklist.html
one further constrain is that only printable (7bit) ASCII characters are allowed
This commit is contained in:
Dr.-Ing. Amilcar Do Carmo Lucas 2017-05-02 15:41:26 +02:00 committed by Andrew Tridgell
parent ed916327fc
commit 25cfee9824
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/AP_BattMonitor/AP_BattMonitor.cpp
View File

@ -37,21 +37,21 @@ const AP_Param::GroupInfo AP_BattMonitor::var_info[] = {
// @Param: _AMP_PERVOLT // @Param: _AMP_PERVOLT
// @DisplayName: Amps per volt // @DisplayName: Amps per volt
// @Description: Number of amps that a 1V reading on the current sensor corresponds to. On the APM2 or Pixhawk using the 3DR Power brick this should be set to 17. For the Pixhawk with the 3DR 4in1 ESC this should be 17. // @Description: Number of amps that a 1V reading on the current sensor corresponds to. On the APM2 or Pixhawk using the 3DR Power brick this should be set to 17. For the Pixhawk with the 3DR 4in1 ESC this should be 17.
// @Units: Amps/Volt // @Units: A/V
// @User: Standard // @User: Standard
AP_GROUPINFO("_AMP_PERVOLT", 4, AP_BattMonitor, _curr_amp_per_volt[0], AP_BATT_CURR_AMP_PERVOLT_DEFAULT), AP_GROUPINFO("_AMP_PERVOLT", 4, AP_BattMonitor, _curr_amp_per_volt[0], AP_BATT_CURR_AMP_PERVOLT_DEFAULT),
// @Param: _AMP_OFFSET // @Param: _AMP_OFFSET
// @DisplayName: AMP offset // @DisplayName: AMP offset
// @Description: Voltage offset at zero current on current sensor // @Description: Voltage offset at zero current on current sensor
// @Units: Volts // @Units: V
// @User: Standard // @User: Standard
AP_GROUPINFO("_AMP_OFFSET", 5, AP_BattMonitor, _curr_amp_offset[0], 0), AP_GROUPINFO("_AMP_OFFSET", 5, AP_BattMonitor, _curr_amp_offset[0], 0),
// @Param: _CAPACITY // @Param: _CAPACITY
// @DisplayName: Battery capacity // @DisplayName: Battery capacity
// @Description: Capacity of the battery in mAh when full // @Description: Capacity of the battery in mAh when full
// @Units: mAh // @Units: mA.h
// @Increment: 50 // @Increment: 50
// @User: Standard // @User: Standard
AP_GROUPINFO("_CAPACITY", 6, AP_BattMonitor, _pack_capacity[0], AP_BATT_CAPACITY_DEFAULT), AP_GROUPINFO("_CAPACITY", 6, AP_BattMonitor, _pack_capacity[0], AP_BATT_CAPACITY_DEFAULT),
@ -62,7 +62,7 @@ const AP_Param::GroupInfo AP_BattMonitor::var_info[] = {
// @Param: _WATT_MAX // @Param: _WATT_MAX
// @DisplayName: Maximum allowed power (Watts) // @DisplayName: Maximum allowed power (Watts)
// @Description: If battery wattage (voltage * current) exceeds this value then the system will reduce max throttle (THR_MAX, TKOFF_THR_MAX and THR_MIN for reverse thrust) to satisfy this limit. This helps limit high current to low C rated batteries regardless of battery voltage. The max throttle will slowly grow back to THR_MAX (or TKOFF_THR_MAX ) and THR_MIN if demanding the current max and under the watt max. Use 0 to disable. // @Description: If battery wattage (voltage * current) exceeds this value then the system will reduce max throttle (THR_MAX, TKOFF_THR_MAX and THR_MIN for reverse thrust) to satisfy this limit. This helps limit high current to low C rated batteries regardless of battery voltage. The max throttle will slowly grow back to THR_MAX (or TKOFF_THR_MAX ) and THR_MIN if demanding the current max and under the watt max. Use 0 to disable.
// @Units: Watts // @Units: W
// @Increment: 1 // @Increment: 1
// @User: Advanced // @User: Advanced
AP_GROUPINFO("_WATT_MAX", 9, AP_BattMonitor, _watt_max[0], AP_BATT_MAX_WATT_DEFAULT), AP_GROUPINFO("_WATT_MAX", 9, AP_BattMonitor, _watt_max[0], AP_BATT_MAX_WATT_DEFAULT),
@ -105,21 +105,21 @@ const AP_Param::GroupInfo AP_BattMonitor::var_info[] = {
// @Param: 2_AMP_PERVOL // @Param: 2_AMP_PERVOL
// @DisplayName: Amps per volt // @DisplayName: Amps per volt
// @Description: Number of amps that a 1V reading on the current sensor corresponds to. On the APM2 or Pixhawk using the 3DR Power brick this should be set to 17. For the Pixhawk with the 3DR 4in1 ESC this should be 17. // @Description: Number of amps that a 1V reading on the current sensor corresponds to. On the APM2 or Pixhawk using the 3DR Power brick this should be set to 17. For the Pixhawk with the 3DR 4in1 ESC this should be 17.
// @Units: Amps/Volt // @Units: A/V
// @User: Standard // @User: Standard
AP_GROUPINFO("2_AMP_PERVOL", 15, AP_BattMonitor, _curr_amp_per_volt[1], AP_BATT_CURR_AMP_PERVOLT_DEFAULT), AP_GROUPINFO("2_AMP_PERVOL", 15, AP_BattMonitor, _curr_amp_per_volt[1], AP_BATT_CURR_AMP_PERVOLT_DEFAULT),
// @Param: 2_AMP_OFFSET // @Param: 2_AMP_OFFSET
// @DisplayName: AMP offset // @DisplayName: AMP offset
// @Description: Voltage offset at zero current on current sensor // @Description: Voltage offset at zero current on current sensor
// @Units: Volts // @Units: V
// @User: Standard // @User: Standard
AP_GROUPINFO("2_AMP_OFFSET", 16, AP_BattMonitor, _curr_amp_offset[1], 0), AP_GROUPINFO("2_AMP_OFFSET", 16, AP_BattMonitor, _curr_amp_offset[1], 0),
// @Param: 2_CAPACITY // @Param: 2_CAPACITY
// @DisplayName: Battery capacity // @DisplayName: Battery capacity
// @Description: Capacity of the battery in mAh when full // @Description: Capacity of the battery in mAh when full
// @Units: mAh // @Units: mA.h
// @Increment: 50 // @Increment: 50
// @User: Standard // @User: Standard
AP_GROUPINFO("2_CAPACITY", 17, AP_BattMonitor, _pack_capacity[1], AP_BATT_CAPACITY_DEFAULT), AP_GROUPINFO("2_CAPACITY", 17, AP_BattMonitor, _pack_capacity[1], AP_BATT_CAPACITY_DEFAULT),
@ -129,7 +129,7 @@ const AP_Param::GroupInfo AP_BattMonitor::var_info[] = {
// @Param: 2_WATT_MAX // @Param: 2_WATT_MAX
// @DisplayName: Maximum allowed current // @DisplayName: Maximum allowed current
// @Description: If battery wattage (voltage * current) exceeds this value then the system will reduce max throttle (THR_MAX, TKOFF_THR_MAX and THR_MIN for reverse thrust) to satisfy this limit. This helps limit high current to low C rated batteries regardless of battery voltage. The max throttle will slowly grow back to THR_MAX (or TKOFF_THR_MAX ) and THR_MIN if demanding the current max and under the watt max. Use 0 to disable. // @Description: If battery wattage (voltage * current) exceeds this value then the system will reduce max throttle (THR_MAX, TKOFF_THR_MAX and THR_MIN for reverse thrust) to satisfy this limit. This helps limit high current to low C rated batteries regardless of battery voltage. The max throttle will slowly grow back to THR_MAX (or TKOFF_THR_MAX ) and THR_MIN if demanding the current max and under the watt max. Use 0 to disable.
// @Units: Amps // @Units: A
// @Increment: 1 // @Increment: 1
// @User: Advanced // @User: Advanced
AP_GROUPINFO("2_WATT_MAX", 18, AP_BattMonitor, _watt_max[1], AP_BATT_MAX_WATT_DEFAULT), AP_GROUPINFO("2_WATT_MAX", 18, AP_BattMonitor, _watt_max[1], AP_BATT_MAX_WATT_DEFAULT),
@ -146,7 +146,7 @@ const AP_Param::GroupInfo AP_BattMonitor::var_info[] = {
// @Param: _VOLT_TIMER // @Param: _VOLT_TIMER
// @DisplayName: Low voltage timeout // @DisplayName: Low voltage timeout
// @Description: This is the timeout in seconds before a low voltage event will be triggered. For aircraft with low C batteries it may be necessary to raise this in order to cope with low voltage on long takeoffs. A value of zero disables low voltage errors. // @Description: This is the timeout in seconds before a low voltage event will be triggered. For aircraft with low C batteries it may be necessary to raise this in order to cope with low voltage on long takeoffs. A value of zero disables low voltage errors.
// @Units: Seconds // @Units: s
// @Increment: 1 // @Increment: 1
// @Range: 0 120 // @Range: 0 120
// @User: Advanced // @User: Advanced