Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fixed sound, cones and chocks which depend on LIGHT BEACON (ON)) var #7689

Merged
merged 1 commit into from
Jan 9, 2023
Merged

fix: Fixed sound, cones and chocks which depend on LIGHT BEACON (ON)) var #7689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/model/A320_NEO.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@
<FREQUENCY>10</FREQUENCY>
<UPDATE_CODE>
(A:SURFACE RELATIVE GROUND SPEED, feet per second) 0.1 &gt; ! (&gt;L:A32NX_IS_STATIONARY, bool)
(A:SIM ON GROUND, bool) (L:A32NX_ENGINE_N1:1, Number) 3.5 &lt; and (L:A32NX_ENGINE_N1:2, Number) 3.5 &lt; and (L:A32NX_HYD_NW_STRG_DISC_ECAM_MEMO, bool) 0 == and (A:LIGHT BEACON ON, bool) 0 == and (&gt;L:A32NX_GND_EQP_IS_VISIBLE, bool)
(A:SIM ON GROUND, bool) (L:A32NX_ENGINE_N1:1, Number) 3.5 &lt; and (L:A32NX_ENGINE_N1:2, Number) 3.5 &lt; and (L:A32NX_HYD_NW_STRG_DISC_ECAM_MEMO, bool) 0 == and (A:LIGHT BEACON, bool) 0 == and (&gt;L:A32NX_GND_EQP_IS_VISIBLE, bool)
</UPDATE_CODE>
</UseTemplate>

Expand Down
6 changes: 3 additions & 3 deletions flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/sound/sound.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2263,14 +2263,14 @@

<Sound WwiseEvent="welcomeonboard" WwiseData="true" NodeName="SOUND_FWD_GALLEY" ConeHeading="180" CancelConeHeadingWhenInside="false" Continuous="false" LocalVar="A32NX_SOUND_BOARDING_COMPLETE">
<Range LowerBound="1" />
<Requires SimVar="LIGHT BEACON" Index="0" Units="Bool">
<Requires SimVar="LIGHT BEACON ON" Index="0" Units="Bool">
<Range UpperBound="0" />
</Requires>
<WwiseRTPC LocalVar="A32NX_COCKPIT_DOOR_LOCKED" RTPCAttackTime="0.5" RTPCReleaseTime="0.5" Units="bool" Index="1" RTPCName="LOCALVAR_A32NX_COCKPIT_DOOR_LOCKED" />
<WwiseRTPC LocalVar="A32NX_SOUND_ANNOUNCEMENTS_ENABLED" Units="number" Index="0" RTPCName="LOCALVAR_A32NX_ANNOUNCEMENT_TOGGLE" />
</Sound>

<Sound WwiseEvent="armdoors" WwiseData="true" NodeName="SOUND_FWD_GALLEY" ConeHeading="180" CancelConeHeadingWhenInside="false" Continuous="true" SimVar="LIGHT BEACON" Index="0" Units="Bool">
<Sound WwiseEvent="armdoors" WwiseData="true" NodeName="SOUND_FWD_GALLEY" ConeHeading="180" CancelConeHeadingWhenInside="false" Continuous="true" SimVar="LIGHT BEACON ON" Index="0" Units="Bool">
<Range LowerBound="1" />
<WwiseRTPC LocalVar="A32NX_COCKPIT_DOOR_LOCKED" RTPCAttackTime="0.5" RTPCReleaseTime="0.5" Units="bool" Index="1" RTPCName="LOCALVAR_A32NX_COCKPIT_DOOR_LOCKED" />
<WwiseRTPC LocalVar="A32NX_SOUND_ANNOUNCEMENTS_ENABLED" Units="number" Index="0" RTPCName="LOCALVAR_A32NX_ANNOUNCEMENT_TOGGLE" />
Expand All @@ -2279,7 +2279,7 @@
</Requires>
</Sound>

