diff --git a/Systems/fbw-pitch.xml b/Systems/fbw-pitch.xml index 05e952b3..d3618f68 100644 --- a/Systems/fbw-pitch.xml +++ b/Systems/fbw-pitch.xml @@ -14,11 +14,156 @@ + + + IT-CONTROLLER: LOAD FACTOR CMD + gain + 1.0 + + + + + /controls/flight/elevator-input + 1-0.5 + 0 1.0 + -1 2.5 +
+
+
+ + /it-fbw/g-target + + + + /controls/flight/flap-pos + 0 + + + 0.0 + + -1.0 + + + + /controls/flight/flap-pos + 0 + + + 2.0 + + 2.5 +
+ + + IT-CONTROLLER: COMPUTED G + gain + 1.0 + + + + + /fdm/jsbsim/forces/load-factor + -1 + +
+ -1 + + + + /orientation/roll-deg + 0.965 + + + +
+ 1 +
+
+ + /it-fbw/g-computed +
+ + + IT-CONTROLLER: G ERROR + gain + -1.0 + + + + /it-fbw/g-target + /it-fbw/g-computed + + + + /it-fbw/g-error + + + + IT-CONTROLLER: G ELEVATOR + false + + + + + /gear/gear[1]/wow + 0 + + + /gear/gear[2]/wow + 0 + + + + /it-fbw/law + 0 + + + /it-fbw/law + 1 + + + + + + + /it-fbw/g-error + + + 0 + + + /it-fbw/g-elevator + + + -2.5 + -1.5 + + + + /controls/flight/elevator-input + 0 + + + /controls/flight/elevator-input + + 0.0 + + + + /controls/flight/elevator-input + 0 + + + /controls/flight/elevator-input + + 0.0 + + IT-CONTROLLER: PITCH RATE CMD gain - 1 + 1.0 @@ -35,7 +180,7 @@ - /controls/flight/elevator-input + /it-fbw/g-elevator 1-5.0 0 0.0-1 5.0 @@ -47,7 +192,7 @@ -14.999990
- /controls/flight/elevator-input + /it-fbw/g-elevator15.000.0
@@ -59,7 +204,7 @@ 30.000001 - /controls/flight/elevator-input + /it-fbw/g-elevator 0 0.0-1-5.0
@@ -90,7 +235,7 @@ - /controls/flight/elevator-input + /it-fbw/g-elevator 1-5.0 0 0.0-1 5.0 @@ -114,7 +259,7 @@
- /controls/flight/elevator-input + /it-fbw/g-elevator 0.0 1.5-1.0 5.0
@@ -125,7 +270,7 @@ 30.000001 - /controls/flight/elevator-input + /it-fbw/g-elevator 0-1.5-1-5.0
@@ -154,7 +299,7 @@ - /controls/flight/elevator-input + /it-fbw/g-elevator 1.0-3.5 0.0 1.5-1.0 5.0 @@ -166,7 +311,7 @@ -14.999990
- /controls/flight/elevator-input + /it-fbw/g-elevator1 3.50-1.5
@@ -178,7 +323,7 @@ 30.000001 - /controls/flight/elevator-input + /it-fbw/g-elevator 0-1.5-1-5.0
@@ -197,9 +342,9 @@
- IT-FBW: PITCH KP (P Gain) + IT-CONTROLLER: PITCH KP (P Gain) gain - 1 + 1.0 @@ -213,9 +358,9 @@ - IT-FBW: PITCH TI (I Time) + IT-CONTROLLER: PITCH TI (I Time) gain - 1 + 1.0
@@ -229,7 +374,7 @@ - IT-FBW: PITCH + IT-CONTROLLER: PITCH false @@ -281,10 +426,10 @@ - IT-FBW: PITCH OPTION + IT-CONTROLLER: PITCH OPTION false gain - 1 + 1.0 true output @@ -381,7 +526,7 @@ - IT-FBW: PITCH TRIM + IT-CONTROLLER: PITCH TRIM false output diff --git a/Systems/fbw-roll-yaw.xml b/Systems/fbw-roll-yaw.xml index 989a3051..c5b8ae09 100644 --- a/Systems/fbw-roll-yaw.xml +++ b/Systems/fbw-roll-yaw.xml @@ -18,7 +18,7 @@ IT-CONTROLLER: ROLL gain - 1 + 1.0 0.05 @@ -221,9 +221,9 @@ - IT-FBW: ROLL KP (P Gain) + IT-CONTROLLER: ROLL KP (P Gain) gain - 1 + 1.0
@@ -237,9 +237,9 @@ - IT-FBW: ROLL TI (I Time) + IT-CONTROLLER: ROLL TI (I Time) gain - 1 + 1.0
@@ -253,7 +253,7 @@ - IT-FBW: ROLL + IT-CONTROLLER: ROLL false @@ -299,10 +299,10 @@ - IT-FBW: ROLL OPTION + IT-CONTROLLER: ROLL OPTION false gain - 1 + 1.0 true output @@ -414,9 +414,9 @@ - IT-FBW: SPOILER + IT-CONTROLLER: SPOILER gain - 1 + 1.0 @@ -448,9 +448,9 @@ - IT-FBW: LEFT SPOILER + IT-CONTROLLER: LEFT SPOILER gain - 1 + 1.0 @@ -504,9 +504,9 @@ - IT-FBW: RIGHT SPOILER + IT-CONTROLLER: RIGHT SPOILER gain - 1 + 1.0 @@ -564,7 +564,7 @@ - IT-FBW: YAW DAMPER/TURN COORDINATOR FEEDBACK IF DISABLED + IT-CONTROLLER: YAW DAMPER/TURN COORDINATOR FEEDBACK IF DISABLED @@ -600,7 +600,7 @@ gain - 1 + 1.0 0 /controls/flight/rudder-fbw-cmd -0.2 @@ -608,7 +608,7 @@ - IT-FBW: YAW DAMPER/TURN COORDINATOR + IT-CONTROLLER: YAW DAMPER/TURN COORDINATOR false @@ -666,7 +666,7 @@ - IT-FBW: RUDDER OPTION + IT-CONTROLLER: RUDDER OPTION false true output diff --git a/Systems/fmgc-pitch.xml b/Systems/fmgc-pitch.xml index 090dec5d..f7dcdfb3 100644 --- a/Systems/fmgc-pitch.xml +++ b/Systems/fmgc-pitch.xml @@ -638,7 +638,7 @@ PITCH DEG SYNC false gain - 1 + 1.0 diff --git a/Systems/fmgc-roll-yaw.xml b/Systems/fmgc-roll-yaw.xml index c49910ca..fdd3a12c 100644 --- a/Systems/fmgc-roll-yaw.xml +++ b/Systems/fmgc-roll-yaw.xml @@ -152,7 +152,7 @@ ROLL DEG SYNC false gain - 1 + 1.0 diff --git a/Systems/fmgc-thrust.xml b/Systems/fmgc-thrust.xml index 6d02a1c5..62b06f75 100644 --- a/Systems/fmgc-thrust.xml +++ b/Systems/fmgc-thrust.xml @@ -131,7 +131,7 @@ Throttle Comparator gain - 1 + 1.0 @@ -286,7 +286,7 @@ IDLE false gain - 1 + 1.0 @@ -337,7 +337,7 @@ CLB false gain - 1 + 1.0 @@ -378,7 +378,7 @@ Thrust Filter 1 gain - 1 + 1.0 /controls/engines/throttle-cmd-pid /controls/engines/engine[0]/throttle-cmd @@ -390,7 +390,7 @@ Thrust Filter 2 gain - 1 + 1.0 /controls/engines/throttle-cmd-pid /controls/engines/engine[1]/throttle-cmd diff --git a/revision.txt b/revision.txt index 457561c7..ca1c19b1 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4048 \ No newline at end of file +4050 \ No newline at end of file