autotest: Update tests for relay

ArduPilot · Nov 7, 2023 · c10c653 · c10c653
1 parent 4d205b8
commit c10c653
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/Tools/autotest/default_params/rover.parm b/Tools/autotest/default_params/rover.parm
@@ -24,8 +24,8 @@ RC1_MAX 2000
 RC1_MIN 1000
 RC3_MAX 2000
 RC3_MIN 1000
-RELAY_PIN 1
-RELAY_PIN2 2
+RELAY1_PIN 1
+RELAY2_PIN 2
 SERVO1_MIN 1000
 SERVO1_MAX 2000
 SERVO3_MAX 2000

diff --git a/Tools/autotest/default_params/vee-gull 005.param b/Tools/autotest/default_params/vee-gull 005.param
@@ -456,10 +456,7 @@ RCMAP_ROLL,1
 RCMAP_THROTTLE,3
 RCMAP_YAW,4
 RELAY_DEFAULT,0
-RELAY_PIN,13
-RELAY_PIN2,-1
-RELAY_PIN3,-1
-RELAY_PIN4,-1
+RELAY1_PIN,13
 RLL_RATE_D,0.000000
 RLL_RATE_FF,0.255000
 RLL_RATE_I,0.050000

diff --git a/Tools/autotest/rover.py b/Tools/autotest/rover.py
@@ -603,7 +603,7 @@ def ServoRelayEvents(self):
             })
 
             # add another servo:
-            self.set_parameter("RELAY_PIN6", 14)
+            self.set_parameter("RELAY6_PIN", 14)
             self.assert_received_message_field_values('RELAY_STATUS', {
                 "present": 35,
                 "on": 0,
@@ -5369,7 +5369,7 @@ def test_scripting_auxfunc(self):
         self.context_collect("STATUSTEXT")
         self.set_parameters({
             "SCR_ENABLE": 1,
-            "RELAY_PIN": 1,
+            "RELAY1_PIN": 1,
         })
         self.install_example_script_context("RCIN_test.lua")
         self.reboot_sitl()