Automatically disable `pid_at_min_throttle` when `retarded_arm` is
enabled. Closes #719.
This commit is contained in:
parent
48dfbd9800
commit
caf253e4f8
|
@ -117,11 +117,11 @@ Re-apply any new defaults as desired.
|
|||
| 3d_deadband_throttle | | 0 | 2000 | 50 | Master | UINT16 |
|
||||
| motor_pwm_rate | Output frequency (in Hz) for motor pins. Defaults are 400Hz for motor. If setting above 500Hz, will switch to brushed (direct drive) motors mode. For example, setting to 8000 will use brushed mode at 8kHz switching frequency. Up to 32kHz is supported. Note, that in brushed mode, minthrottle is offset to zero. Default is 16000 for boards with brushed motors. | 50 | 32000 | 400 | Master | UINT16 |
|
||||
| servo_pwm_rate | Output frequency (in Hz) servo pins. Default is 50Hz. When using tricopters or gimbal with digital servo, this rate can be increased. Max of 498Hz (for 500Hz pwm period), and min of 50Hz. Most digital servos will support for example 330Hz. | 50 | 498 | 50 | Master | UINT16 |
|
||||
| retarded_arm | Disabled by default, enabling (setting to 1) allows disarming by throttle low + roll. This could be useful for non-acro tricopters, where default arming by yaw could move tail servo too much. | 0 | 1 | 0 | Master | UINT8 |
|
||||
| retarded_arm | Disabled by default, enabling (setting to 1) allows disarming by throttle low + roll. This could be useful for mode-1 users and non-acro tricopters, where default arming by yaw could move tail servo too much. | 0 | 1 | 0 | Master | UINT8 |
|
||||
| disarm_kill_switch | Enabled by default. Disarms the motors independently of throttle value. Setting to 0 reverts to the old behaviour of disarming only when the throttle is low. Only applies when arming and disarming with an AUX channel. | 0 | 1 | 1 | Master | UINT8 |
|
||||
| auto_disarm_delay | | 0 | 60 | 5 | Master | UINT8 |
|
||||
| small_angle | If the copter tilt angle exceed this value the copter will refuse to arm. default is 25°. | 0 | 180 | 25 | Master | UINT8 |
|
||||
| pid_at_min_throttle | If enabled, the copter will process the pid algorithm at minimum throttle. | 0 | 1 | 1 | Master | UINT8 |
|
||||
| pid_at_min_throttle | If enabled, the copter will process the pid algorithm at minimum throttle. Cannot be used when `retarded_arm` is enabled. | 0 | 1 | 1 | Master | UINT8 |
|
||||
| flaps_speed | | 0 | 100 | 0 | Master | UINT8 |
|
||||
| fixedwing_althold_dir | | -1 | 1 | 1 | Master | INT8 |
|
||||
| reboot_character | | 48 | 126 | 82 | Master | UINT8 |
|
||||
|
|
|
@ -787,6 +787,14 @@ void validateAndFixConfig(void)
|
|||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* The retarded_arm setting is incompatible with pid_at_min_throttle because full roll causes the craft to roll over on the ground.
|
||||
* The pid_at_min_throttle implementation ignores yaw on the ground, but doesn't currently ignore roll when retarded_arm is enabled.
|
||||
*/
|
||||
if (masterConfig.retarded_arm && masterConfig.mixerConfig.pid_at_min_throttle) {
|
||||
masterConfig.mixerConfig.pid_at_min_throttle = 0;
|
||||
}
|
||||
|
||||
useRxConfig(&masterConfig.rxConfig);
|
||||
|
||||
serialConfig_t *serialConfig = &masterConfig.serialConfig;
|
||||
|
|
Loading…
Reference in New Issue