1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-24 16:55:29 +03:00

Another batch of cherry picks

This commit is contained in:
Stewart Loving-Gibbard 2017-10-05 06:55:16 -07:00
parent 72b2ccccf8
commit 12ced110d7
3 changed files with 5 additions and 5 deletions

View file

@ -246,7 +246,7 @@ Re-apply any new defaults as desired.
| failsafe_fw_roll_angle | -200 | Amount of banking when `SET-THR` failsafe is active on a fixed-wing machine. In 1/10 deg (deci-degrees). Negative values = left roll |
| failsafe_fw_pitch_angle | 100 | Amount of dive/climb when `SET-THR` failsafe is active on a fixed-wing machine. In 1/10 deg (deci-degrees). Negative values = climb |
| failsafe_fw_yaw_rate | -45 | Requested yaw rate to execute when `SET-THR` failsafe is active on a fixed-wing machine. In deg/s. Negative values = left turn |
| failsafe_min_distance | 0 | If failsafe happens when craft is below this distance in meters from home, failsafe will not execure regular failsafe_procedure, but will execute procedure specified in failsafe_min_distance_procedure instead. 0 = Normal failsafe_procedure always taken. |
| failsafe_min_distance | 0 | If failsafe happens when craft is closer than this distance in meters from home, failsafe will not execute regular failsafe_procedure, but will execute procedure specified in failsafe_min_distance_procedure instead. 0 = Normal failsafe_procedure always taken. |
| failsafe_min_distance_procedure | SET-THR | What failsafe procedure to initiate in Stage 2 when craft is closer to home than failsafe_min_distance. See [Failsafe documentation](Failsafe.md#failsafe_throttle). |
| rx_min_usec | 885 | Defines the shortest pulse width value used when ensuring the channel value is valid. If the receiver gives a pulse value lower than this value then the channel will be marked as bad and will default to the value of mid_rc. |
| rx_max_usec | 2115 | Defines the longest pulse width value used when ensuring the channel value is valid. If the receiver gives a pulse value higher than this value then the channel will be marked as bad and will default to the value of mid_rc. |

View file

@ -70,7 +70,7 @@ Time throttle level must have been below 'min_throttle' to _only disarm_ instead
#### `failsafe_min_distance`
If failsafe happens when craft is below this distance in meters from home, failsafe will not execure regular failsafe_procedure, but will execute procedure specified in failsafe_min_distance_procedure instead. 0 = Normal failsafe_procedure always taken.
If failsafe happens when craft is closer than this distance in meters from home, failsafe will not execute regular failsafe_procedure, but will execute procedure specified in failsafe_min_distance_procedure instead. 0 = Normal failsafe_procedure always taken.
#### `failsafe_min_distance_procedure`

View file

@ -704,10 +704,10 @@ static bool mspFcProcessOutCommand(uint16_t cmdMSP, sbuf_t *dst, mspPostProcessF
sbufWriteU8(dst, failsafeConfig()->failsafe_recovery_delay);
sbufWriteU16(dst, failsafeConfig()->failsafe_fw_roll_angle);
sbufWriteU16(dst, failsafeConfig()->failsafe_fw_pitch_angle);
sbufWriteU16(dst, failsafeConfig()->failsafe_fw_yaw_rate);
sbufWriteU16(dst, failsafeConfig()->failsafe_fw_yaw_rate);
sbufWriteU16(dst, failsafeConfig()->failsafe_stick_motion_threshold);
sbufWriteU16(dst, failsafeConfig()->failsafe_min_distance);
sbufWriteU8(dst, failsafeConfig()->failsafe_min_distance_procedure);
sbufWriteU16(dst, failsafeConfig()->failsafe_min_distance);
sbufWriteU8(dst, failsafeConfig()->failsafe_min_distance_procedure);
break;
case MSP_RSSI_CONFIG: