mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-05-09 13:24:25 +08:00
fix(commander): Remove COM_OBC_LOSS_T (#27261)
hardcoding the default 5 second timeout.
This commit is contained in:
@@ -198,10 +198,6 @@ if [ -n "$PX4_SIM_SPEED_FACTOR" ]; then
|
|||||||
COM_OF_LOSS_T_LONGER=$(echo "$PX4_SIM_SPEED_FACTOR * 1.0" | bc)
|
COM_OF_LOSS_T_LONGER=$(echo "$PX4_SIM_SPEED_FACTOR * 1.0" | bc)
|
||||||
echo "COM_OF_LOSS_T set to $COM_OF_LOSS_T_LONGER"
|
echo "COM_OF_LOSS_T set to $COM_OF_LOSS_T_LONGER"
|
||||||
param set COM_OF_LOSS_T $COM_OF_LOSS_T_LONGER
|
param set COM_OF_LOSS_T $COM_OF_LOSS_T_LONGER
|
||||||
|
|
||||||
COM_OBC_LOSS_T_LONGER=$(echo "$PX4_SIM_SPEED_FACTOR * 5.0" | bc)
|
|
||||||
echo "COM_OBC_LOSS_T set to $COM_OBC_LOSS_T_LONGER"
|
|
||||||
param set COM_OBC_LOSS_T $COM_OBC_LOSS_T_LONGER
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Autostart ID
|
# Autostart ID
|
||||||
|
|||||||
@@ -309,7 +309,6 @@
|
|||||||
1 1 COM_IMB_PROP_ACT 0 6
|
1 1 COM_IMB_PROP_ACT 0 6
|
||||||
1 1 COM_LKDOWN_TKO 3.000000000000000000 9
|
1 1 COM_LKDOWN_TKO 3.000000000000000000 9
|
||||||
1 1 COM_LOW_BAT_ACT 0 6
|
1 1 COM_LOW_BAT_ACT 0 6
|
||||||
1 1 COM_OBC_LOSS_T 5.000000000000000000 9
|
|
||||||
1 1 COM_OBL_RC_ACT 0 6
|
1 1 COM_OBL_RC_ACT 0 6
|
||||||
1 1 COM_OBS_AVOID 0 6
|
1 1 COM_OBS_AVOID 0 6
|
||||||
1 1 COM_OF_LOSS_T 1.000000000000000000 9
|
1 1 COM_OF_LOSS_T 1.000000000000000000 9
|
||||||
|
|||||||
@@ -2976,7 +2976,7 @@ void Commander::dataLinkCheck()
|
|||||||
|
|
||||||
// ONBOARD CONTROLLER data link loss failsafe
|
// ONBOARD CONTROLLER data link loss failsafe
|
||||||
if ((_datalink_last_heartbeat_onboard_controller > 0)
|
if ((_datalink_last_heartbeat_onboard_controller > 0)
|
||||||
&& (hrt_elapsed_time(&_datalink_last_heartbeat_onboard_controller) > (_param_com_obc_loss_t.get() * 1_s))
|
&& (hrt_elapsed_time(&_datalink_last_heartbeat_onboard_controller) > 5_s)
|
||||||
&& !_onboard_controller_lost) {
|
&& !_onboard_controller_lost) {
|
||||||
|
|
||||||
mavlink_log_critical(&_mavlink_log_pub, "Connection to mission computer lost\t");
|
mavlink_log_critical(&_mavlink_log_pub, "Connection to mission computer lost\t");
|
||||||
|
|||||||
@@ -343,7 +343,6 @@ private:
|
|||||||
(ParamBool<px4::params::COM_HOME_EN>) _param_com_home_en,
|
(ParamBool<px4::params::COM_HOME_EN>) _param_com_home_en,
|
||||||
(ParamBool<px4::params::COM_HOME_IN_AIR>) _param_com_home_in_air,
|
(ParamBool<px4::params::COM_HOME_IN_AIR>) _param_com_home_in_air,
|
||||||
(ParamBool<px4::params::COM_FORCE_SAFETY>) _param_com_force_safety,
|
(ParamBool<px4::params::COM_FORCE_SAFETY>) _param_com_force_safety,
|
||||||
(ParamFloat<px4::params::COM_OBC_LOSS_T>) _param_com_obc_loss_t,
|
|
||||||
(ParamInt<px4::params::COM_PREARM_MODE>) _param_com_prearm_mode,
|
(ParamInt<px4::params::COM_PREARM_MODE>) _param_com_prearm_mode,
|
||||||
(ParamInt<px4::params::COM_RC_OVERRIDE>) _param_com_rc_override,
|
(ParamInt<px4::params::COM_RC_OVERRIDE>) _param_com_rc_override,
|
||||||
(ParamFloat<px4::params::COM_SPOOLUP_TIME>) _param_com_spoolup_time,
|
(ParamFloat<px4::params::COM_SPOOLUP_TIME>) _param_com_spoolup_time,
|
||||||
|
|||||||
@@ -233,17 +233,6 @@ parameters:
|
|||||||
6: Terminate
|
6: Terminate
|
||||||
7: Disarm
|
7: Disarm
|
||||||
default: 0
|
default: 0
|
||||||
COM_OBC_LOSS_T:
|
|
||||||
description:
|
|
||||||
short: Onboard computer connection loss timeout
|
|
||||||
long: Time-out to wait when onboard computer connection is lost before warning
|
|
||||||
about loss connection
|
|
||||||
type: float
|
|
||||||
default: 5.0
|
|
||||||
unit: s
|
|
||||||
min: 0
|
|
||||||
max: 60
|
|
||||||
increment: 0.01
|
|
||||||
COM_ARM_IMU_ACC:
|
COM_ARM_IMU_ACC:
|
||||||
description:
|
description:
|
||||||
short: Max accelerometer inconsistency for arming
|
short: Max accelerometer inconsistency for arming
|
||||||
|
|||||||
Reference in New Issue
Block a user