Compare commits

...

3 Commits

Author SHA1 Message Date
Matthias Grob 6cb610ded2 generate_msg_docs: ommit line with no effect 2023-11-24 18:15:57 +01:00
Matthias Grob eb76b0ce55 FlightTaskManualAltitude: refactor horizontal stick input check 2023-11-24 17:51:17 +01:00
Matthias Grob 0e84dd7040 failure_detector_params: fix description typo 2023-11-24 17:48:26 +01:00
3 changed files with 2 additions and 5 deletions

View File

@ -60,7 +60,6 @@ if __name__ == "__main__":
summary_description = msg_description summary_description = msg_description
print('msg_description: Z%sZ' % msg_description) print('msg_description: Z%sZ' % msg_description)
print('summary_description: Z%sZ' % summary_description) print('summary_description: Z%sZ' % summary_description)
summary_description
msg_contents = "" msg_contents = ""
#Get msg contents (read the file) #Get msg contents (read the file)
with open(msg_filename, 'r') as source_file: with open(msg_filename, 'r') as source_file:

View File

@ -162,7 +162,7 @@ PARAM_DEFINE_INT32(FD_IMB_PROP_THR, 30);
* *
* If enabled, failure detector will verify that for motors, a minimum amount of ESC current per throttle * If enabled, failure detector will verify that for motors, a minimum amount of ESC current per throttle
* level is being consumed. * level is being consumed.
* Otherwise this indicates an motor failure. * Otherwise this indicates a motor failure.
* *
* @boolean * @boolean
* @reboot_required true * @reboot_required true

View File

@ -115,8 +115,7 @@ void FlightTaskManualAltitude::_updateAltitudeLock()
float spd_xy = Vector2f(_velocity).length(); float spd_xy = Vector2f(_velocity).length();
// Use presence of horizontal stick inputs as a transition criteria // Use presence of horizontal stick inputs as a transition criteria
float stick_xy = Vector2f(_sticks.getPitchRollExpo()).length(); bool stick_input = _sticks.getPitchRollExpo().longerThan(FLT_EPSILON);
bool stick_input = stick_xy > 0.001f;
if (_terrain_hold) { if (_terrain_hold) {
bool too_fast = spd_xy > _param_mpc_hold_max_xy.get(); bool too_fast = spd_xy > _param_mpc_hold_max_xy.get();
@ -147,7 +146,6 @@ void FlightTaskManualAltitude::_updateAltitudeLock()
} }
} }
} }
} }
if ((_param_mpc_alt_mode.get() == 1 || _terrain_hold) && PX4_ISFINITE(_dist_to_bottom)) { if ((_param_mpc_alt_mode.get() == 1 || _terrain_hold) && PX4_ISFINITE(_dist_to_bottom)) {