fly/fgdata
1
0
Fork 0
Code Activity

Joystick bindings: fix confusions over trigger and pickle.

Browse source 
Trigger sets /controls/armament/trigger - typically for a gun, but can be used (model side) to launch anything

Pick sets /controls/armament/pickle - typically to release something (e.g. missiles), but could be bound model side to act as a trigger.
This commit is contained in:
Richard Harrison 2018-09-16 17:37:04 +02:00
parent da2eff6a7c
commit 939887cca1
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Nasal/controls.nas
View file

@ -274,17 +274,17 @@ setElevatorTrimToPosition = func() {
print("Elevator trim: centre");
setprop("/controls/flight/elevator-trim", 0);
} else {
print("Trim when centered stick");
#print("Trim when centered stick");
setElevatorTrimToPosition_listener = setlistener("/controls/flight/elevator", func(v){
if (math.abs(v.getValue()) <= 0.001) {
setprop("controls/flight/elevator",0);
removelistener(setElevatorTrimToPosition_listener);
setElevatorTrimToPosition_listener = nil;
print("set trim to ",nv);
# print("set trim to ",nv);
setprop("/controls/flight/elevator-trim", nv);
}
else
print("Not trimming yet ",v.getValue());
# else
# print("Not trimming yet ",v.getValue());
}, 0, 0);
}
@ -483,7 +483,7 @@ var applyBrakes = func(v, which = 0) {
if (which <= 0) { interpolate("/controls/gear/brake-left", v, fullBrakeTime); }
if (which >= 0) { interpolate("/controls/gear/brake-right", v, fullBrakeTime); }
}
var applyTrigger = func(v) {
var applyPickle = func(v) {
setprop("/controls/armament/pickle", v);
}

3
Nasal/joystick.nas
View file

@ -543,6 +543,7 @@ var buttonBindings = [
NasalButton.new("Aileron Trim Right", "controls.aileronTrim(1);", 1),
NasalHoldButton.new("FGCom PTT", "controls.ptt(1);", "controls.ptt(0);"),
NasalHoldButton.new("Trigger", "controls.trigger(1);", "controls.trigger(0);"),
NasalHoldButton.new("Pickle", "controls.applyPickle(1);","controls.applyPickle(0);"),
NasalButton.new("Flaps Up", "controls.flapsDown(-1);",0),
NasalButton.new("Flaps Down", "controls.flapsDown(1);",0),
NasalButton.new("Gear Up", "controls.gearDown(-1);",0),
@ -559,8 +560,6 @@ var buttonBindings = [
# with all of these it is expected the the armament system in the selected aircraft
# will manage the wrap around and or reset to zero.
NasalHoldButton.new("Trigger", "controls.applyTrigger(1);","controls.applyTrigger(0);"),
PropertyAdjustButton.new("Pickle", "/controls/armament/pickle-target", "1"),
PropertyAdjustButton.new("Target next", "/controls/armament/target-selected", "1"),
PropertyAdjustButton.new("Target previous", "/controls/armament/target-selected", "-1"),
PropertyAdjustButton.new("Weapon next", "/controls/armament/weapon-selected", "1"),