diff --git a/src/FirmwarePlugin/APM/APMParameterFactMetaData.Sub.3.4.xml b/src/FirmwarePlugin/APM/APMParameterFactMetaData.Sub.3.4.xml
index 9c884ba..ac42cc7 100644
--- a/src/FirmwarePlugin/APM/APMParameterFactMetaData.Sub.3.4.xml
+++ b/src/FirmwarePlugin/APM/APMParameterFactMetaData.Sub.3.4.xml
@@ -108,13 +108,50 @@
50
mAh
-
+
Disabled
-Enabled always RTL
-Enabled Continue with Mission in Auto Mode
+Warn only
+Disarm
+Enter depth hold mode
+Enter surface mode
+
+
+
+
+Disabled
+Warn only
+Enter surface mode
+
+
+
+
+Disabled
+Warn only
+
+
+
+
+Disabled
+Warn only
+
+
+
+Pascal
+
+
+Degrees Centigrade
+
+
+
+Disarm
+Hold Position
+Surface
+
+10 90
+
100 900
@@ -770,6 +807,9 @@
Use in RTL and Land
+
+0 5
+
@@ -1918,6 +1958,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -1932,6 +1974,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -1953,6 +2007,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -1967,6 +2023,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -1990,6 +2058,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2004,6 +2074,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2025,6 +2107,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2039,6 +2123,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2062,6 +2158,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2076,6 +2174,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2097,6 +2207,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2111,6 +2223,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2134,6 +2258,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2148,6 +2274,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2169,6 +2307,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2183,6 +2323,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2206,6 +2358,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2220,6 +2374,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2241,6 +2407,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2255,6 +2423,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2278,6 +2458,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2292,6 +2474,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2313,6 +2507,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2327,6 +2523,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2350,6 +2558,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2364,6 +2574,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2385,6 +2607,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2399,6 +2623,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2422,6 +2658,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2436,6 +2674,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2457,6 +2707,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2471,6 +2723,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2494,6 +2758,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2508,6 +2774,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2529,6 +2807,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2543,6 +2823,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2566,6 +2858,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2580,6 +2874,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2601,6 +2907,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2615,6 +2923,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2638,6 +2958,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2652,6 +2974,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2673,6 +3007,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2687,6 +3023,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2710,6 +3058,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2724,6 +3074,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2745,6 +3107,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2759,6 +3123,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2782,6 +3158,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2796,6 +3174,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2817,6 +3207,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2831,6 +3223,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2854,6 +3258,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2868,6 +3274,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2889,6 +3307,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2903,6 +3323,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2926,6 +3358,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2940,6 +3374,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2961,6 +3407,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -2975,6 +3423,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -2998,6 +3458,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -3012,6 +3474,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -3033,6 +3507,8 @@
mount_tilt_down
camera_trigger
camera_source_toggle
+mount_pan_right
+mount_pan_left
lights1_cycle
lights1_brighter
lights1_dimmer
@@ -3047,6 +3523,18 @@
trim_pitch_inc
trim_pitch_dec
input_hold_toggle
+relay_1_on
+relay_1_off
+relay_1_toggle
+relay_2_on
+relay_2_off
+relay_2_toggle
+custom_1
+custom_2
+custom_3
+custom_4
+custom_5
+custom_6
@@ -4952,6 +5440,68 @@
+
+
+
+Disabled
+Pixhawk Aux1
+Pixhawk Aux2
+Pixhawk Aux3
+Pixhawk Aux4
+Pixhawk Aux5
+Pixhawk Aux6
+Pixhawk 3.3ADC1
+Pixhawk 3.3ADC2
+Pixhawk 6.6ADC
+
+
+
+
+Low
+High
+
+
+
+
+Disabled
+Pixhawk Aux1
+Pixhawk Aux2
+Pixhawk Aux3
+Pixhawk Aux4
+Pixhawk Aux5
+Pixhawk Aux6
+Pixhawk 3.3ADC1
+Pixhawk 3.3ADC2
+Pixhawk 6.6ADC
+
+
+
+
+Low
+High
+
+
+
+
+Disabled
+Pixhawk Aux1
+Pixhawk Aux2
+Pixhawk Aux3
+Pixhawk Aux4
+Pixhawk Aux5
+Pixhawk Aux6
+Pixhawk 3.3ADC1
+Pixhawk 3.3ADC2
+Pixhawk 6.6ADC
+
+
+
+
+Low
+High
+
+
+
@@ -5095,18 +5645,6 @@
0.0 1.5
0.1
-
-0.1 1.0
-0.01
-
-
-0.1 1.0
-0.01
-
-
-1 10
-1
-
@@ -5491,9 +6029,9 @@
100 1000
25
-
--1 100
-10
+
+10 50
+5
0.00001 0.01
@@ -6026,6 +6564,42 @@
1 100
+
+1 100000
+
+
+-1 16777215
+
+
+
+NoInfo
+Light
+Small
+Large
+HighVortexlarge
+Heavy
+HighlyManuv
+Rotocraft
+RESERVED
+Glider
+LightAir
+Parachute
+UltraLight
+RESERVED
+UAV
+Space
+RESERVED
+EmergencySurface
+ServiceSurface
+PointObstacle
+
+
+
+
+
+
+
+
@@ -6042,5 +6616,11 @@
Enable
+
+
+Disable
+Enable
+
+