Menu
▾
▴
[Flightgear-commitlogs] FlightGear Base Package branch, master, updated. e9d94f035fd5948f984ddf3d9ab56727744850d6
|
From: Flightgear-commitlogs <ma...@hy...> - 2013-07-28 18:14:31
|
The branch, master has been updated
- Log -----------------------------------------------------------------
commit e9d94f035fd5948f984ddf3d9ab56727744850d6
Author: Hyde Yamakawa
Date: Sun Jul 28 13:47:21 2013 -0400
777:Change autopilot pitch control to use elevator + parameter add to Flight Recorder
- Summary -------------------------------------------------------------
Aircraft/777/777-set-common.xml | 2 +-
Aircraft/777/Nasal/AFDS.nas | 18 ------------
Aircraft/777/Systems/777-autopilot.xml | 47 +++++++++++++++++++-----------
Aircraft/777/Systems/flight-recorder.xml | 33 +++++++++++++++++++++
4 files changed, 64 insertions(+), 36 deletions(-)
- Diff ----------------------------------------------------------------
diff --git a/Aircraft/777/777-set-common.xml b/Aircraft/777/777-set-common.xml
index 12708ee..1948fc7 100644
--- a/Aircraft/777/777-set-common.xml
+++ b/Aircraft/777/777-set-common.xml
@@ -9,7 +9,7 @@
<cockpit type="int">4</cockpit>
<model type="int">4</model>
</rating>
- <aircraft-version>20130707</aircraft-version>
+ <aircraft-version>20130728</aircraft-version>
<flight-model>yasim</flight-model>
<fuel-fraction type="double">0.1</fuel-fraction>
<model n="0">
diff --git a/Aircraft/777/Nasal/AFDS.nas b/Aircraft/777/Nasal/AFDS.nas
index 7ce8d5e..c1cc6ce 100644
--- a/Aircraft/777/Nasal/AFDS.nas
+++ b/Aircraft/777/Nasal/AFDS.nas
@@ -227,11 +227,6 @@ var AFDS = {
me.target_alt.setValue(me.alt_setting.getValue());
}
me.autothrottle_mode.setValue(5); # A/T SPD
- setprop("/autopilot/locks/pitch-lock", 1);
- settimer(func
- {
- setprop("autopilot/locks/pitch-lock", 0);
- }, 5);
}
if(btn==4)
{
@@ -323,11 +318,6 @@ var AFDS = {
setprop("autopilot/internal/current-pitch-deg", getprop("orientation/pitch-deg"));
var alt = me.alt_setting.getValue();
me.target_alt.setValue(alt);
- setprop("/autopilot/locks/pitch-lock", 1);
- settimer(func
- {
- setprop("autopilot/locks/pitch-lock", 0);
- }, 5);
}
me.vertical_mode.setValue(btn);
}
@@ -701,14 +691,6 @@ var AFDS = {
{
setprop("autopilot/settings/autopilot-transition", 0);
}, 10);
- if(me.AP_annun.getValue() != "LAND 3")
- {
- setprop("/autopilot/locks/pitch-lock", 1);
- settimer(func
- {
- setprop("autopilot/locks/pitch-lock", 0);
- }, 5);
- }
}
me.AP_annun.setValue(msg);
var tmp = abs(me.vs_setting.getValue());
diff --git a/Aircraft/777/Systems/777-autopilot.xml b/Aircraft/777/Systems/777-autopilot.xml
index eaa5aae..470bb54 100644
--- a/Aircraft/777/Systems/777-autopilot.xml
+++ b/Aircraft/777/Systems/777-autopilot.xml
@@ -1111,20 +1111,6 @@
</config>
</pid-controller>
- <filter>
- <name>AP:Pitch sample and hold</name>
- <debug>false</debug>
- <enable>
- <condition>
- <property>autopilot/locks/pitch-lock</property>
- </condition>
- </enable>
- <type>gain</type>
- <gain>1.0</gain>
- <input>/orientation/pitch-deg</input>
- <output>/autopilot/internal/target-pitch-deg</output>
- </filter>
-
<pid-controller>
<name>Elevator Control</name>
<debug>false</debug>
@@ -1138,7 +1124,7 @@
<property>/autopilot/internal/target-pitch-deg</property>
</reference>
<output>
- <property>/controls/flight/elevator-trim-filter</property>
+ <property>/controls/flight/elevator-filter</property>
</output>
<config>
<Kp>-0.024</Kp>
@@ -1190,9 +1176,36 @@
<max-rate-of-change>0.2</max-rate-of-change>
<initialize-to>output</initialize-to>
<input>
- <property>/controls/flight/elevator-trim-filter</property>
+ <property>/controls/flight/elevator-filter</property>
</input>
- <output>/controls/flight/elevator-trim</output>
+ <output>/controls/flight/elevator</output>
</filter>
+ <pid-controller>
+ <name>Stabilizer Control</name>
+ <debug>false</debug>
+ <enable>
+ <property>instrumentation/afds/inputs/AP</property>
+ </enable>
+ <input>
+ <property>/controls/flight/elevator</property>
+ </input>
+ <reference>
+ <value>0</value>
+ </reference>
+ <output>
+ <property>/controls/flight/elevator-trim</property>
+ </output>
+ <config>
+ <Kp>-0.05</Kp>
+ <Ti>10.0</Ti>
+ <Td>0.0</Td>
+ <u_min>
+ <value>-1.0</value>
+ </u_min>
+ <u_max>
+ <value>1.0</value>
+ </u_max>
+ </config>
+ </pid-controller>
</PropertyList>
diff --git a/Aircraft/777/Systems/flight-recorder.xml b/Aircraft/777/Systems/flight-recorder.xml
index 5bcf345..a691900 100644
--- a/Aircraft/777/Systems/flight-recorder.xml
+++ b/Aircraft/777/Systems/flight-recorder.xml
@@ -47,6 +47,9 @@
<signal>
<type>bool</type><property type="string">/engines/engine[%i]/run</property>
</signal>
+ <signal>
+ <type>int8</type><property type="string">/controls/engines/engine[%i]/reverser</property>
+ </signal>
</signals>
<signal>
@@ -95,12 +98,42 @@
<type>bool</type><property type="string">/controls/lighting/landing-light[2]</property>
</signal>
<signal>
+ <type>bool</type><property type="string">/instrumentation/afds/inputs/AP</property>
+ </signal>
+ <signal>
+ <type>bool</type><property type="string">/instrumentation/afds/inputs/loc-armed</property>
+ </signal>
+ <signal>
+ <type>bool</type><property type="string">/instrumentation/afds/inputs/gs-armed</property>
+ </signal>
+ <signal>
+ <type>int8</type><property type="string">/instrumentation/afds/inputs/vertical-index</property>
+ </signal>
+ <signal>
+ <type>int8</type><property type="string">/instrumentation/afds/inputs/lateral-index</property>
+ </signal>
+ <signal>
+ <type>bool</type><property type="string">/instrumentation/afds/inputs/at-armed[0]</property>
+ </signal>
+ <signal>
+ <type>bool</type><property type="string">/instrumentation/afds/inputs/at-armed[1]</property>
+ </signal>
+ <signal>
+ <type>int8</type><property type="string">/controls/flight/speedbrake-lever</property>
+ </signal>
+ <signal>
+ <type>int8</type><property type="string">/autopilot/autobrake/step</property>
+ </signal>
+ <signal>
<type>int8</type><property type="string">/instrumentation/afds/inputs/autothrottle-index</property>
</signal>
<signal>
<type>int16</type><property type="string">/autopilot/settings/target-speed-kt</property>
</signal>
<signal>
+ <type>float</type><property type="string">/instrumentation/pfd/stallspeed-diff</property>
+ </signal>
+ <signal>
<type>int</type><property type="string">/autopilot/settings/actual-target-altitude-ft</property>
</signal>
<signal>
-----------------------------------------------------------------------
FlightGear Base Package
|