From 48c2c05aeab1c371deccf95eb0d7be426ad35a8a Mon Sep 17 00:00:00 2001 From: Kilian Hofmann Date: Fri, 24 Jan 2025 21:59:02 +0100 Subject: [PATCH] THR LEVER --- .../TFDi_Design_MD-11/TFDi_MD11_INT_Knobs.xml | 83 ++--- .../TFDi_Design_MD-11/TFDi_MD11_INT_Misc.xml | 43 ++- .../TFDi_MD11_INT_Switches.xml | 140 +++++++++ .../model.F/TFDi_MD11_INT.xml | 296 ++---------------- .../TFDi_MD11_INT_PED.xml | 2 +- .../TFDi_MD11_INT_THR.xml | 109 ++++++- 6 files changed, 355 insertions(+), 318 deletions(-) diff --git a/PackageSources/ModelBehaviorDefs/TFDi_Design_MD-11/TFDi_MD11_INT_Knobs.xml b/PackageSources/ModelBehaviorDefs/TFDi_Design_MD-11/TFDi_MD11_INT_Knobs.xml index 0535148..aae4ccb 100644 --- a/PackageSources/ModelBehaviorDefs/TFDi_Design_MD-11/TFDi_MD11_INT_Knobs.xml +++ b/PackageSources/ModelBehaviorDefs/TFDi_Design_MD-11/TFDi_MD11_INT_Knobs.xml @@ -619,7 +619,8 @@ 50 500 0.15 - 0.35 + 0.0150 + 50 @@ -648,12 +649,17 @@ - (L:#NODE_NAME#) 5 * + (L:#NODE_NAME#) #ANIM_LENGTH# #NUM_POS# 1 - / * #ANIM_LAG# + + + 0 + + @@ -675,54 +681,59 @@ - (M:Event) 'LeftSingle' scmi 0 == if{ - (M:RelativeX) 0 > if{ - #INC_CODE# - } - (M:RelativeX) 0 < if{ - #DEC_CODE# - } - (E:SIMULATION TIME, seconds) (>O:UpdateTime) - } - (M:Event) 'WheelUp' scmi 0 == if{ - #INC_CODE# - (E:SIMULATION TIME,seconds) (>O:UpdateTime) - } - (M:Event) 'WheelDown' scmi 0 == if{ - #DEC_CODE# - (E:SIMULATION TIME, seconds) (>O:UpdateTime) + (M:Event) 'LeftSingle' scmi 0 == + if{ + (M:RelativeY) 0 > + (L:#NODE_NAME#) #NUM_POS# 1 - < + && + if{ #INC_CODE# } + (M:RelativeY) 0 < + (L:#NODE_NAME#) 0 > + && + if{ #DEC_CODE# } } + (M:Event) 'WheelUp' scmi 0 == + (L:#NODE_NAME#) #NUM_POS# 1 - < + && + if{ #INC_CODE# } + (M:Event) 'WheelDown' scmi 0 == + (L:#NODE_NAME#) 0 > + && + if{ #DEC_CODE# } - (M:Event) 'WheelUp' scmi 0 == if{ + (M:Event) 'WheelUp' scmi 0 == + (L:#NODE_NAME#) #NUM_POS# 1 - < + && if{ #INC_CODE# - (E:SIMULATION TIME, seconds) (>O:UpdateTime) } - (M:Event) 'WheelDown' scmi 0 == if{ + (M:Event) 'WheelDown' scmi 0 == + (L:#NODE_NAME#) 0 > + && if{ #DEC_CODE# - (E:SIMULATION TIME, seconds) (>O:UpdateTime) } (M:Event) 'Lock' scmi 0 == if{ - (L:#VAR_NAME#) 2 / (>O:InitialPosition) - } - (M:Event) 'Unlock' scmi 0 == if{ - 0 (>O:IsThresholdExceeded) + (M:RelativeY) (>O:InitialPosition) } (M:Event) 'LeftDrag' scmi 0 == if{ - (O:IsThresholdExceeded) ! if{ - (M:DragPercent) - (O:InitialPosition) - (>O:DragChange) - (O:DragChange) #DRAG_THRESHOLD# >= if{ + (M:RelativeY) (O:PreviousPosition) > if{ + (M:RelativeY) (O:InitialPosition) - #DRAG_THRESHOLD# > + (L:#NODE_NAME#) #NUM_POS# 1 - < + && + if{ #INC_CODE# - 1 (>O:IsThresholdExceeded) - (E:SIMULATION TIME, seconds) (>O:UpdateTime) + (M:RelativeY) (>O:InitialPosition) } - (O:DragChange) -#DRAG_THRESHOLD# <= if{ + } els{ + (O:InitialPosition) (M:RelativeY) - abs #DRAG_THRESHOLD# > + (L:#NODE_NAME#) 0 > + && + if{ #DEC_CODE# - 1 (>O:IsThresholdExceeded) (E:SIMULATION TIME, seconds) - (>O:UpdateTime) + (M:RelativeY) (>O:InitialPosition) } } + (M:RelativeY) (>O:PreviousPosition) } @@ -731,7 +742,7 @@ #NODE_NAME# True True - X + Y LeftDrag+RightDrag+MiddleDrag diff --git a/PackageSources/ModelBehaviorDefs/TFDi_Design_MD-11/TFDi_MD11_INT_Misc.xml b/PackageSources/ModelBehaviorDefs/TFDi_Design_MD-11/TFDi_MD11_INT_Misc.xml index e379c6f..62400c3 100644 --- a/PackageSources/ModelBehaviorDefs/TFDi_Design_MD-11/TFDi_MD11_INT_Misc.xml +++ b/PackageSources/ModelBehaviorDefs/TFDi_Design_MD-11/TFDi_MD11_INT_Misc.xml @@ -100,7 +100,7 @@ + + \ No newline at end of file diff --git a/PackageSources/ModelBehaviorDefs/TFDi_Design_MD-11/TFDi_MD11_INT_Switches.xml b/PackageSources/ModelBehaviorDefs/TFDi_Design_MD-11/TFDi_MD11_INT_Switches.xml index 7ec2278..5b9640d 100644 --- a/PackageSources/ModelBehaviorDefs/TFDi_Design_MD-11/TFDi_MD11_INT_Switches.xml +++ b/PackageSources/ModelBehaviorDefs/TFDi_Design_MD-11/TFDi_MD11_INT_Switches.xml @@ -414,4 +414,144 @@ + + \ No newline at end of file diff --git a/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11F_GE/model.F/TFDi_MD11_INT.xml b/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11F_GE/model.F/TFDi_MD11_INT.xml index 23559fe..6201e85 100644 --- a/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11F_GE/model.F/TFDi_MD11_INT.xml +++ b/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11F_GE/model.F/TFDi_MD11_INT.xml @@ -4200,136 +4200,6 @@ - - MD11_THR_L_ATS_BT - 10 - - - (L:MD11_THR_L_ATS_BT, enum) 10 * - 100 - - - - HAND - LEFTSINGLE+LEFTRELEASE - (M:Event) 'LeftSingle' scmp 0 == if{ 77844 (>L:CEVENT) } (M:Event) - 'LeftRelease' scmp 0 == if{ 77845 (>L:CEVENT) } - - - - MD11_THR_R_ATS_BT - 10 - - - (L:MD11_THR_R_ATS_BT, enum) 10 * - 100 - - - - HAND - LEFTSINGLE+LEFTRELEASE - (M:Event) 'LeftSingle' scmp 0 == if{ 77846 (>L:CEVENT) } (M:Event) - 'LeftRelease' scmp 0 == if{ 77847 (>L:CEVENT) } - - - - MD11_THR_GEAR_HORN_BT - 10 - - - (L:MD11_THR_GEAR_HORN_BT, enum) 10 * - 100 - - - - HAND - LEFTSINGLE+LEFTRELEASE - (M:Event) 'LeftSingle' scmp 0 == if{ 77849 (>L:CEVENT) } (M:Event) - 'LeftRelease' scmp 0 == if{ 77850 (>L:CEVENT) } - - - - MD11_THR_GA_BT - 10 - - - (L:MD11_THR_GA_BT, enum) 10 * - 100 - - - - HAND - LEFTSINGLE+LEFTRELEASE - (M:Event) 'LeftSingle' scmp 0 == if{ 77851 (>L:CEVENT) } (M:Event) - 'LeftRelease' scmp 0 == if{ 77852 (>L:CEVENT) } - - - - MD11_THR_L_RNG - 100 - - - (L:MD11_THR_L_RNG, enum) 0.909090909090909 * - 1000 - - - - - - MD11_THR_C_RNG - 100 - - - (L:MD11_THR_C_RNG, enum) 0.909090909090909 * - 1000 - - - - - - MD11_THR_R_RNG - 100 - - - (L:MD11_THR_R_RNG, enum) 0.909090909090909 * - 1000 - - - - - - MD11_THR_L_REV_RNG - 100 - - - (L:MD11_THR_L_REV_RNG, enum) 0.909090909090909 * - 1000 - - - - - - MD11_THR_C_REV_RNG - 100 - - - (L:MD11_THR_C_REV_RNG, enum) 0.909090909090909 * - 1000 - - - - - - MD11_THR_R_REV_RNG - 100 - - - (L:MD11_THR_R_REV_RNG, enum) 0.909090909090909 * - 1000 - - - - MD11_SPDBRK_RNG 100 @@ -4339,7 +4209,6 @@ 1000 - MD11_SPDBRK_LATCH @@ -4350,8 +4219,25 @@ 100 - + + MD11_SPDBRK_HANDLE + 10 + + + (L:MD11_SPDBRK_HANDLE, enum) 5 * + 100 + + + + Hand + LEFTSINGLE+WHEELUP+WHEELDOWN + (M:Event) 'LeftSingle' scmp 0 == if{ 77829 (>L:CEVENT) } (M:Event) + 'WheelUp' scmp 0 == if{ 77853 (>L:CEVENT) } (M:Event) 'WheelDown' + scmp 0 == if{ 77828 (>L:CEVENT) } + + + MD11_FLAP_LATCH 10 @@ -4377,7 +4263,6 @@ 1000 - MD11_DIALAFLAP_IND_RNG @@ -4388,7 +4273,6 @@ 1000 - MD11_DIALAFLAP_WHEEL_RNG @@ -4406,150 +4290,6 @@ 'WheelDown' scmp 0 == if{ 77833 (>L:CEVENT) } - - MD11_SPDBRK_HANDLE - 10 - - - (L:MD11_SPDBRK_HANDLE, enum) 5 * - 100 - - - - Hand - LEFTSINGLE+WHEELUP+WHEELDOWN - (M:Event) 'LeftSingle' scmp 0 == if{ 77829 (>L:CEVENT) } (M:Event) - 'WheelUp' scmp 0 == if{ 77853 (>L:CEVENT) } (M:Event) 'WheelDown' - scmp 0 == if{ 77828 (>L:CEVENT) } - - - - MD11_THR_L_FUEL_SW - 10 - - - (L:MD11_THR_L_FUEL_SW, enum) 10 * - 100 - - - - HAND - LEFTSINGLE - (M:Event) 'LeftSingle' scmp 0 == if{ 77834 (>L:CEVENT) } - - - - MD11_THR_C_FUEL_SW - 10 - - - (L:MD11_THR_C_FUEL_SW, enum) 10 * - 100 - - - - HAND - LEFTSINGLE - (M:Event) 'LeftSingle' scmp 0 == if{ 77835 (>L:CEVENT) } - - - - MD11_THR_R_FUEL_SW - 10 - - - (L:MD11_THR_R_FUEL_SW, enum) 10 * - 100 - - - - HAND - LEFTSINGLE - (M:Event) 'LeftSingle' scmp 0 == if{ 77836 (>L:CEVENT) } - - - - MD11_THR_L_START_SW - 10 - - - (L:MD11_THR_L_START_SW, enum) 10 * - 100 - - - - HAND - LEFTSINGLE - (M:Event) 'LeftSingle' scmp 0 == if{ 77837 (>L:CEVENT) } - - - - MD11_THR_C_START_SW - 10 - - - (L:MD11_THR_C_START_SW, enum) 10 * - 100 - - - - HAND - LEFTSINGLE - (M:Event) 'LeftSingle' scmp 0 == if{ 77838 (>L:CEVENT) } - - - - MD11_THR_R_START_SW - 10 - - - (L:MD11_THR_R_START_SW, enum) 10 * - 100 - - - - HAND - LEFTSINGLE - (M:Event) 'LeftSingle' scmp 0 == if{ 77839 (>L:CEVENT) } - - - - MD11_THR_LONG_TRIM_SW - 10 - - - (L:MD11_THR_LONG_TRIM_SW, enum) 5 * - 100 - - - - GRAB - LeftDrag+LeftSingle+MoveRepeat+Move+LeftRelease+Leave - (M:Event) 'LeftSingle' scmi 0 == if{ (M:Y) (>L:LastPos) 1 (>L:MOUSEDOWN) } - (M:Event) 'Move' scmi 0 == if{ - (L:MOUSEDOWN) 0 > if{ - (M:Y) (L:LastPos) - 1 > if{ 77840 (>L:CEVENT) 0 (>L:MOUSEDOWN) } - (M:Y) (L:LastPos) - -1 < if{ 77842 (>L:CEVENT) 0 (>L:MOUSEDOWN) } } - } - (M:Event) 'LeftRelease' scmi 0 == if{ 77841 (>L:CEVENT) 0 (>L:MOUSEDOWN) } - (M:Event) 'Leave' scmi 0 == if{ 77841 (>L:CEVENT) 0 (>L:MOUSEDOWN) } - - - - MD11_THR_PARK_LVR - 10 - - - (L:MD11_THR_PARK_LVR, enum) 10 * - 100 - - - - HAND - LEFTSINGLE - (M:Event) 'LeftSingle' scmp 0 == if{ 77848 (>L:CEVENT) } - - diff --git a/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11_Shared/TFDi_MD11_INT_PED.xml b/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11_Shared/TFDi_MD11_INT_PED.xml index 9fd0940..df3f0b1 100644 --- a/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11_Shared/TFDi_MD11_INT_PED.xml +++ b/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11_Shared/TFDi_MD11_INT_PED.xml @@ -343,7 +343,7 @@ MD11_PED_RUD_TRIM_SW - 2 (L:MD11_PED_RUD_TRIM_SW) - + 50 (L:MD11_PED_RUD_TRIM_SW) 25 * - (L:MD11_PED_RUD_TRIM_SW) 50 < if{ 69848 (>L:CEVENT) } (L:MD11_PED_RUD_TRIM_SW) 0 > if{ 69850 (>L:CEVENT) } 69849 (>L:CEVENT) diff --git a/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11_Shared/TFDi_MD11_INT_THR.xml b/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11_Shared/TFDi_MD11_INT_THR.xml index 66ed29b..09e2143 100644 --- a/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11_Shared/TFDi_MD11_INT_THR.xml +++ b/PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11_Shared/TFDi_MD11_INT_THR.xml @@ -1,6 +1,113 @@ \ No newline at end of file