diff --git a/Cargo.lock b/Cargo.lock index aed8f4d2a42..902db99939e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -81,24 +81,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "approx" version = "0.4.0" @@ -108,17 +90,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -142,24 +113,24 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.59.2" +version = "0.66.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" dependencies = [ - "bitflags", + "bitflags 2.4.1", "cexpr", "clang-sys", - "clap", - "env_logger", "lazy_static", "lazycell", "log", "peeking_take_while", + "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", + "syn 2.0.38", "which", ] @@ -169,6 +140,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + [[package]] name = "bounded-vec-deque" version = "0.1.1" @@ -213,21 +190,6 @@ dependencies = [ "libloading", ] -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - [[package]] name = "either" version = "1.8.1" @@ -246,19 +208,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - [[package]] name = "failure" version = "0.1.8" @@ -337,7 +286,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.38", ] [[package]] @@ -418,21 +367,6 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "indexmap" version = "1.9.3" @@ -519,7 +453,7 @@ dependencies = [ [[package]] name = "msfs" version = "0.1.0" -source = "git+https://github.com/flybywiresim/msfs-rs?branch=main#53ba9a5539d11401eb6c43d3c69f24311a9f321d" +source = "git+https://github.com/flybywiresim/msfs-rs?branch=main#c85ac3917d007dce123bbe7382e8801f1b83999f" dependencies = [ "bindgen", "cc", @@ -531,7 +465,7 @@ dependencies = [ [[package]] name = "msfs_derive" version = "0.2.0" -source = "git+https://github.com/flybywiresim/msfs-rs?branch=main#53ba9a5539d11401eb6c43d3c69f24311a9f321d" +source = "git+https://github.com/flybywiresim/msfs-rs?branch=main#c85ac3917d007dce123bbe7382e8801f1b83999f" dependencies = [ "quote", "syn 1.0.109", @@ -540,7 +474,7 @@ dependencies = [ [[package]] name = "msfs_sdk" version = "0.1.0" -source = "git+https://github.com/flybywiresim/msfs-rs?branch=main#53ba9a5539d11401eb6c43d3c69f24311a9f321d" +source = "git+https://github.com/flybywiresim/msfs-rs?branch=main#c85ac3917d007dce123bbe7382e8801f1b83999f" [[package]] name = "nalgebra" @@ -726,6 +660,16 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "prettyplease" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +dependencies = [ + "proc-macro2", + "syn 2.0.38", +] + [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -738,18 +682,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.26" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -815,8 +759,6 @@ version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ - "aho-corasick", - "memchr", "regex-syntax", ] @@ -901,7 +843,7 @@ checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.38", ] [[package]] @@ -931,12 +873,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - [[package]] name = "svg" version = "0.7.2" @@ -956,9 +892,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -981,7 +917,7 @@ dependencies = [ name = "systems" version = "0.1.0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bounded-vec-deque", "fxhash", "nalgebra", @@ -1006,24 +942,6 @@ dependencies = [ "uom", ] -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - [[package]] name = "thiserror" version = "1.0.40" @@ -1041,7 +959,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.38", ] [[package]] @@ -1079,12 +997,6 @@ version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - [[package]] name = "unicode-xid" version = "0.2.4" @@ -1101,12 +1013,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "version_check" version = "0.9.4" @@ -1146,15 +1052,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" diff --git a/Cargo.toml b/Cargo.toml index b5d8deee4ab..fdc4dda32ae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,5 @@ [workspace] +resolver = "2" members = [ "fbw-a32nx/src/wasm/systems/a320_systems", diff --git a/fbw-a32nx/src/wasm/systems/a320_systems/src/air_conditioning.rs b/fbw-a32nx/src/wasm/systems/a320_systems/src/air_conditioning.rs index a6ce6e2278f..f5a8e652825 100644 --- a/fbw-a32nx/src/wasm/systems/a320_systems/src/air_conditioning.rs +++ b/fbw-a32nx/src/wasm/systems/a320_systems/src/air_conditioning.rs @@ -2127,7 +2127,7 @@ mod tests { test_bed = test_bed.command_ditching_pb_on().iterate(5); - assert!(!(test_bed.outflow_valve_open_amount() > Ratio::new::(99.))); + assert!(test_bed.outflow_valve_open_amount() <= Ratio::new::(99.)); assert!(test_bed.outflow_valve_open_amount() < Ratio::new::(1.)); } diff --git a/fbw-a32nx/src/wasm/systems/a320_systems/src/hydraulic/mod.rs b/fbw-a32nx/src/wasm/systems/a320_systems/src/hydraulic/mod.rs index fd96fb7508e..4d6dd80293a 100644 --- a/fbw-a32nx/src/wasm/systems/a320_systems/src/hydraulic/mod.rs +++ b/fbw-a32nx/src/wasm/systems/a320_systems/src/hydraulic/mod.rs @@ -2986,15 +2986,10 @@ impl A320BlueElectricPumpController { ) { let mut should_pressurise_if_powered = false; if overhead_panel.blue_epump_push_button.is_auto() { - if !lgciu1.nose_gear_compressed(false) + should_pressurise_if_powered = !lgciu1.nose_gear_compressed(false) || engine1.is_above_minimum_idle() || engine2.is_above_minimum_idle() - || overhead_panel.blue_epump_override_push_button_is_on() - { - should_pressurise_if_powered = true; - } else { - should_pressurise_if_powered = false; - } + || overhead_panel.blue_epump_override_push_button_is_on(); } else if overhead_panel.blue_epump_push_button_is_off() { should_pressurise_if_powered = false; } @@ -3075,7 +3070,7 @@ impl A320BlueElectricPumpController { } fn has_overheat_fault(&self) -> bool { - self.has_low_level_fault + self.has_overheat_fault } } impl PumpController for A320BlueElectricPumpController { diff --git a/fbw-a380x/src/wasm/systems/a380_systems/src/air_conditioning/mod.rs b/fbw-a380x/src/wasm/systems/a380_systems/src/air_conditioning/mod.rs index a501aa5397b..d4e45280b7c 100644 --- a/fbw-a380x/src/wasm/systems/a380_systems/src/air_conditioning/mod.rs +++ b/fbw-a380x/src/wasm/systems/a380_systems/src/air_conditioning/mod.rs @@ -2910,7 +2910,7 @@ mod tests { test_bed = test_bed.command_ditching_pb_on().iterate(5); - assert!(!(test_bed.outflow_valve_open_amount() > Ratio::new::(99.))); + assert!(test_bed.outflow_valve_open_amount() <= Ratio::new::(99.)); assert!(test_bed.outflow_valve_open_amount() < Ratio::new::(1.)); } @@ -4657,10 +4657,10 @@ mod tests { test_bed = test_bed.iterate(50); assert!( - !((test_bed.mixer_unit_outlet_air().flow_rate() + ((test_bed.mixer_unit_outlet_air().flow_rate() - (MassRate::new::(5.1183) * 0.8)) .abs() - < MassRate::new::(0.1)) + >= MassRate::new::(0.1)) ); assert!( diff --git a/fbw-a380x/src/wasm/systems/a380_systems/src/structural_flex.rs b/fbw-a380x/src/wasm/systems/a380_systems/src/structural_flex.rs index 838ae2055bb..779c8c27615 100644 --- a/fbw-a380x/src/wasm/systems/a380_systems/src/structural_flex.rs +++ b/fbw-a380x/src/wasm/systems/a380_systems/src/structural_flex.rs @@ -38,7 +38,7 @@ impl A380StructuralFlex { elevators_flex_physics: FlexibleElevators::new(context), wing_flex: WingFlexA380::new(context), - surface_vibrations: SurfaceVibrationGenerator::default(), + surface_vibrations: SurfaceVibrationGenerator::default_generator(), } } diff --git a/fbw-a380x/src/wasm/systems/a380_systems_wasm/src/payload.rs b/fbw-a380x/src/wasm/systems/a380_systems_wasm/src/payload.rs index d325f342ff0..5e190d50906 100644 --- a/fbw-a380x/src/wasm/systems/a380_systems_wasm/src/payload.rs +++ b/fbw-a380x/src/wasm/systems/a380_systems_wasm/src/payload.rs @@ -80,7 +80,7 @@ pub(super) fn payload(builder: &mut MsfsAspectBuilder) -> Result<(), Box::default()); Ok(()) } diff --git a/fbw-common/src/wasm/systems/systems/src/air_conditioning/cabin_pressure_controller.rs b/fbw-common/src/wasm/systems/systems/src/air_conditioning/cabin_pressure_controller.rs index 5e7fad6d697..acf51d0220b 100644 --- a/fbw-common/src/wasm/systems/systems/src/air_conditioning/cabin_pressure_controller.rs +++ b/fbw-common/src/wasm/systems/systems/src/air_conditioning/cabin_pressure_controller.rs @@ -177,7 +177,7 @@ impl CabinPressureController { self.cabin_vertical_speed, self.cabin_target_vs, press_overhead, - self.is_ground() || !(self.cabin_altitude() > Length::new::(15000.)), + self.is_ground() || (self.cabin_altitude() <= Length::new::(15000.)), self.is_ground() && self.should_open_outflow_valve(), ); diff --git a/fbw-common/src/wasm/systems/systems/src/apu/mod.rs b/fbw-common/src/wasm/systems/systems/src/apu/mod.rs index d8e99d46fb9..920a48ba60c 100644 --- a/fbw-common/src/wasm/systems/systems/src/apu/mod.rs +++ b/fbw-common/src/wasm/systems/systems/src/apu/mod.rs @@ -1630,7 +1630,7 @@ mod tests { .and() .unpowered_dc_bat_bus() .run(Duration::from_secs(1)); - assert!(matches!(test_bed.close_start_contactors_signal(), None)); + assert!(test_bed.close_start_contactors_signal().is_none()); } #[test] diff --git a/fbw-common/src/wasm/systems/systems/src/payload/mod.rs b/fbw-common/src/wasm/systems/systems/src/payload/mod.rs index 5d2354e5c63..3353494ca02 100644 --- a/fbw-common/src/wasm/systems/systems/src/payload/mod.rs +++ b/fbw-common/src/wasm/systems/systems/src/payload/mod.rs @@ -123,7 +123,7 @@ impl PassengerDeck { } fn pax_num(&self, ps: usize) -> i8 { - self.pax[ps].pax_num() as i8 + self.pax[ps].pax_num() } fn total_pax_num(&self) -> i32 { diff --git a/fbw-common/src/wasm/systems/systems/src/shared/can_bus.rs b/fbw-common/src/wasm/systems/systems/src/shared/can_bus.rs index e25b8a0a7dd..dda844aceaf 100644 --- a/fbw-common/src/wasm/systems/systems/src/shared/can_bus.rs +++ b/fbw-common/src/wasm/systems/systems/src/shared/can_bus.rs @@ -71,16 +71,16 @@ impl CanBus { // search the next sendable message for x in 0..N { let idx = (self.next_transmitting_system + x) % N; - let message = self.transmission_buffers[idx as usize].get(0); + let message = self.transmission_buffers[idx].get(0); if message.is_some() { // reset the received flags to release the bus for the next transmission self.message_received_by_systems .iter_mut() .for_each(|received| *received = [false, true]); - self.message_received_by_systems[idx as usize][0] = true; + self.message_received_by_systems[idx][0] = true; self.next_output_message = - self.transmission_buffers[idx as usize].pop_front().unwrap(); + self.transmission_buffers[idx].pop_front().unwrap(); self.next_output_message_valid = true; break; diff --git a/fbw-common/src/wasm/systems/systems/src/shared/mod.rs b/fbw-common/src/wasm/systems/systems/src/shared/mod.rs index 243fd69bbd4..37ff8ab4467 100644 --- a/fbw-common/src/wasm/systems/systems/src/shared/mod.rs +++ b/fbw-common/src/wasm/systems/systems/src/shared/mod.rs @@ -579,12 +579,7 @@ impl DelayedPulseTrueLogicGate { let gate_out = self.true_delayed_gate.output(); - if gate_out && !self.last_gate_output { - self.output = true; - } else { - self.output = false; - } - + self.output = gate_out && !self.last_gate_output; self.last_gate_output = gate_out; } diff --git a/fbw-common/src/wasm/systems/systems/src/structural_flex/mod.rs b/fbw-common/src/wasm/systems/systems/src/structural_flex/mod.rs index 35fffcb3787..128874c2f24 100644 --- a/fbw-common/src/wasm/systems/systems/src/structural_flex/mod.rs +++ b/fbw-common/src/wasm/systems/systems/src/structural_flex/mod.rs @@ -74,7 +74,7 @@ pub struct SurfaceVibrationGenerator { final_bump_accel_filtered: LowPassFilter, } impl SurfaceVibrationGenerator { - pub fn default() -> Self { + pub fn default_generator() -> Self { let big_holes = BumpGenerator::new(Duration::from_secs(25), 2., 0.4); let small_holes = BumpGenerator::new(Duration::from_secs(5), 1.1, 0.1); let vibrations = BumpGenerator::new(Duration::from_millis(20), 0.2, 0.05); diff --git a/fbw-common/src/wasm/systems/systems_wasm/src/msfs.rs b/fbw-common/src/wasm/systems/systems_wasm/src/msfs.rs index c6c2b8e34dc..3494e16e5f4 100644 --- a/fbw-common/src/wasm/systems/systems_wasm/src/msfs.rs +++ b/fbw-common/src/wasm/systems/systems_wasm/src/msfs.rs @@ -1,5 +1,5 @@ -///! Module declared to be able to compile documentation. -///! Does not provide any meaningful functionality. +//! Module declared to be able to compile documentation. +//! Does not provide any meaningful functionality. #[cfg(not(target_arch = "wasm32"))] pub(crate) mod legacy { use std::cell::Cell; diff --git a/igniter.config.mjs b/igniter.config.mjs index 2e2aa18326b..8cef3fd776e 100644 --- a/igniter.config.mjs +++ b/igniter.config.mjs @@ -127,7 +127,7 @@ export default new TaskOfTasks("all", [ ]), new ExecTask("systems-terronnd", [ "fbw-common/src/wasm/terronnd/build.sh", - "wasm-opt -O1 -o fbw-a32nx/out/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/panel/terronnd.wasm fbw-common/src/wasm/terronnd/out/terronnd.wasm" + "wasm-opt -O1 --signext-lowering -o fbw-a32nx/out/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/panel/terronnd.wasm fbw-common/src/wasm/terronnd/out/terronnd.wasm" ], [ "fbw-common/src/wasm/terronnd", "fbw-a32nx/out/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/panel/terronnd.wasm", @@ -185,7 +185,7 @@ export default new TaskOfTasks("all", [ ]), new ExecTask("systems-terronnd", [ "fbw-common/src/wasm/terronnd/build.sh", - "wasm-opt -O1 -o fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/terronnd.wasm fbw-common/src/wasm/terronnd/out/terronnd.wasm" + "wasm-opt -O1 --signext-lowering -o fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/terronnd.wasm fbw-common/src/wasm/terronnd/out/terronnd.wasm" ], [ "fbw-common/src/wasm/terronnd", "fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/terronnd.wasm", diff --git a/package.json b/package.json index f798f7e8be6..e738f18a247 100644 --- a/package.json +++ b/package.json @@ -28,10 +28,10 @@ "build-a32nx:systems-host": "node fbw-a32nx/src/systems/systems-host/build.js", "build-a32nx:tcas": "node fbw-a32nx/src/systems/tcas/build.js", - "build-a32nx:fadec": "cd fbw-a32nx/src/wasm/fadec_a320 && ./build.sh && wasm-opt -O1 -o /external/fbw-a32nx/out/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/panel/fadec.wasm /external/fbw-a32nx/out/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/panel/fadec.wasm", - "build-a32nx:fbw": "cd fbw-a32nx/src/wasm/fbw_a320 && ./build.sh && wasm-opt -O1 -o /external/fbw-a32nx/out/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/panel/fbw.wasm /external/fbw-a32nx/out/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/panel/fbw.wasm", - "build-a32nx:flypad-backend": "cd fbw-a32nx/src/wasm/flypad-backend && ./build.sh && wasm-opt -O1 -o /external/fbw-a32nx/out/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/panel/flypad-backend.wasm /external/fbw-a32nx/out/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/panel/flypad-backend.wasm", - "build-a32nx:systems": "cargo build -p a320_systems_wasm --target wasm32-wasi --release && wasm-opt -O1 -o /external/fbw-a32nx/out/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/panel/systems.wasm /external/target/wasm32-wasi/release/a320_systems_wasm.wasm", + "build-a32nx:fadec": "cd fbw-a32nx/src/wasm/fadec_a320 && ./build.sh && wasm-opt -O1 --signext-lowering -o /external/fbw-a32nx/out/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/panel/fadec.wasm /external/fbw-a32nx/out/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/panel/fadec.wasm", + "build-a32nx:fbw": "cd fbw-a32nx/src/wasm/fbw_a320 && ./build.sh && wasm-opt -O1 --signext-lowering -o /external/fbw-a32nx/out/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/panel/fbw.wasm /external/fbw-a32nx/out/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/panel/fbw.wasm", + "build-a32nx:flypad-backend": "cd fbw-a32nx/src/wasm/flypad-backend && ./build.sh && wasm-opt -O1 --signext-lowering -o /external/fbw-a32nx/out/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/panel/flypad-backend.wasm /external/fbw-a32nx/out/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/panel/flypad-backend.wasm", + "build-a32nx:systems": "cargo build -p a320_systems_wasm --target wasm32-wasi --release && wasm-opt -O1 --signext-lowering --enable-bulk-memory -o /external/fbw-a32nx/out/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/panel/systems.wasm /external/target/wasm32-wasi/release/a320_systems_wasm.wasm", "build-a32nx:metadata": "node scripts/metadata.js fbw-a32nx/out/flybywire-aircraft-a320-neo a32nx", "build-a32nx:manifest": "node scripts/build_a32nx.js", @@ -53,10 +53,10 @@ "====== A380 =================": "==========================================", "build-a380x:copy-base-files": "mkdir -p fbw-a380x/out/flybywire-aircraft-a380-842 && (rsync -a fbw-a380x/src/base/flybywire-aircraft-a380-842 fbw-a380x/out/ || cp -a -u fbw-a380x/src/base/flybywire-aircraft-a380-842 fbw-a380x/out/)", - "build-a380x:systems": "cargo build -p a380_systems_wasm --target wasm32-wasi --release && wasm-opt -O1 -o /external/fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/systems.wasm /external/target/wasm32-wasi/release/a380_systems_wasm.wasm", - "build-a380x:fadec": "cd fbw-a380x/src/wasm/fadec_a380 && ./build.sh && wasm-opt -O1 -o /external/fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/fadec.wasm /external/fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/fadec.wasm", - "build-a380x:fbw": "cd fbw-a380x/src/wasm/fbw_a380 && ./build.sh && wasm-opt -O1 -o /external/fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/fbw.wasm /external/fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/fbw.wasm", - "build-a380x:flypad-backend": "cd fbw-a380x/src/wasm/flypad-backend && ./build.sh && wasm-opt -O1 -o /external/fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/flypad-backend.wasm /external/fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/flypad-backend.wasm", + "build-a380x:systems": "cargo build -p a380_systems_wasm --target wasm32-wasi --release && wasm-opt -O1 --signext-lowering --enable-bulk-memory -o /external/fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/systems.wasm /external/target/wasm32-wasi/release/a380_systems_wasm.wasm", + "build-a380x:fadec": "cd fbw-a380x/src/wasm/fadec_a380 && ./build.sh && wasm-opt -O1 --signext-lowering -o /external/fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/fadec.wasm /external/fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/fadec.wasm", + "build-a380x:fbw": "cd fbw-a380x/src/wasm/fbw_a380 && ./build.sh && wasm-opt -O1 --signext-lowering -o /external/fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/fbw.wasm /external/fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/fbw.wasm", + "build-a380x:flypad-backend": "cd fbw-a380x/src/wasm/flypad-backend && ./build.sh && wasm-opt -O1 --signext-lowering -o /external/fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/flypad-backend.wasm /external/fbw-a380x/out/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/panel/flypad-backend.wasm", "build-a380x:all": "npm run build-a380x:copy-base-files && npm run build-a380x:systems && npm run build-a380x:fadec && npm run build-a380x:fbw && npm run build-a380x:flypad-backend", diff --git a/rust-toolchain.toml b/rust-toolchain.toml index fb9e97ca0da..5891a193b9f 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.65" +channel = "1.72.1" targets = [ "wasm32-wasi" ] diff --git a/scripts/dev-env/run-local.cmd b/scripts/dev-env/run-local.cmd index 3bec7a28077..4f1bd8e9943 100644 --- a/scripts/dev-env/run-local.cmd +++ b/scripts/dev-env/run-local.cmd @@ -2,7 +2,7 @@ rem This is a script to use a locally build docker image to run the tests -set image="sha256:9f57eb40bd69f1660e7ee2aecebde7ced61645ea6a614e67234a15de03324ac3" +set image="sha256:528f8e1ca9063b9346c7d4f684d7aadbcb58ca1fba2b1a3c2cdd9c820c4236f4" docker image inspect %image% 1> nul || docker system prune --filter label=flybywiresim=true -f docker run --rm -it -v "%cd%:/external" %image% %* diff --git a/scripts/dev-env/run-local.sh b/scripts/dev-env/run-local.sh index 24766df46e5..c1c389e24a0 100644 --- a/scripts/dev-env/run-local.sh +++ b/scripts/dev-env/run-local.sh @@ -3,7 +3,7 @@ # This is a script to use a locally build docker image to run the tests -IMAGE="sha256:9f57eb40bd69f1660e7ee2aecebde7ced61645ea6a614e67234a15de03324ac3" +IMAGE="sha256:528f8e1ca9063b9346c7d4f684d7aadbcb58ca1fba2b1a3c2cdd9c820c4236f4" # only set `-it` if there is a tty if [ -t 0 ] && [ -t 1 ]; diff --git a/scripts/dev-env/run.cmd b/scripts/dev-env/run.cmd index 228fce36fcd..b655ce4df03 100755 --- a/scripts/dev-env/run.cmd +++ b/scripts/dev-env/run.cmd @@ -1,6 +1,6 @@ @echo off -set image="ghcr.io/flybywiresim/dev-env@sha256:52415c40545b88c820f61f5d0ce77178599288c3bc60adae57acc5435d19d98c" +set image="ghcr.io/flybywiresim/dev-env@sha256:528f8e1ca9063b9346c7d4f684d7aadbcb58ca1fba2b1a3c2cdd9c820c4236f4" docker image inspect %image% 1> nul || docker system prune --filter label=flybywiresim=true -f docker run --rm -it -v "%cd%:/external" %image% %* diff --git a/scripts/dev-env/run.sh b/scripts/dev-env/run.sh index 1f6171cc7c0..a8155afbf42 100755 --- a/scripts/dev-env/run.sh +++ b/scripts/dev-env/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -IMAGE="ghcr.io/flybywiresim/dev-env@sha256:52415c40545b88c820f61f5d0ce77178599288c3bc60adae57acc5435d19d98c" +IMAGE="ghcr.io/flybywiresim/dev-env@sha256:528f8e1ca9063b9346c7d4f684d7aadbcb58ca1fba2b1a3c2cdd9c820c4236f4" # only set `-it` if there is a tty if [ -t 0 ] && [ -t 1 ];