From 8a4fc3268b373237528b0be621d14eaf30dd75fd Mon Sep 17 00:00:00 2001 From: lukecologne Date: Sat, 15 Jul 2023 14:11:59 +0200 Subject: [PATCH] feat(elec-a380): ALTN ESS FEED P/B FAULT illuminates when AC EMER is not powered (#8115) * feat(elec): ALTN ESS FEED P/B FAULT illuminates when AC EMER is not powered * fix: change unit test, remove unused functions --- .../src/electrical/alternating_current.rs | 4 ++-- .../wasm/systems/a380_systems/src/electrical/mod.rs | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/fbw-a380x/src/wasm/systems/a380_systems/src/electrical/alternating_current.rs b/fbw-a380x/src/wasm/systems/a380_systems/src/electrical/alternating_current.rs index 60d1ab7730d..7e6d6319069 100644 --- a/fbw-a380x/src/wasm/systems/a380_systems/src/electrical/alternating_current.rs +++ b/fbw-a380x/src/wasm/systems/a380_systems/src/electrical/alternating_current.rs @@ -210,8 +210,8 @@ impl A380AlternatingCurrentElectrical { self.emergency_gen_contactor.is_closed() } - pub fn ac_ess_bus_is_powered(&self, electricity: &Electricity) -> bool { - electricity.is_powered(&self.ac_ess_bus) + pub fn ac_emer_bus_is_powered(&self, electricity: &Electricity) -> bool { + electricity.is_powered(&self.ac_emer_bus) } } impl A380AlternatingCurrentElectricalSystem for A380AlternatingCurrentElectrical { diff --git a/fbw-a380x/src/wasm/systems/a380_systems/src/electrical/mod.rs b/fbw-a380x/src/wasm/systems/a380_systems/src/electrical/mod.rs index 826039a74dd..65d9eb35e0c 100644 --- a/fbw-a380x/src/wasm/systems/a380_systems/src/electrical/mod.rs +++ b/fbw-a380x/src/wasm/systems/a380_systems/src/electrical/mod.rs @@ -200,8 +200,8 @@ impl A380Electrical { .emergency_generator_contactor_is_closed() } - fn ac_ess_bus_is_powered(&self, electricity: &Electricity) -> bool { - self.alternating_current.ac_ess_bus_is_powered(electricity) + fn ac_emer_bus_is_powered(&self, electricity: &Electricity) -> bool { + self.alternating_current.ac_emer_bus_is_powered(electricity) } fn galley_is_shed(&self) -> bool { @@ -348,7 +348,7 @@ impl A380ElectricalOverheadPanel { electricity: &Electricity, ) { self.ac_ess_feed - .set_fault(!electrical.ac_ess_bus_is_powered(electricity)); + .set_fault(!electrical.ac_emer_bus_is_powered(electricity)); self.generators .iter_mut() @@ -2479,8 +2479,11 @@ mod a380_electrical_circuit_tests { } #[test] - fn when_ac_ess_bus_is_unpowered_ac_ess_feed_has_fault() { - let mut test_bed = test_bed_with().airspeed(Velocity::default()).run(); + fn when_ac_emer_bus_is_unpowered_ac_ess_feed_has_fault() { + let mut test_bed = test_bed_with() + .airspeed(Velocity::default()) + .all_bats_off() + .run(); assert!(test_bed.ac_ess_feed_has_fault()); }