From 0043d4011721c30ccae553134ce7adbac8ae9c07 Mon Sep 17 00:00:00 2001 From: Pradeep CK Date: Tue, 3 Sep 2024 15:49:26 +1000 Subject: [PATCH] AP_ICEngine : enable starter when soft_armed This condition was modified to fix the CI autotest error : MAV_CMD_DO_ENGINE_CONTROL 2024-09-03T04:03:41.0759926Z AT-0409.5: Exception caught: Failed to attain RPM1 want 350.0, reached 0 2024-09-03T04:03:41.0760806Z Traceback (most recent call last): 2024-09-03T04:03:41.0761962Z File "/__w/carbopilot_V2/carbopilot_V2/Tools/autotest/vehicle_test_suite.py", line 8309, in run_one_test_attempt 2024-09-03T04:03:41.0763147Z test_function(**test_kwargs) 2024-09-03T04:03:41.0764410Z File "/__w/carbopilot_V2/carbopilot_V2/Tools/autotest/quadplane.py", line 1116, in MAV_CMD_DO_ENGINE_CONTROL 2024-09-03T04:03:41.0765822Z self.wait_rpm(1, expected_starter_rpm_min, expected_starter_rpm_max) 2024-09-03T04:03:41.0767135Z File "/__w/carbopilot_V2/carbopilot_V2/Tools/autotest/vehicle_test_suite.py", line 6734, in wait_rpm 2024-09-03T04:03:41.0768213Z self.wait_and_maintain( 2024-09-03T04:03:41.0769475Z File "/__w/carbopilot_V2/carbopilot_V2/Tools/autotest/vehicle_test_suite.py", line 6902, in wait_and_maintain 2024-09-03T04:03:41.0770669Z return self.wait_and_maintain_range( 2024-09-03T04:03:41.0771877Z File "/__w/carbopilot_V2/carbopilot_V2/Tools/autotest/vehicle_test_suite.py", line 7097, in wait_and_maintain_range 2024-09-03T04:03:41.0773309Z raise AutoTestTimeoutException( 2024-09-03T04:03:41.0774319Z vehicle_test_suite.AutoTestTimeoutException: Failed to attain RPM1 want 350.0, reached 0 --- libraries/AP_ICEngine/AP_ICEngine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/AP_ICEngine/AP_ICEngine.cpp b/libraries/AP_ICEngine/AP_ICEngine.cpp index 01fe1030df..4f753713f8 100644 --- a/libraries/AP_ICEngine/AP_ICEngine.cpp +++ b/libraries/AP_ICEngine/AP_ICEngine.cpp @@ -403,7 +403,7 @@ void AP_ICEngine::update(void) case ICE_STARTING: set_ignition(true); - if (allow_throttle_while_disarmed()) { + if (hal.util->get_soft_armed() || allow_throttle_while_disarmed()) { set_starter(true); } else { set_starter(false);