<Sound WwiseEvent="safetydemo" WwiseData="true" NodeName="SOUND_FWD_GALLEY" ConeHeading="180" CancelConeHeadingWhenInside="false" Continuous="true" SimVar="LIGHT BEACON" Index="0" Units="Bool">
<Sound WwiseEvent="safetydemo" WwiseData="true" NodeName="SOUND_FWD_GALLEY" ConeHeading="180" CancelConeHeadingWhenInside="false" Continuous="true" SimVar="LIGHT BEACON ON" Index="0" Units="Bool">
<Range LowerBound="1" />
<WwiseRTPC LocalVar="A32NX_COCKPIT_DOOR_LOCKED" RTPCAttackTime="0.5" RTPCReleaseTime="0.5" Units="bool" Index="1" RTPCName="LOCALVAR_A32NX_COCKPIT_DOOR_LOCKED" />
<WwiseRTPC LocalVar="A32NX_SOUND_ANNOUNCEMENTS_ENABLED" Units="number" Index="0" RTPCName="LOCALVAR_A32NX_ANNOUNCEMENT_TOGGLE" />
Expand Down
2 changes: 1 addition & 1 deletion src/behavior/src/A32NX_Exterior.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@
<DefaultTemplateParameters>
<GND_ENABLE_OVRD></GND_ENABLE_OVRD>
<GND_EQUIPMENT_LOGIC>
(A:SIM ON GROUND, bool) (L:A32NX_ENGINE_N1:1, Number) 3.5 &lt; and (L:A32NX_ENGINE_N1:2, Number) 3.5 &lt; and (L:A32NX_HYD_NW_STRG_DISC_ECAM_MEMO, bool) 0 == and (A:LIGHT BEACON ON, bool) 0 == and
(A:SIM ON GROUND, bool) (L:A32NX_ENGINE_N1:1, Number) 3.5 &lt; and (L:A32NX_ENGINE_N1:2, Number) 3.5 &lt; and (L:A32NX_HYD_NW_STRG_DISC_ECAM_MEMO, bool) 0 == and (A:LIGHT BEACON, bool) 0 == and
</GND_EQUIPMENT_LOGIC>
</DefaultTemplateParameters>
<Component ID="#NODE_ID#" Node="#NODE_ID#">
Expand Down
2 changes: 1 addition & 1 deletion src/behavior/src/A32NX_Interior_Handling.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<DRAG_SPEED>30</DRAG_SPEED>
<POSITION_TYPE>O</POSITION_TYPE>
<POSITION_VAR>Position</POSITION_VAR>
<EVENT_SPEED Process="True">16383 10 /</EVENT_SPEED>
<EVENT_SPEED Process="Float">16383 10 /</EVENT_SPEED>
<TOOLTIPID>TT:COCKPIT.TOOLTIPS.SPEEDBRAKE_LEVER</TOOLTIPID>
</DefaultTemplateParameters>
<OverrideTemplateParameters>
Expand Down
2 changes: 1 addition & 1 deletion src/systems/a320_systems/src/hydraulic/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3847,7 +3847,7 @@ impl A320BrakingForce {
.get_identifier("RIGHT_FLAPS_POSITION_PERCENT".to_owned()),

enabled_chocks_id: context.get_identifier("MODEL_WHEELCHOCKS_ENABLED".to_owned()),
light_beacon_on_id: context.get_identifier("LIGHT BEACON ON".to_owned()),
light_beacon_on_id: context.get_identifier("LIGHT BEACON".to_owned()),

left_braking_force: 0.,
right_braking_force: 0.,
Expand Down
1 change: 1 addition & 0 deletions src/systems/a320_systems_wasm/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ async fn systems(mut gauge: msfs::Gauge) -> Result<(), Box<dyn Error>> {
.provides_aircraft_variable("INDICATED ALTITUDE", "Feet", 0)?
.provides_aircraft_variable("INTERACTIVE POINT OPEN:0", "Percent", 0)?
.provides_aircraft_variable("INTERACTIVE POINT OPEN:3", "Percent", 0)?
.provides_aircraft_variable("LIGHT BEACON", "Bool", 0)?
.provides_aircraft_variable("LIGHT BEACON ON", "Bool", 0)?
.provides_aircraft_variable("PLANE ALT ABOVE GROUND", "Feet", 0)?
.provides_aircraft_variable("PLANE PITCH DEGREES", "Degrees", 0)?
Expand Down
2 changes: 1 addition & 1 deletion src/systems/a380_systems/src/hydraulic/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3906,7 +3906,7 @@ impl A380BrakingForce {
.get_identifier("RIGHT_FLAPS_POSITION_PERCENT".to_owned()),

enabled_chocks_id: context.get_identifier("MODEL_WHEELCHOCKS_ENABLED".to_owned()),
light_beacon_on_id: context.get_identifier("LIGHT BEACON ON".to_owned()),
light_beacon_on_id: context.get_identifier("LIGHT BEACON".to_owned()),

left_braking_force: 0.,
right_braking_force: 0.,
Expand Down
1 change: 1 addition & 0 deletions src/systems/a380_systems_wasm/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ async fn systems(mut gauge: msfs::Gauge) -> Result<(), Box<dyn Error>> {
.provides_aircraft_variable("INDICATED ALTITUDE", "Feet", 0)?
.provides_aircraft_variable("INTERACTIVE POINT OPEN:0", "Percent", 0)?
.provides_aircraft_variable("INTERACTIVE POINT OPEN:3", "Percent", 0)?
.provides_aircraft_variable("LIGHT BEACON", "Bool", 0)?
.provides_aircraft_variable("LIGHT BEACON ON", "Bool", 0)?
.provides_aircraft_variable("PLANE ALT ABOVE GROUND", "Feet", 0)?
.provides_aircraft_variable("PLANE PITCH DEGREES", "Degrees", 0)?
Expand Down