Skip to content

Commit

Permalink
Merge pull request #1332 from c172p-team/Issue-1330
Browse files Browse the repository at this point in the history 
Issue 1330
  • Loading branch information
@gilbertohasnofb
gilbertohasnofb authored Sep 11, 2020
2 parents 6e74aa9 + 05dbb95 commit 996d98d
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 36 deletions.
18 changes: 9 additions & 9 deletions Models/c172p.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5123,7 +5123,7 @@
<binding>
<command>property-adjust</command>
<property>/controls/engines/current-engine/throttle</property>
<factor>0.05</factor>
<factor>0.02</factor>
<min>0</min>
<max>1</max>
<wrap>0</wrap>
Expand Down Expand Up @@ -5200,7 +5200,7 @@
<binding>
<command>property-adjust</command>
<property>controls/engines/current-engine/mixture</property>
<factor>0.05</factor>
<factor>0.02</factor>
<min>0</min>
<max>1</max>
<wrap>0</wrap>
Expand Down Expand Up @@ -5239,7 +5239,7 @@
<binding>
<command>property-adjust</command>
<property>controls/flight/elevator-trim</property>
<factor>0.01</factor>
<factor>0.001</factor>
<min>-1</min>
<max>1</max>
<wrap>0</wrap>
Expand All @@ -5248,7 +5248,7 @@
<hovered>
<binding>
<command>set-tooltip</command>
<label>Elevator trim: %3.2f</label>
<label>Elevator trim: %3.3f</label>
<tooltip-id>pitch-trim</tooltip-id>
<property>controls/flight/elevator-trim</property>
</binding>
Expand All @@ -5274,7 +5274,7 @@
<animation>
<type>knob</type>
<object-name>RudderTrimKnob</object-name>
<property>controls/flight/rudder-trim-knob</property>
<property>controls/flight/rudder-trim</property>
<factor>40</factor>
<drag-direction>horizontal</drag-direction>
<offset-deg>0</offset-deg>
Expand All @@ -5291,8 +5291,8 @@
<action>
<binding>
<command>property-adjust</command>
<property>controls/flight/rudder-trim-knob</property>
<factor>0.01</factor>
<property>controls/flight/rudder-trim</property>
<factor>0.002</factor>
<min>-.18</min>
<max>.18</max>
<wrap>false</wrap>
Expand All @@ -5301,9 +5301,9 @@
<hovered>
<binding>
<command>set-tooltip</command>
<label>Rudder trim: %3.2f</label>
<label>Rudder trim: %3.3f</label>
<tooltip-id>rudder-trim</tooltip-id>
<property>controls/flight/rudder-trim-knob</property>
<property>controls/flight/rudder-trim</property>
</binding>
</hovered>
</animation>
Expand Down
16 changes: 15 additions & 1 deletion Nasal/c172p.nas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,8 @@ var switches_save_state = func {
setprop("/environment/aircraft-effects/cabin-air-set", 0.0);
setprop("/consumables/fuel/tank[0]/selected", 1);
setprop("/consumables/fuel/tank[1]/selected", 1);
setprop("/controls/flight/rudder-trim-knob", 0.0);
if (getprop("/sim/model/c172p/ruddertrim-visible"))
setprop("/controls/flight/rudder-trim", 0);
};
};

Expand Down Expand Up @@ -664,6 +665,10 @@ setlistener("/sim/signals/fdm-initialized", func {
# Listening for lightning strikes
setlistener("/environment/lightning/lightning-pos-y", thunder);

if (!getprop("sim/model/c172p/ruddertrim-visible")){
setprop("/controls/flight/rudder-trim", 0.02);
}

reset_system();

var onground = getprop("/sim/presets/onground") or "";
Expand Down Expand Up @@ -737,3 +742,12 @@ setprop("/sim/startup/season-winter", getprop("/sim/startup/season") == "winter"
setlistener("/sim/startup/season", func (node) {
setprop("/sim/startup/season-winter", node.getValue() == "winter");
}, 0, 0);

# rudder trim setting changes, manual or automatic
setlistener("/sim/model/c172p/ruddertrim-visible", func (node) {
if (node.getValue()) {
setprop("/controls/flight/rudder-trim", 0);
} else
setprop("/controls/flight/rudder-trim", 0.02);
}, 0, 0);

2 changes: 1 addition & 1 deletion c172-sound.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1295,7 +1295,7 @@
<name>dial-rudder-trim-</name>
<mode>in-transit</mode>
<path>Sounds/rudder-trim.wav</path>
<property>/controls/flight/rudder-trim-knob</property>
<property>/controls/flight/rudder-trim</property>
<position>
<x>-0.3660</x>
<y>0.0500</y>
Expand Down
7 changes: 3 additions & 4 deletions c172p-set.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ http://forum.flightgear.org/viewtopic.php?f=4&t=25157
<path>/sim/current-view/user/pitch-offset-deg</path>
<path>/sim/current-view/user/default-field-of-view-deg</path>
<path>/sim/model/c172p/ruddertrim-visible</path>
<path>/controls/flight/rudder-trim-knob</path>
<path>/controls/flight/rudder-trim</path>
</aircraft-data>

<current-view>
Expand Down Expand Up @@ -561,7 +561,7 @@ http://forum.flightgear.org/viewtopic.php?f=4&t=25157

<!-- Fix scrolling direction of knobs -->
<mouse>
<invert-mouse-wheel type="bool">true</invert-mouse-wheel>
<invert-mouse-wheel type="bool">false</invert-mouse-wheel>
</mouse>

<gui>
Expand Down Expand Up @@ -591,8 +591,7 @@ http://forum.flightgear.org/viewtopic.php?f=4&t=25157
<controls>
<flight>
<aileron-trim type="double">0.022</aileron-trim>
<rudder-trim type="double">0.02</rudder-trim>
<rudder-trim-knob type="double">0.0</rudder-trim-knob>
<rudder-trim type="double">0.0</rudder-trim>
<freeze-yoke type="bool">false</freeze-yoke>
<aileron-cmd type="double">0.0</aileron-cmd>
<elevator-cmd type="double">0.0</elevator-cmd>
Expand Down
13 changes: 0 additions & 13 deletions c172p.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -810,19 +810,6 @@
<output>/sim/model/c172p/cockpit/pedals-rudder</output>
</kinematic>

<fcs_function name="fcs/yaw-trim-cockpit">
<function>
<table>
<independentVar lookup="row">/controls/flight/rudder-trim-knob</independentVar>
<tableData>
-.18 0.20
0.00 0.00
.18 -0.20
</tableData>
</table>
</function>
</fcs_function>

<summer name="Yaw Trim Sum">
<input>fcs/rudder-cmd-norm-filtered</input>
<input>fcs/yaw-trim-cmd-norm</input>
Expand Down
8 changes: 0 additions & 8 deletions gui/dialogs/aircraft-dialog.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -362,14 +362,6 @@
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>nasal</command>
<script>
if (!getprop("/sim/model/c172p/ruddertrim-visible")) {
setprop("/controls/flight/rudder-trim-knob", 0);
}
</script>
</binding>
</checkbox>

</group>
Expand Down

0 comments on commit 996d98d

Please sign in to comment.