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.

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

refactor(w&b): rust refactor of payload management #7715

Merged
merged 50 commits into from
Apr 1, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
2472d97
feat(efb/wb): boarding.rs, Payload.tsx and related changes
2hwk Feb 1, 2023
90263c2
refactor: standardise units as kg
2hwk Feb 2, 2023
327a13d
refactor: setting A:PAYLOAD STATION WEIGHT in rs
2hwk Feb 3, 2023
af5ee85
refactor: use uom for units instead of f64
2hwk Feb 4, 2023
24e04c5
refactor: renamed to payload from boarding
2hwk Feb 4, 2023
9f74316
refactor: restore payload sync in .rs
2hwk Feb 4, 2023
f8ff210
chore: fix diff
2hwk Feb 4, 2023
2696128
refactor: remove pax target id
2hwk Feb 5, 2023
dcd7d87
fix: per pax weight tests
2hwk Feb 6, 2023
20257b1
fix: delete dead code
2hwk Feb 6, 2023
8f2f9d8
fix: remove unused pax station vars
2hwk Feb 10, 2023
8d60bde
fix: engine control hotfix
2hwk Feb 10, 2023
445531e
fix: backport fixes
2hwk Feb 12, 2023
004149a
fix: backport more changes
2hwk Feb 12, 2023
db8c641
feat: added gw cg, renamed simvar pax_flags_ to pax_
2hwk Feb 17, 2023
dc56fdd
feat: init changes for gw on payload page
2hwk Feb 19, 2023
90b0c6a
feat: switch to GW/GWCG
2hwk Feb 19, 2023
be54c00
fix: remove comments
2hwk Feb 24, 2023
9be74af
fix: changes for GSX
2hwk Feb 25, 2023
ebe7998
fix: css font-mono
2hwk Feb 25, 2023
5ff9f6c
feat: more gsx vars
2hwk Feb 26, 2023
1c1b356
feat: complete gsx integration in rust
2hwk Feb 26, 2023
1a091e8
chore: remove js bitflags
2hwk Feb 26, 2023
3d73457
fix: undo NXUnits change
2hwk Feb 26, 2023
c201a60
Tech Debt
Lucky38i Feb 26, 2023
046a839
Revert "chore: remove js bitflags"
2hwk Feb 27, 2023
c880c28
fix: rust lint
2hwk Feb 26, 2023
1284390
fix: rust lint
2hwk Feb 27, 2023
243a831
fix: max gw and tooltips
2hwk Feb 28, 2023
32b3079
fix(efb): remove pseudo fuel calculation from payload for performance
2hwk Mar 11, 2023
6a8a279
fix(cdu): wrong zfwcg calculation for payload manager utility
2hwk Mar 11, 2023
2d3bf49
GSX Implementation
Lucky38i Mar 13, 2023
528ad50
refactor: review comments and gsx fixes
2hwk Mar 15, 2023
1e10b7a
fix: temporary workaround for deboarding cargo
2hwk Mar 15, 2023
777becc
fix: fix tests
2hwk Mar 15, 2023
090d5e6
POC to maintain state of cargo loaded for GSX boarding
Lucky38i Mar 15, 2023
50b805a
Merge remote-tracking branch 'upstream/master' into flypad-weight-bal…
mjuhe Mar 16, 2023
3afc97b
refactor: add trait to transfer number of pax to air cond
mjuhe Mar 16, 2023
cd488cd
GSX Implementation
Lucky38i Mar 17, 2023
77f733f
Merge remote-tracking branch 'origin/flypad-weight-balance-gsx' into …
Lucky38i Mar 17, 2023
237a9a3
fix: lint-rust.sh
2hwk Mar 19, 2023
a14895e
Merge branch 'master' into flypad-weight-balance-gsx
2hwk Mar 19, 2023
17ca8d7
Merge branch 'master' into flypad-weight-balance-gsx
2hwk Mar 25, 2023
7fb8b98
refactor/fix(efb): new cg limits, unit conversion, simvar documentati…
2hwk Mar 27, 2023
a64040e
Merge branch 'master' into flypad-weight-balance-gsx
2hwk Mar 28, 2023
b321732
fix: package.json
2hwk Mar 29, 2023
bce1e42
meta: removed 380 changes
2hwk Mar 29, 2023
614c534
Merge branch 'master' into flypad-weight-balance-gsx
2hwk Apr 1, 2023
021bd98
fix(efb): localisation diff and deboarding full bugs
2hwk Apr 1, 2023
83d8c00
Merge remote-tracking branch 'a32nx/master' into flypad-weight-balanc…
2hwk Apr 1, 2023
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
Prev Previous commit
Next Next commit
fix: temporary workaround for deboarding cargo
  • Loading branch information
2hwk committed Mar 15, 2023
commit 1e10b7ac03daddac48c7b21e1df5cf3fec94b7e9
4 changes: 3 additions & 1 deletion fbw-a32nx/src/wasm/systems/a320_systems/src/payload/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -291,12 +291,14 @@ impl A320Payload {
GsxState::None | GsxState::Available | GsxState::NotAvailable | GsxState::Bypassed => {}
GsxState::Requested => {
self.reset_all_pax_targets();
self.reset_all_cargo_targets();
// Temp workaround for cargo deboarding issue
// self.reset_all_cargo_targets();
}
GsxState::Completed => {
for cs in A320Cargo::iterator() {
self.move_all_cargo(cs);
}
self.reset_all_cargo_targets();
}
GsxState::Performing => {
self.move_all_pax_num(
Expand Down
4 changes: 2 additions & 2 deletions fbw-a32nx/src/wasm/systems/a320_systems/src/payload/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1271,7 +1271,7 @@ fn gsx_deboarding_full_pax_partial() {
.with_full_cargo()
.with_full_pax()
.target_no_pax()
.target_no_cargo()
.target_full_cargo()
.gsx_requested_deboard_state()
.gsx_performing_deboard_state()
.deboard_gsx_pax_half()
Expand All @@ -1280,7 +1280,7 @@ fn gsx_deboarding_full_pax_partial() {
.and_stabilize();

test_bed.has_half_pax();
// test_bed.has_half_cargo();
test_bed.has_half_cargo();

let mut test_bed = test_bed
.deboard_gsx_pax_full()
Expand Down