Skip to content

Commit

Permalink
Improved ground spoiler arming. "Manual arm" won't activate spoilers …
Browse files Browse the repository at this point in the history 
…in flight anymore.

Modified keybindings for flight spoiler and ground lift dump setting, updated help accordingly.
  • Loading branch information
Henning Stahlke committed Jan 2, 2016
1 parent 0d84aab commit d96c576
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 79 deletions.
16 changes: 8 additions & 8 deletions CRJ700-help.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@
<name>Ctrl-B</name>
<desc alias="/input/keyboard/key[2]/desc" />
</key>
<key>
<name>j</name>
<desc alias="/input/keyboard/key[106]/desc" />
</key>
<key>
<name>k</name>
<desc alias="/input/keyboard/key[107]/desc" />
</key>
<key>
<name>Delete</name>
<desc>Toggle thrust reversers</desc>
Expand All @@ -27,6 +19,14 @@
<name>Ctrl-Delete</name>
<desc>Arm/disarm thrust reversers</desc>
</key>
<key>
<name>d</name>
<desc alias="/input/keyboard/key[100]/desc" />
</key>
<key>
<name>D</name>
<desc alias="/input/keyboard/key[68]/desc" />
</key>
<key>
<name>n</name>
<desc alias="/input/keyboard/key[110]/desc" />
Expand Down
4 changes: 2 additions & 2 deletions Nasal/controls.nas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@ incThrottle = func(v, a)
}
};

var cycleSpeedbrake = func
var cycleSpeedbrake = func(offset=1)
{
var vals = [0,0.25,0.5,0.75,1];
fgcommand("property-cycle", props.Node.new({property: "controls/flight/speedbrake",value: vals}));
fgcommand("property-cycle", props.Node.new({property: "controls/flight/speedbrake",value: vals, offset: offset}));
};

var stepGroundDump = func(v)
Expand Down
50 changes: 23 additions & 27 deletions Systems/CRJ700-flight-controls.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,26 +358,28 @@
<name>Automatic ground spoiler deployment logic</name>
<input>
<and>
<equals>
<less-than-equals>
<property>controls/engines/engine[0]/throttle</property>
<value>0</value>
</equals>
<value>0.01</value>
</less-than-equals>
<equals>
<property>controls/engines/engine[0]/thrust-mode</property>
<value>0</value>
</equals>
<equals>
<less-than-equals>
<property>controls/engines/engine[1]/throttle</property>
<value>0</value>
</equals>
<value>0.01</value>
</less-than-equals>
<equals>
<property>controls/engines/engine[1]/thrust-mode</property>
<value>0</value>
</equals>
<or>
<property>gear/gear[1]/wow</property>
<property>gear/gear[2]/wow</property>
</or>
<property>gear/gear[1]/wow</property>
<property>gear/gear[2]/wow</property>
<less-than-equals>
<property>instrumentation/radar-altimeter/radar-altitude-ft</property>
<value>3</value>
</less-than-equals>
<or>
<greater-than>
<property>gear/gear[1]/rollspeed-ms</property>
Expand All @@ -395,29 +397,23 @@
<logic>
<name>Ground spoilers deploy logic</name>
<input>
<and>
<or>
<property>controls/engines/engine[0]/reverser</property>
<property>controls/engines/engine[1]/reverser</property>
<or>
<and>
<equals>
<property>controls/flight/ground-lift-dump</property>
<value>2</value>
<value>2</value><!-- manual arm -->
</equals>
<and>
<property>controls/flight/spoilers-ground-auto-cmd</property>
<equals>
<property>controls/flight/ground-lift-dump</property>
<value>1</value>
</equals>
</and>
</or>
<not>
<property>controls/engines/engine[0]/reverser</property>
<property>controls/engines/engine[1]/reverser</property>
</and>
<and>
<equals>
<property>controls/flight/ground-lift-dump</property>
<value>0</value>
<value>1</value> <!-- auto arm -->
</equals>
</not>
</and>
<property>controls/flight/spoilers-ground-auto-cmd</property>
</and>
</or>
</input>
<output>controls/flight/spoilers-ground-cmd</output>
</logic>
Expand Down
69 changes: 27 additions & 42 deletions Systems/CRJ700-keybindings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,70 +6,55 @@
<PropertyList>
<!-- Developer key bindings (disabled for users) -->
<!-- Overrides instant replay shortcut -->
<!--key n="18">
<!--
<key n="18">
<name>Ctrl-R</name>
<desc>Reload interactive CDU</desc>
<binding>
<command>nasal</command>
<script>
CRJ700.cdu1.reload();
</script>
</binding>
</key>
<key n="115">
<name>s</name>
<desc>Instant start</desc>
<binding>
<command>nasal</command>
<script>
CRJ700.instastart();
</script>
<command>nasal</command>
<script>
CRJ700.cdu1.reload();
</script>
</binding>
</key-->
</key>
-->
<!-- Speedbrakes/spoilers -->
<key n="2">
<name>Ctrl-B</name>
<desc>Cycle speedbrake setting</desc>
<name>Ctrl-(Shift)-B</name>
<desc>Cycle speedbrake setting (backward)</desc>
<binding>
<command>nasal</command>
<script>
controls.cycleSpeedbrake();
controls.cycleSpeedbrake(1);
</script>
<!--command>property-cycle</command>
<property>controls/flight/speedbrake</property>
<value>0</value>
<value>0.25</value>
<value>0.5</value>
<value>0.75</value>
<value>1</value-->
</binding>
<mod-shift>
<binding>
<command>nasal</command>
<script>
controls.cycleSpeedbrake(-1);
</script>
</binding>
</mod-shift>
</key>
<key n="106">
<name>j</name>
<desc>Decrease ground lift dumping setting</desc>
<key n="100">
<name>d</name>
<desc>Step ground lift dumping setting to man. arm</desc>
<binding>
<command>nasal</command>
<script>
controls.stepGroundDump(-1);
controls.stepGroundDump(1);
</script>
<!--command>property-adjust</command>
<property>controls/flight/ground-lift-dump</property>
<step>-1</step>
<min>0</min-->
</binding>
</key>
<key n="107">
<name>k</name>
<desc>Increase ground lift dumping setting</desc>
<key n="68">
<name>D</name>
<desc>Step ground lift dumping setting to man. disarm</desc>
<binding>
<command>nasal</command>
<script>
controls.stepGroundDump(1);
controls.stepGroundDump(-1);
</script>
<!--command>property-adjust</command>
<property>controls/flight/ground-lift-dump</property>
<step>1</step>
<max>2</max-->
</binding>
</key>
<!-- Walk -->
Expand Down

0 comments on commit d96c576

Please sign in to comment.