Merge branch 'dev' into pneumatics
This commit is contained in:
legoboyvdlp R
commit
02c1104d99
25 changed files with 5169 additions and 5020 deletions
|
|
@ -493,6 +493,7 @@
|
|||
<y alias="/sim/model/autopush/force-y"/>
|
||||
</tractor>
|
||||
</external_reactions>
|
||||
<zero type="int">0</zero>
|
||||
</jsbsim>
|
||||
</fdm>
|
||||
|
||||
|
|
@ -950,7 +951,10 @@
|
|||
|
||||
<systems>
|
||||
<acconfig n="0">
|
||||
<autoconfig-running>0</autoconfig-running>
|
||||
<autoconfig-running type="bool">0</autoconfig-running>
|
||||
<options n="0">
|
||||
<seperate-tiller-axis type="bool">0</seperate-tiller-axis>
|
||||
</options>
|
||||
</acconfig>
|
||||
<air-conditioning>
|
||||
<packs>
|
||||
|
|
|
|||
|
|
@ -86,6 +86,7 @@ setprop("/systems/acconfig/options/allow-oil-consumption", 0);
|
|||
setprop("/systems/acconfig/options/welcome-skip", 0);
|
||||
setprop("/systems/acconfig/options/no-rendering-warn", 0);
|
||||
setprop("/systems/acconfig/options/save-state", 0);
|
||||
setprop("/systems/acconfig/options/seperate-tiller-axis", 0);
|
||||
setprop("/systems/acconfig/options/pfd-rate", 1);
|
||||
setprop("/systems/acconfig/options/nd-rate", 1);
|
||||
setprop("/systems/acconfig/options/uecam-rate", 1);
|
||||
|
|
|
|||
|
|
@ -467,9 +467,29 @@
|
|||
<live>true</live>
|
||||
</checkbox>
|
||||
|
||||
<checkbox>
|
||||
<label>Use Seperate Tiller Axis</label>
|
||||
<halign>left</halign>
|
||||
<property>/systems/acconfig/options/seperate-tiller-axis</property>
|
||||
<binding>
|
||||
<command>property-toggle</command>
|
||||
<property>/systems/acconfig/options/seperate-tiller-axis</property>
|
||||
</binding>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
</binding>
|
||||
<binding>
|
||||
<command>nasal</command>
|
||||
<script>
|
||||
acconfig.writeSettings();
|
||||
</script>
|
||||
</binding>
|
||||
<live>true</live>
|
||||
</checkbox>
|
||||
|
||||
<checkbox>
|
||||
<!-- TODO there might be a better way to formulate this. -->
|
||||
<label>Save states between sessions</label>
|
||||
<label>Save States Between Sessions</label>
|
||||
<halign>left</halign>
|
||||
<property>/systems/acconfig/options/save-state</property>
|
||||
<binding>
|
||||
|
|
|
|||
|
|
@ -1073,8 +1073,6 @@
|
|||
<object-name>vs-text-test</object-name>
|
||||
<object-name>wpt_led</object-name>
|
||||
<object-name>wpt_led.001</object-name>
|
||||
<object-name>terr_on_nd_label</object-name>
|
||||
<!-- <object-name>clock_glare</object-name>-->
|
||||
<condition>
|
||||
<greater-than-equals>
|
||||
<property>systems/electrical/bus/dc-ess</property>
|
||||
|
|
@ -6596,8 +6594,8 @@
|
|||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>tiller</object-name>
|
||||
<property>fdm/jsbsim/fbw/rudder-pedal</property>
|
||||
<factor>-70</factor>
|
||||
<property>fdm/jsbsim/fbw/tiller-handle</property>
|
||||
<factor>-75</factor>
|
||||
<axis>
|
||||
<object-name>tiller.axis</object-name>
|
||||
</axis>
|
||||
|
|
@ -6605,8 +6603,8 @@
|
|||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>tillerFo</object-name>
|
||||
<property>fdm/jsbsim/fbw/rudder-pedal</property>
|
||||
<factor>-70</factor>
|
||||
<property>fdm/jsbsim/fbw/tiller-handle</property>
|
||||
<factor>-75</factor>
|
||||
<axis>
|
||||
<object-name>tillerFo.axis</object-name>
|
||||
</axis>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
Before Width: | Height: | Size: 366 KiB After Width: | Height: | Size: 367 KiB |
|
|
@ -320,7 +320,6 @@ var flightPlanController = {
|
|||
# we want to delete the intermediate waypoints up to but not including the waypoint. Leave index 0, we delete it later.
|
||||
# example - waypoint dirto is index 5, we want to delete indexes 1 -> 4. 5 - 1 = 4.
|
||||
# so four individual deletions. Delete index 1 four times.
|
||||
# Add one extra for the TP, so while > 2
|
||||
|
||||
var timesToDelete = me.flightplans[plan].indexOfWP(waypointGhost);
|
||||
while (timesToDelete > 1) {
|
||||
|
|
@ -330,9 +329,9 @@ var flightPlanController = {
|
|||
# Add TP afterwards, this is essential
|
||||
me.insertTP(plan, 1);
|
||||
}
|
||||
me.deleteWP(0, plan);
|
||||
var curAircraftPosDirTo = geo.aircraft_position();
|
||||
canvas_mcdu.myDirTo[plan].updateDist(me.flightplans[plan].getWP(1).courseAndDistanceFrom(curAircraftPosDirTo)[1]);
|
||||
canvas_mcdu.myDirTo[plan].updateDist(me.flightplans[plan].getWP(2).courseAndDistanceFrom(curAircraftPosDirTo)[1]);
|
||||
me.deleteWP(0, plan);
|
||||
me.flightPlanChanged(plan);
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ var distance = 0;
|
|||
var min_dist = 0;
|
||||
var max_dist = 0;
|
||||
var canChangeZOffset = 0;
|
||||
var decStep = -0.5;
|
||||
var incStep = 0.5;
|
||||
var decStep = -1;
|
||||
var incStep = 1;
|
||||
var viewName = "XX";
|
||||
|
||||
var fovZoom = func(d) {
|
||||
|
|
|
|||
|
|
@ -148,6 +148,7 @@ var dirTo = {
|
|||
fieldL1: func(text, override = 0, overrideIndex = -1) {
|
||||
me.makeTmpy();
|
||||
me.L1[0] = text;
|
||||
me.fontMatrix = [[0, 0, 0, 0, 0, 0], [0, 0, 0, 1, 1, 0]];
|
||||
if (size(text) == 16) {
|
||||
# lat lon
|
||||
var lat = split("/", text)[0];
|
||||
|
|
@ -236,8 +237,9 @@ var dirTo = {
|
|||
},
|
||||
leftFieldBtn: func(index) {
|
||||
me.makeTmpy();
|
||||
me.L1[0] = me.vector[index + me.scroll - 2].wp_name;
|
||||
fmgc.flightPlanController.directTo(me.vector[index + me.scroll - 2], me.computer);
|
||||
me.L1[0] = me.vector[index - 2].wp_name;
|
||||
me.fontMatrix = [[0, 0, 0, 0, 0, 0], [0, 0, 0, 1, 1, 0]];
|
||||
fmgc.flightPlanController.directTo(me.vector[index - 2], me.computer);
|
||||
me.arrowsMatrix[0][1] = 0;
|
||||
# FIGURE OUT HOW TO MAKE IT SO IT DOESN'T DELETE THE WAYPOINTS ON DIR TO BUT DOES IN FLIGHTPLAN
|
||||
#for (var i = 2; i != 6; i = i + 1) {
|
||||
|
|
@ -256,6 +258,7 @@ var dirTo = {
|
|||
notAllowed(me.computer);
|
||||
}
|
||||
me.L1 = [" [ ]", " WAYPOINT", "blu"];
|
||||
me.fontMatrix = [[1, 0, 0, 0, 0, 0], [0, 0, 0, 1, 1, 0]];
|
||||
me.R1 = ["---- --- ", "UTC DIST ", "wht"];
|
||||
},
|
||||
fieldR6: func() {
|
||||
|
|
@ -266,6 +269,7 @@ var dirTo = {
|
|||
notAllowed(me.computer);
|
||||
}
|
||||
me.L1 = [" [ ]", " WAYPOINT", "blu"];
|
||||
me.fontMatrix = [[1, 0, 0, 0, 0, 0], [0, 0, 0, 1, 1, 0]];
|
||||
me.R1 = ["---- --- ", "UTC DIST ", "wht"];
|
||||
setprop("MCDU[" ~ me.computer ~ "]/page", "F-PLNA"); # todo - remember horizontal srcoll of f-plna?
|
||||
},
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ var perfAPPRInput = func(key, i) {
|
|||
mcdu.clearScratchpad(i);
|
||||
} else if (int(scratchpad) != nil and scratchpad >= 100 and scratchpad <= 350) {
|
||||
setprop("/FMGC/internal/vapp-speed-set", 1);
|
||||
setprop("/FMGC/internal/computed-speeds/vapp_appr", scratchpad);
|
||||
setprop("/FMGC/internal/computed-speeds/vapp", scratchpad);
|
||||
mcdu.clearScratchpad(i);
|
||||
} else {
|
||||
notAllowed(i);
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -719,15 +719,157 @@
|
|||
|
||||
<channel name="Tiller">
|
||||
|
||||
<switch name="hydraulics/tiller/switch">
|
||||
<switch name="/controls/gear/steering-switched">
|
||||
<default value="/controls/flight/rudder"/>
|
||||
<test logic="AND" value="/controls/flight/aileron">
|
||||
fbw/fmgc/enabled eq 0
|
||||
<test value="0">
|
||||
/gear/gear[0]/wow ne 1
|
||||
</test>
|
||||
<test value="/controls/gear/steering">
|
||||
/systems/acconfig/options/seperate-tiller-axis eq 1
|
||||
</test>
|
||||
<test value="/controls/flight/aileron">
|
||||
/controls/flight/aileron-drives-tiller eq 1
|
||||
</test>
|
||||
<test value="fbw/fmgc/yaw-cmd">
|
||||
</switch>
|
||||
|
||||
<scheduled_gain name="fbw/tiller-handle-scheduled">
|
||||
<input>/controls/gear/steering-switched</input>
|
||||
<table>
|
||||
<independentVar lookup="row">/velocities/groundspeed-kt</independentVar>
|
||||
<independentVar lookup="column">/systems/acconfig/options/seperate-tiller-axis</independentVar>
|
||||
<tableData>
|
||||
0 1
|
||||
0.5 0 0
|
||||
1.0 1 1
|
||||
20.0 1 1
|
||||
70.0 0 1
|
||||
</tableData>
|
||||
</table>
|
||||
</scheduled_gain>
|
||||
|
||||
<lag_filter name="fbw/tiller-handle">
|
||||
<input>fbw/tiller-handle-scheduled</input>
|
||||
<c1>20</c1>
|
||||
</lag_filter>
|
||||
|
||||
<pure_gain name="/controls/gear/steering-deg">
|
||||
<input>/controls/gear/steering</input>
|
||||
<gain>75</gain>
|
||||
</pure_gain>
|
||||
|
||||
<pure_gain name="hydraulics/tiller/autopush-cmd-deg">
|
||||
<input>hydraulics/tiller/autopush-cmd</input>
|
||||
<gain>75</gain>
|
||||
</pure_gain>
|
||||
|
||||
<scheduled_gain name="hydraulics/tiller/fmgc-cmd-deg">
|
||||
<input>fbw/fmgc/yaw-cmd</input>
|
||||
<table>
|
||||
<independentVar lookup="row">/velocities/groundspeed-kt</independentVar>
|
||||
<tableData>
|
||||
0.5 0
|
||||
1.0 6
|
||||
40.0 6
|
||||
130.0 0
|
||||
</tableData>
|
||||
</table>
|
||||
</scheduled_gain>
|
||||
|
||||
<switch name="hydraulics/tiller/rudder-cmd-input">
|
||||
<default value="/controls/flight/rudder"/>
|
||||
<test value="/controls/flight/aileron">
|
||||
/controls/flight/aileron-drives-tiller eq 1
|
||||
</test>
|
||||
</switch>
|
||||
|
||||
<pure_gain name="hydraulics/tiller/rudder-cmd-input-deg">
|
||||
<input>hydraulics/tiller/rudder-cmd-input</input>
|
||||
<gain>75</gain>
|
||||
</pure_gain>
|
||||
|
||||
<fcs_function name="hydraulics/tiller/rudder-cmd-deg"> <!-- Combines rudder and tiller into just rudder -->
|
||||
<function>
|
||||
<table>
|
||||
<independentVar lookup="row">zero</independentVar> <!-- Take advantage of the table lookup to interpolate -->
|
||||
<independentVar lookup="column">hydraulics/tiller/rudder-cmd-input-deg</independentVar>
|
||||
<independentVar lookup="table">/velocities/groundspeed-kt</independentVar>
|
||||
<tableData breakPoint="0.5">
|
||||
-75 -66 -40 -20 -1 1 20 40 66 75
|
||||
0 0 0 0 0 0 0 0 0 0 0
|
||||
1 0 0 0 0 0 0 0 0 0 0
|
||||
</tableData>
|
||||
<tableData breakPoint="1.0">
|
||||
-75 -66 -40 -20 -1 1 20 40 66 75
|
||||
0 -75 -45 -15 -4 0 0 4 15 45 75
|
||||
1 -75 -45 -15 -4 0 0 4 15 45 75
|
||||
</tableData>
|
||||
<tableData breakPoint="20.0">
|
||||
-75 -66 -40 -20 -1 1 20 40 66 75
|
||||
0 -75 -45 -15 -4 0 0 4 15 45 75
|
||||
1 -75 -45 -15 -4 0 0 4 15 45 75
|
||||
</tableData>
|
||||
<tableData breakPoint="40.0">
|
||||
-75 0 75
|
||||
0 -6 0 6
|
||||
1 -6 0 6
|
||||
</tableData>
|
||||
<tableData breakPoint="130.0">
|
||||
-75 0 75
|
||||
0 0 0 0
|
||||
1 0 0 0
|
||||
</tableData>
|
||||
</table>
|
||||
</function>
|
||||
</fcs_function>
|
||||
|
||||
<fcs_function name="hydraulics/tiller/tiller-cmd-deg">
|
||||
<function>
|
||||
<sum>
|
||||
<table>
|
||||
<independentVar lookup="row">/velocities/groundspeed-kt</independentVar>
|
||||
<independentVar lookup="column">/controls/gear/steering-deg</independentVar>
|
||||
<tableData>
|
||||
-75 -66 -40 -20 -1 1 20 40 66 75
|
||||
0.5 0 0 0 0 0 0 0 0 0 0
|
||||
1.0 -75 -45 -15 -4 0 0 4 15 45 75
|
||||
20.0 -75 -45 -15 -4 0 0 4 15 45 75
|
||||
70.0 0 0 0 0 0 0 0 0 0 0
|
||||
</tableData>
|
||||
</table>
|
||||
<product>
|
||||
<property>hydraulics/tiller/rudder-cmd-input</property>
|
||||
<table>
|
||||
<independentVar lookup="row">/velocities/groundspeed-kt</independentVar>
|
||||
<tableData>
|
||||
0.5 0
|
||||
1.0 6
|
||||
40.0 6
|
||||
130.0 0
|
||||
</tableData>
|
||||
</table>
|
||||
</product>
|
||||
</sum>
|
||||
</function>
|
||||
</fcs_function>
|
||||
|
||||
<switch name="hydraulics/tiller/cmd-deg">
|
||||
<default value="hydraulics/tiller/rudder-cmd-deg"/>
|
||||
<test value="0">
|
||||
/gear/gear[0]/wow ne 1
|
||||
</test>
|
||||
<test value="hydraulics/tiller/autopush-cmd-deg">
|
||||
/sim/model/autopush/connected eq 1
|
||||
</test>
|
||||
<test value="hydraulics/tiller/fmgc-cmd-deg">
|
||||
fbw/fmgc/enabled eq 1
|
||||
</test>
|
||||
<test value="hydraulics/tiller/tiller-cmd-deg">
|
||||
/systems/acconfig/options/seperate-tiller-axis eq 1
|
||||
</test>
|
||||
<clipto>
|
||||
<min>-75</min>
|
||||
<max>75</max>
|
||||
</clipto>
|
||||
</switch>
|
||||
|
||||
<switch name="hydraulics/tiller/elec-pwr">
|
||||
|
|
@ -755,33 +897,6 @@
|
|||
</test>
|
||||
</switch>
|
||||
|
||||
<fcs_function name="hydraulics/tiller/function">
|
||||
<function>
|
||||
<ifthen>
|
||||
<eq>
|
||||
<property>/sim/model/autopush/connected</property>
|
||||
<value>1</value>
|
||||
</eq>
|
||||
<product>
|
||||
<property>hydraulics/tiller/autopush-cmd</property>
|
||||
<value>75</value>
|
||||
</product>
|
||||
<table>
|
||||
<independentVar lookup="row">/velocities/groundspeed-kt</independentVar>
|
||||
<independentVar lookup="column">hydraulics/tiller/switch</independentVar>
|
||||
<tableData>
|
||||
-1 0 1
|
||||
0.500 0 0 0
|
||||
1.000 -75 0 75
|
||||
30.000 -47 0 47
|
||||
30.001 -6 0 6
|
||||
135.000 0 0 0
|
||||
</tableData>
|
||||
</table>
|
||||
</ifthen>
|
||||
</function>
|
||||
</fcs_function>
|
||||
|
||||
<switch name="fcs/steer-rate">
|
||||
<default value="0"/>
|
||||
<test logic="OR" value="75">
|
||||
|
|
@ -794,7 +909,7 @@
|
|||
</switch>
|
||||
|
||||
<actuator name="fcs/steer-deg">
|
||||
<input>hydraulics/tiller/function</input>
|
||||
<input>hydraulics/tiller/cmd-deg</input>
|
||||
<rate_limit>fcs/steer-rate</rate_limit>
|
||||
<output>fcs/steer-pos-deg[0]</output>
|
||||
</actuator>
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
34
|
||||
36
|
||||
Loading…
Reference in a new issue