diff --git a/ROMFS/px4fmu_common/init.d/1000_rc_fw_easystar.hil b/ROMFS/px4fmu_common/init.d/1000_rc_fw_easystar.hil index 1f36cc0d2d..98b7e9f90c 100644 --- a/ROMFS/px4fmu_common/init.d/1000_rc_fw_easystar.hil +++ b/ROMFS/px4fmu_common/init.d/1000_rc_fw_easystar.hil @@ -9,6 +9,8 @@ # @output MAIN2 elevator # @output MAIN3 rudder # @output MAIN4 throttle +# @output MAIN5 flaps +# @output MAIN6 gear # # @maintainer Lorenz Meier # diff --git a/ROMFS/px4fmu_common/init.d/2101_fw_AERT b/ROMFS/px4fmu_common/init.d/2101_fw_AERT index e4ab043dec..3896951c0c 100644 --- a/ROMFS/px4fmu_common/init.d/2101_fw_AERT +++ b/ROMFS/px4fmu_common/init.d/2101_fw_AERT @@ -10,6 +10,7 @@ # @output MAIN3 rudder # @output MAIN4 throttle # @output MAIN5 flaps +# @output MAIN6 gear # # @output AUX1 feed-through of RC AUX1 channel # @output AUX2 feed-through of RC AUX2 channel diff --git a/ROMFS/px4fmu_common/init.d/2103_skyhunter_1800 b/ROMFS/px4fmu_common/init.d/2103_skyhunter_1800 index cf5a30ea14..9a93822875 100644 --- a/ROMFS/px4fmu_common/init.d/2103_skyhunter_1800 +++ b/ROMFS/px4fmu_common/init.d/2103_skyhunter_1800 @@ -7,7 +7,10 @@ # # @output MAIN1 aileron # @output MAIN2 elevator +# @output MAIN3 EMPTY # @output MAIN4 throttle +# @output MAIN5 flaps +# @output MAIN6 gear # # @output AUX1 feed-through of RC AUX1 channel # @output AUX2 feed-through of RC AUX2 channel diff --git a/ROMFS/px4fmu_common/init.d/2104_fw_AETR b/ROMFS/px4fmu_common/init.d/2104_fw_AETR index 00118ac9a7..4406b5332a 100644 --- a/ROMFS/px4fmu_common/init.d/2104_fw_AETR +++ b/ROMFS/px4fmu_common/init.d/2104_fw_AETR @@ -10,6 +10,7 @@ # @output MAIN3 throttle # @output MAIN4 rudder # @output MAIN5 flaps +# @output MAIN6 gear # # @output AUX1 feed-through of RC AUX1 channel # @output AUX2 feed-through of RC AUX2 channel diff --git a/ROMFS/px4fmu_common/mixers/AERT.main.mix b/ROMFS/px4fmu_common/mixers/AERT.main.mix index 75e82bb00a..a58ecf6f54 100644 --- a/ROMFS/px4fmu_common/mixers/AERT.main.mix +++ b/ROMFS/px4fmu_common/mixers/AERT.main.mix @@ -9,7 +9,7 @@ elevator to output 1, the rudder to output 2 and the throttle to output 3. Inputs to the mixer come from channel group 0 (vehicle attitude), channels 0 (roll), 1 (pitch) and 3 (thrust). -Aileron mixer +CH1: Aileron mixer ------------- Two scalers total (output, roll). @@ -26,7 +26,7 @@ M: 1 O: 10000 10000 0 -10000 10000 S: 0 0 10000 10000 0 -10000 10000 -Elevator mixer +CH2: Elevator mixer ------------ Two scalers total (output, roll). @@ -39,7 +39,7 @@ M: 1 O: 10000 10000 0 -10000 10000 S: 0 1 -10000 -10000 0 -10000 10000 -Rudder mixer +CH3: Rudder mixer ------------ Two scalers total (output, yaw). @@ -52,7 +52,7 @@ M: 1 O: 10000 10000 0 -10000 10000 S: 0 2 10000 10000 0 -10000 10000 -Motor speed mixer +CH4: Motor speed mixer ----------------- Two scalers total (output, thrust). @@ -62,3 +62,20 @@ range. Inputs below zero are treated as zero. M: 1 O: 10000 10000 0 -10000 10000 S: 0 3 0 20000 -10000 -10000 10000 + +CH5: Flaps mixer +------------ +Flaps are controlled automatically in position control and auto +but can also be controlled manually + +M: 1 +O: 5000 10000 0 -10000 10000 +S: 0 4 10000 10000 0 -10000 10000 + +Ch6: Landing gear mixer +------------ +By default pass-through of gear switch + +M: 1 +O: 10000 10000 0 -10000 10000 +S: 3 5 10000 10000 0 -10000 10000 diff --git a/ROMFS/px4fmu_common/mixers/AET.main.mix b/ROMFS/px4fmu_common/mixers/AET.main.mix index 20cb88b916..3f6f8c0a08 100644 --- a/ROMFS/px4fmu_common/mixers/AET.main.mix +++ b/ROMFS/px4fmu_common/mixers/AET.main.mix @@ -9,7 +9,7 @@ output 1 and the throttle to output 3. Inputs to the mixer come from channel group 0 (vehicle attitude), channels 0 (roll), 1 (pitch) and 3 (thrust). -Aileron mixer +CH1: Aileron mixer ------------- Two scalers total (output, roll). @@ -29,7 +29,7 @@ M: 1 O: 10000 10000 0 -10000 10000 S: 0 0 10000 10000 0 -10000 10000 -Elevator mixer +CH2: Elevator mixer ------------ Two scalers total (output, roll). @@ -42,13 +42,13 @@ M: 1 O: 10000 10000 0 -10000 10000 S: 0 1 -10000 -10000 0 -10000 10000 -Output 2 +CH3: Output 2 -------- This mixer is empty. Z: -Motor speed mixer +CH4: Motor speed mixer ----------------- Two scalers total (output, thrust). @@ -58,3 +58,20 @@ range. Inputs below zero are treated as zero. M: 1 O: 10000 10000 0 -10000 10000 S: 0 3 0 20000 -10000 -10000 10000 + +CH5: Flaps mixer +------------ +Flaps are controlled automatically in position control and auto +but can also be controlled manually + +M: 1 +O: 5000 10000 0 -10000 10000 +S: 0 4 10000 10000 0 -10000 10000 + +Ch6: Landing gear mixer +------------ +By default pass-through of gear switch + +M: 1 +O: 10000 10000 0 -10000 10000 +S: 3 5 10000 10000 0 -10000 10000 diff --git a/ROMFS/px4fmu_common/mixers/AETR.main.mix b/ROMFS/px4fmu_common/mixers/AETR.main.mix index 004fad8bd7..98c838c512 100644 --- a/ROMFS/px4fmu_common/mixers/AETR.main.mix +++ b/ROMFS/px4fmu_common/mixers/AETR.main.mix @@ -9,7 +9,7 @@ elevator to output 1, the throttle to output 2 and the rudder to output 3. Inputs to the mixer come from channel group 0 (vehicle attitude), channels 0 (roll), 1 (pitch) and 3 (thrust). -Aileron mixer +CH1: Aileron mixer ------------- Two scalers total (output, roll). @@ -26,7 +26,7 @@ M: 1 O: 10000 10000 0 -10000 10000 S: 0 0 10000 10000 0 -10000 10000 -Elevator mixer +CH2: Elevator mixer ------------ Two scalers total (output, roll). @@ -39,7 +39,7 @@ M: 1 O: 10000 10000 0 -10000 10000 S: 0 1 -10000 -10000 0 -10000 10000 -Motor speed mixer +CH3: Motor speed mixer ----------------- Two scalers total (output, thrust). @@ -50,7 +50,7 @@ M: 1 O: 10000 10000 0 -10000 10000 S: 0 3 0 20000 -10000 -10000 10000 -Rudder mixer +CH4: Rudder mixer ------------ Two scalers total (output, yaw). @@ -62,3 +62,20 @@ endpoints to suit. M: 1 O: 10000 10000 0 -10000 10000 S: 0 2 10000 10000 0 -10000 10000 + +CH5: Flaps mixer +------------ +Flaps are controlled automatically in position control and auto +but can also be controlled manually + +M: 1 +O: 5000 10000 0 -10000 10000 +S: 0 4 10000 10000 0 -10000 10000 + +Ch6: Landing gear mixer +------------ +By default pass-through of gear switch + +M: 1 +O: 10000 10000 0 -10000 10000 +S: 3 5 10000 10000 0 -10000 10000