aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ArduCopter: renamed BATT_FAILSAFE to FS_BATT_ENABLE

Browse Source
This commit is contained in:
rmackay9 2012-12-10 23:47:14 +09:00
parent d31efebd44
commit 2f748f8382
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduCopter/Parameters.h
View File

@ -181,7 +181,7 @@ public:
k_param_radio_tuning_high,
k_param_radio_tuning_low,
k_param_rc_speed = 192,
k_param_battery_fs_enabled, // 193
k_param_failsafe_battery_enabled, // 193
//
// 200: flight modes
@ -255,7 +255,7 @@ public:
AP_Float curr_amp_per_volt;
AP_Float input_voltage;
AP_Int16 pack_capacity; // Battery pack capacity less reserve
AP_Int8 battery_fs_enabled; // battery failsafe enabled
AP_Int8 failsafe_battery_enabled; // battery failsafe enabled
AP_Int8 compass_enabled;
AP_Int8 optflow_enabled;

4
ArduCopter/Parameters.pde
View File

@ -79,12 +79,12 @@ const AP_Param::Info var_info[] PROGMEM = {
// @User: Standard
GSCALAR(battery_monitoring, "BATT_MONITOR", DISABLED),
// @Param: BATT_FAILSAFE
// @Param: FS_BATT_ENABLE
// @DisplayName: Battery Failsafe Enable
// @Description: Controls whether failsafe will be invoked when battery voltage or current runs low
// @Values: 0:Disabled,1:Enabled
// @User: Standard
GSCALAR(battery_fs_enabled, "BATT_FAILSAFE", BATTERY_FAILSAFE),
GSCALAR(failsafe_battery_enabled, "FS_BATT_ENABLE", FS_BATTERY),
// @Param: VOLT_DIVIDER
// @DisplayName: Voltage Divider

4
ArduCopter/config.h
View File

@ -318,8 +318,8 @@
#endif
// Battery failsafe
#ifndef BATTERY_FAILSAFE
# define BATTERY_FAILSAFE DISABLED
#ifndef FS_BATTERY
# define FS_BATTERY DISABLED
#endif

2
ArduCopter/events.pde
View File

@ -65,7 +65,7 @@ static void low_battery_event(void)
gcs_send_text_P(SEVERITY_LOW,PSTR("Low Battery!"));
// failsafe check
if (g.battery_fs_enabled && !ap.low_battery && motors.armed()) {
if (g.failsafe_battery_enabled && !ap.low_battery && motors.armed()) {
switch(control_mode) {
case STABILIZE:
case ACRO: