mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-06-01 02:55:07 +08:00
rc_update: require consecutive valid input_rc before publishing
This commit is contained in:
@@ -424,35 +424,39 @@ void RCUpdate::Run()
|
|||||||
/* publish rc_channels topic even if signal is invalid, for debug */
|
/* publish rc_channels topic even if signal is invalid, for debug */
|
||||||
_rc_channels_pub.publish(_rc);
|
_rc_channels_pub.publish(_rc);
|
||||||
|
|
||||||
/* only publish manual control if the signal is present */
|
// only publish manual control if the signal is present and regularly updating
|
||||||
if (input_source_stable && channel_count_stable && !signal_lost
|
if (input_source_stable && channel_count_stable && !signal_lost) {
|
||||||
&& (input_rc.timestamp_last_signal > _last_timestamp_signal)) {
|
|
||||||
|
|
||||||
_last_timestamp_signal = input_rc.timestamp_last_signal;
|
if ((input_rc.timestamp_last_signal > _last_timestamp_signal)
|
||||||
perf_count(_valid_data_interval_perf);
|
&& (input_rc.timestamp_last_signal - _last_timestamp_signal < 1_s)) {
|
||||||
|
|
||||||
// check if channels actually updated
|
perf_count(_valid_data_interval_perf);
|
||||||
bool rc_updated = false;
|
|
||||||
|
|
||||||
for (unsigned i = 0; i < channel_count_limited; i++) {
|
// check if channels actually updated
|
||||||
if (_rc_values_previous[i] != input_rc.values[i]) {
|
bool rc_updated = false;
|
||||||
rc_updated = true;
|
|
||||||
break;
|
for (unsigned i = 0; i < channel_count_limited; i++) {
|
||||||
|
if (_rc_values_previous[i] != input_rc.values[i]) {
|
||||||
|
rc_updated = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// limit processing if there's no update
|
||||||
|
if (rc_updated || (hrt_elapsed_time(&_last_manual_control_setpoint_publish) > 300_ms)) {
|
||||||
|
UpdateManualSetpoint(input_rc.timestamp_last_signal);
|
||||||
|
}
|
||||||
|
|
||||||
|
UpdateManualSwitches(input_rc.timestamp_last_signal);
|
||||||
|
|
||||||
|
/* Update parameters from RC Channels (tuning with RC) if activated */
|
||||||
|
if (hrt_elapsed_time(&_last_rc_to_param_map_time) > 1_s) {
|
||||||
|
set_params_from_rc();
|
||||||
|
_last_rc_to_param_map_time = hrt_absolute_time();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// limit processing if there's no update
|
_last_timestamp_signal = input_rc.timestamp_last_signal;
|
||||||
if (rc_updated || (hrt_elapsed_time(&_last_manual_control_setpoint_publish) > 300_ms)) {
|
|
||||||
UpdateManualSetpoint(input_rc.timestamp_last_signal);
|
|
||||||
}
|
|
||||||
|
|
||||||
UpdateManualSwitches(input_rc.timestamp_last_signal);
|
|
||||||
|
|
||||||
/* Update parameters from RC Channels (tuning with RC) if activated */
|
|
||||||
if (hrt_elapsed_time(&_last_rc_to_param_map_time) > 1_s) {
|
|
||||||
set_params_from_rc();
|
|
||||||
_last_rc_to_param_map_time = hrt_absolute_time();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
memcpy(_rc_values_previous, input_rc.values, sizeof(input_rc.values[0]) * channel_count_limited);
|
memcpy(_rc_values_previous, input_rc.values, sizeof(input_rc.values[0]) * channel_count_limited);
|
||||||
|
|||||||
Reference in New Issue
Block a user