From 3629037177af3b14c523f6844a02a7edc8f86cd5 Mon Sep 17 00:00:00 2001 From: Henry Wurzburg Date: Fri, 7 Jul 2023 18:37:51 -0500 Subject: [PATCH] RC_Channel:clean up metadata for AUX switches --- libraries/RC_Channel/RC_Channel.cpp | 109 +++++++++++++--------------- 1 file changed, 51 insertions(+), 58 deletions(-) diff --git a/libraries/RC_Channel/RC_Channel.cpp b/libraries/RC_Channel/RC_Channel.cpp index 417e6d1007..0b155587e7 100644 --- a/libraries/RC_Channel/RC_Channel.cpp +++ b/libraries/RC_Channel/RC_Channel.cpp @@ -108,24 +108,22 @@ const AP_Param::GroupInfo RC_Channel::var_info[] = { // @DisplayName: RC input option // @Description: Function assigned to this RC channel // @Values{Copter, Rover, Plane, Blimp}: 0:Do Nothing - // @Values{Copter}: 2:Flip + // @Values{Copter}: 2:FLIP Mode // @Values{Copter}: 3:Simple Mode - // @Values{Copter, Rover}: 4:RTL - // @Values{Plane}: 4:ModeRTL + // @Values{Copter, Rover, Plane}: 4:RTL // @Values{Copter}: 5:Save Trim // @Values{Rover}: 5:Save Trim (4.1 and lower) // @Values{Copter, Rover}: 7:Save WP // @Values{Copter, Rover, Plane}: 9:Camera Trigger - // @Values{Copter}: 10:RangeFinder - // @Values{Copter, Rover, Plane}: 11:Fence + // @Values{Copter}: 10:RangeFinder Enable + // @Values{Copter, Rover, Plane}: 11:Fence Enable // @Values{Copter}: 13:Super Simple Mode // @Values{Copter}: 14:Acro Trainer - // @Values{Copter}: 15:Sprayer - // @Values{Copter, Rover}: 16:Auto - // @Values{Plane}: 16:ModeAuto - // @Values{Copter}: 17:AutoTune - // @Values{Copter, Blimp}: 18:Land - // @Values{Copter, Rover}: 19:Gripper + // @Values{Copter}: 15:Sprayer Enable + // @Values{Copter, Rover, Plane}: 16:AUTO Mode + // @Values{Copter}: 17:AUTOTUNE Mode + // @Values{Copter, Blimp}: 18:LAND Mode + // @Values{Copter, Rover}: 19:Gripper Release // @Values{Copter}: 21:Parachute Enable // @Values{Copter, Plane}: 22:Parachute Release // @Values{Copter}: 23:Parachute 3pos @@ -140,92 +138,87 @@ const AP_Param::GroupInfo RC_Channel::var_info[] = { // @Values{Plane}: 30:Lost Plane Sound // @Values{Copter, Rover, Plane}: 31:Motor Emergency Stop // @Values{Copter}: 32:Motor Interlock - // @Values{Copter}: 33:Brake + // @Values{Copter}: 33:BRAKE Mode // @Values{Copter, Rover, Plane}: 34:Relay2 On/Off, 35:Relay3 On/Off, 36:Relay4 On/Off - // @Values{Copter}: 37:Throw - // @Values{Copter, Plane}: 38:ADSB Avoidance En - // @Values{Copter}: 39:PrecLoiter - // @Values{Copter, Rover}: 40:Proximity Avoidance + // @Values{Copter}: 37:THROW Mode + // @Values{Copter, Plane}: 38:ADSB Avoidance Enable + // @Values{Copter}: 39:PrecLoiter Enable + // @Values{Copter, Rover}: 40:Proximity Avoidance Enable // @Values{Copter, Rover, Plane}: 41:ArmDisarm (4.1 and lower) - // @Values{Copter, Rover}: 42:SmartRTL - // @Values{Copter, Plane}: 43:InvertedFlight + // @Values{Copter, Rover}: 42:SMARTRTL Mode + // @Values{Copter, Plane}: 43:InvertedFlight Enable // @Values{Copter}: 44:Winch Enable, 45:Winch Control // @Values{Copter, Rover, Plane, Blimp}: 46:RC Override Enable // @Values{Copter}: 47:User Function 1, 48:User Function 2, 49:User Function 3 - // @Values{Rover}: 50:LearnCruise - // @Values{Rover}: 51:Manual - // @Values{Plane}: 51:ModeManual - // @Values{Copter, Rover}: 52:Acro - // @Values{Plane}: 52:ModeACRO - // @Values{Rover}: 53:Steering - // @Values{Rover}: 54:Hold - // @Values{Copter, Rover}: 55:Guided - // @Values{Plane}: 55:ModeGuided - // @Values{Copter, Rover}: 56:Loiter - // @Values{Plane}: 56:ModeLoiter - // @Values{Copter, Rover}: 57:Follow + // @Values{Rover}: 50:LearnCruise Speed + // @Values{Rover, Plane}: 51:MANUAL Mode + // @Values{Copter, Rover, Plane}: 52:ACRO Mode + // @Values{Rover}: 53:STEERING Mode + // @Values{Rover}: 54:HOLD Mode + // @Values{Copter, Rover, Plane}: 55:GUIDED Mode + // @Values{Copter, Rover, Plane}: 56:LOITER Mode + // @Values{Copter, Rover}: 57:FOLLOW Mode // @Values{Copter, Rover, Plane}: 58:Clear Waypoints // @Values{Rover}: 59:Simple Mode - // @Values{Copter}: 60:ZigZag + // @Values{Copter}: 60:ZigZag Mode // @Values{Copter}: 61:ZigZag SaveWP // @Values{Copter, Rover, Plane}: 62:Compass Learn // @Values{Rover}: 63:Sailboat Tack // @Values{Plane}: 64:Reverse Throttle // @Values{Copter, Rover, Plane, Blimp}: 65:GPS Disable // @Values{Copter, Rover, Plane}: 66:Relay5 On/Off, 67:Relay6 On/Off - // @Values{Copter}: 68:Stabilize - // @Values{Copter}: 69:PosHold - // @Values{Copter}: 70:AltHold - // @Values{Copter}: 71:FlowHold - // @Values{Copter}: 72:Circle - // @Values{Plane}: 72:ModeCircle - // @Values{Copter}: 73:Drift + // @Values{Copter}: 68:STABILIZE Mode + // @Values{Copter}: 69:POSHOLD Mode + // @Values{Copter}: 70:ALTHOLD Mode + // @Values{Copter}: 71:FLOWHOLD Mode + // @Values{Copter,Plane}: 72:CIRCLE Mode + // @Values{Copter}: 73:DRIFT Mode // @Values{Rover}: 74:Sailboat motoring 3pos // @Values{Copter}: 75:SurfaceTrackingUpDown - // @Values{Copter}: 76:Standby Mode - // @Values{Plane}: 77:ModeTakeoff + // @Values{Copter}: 76:STANDBY Mode + // @Values{Plane}: 77:TAKEOFF Mode // @Values{Copter, Rover, Plane}: 78:RunCam Control // @Values{Copter, Rover, Plane}: 79:RunCam OSD Control // @Values{Copter}: 80:VisOdom Align - // @Values{Rover}: 80:Viso Align + // @Values{Rover}: 80:VisoOdom Align // @Values{Copter, Rover, Plane, Blimp}: 81:Disarm // @Values{Plane}: 82:QAssist 3pos // @Values{Copter}: 83:ZigZag Auto - // @Values{Copter, Plane}: 84:Air Mode + // @Values{Copter, Plane}: 84:AirMode // @Values{Copter, Plane}: 85:Generator - // @Values{Plane}: 86: Non Auto Terrain Follow Disable + // @Values{Plane}: 86:Non Auto Terrain Follow Disable // @Values{Plane}: 87:Crow Select // @Values{Plane}: 88:Soaring Enable // @Values{Plane}: 89:Landing Flare // @Values{Copter, Rover, Plane, Blimp}: 90:EKF Pos Source // @Values{Plane}: 91:Airspeed Ratio Calibration - // @Values{Plane}: 92:FBWA + // @Values{Plane}: 92:FBWA Mode // @Values{Copter, Rover, Plane}: 94:VTX Power // @Values{Plane}: 95:FBWA taildragger takeoff mode - // @Values{Plane}: 96:trigger re-reading of mode switch + // @Values{Plane}: 96:Trigger re-reading of mode switch // @Values{Rover}: 97:Windvane home heading direction offset - // @Values{Plane}: 98: ModeTraining + // @Values{Plane}: 98:TRAINING Mode // @Values{Copter}: 99:AUTO RTL // @Values{Copter, Rover, Plane, Blimp}: 100:KillIMU1, 101:KillIMU2 // @Values{Copter, Rover, Plane}: 102:Camera Mode Toggle // @Values{Copter, Rover, Plane}: 105:GPS Disable Yaw // @Values{Rover, Plane}: 106:Disable Airspeed Use - // @Values{Plane}: 107: EnableFixedWingAutotune - // @Values{Plane}: 108: ModeQRTL + // @Values{Plane}: 107:Enable FW Autotune + // @Values{Plane}: 108:QRTL Mode // @Values{Copter, Rover, Plane, Blimp}: 110:KillIMU3 - // @Values{Plane}: 150: CRUISE - // @Values{Copter}: 151:Turtle - // @Values{Copter}: 152:simple heading reset + // @Values{Plane}: 150:CRUISE Mode + // @Values{Copter}: 151:TURTLE Mode + // @Values{Copter}: 152:SIMPLE heading reset // @Values{Copter, Rover, Plane}: 153:ArmDisarm (4.2 and higher) // @Values{Blimp}: 153:ArmDisarm // @Values{Copter}: 154:ArmDisarm with AirMode (4.2 and higher) // @Values{Plane}: 154:ArmDisarm with Quadplane AirMode (4.2 and higher) - // @Values{Rover}: 155: set steering trim to current servo and RC - // @Values{Plane}: 155: set roll pitch and yaw trim to current servo and RC + // @Values{Rover}: 155:Set steering trim to current servo and RC + // @Values{Plane}: 155:Set roll pitch and yaw trim to current servo and RC // @Values{Rover}: 156:Torqeedo Clear Err - // @Values{Plane}: 157: Force FS Action to FBWA + // @Values{Plane}: 157:Force FS Action to FBWA // @Values{Copter, Plane}: 158:Optflow Calibration - // @Values{Copter}: 159:Force Flying + // @Values{Copter}: 159:Force IS_Flying // @Values{Plane}: 160:Weathervane Enable // @Values{Copter}: 161:Turbine Start(heli) // @Values{Copter, Rover, Plane}: 162:FFT Tune @@ -233,7 +226,7 @@ const AP_Param::GroupInfo RC_Channel::var_info[] = { // @Values{Copter, Rover, Plane, Blimp}: 164:Pause Stream Logging // @Values{Copter, Rover, Plane}: 165:Arm/Emergency Motor Stop // @Values{Copter, Rover, Plane, Blimp}: 166:Camera Record Video, 167:Camera Zoom, 168:Camera Manual Focus, 169:Camera Auto Focus - // @Values{Plane}: 170:Mode QStabilize + // @Values{Plane}: 170:QSTABILIZE Mode // @Values{Copter, Rover, Plane, Blimp}: 171:Calibrate Compasses // @Values{Copter, Rover, Plane, Blimp}: 172:Battery MPPT Enable // @Values{Plane}: 173:Plane AUTO Mode Landing Abort @@ -242,8 +235,8 @@ const AP_Param::GroupInfo RC_Channel::var_info[] = { // @Values{Rover}: 202:Pitch // @Values{Rover}: 207:MainSail // @Values{Rover, Plane}: 208:Flap - // @Values{Plane}: 209: Forward Throttle - // @Values{Plane}: 210: Airbrakes + // @Values{Plane}: 209:VTOL Forward Throttle + // @Values{Plane}: 210:Airbrakes // @Values{Rover}: 211:Walking Height // @Values{Copter, Rover, Plane}: 212:Mount1 Roll, 213:Mount1 Pitch, 214:Mount1 Yaw, 215:Mount2 Roll, 216:Mount2 Pitch, 217:Mount2 Yaw // @Values{Copter, Rover, Plane}: 300:Scripting1, 301:Scripting2, 302:Scripting3, 303:Scripting4, 304:Scripting5, 305:Scripting6, 306:Scripting7, 307:Scripting8