From 0f50cf96ca6c3f8b7903f1b525b8563b9e6df2ff Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Thu, 2 Aug 2018 08:24:52 +1000 Subject: [PATCH] Tools: Frame_Params: correct for CH7 -> RC7 change --- Tools/Frame_params/AION_R1_Rover.param | 2 +- Tools/Frame_params/HK-hydrotek-Rover331.param | 2 +- Tools/Frame_params/eLAB_LAB445_AC34.param | 4 ++-- Tools/Frame_params/eLAB_LAB470_AC35.param | 2 +- Tools/autotest/default_params/gazebo-iris.parm | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Tools/Frame_params/AION_R1_Rover.param b/Tools/Frame_params/AION_R1_Rover.param index d2cb3ff59b..7acfee879b 100644 --- a/Tools/Frame_params/AION_R1_Rover.param +++ b/Tools/Frame_params/AION_R1_Rover.param @@ -32,7 +32,7 @@ BATT_VOLT_MULT,13.99818 BATT_VOLT_PIN,2 BRD_PWM_COUNT,2 #default save waypoint -CH7_OPTION,1 +RC7_OPTION,1 COMPASS_OFFS_MAX,2000 #default use only first (hopefully external) compass COMPASS_USE,1 diff --git a/Tools/Frame_params/HK-hydrotek-Rover331.param b/Tools/Frame_params/HK-hydrotek-Rover331.param index 0802ad4a0f..bd978a0268 100644 --- a/Tools/Frame_params/HK-hydrotek-Rover331.param +++ b/Tools/Frame_params/HK-hydrotek-Rover331.param @@ -10,7 +10,7 @@ ATC_STR_RAT_I,0.2 ATC_STR_RAT_MAX,90 ATC_STR_RAT_P,0.2 BRD_SAFETYENABLE,0 -CH7_OPTION,3 +RC7_OPTION,3 COMPASS_ORIENT,4 CRUISE_SPEED,2 CRUISE_THROTTLE,20 diff --git a/Tools/Frame_params/eLAB_LAB445_AC34.param b/Tools/Frame_params/eLAB_LAB445_AC34.param index fde5ab9ef2..c7bd039214 100644 --- a/Tools/Frame_params/eLAB_LAB445_AC34.param +++ b/Tools/Frame_params/eLAB_LAB445_AC34.param @@ -16,8 +16,8 @@ BATT_CAPACITY,3500 BATT_MONITOR,3 BATT_VOLT_MULT,10 BRD_SAFETYENABLE,0 -CH7_OPT,3 -CH8_OPT,4 +RC7_OPTION,3 +RC8_OPTION,4 COMPASS_EXTERNAL,1 COMPASS_USE3,0 FENCE_ALT_MAX,50 diff --git a/Tools/Frame_params/eLAB_LAB470_AC35.param b/Tools/Frame_params/eLAB_LAB470_AC35.param index cf3dcd8538..fc5ff2af63 100644 --- a/Tools/Frame_params/eLAB_LAB470_AC35.param +++ b/Tools/Frame_params/eLAB_LAB470_AC35.param @@ -27,7 +27,7 @@ BATT_CURR_PIN,3 BATT_MONITOR,3 BATT_VOLT_MULT,7.699197 BATT_VOLT_PIN,2 -CH7_OPT,4 +RC7_OPTION,4 FENCE_ACTION,1 FENCE_ALT_MAX,100 FENCE_ENABLE,0 diff --git a/Tools/autotest/default_params/gazebo-iris.parm b/Tools/autotest/default_params/gazebo-iris.parm index e0fd1b14cb..6daba34024 100644 --- a/Tools/autotest/default_params/gazebo-iris.parm +++ b/Tools/autotest/default_params/gazebo-iris.parm @@ -2,7 +2,7 @@ FRAME_CLASS 1 FRAME_TYPE 1 # IRLOCK FEATURE -CH8_OPT 39 +RC8_OPTION 39 PLND_ENABLED 1 PLND_TYPE 3 # SONAR FOR IRLOCK