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

feat(a339x/atsaw): make atsaw for fo available, seperate selection #118

Merged
merged 6 commits into from
Feb 27, 2025
Merged

feat(a339x/atsaw): make atsaw for fo available, seperate selection #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2bee0eb
feat(a339x/atsaw): make atsaw for fo available, seperate selection
Revyn112 Feb 26, 2025
8a8cb44
simply logic
liz3 Feb 27, 2025
4dcf1e1
change switch condition
Revyn112 Feb 27, 2025
3d8ee61
fixes for vatsim and re add clear when switching to no source.
liz3 Feb 27, 2025
b9c32b3
move activeTrafficId to SimVar for feeding global activeTrafficId
Revyn112 Feb 27, 2025
eac0547
rename traffic sim variables to a339x namespace
Revyn112 Feb 27, 2025
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
16 changes: 9 additions & 7 deletions hdw-a339x-common/src/systems/instruments/src/ND/shared/map/CanvasMap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,16 +145,17 @@ export class CanvasMap extends DisplayComponent<CanvasMapProps> {
sub.on('set_map_range_radius').handle((v) => this.mapRangeRadius.set(v));
sub.on('traffic_selector_state').handle((v) => {
if(!v) {
if(this.trafficLayer.activeTrafficId === this.selectedTrafficId) {
this.trafficLayer.activeTrafficId = "";
const activeTrafficId = String(SimVar.GetSimVarValue('L:A339X_TRAFFIC_ACTIVE_ID', 'number'));
if(activeTrafficId === this.selectedTrafficId) {
SimVar.SetSimVarValue('L:A339X_TRAFFIC_ACTIVE_ID', 'number', '-1');
return;
}
this.selectedTrafficIndex = -1;
this.selectedTrafficId = "";
this.trafficLayer.selectedTrafficId = "";
}
if(v && this.selectedTrafficIndex !== -1){
this.trafficLayer.activeTrafficId = this.trafficLayer.selectedTrafficId;
if(v && this.trafficLayer.selectedTrafficId === this.selectedTrafficId){
SimVar.SetSimVarValue('L:A339X_TRAFFIC_ACTIVE_ID', 'number', parseInt(this.trafficLayer.selectedTrafficId));
}
});
// sub.on('set_map_efis_mode').handle((v) => this.mapMode.set(v));
Expand Down Expand Up @@ -252,7 +253,7 @@ export class CanvasMap extends DisplayComponent<CanvasMapProps> {
});

sub.on('traffic').handle((data: NdTraffic[]) => {
this.trafficLayer.displayHideCallsign = SimVar.GetSimVarValue('L:A32NX_TRAFFIC_SELECTOR_DISPLAY_HIDE_CALLSIGN', 'number') === 1;
this.trafficLayer.displayHideCallsign = SimVar.GetSimVarValue('L:A339X_TRAFFIC_SELECTOR_DISPLAY_HIDE_CALLSIGN', 'number') === 1;
this.handleNewTraffic(data);
});

Expand Down Expand Up @@ -429,8 +430,9 @@ export class CanvasMap extends DisplayComponent<CanvasMapProps> {
this.traffic.push(intruder);
});
}
if(this.trafficLayer.activeTrafficId.length && !this.traffic.find(e => e.ID === this.trafficLayer.activeTrafficId)) {
this.trafficLayer.activeTrafficId = "";
const activeTrafficId = String(SimVar.GetSimVarValue('L:A339X_TRAFFIC_ACTIVE_ID', 'number'));
if(activeTrafficId !== "-1" && activeTrafficId.length && !this.traffic.find(e => String(e.ID) === activeTrafficId)) {
SimVar.SetSimVarValue('L:A339X_TRAFFIC_ACTIVE_ID', 'number', '-1');
}
if(this.selectedTrafficId.length) {
this.selectedTrafficIndex = -1;
Expand Down
4 changes: 2 additions & 2 deletions hdw-a339x-common/src/systems/instruments/src/ND/shared/map/TrafficLayer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ export class TrafficLayer implements MapLayer<NdTraffic> {
public trafficIsSelected: boolean = false;
public displayHideCallsign: boolean = false;
public selectedTrafficId: string = "";
public activeTrafficId: string = "";

constructor(private readonly canvasMap: CanvasMap) {}

Expand Down Expand Up @@ -57,9 +56,10 @@ export class TrafficLayer implements MapLayer<NdTraffic> {
intruder: NdTraffic,
) {
let color;
const activeTrafficId = String(SimVar.GetSimVarValue('L:A339X_TRAFFIC_ACTIVE_ID', 'number'));
const ownHeading = Math.round(SimVar.GetSimVarValue('PLANE HEADING DEGREES MAGNETIC', 'degree'));
const trafficRotation = 360 - ((ownHeading - intruder.heading) % 360);
const trafficActive = this.activeTrafficId === intruder.ID;
const trafficActive = activeTrafficId === intruder.ID;
const isSelected = trafficActive || this.selectedTrafficId === intruder.ID;

switch (intruder.intrusionLevel) {
Expand Down
25 changes: 22 additions & 3 deletions ...ndsim-aircraft-a330-900/SimObjects/Airplanes/Headwind_A330neo/model/A330_NEO_INTERIOR.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,11 +799,12 @@
<!-- Effects such as pixels and glass reflections require the screen brightness to be increased -->
<EMISSIVE_CODE>12</EMISSIVE_CODE>
</UseTemplate>
<!-- ATSAW TRAFFIC SELECTOR PB -->

<!-- CPT ATSAW TRAFFIC SELECTOR PB -->
<UseTemplate Name="HDW_Airbus_ATSAW_TrafficSelector_Knob">
<SIDE>L</SIDE>
<NODE_ID>KNOB_TRAFFICSELECTOR_CAPT</NODE_ID>
<PART_ID>KNOB_ATSAW_KNOB_TRAFFICSELECTOR</PART_ID>
<PART_ID>KNOB_ATSAW_KNOB_TRAFFICSELECTOR_CAPT</PART_ID>
<ANIM_NAME_KNOB>KNOB_TRAFFICSELECTOR_CAPT</ANIM_NAME_KNOB>
<ANIM_NAME_PUSHPULL>PUSH_TRAFFICSELECTOR_CAPT</ANIM_NAME_PUSHPULL>
<ANIMREF_ID>-1</ANIMREF_ID>
Expand Down Expand Up @@ -1016,6 +1017,24 @@
<POTENTIOMETER>90</POTENTIOMETER>
</UseTemplate>

<!-- F/O ATSAW TRAFFIC SELECTOR PB -->
<UseTemplate Name="HDW_Airbus_ATSAW_TrafficSelector_Knob">
<SIDE>R</SIDE>
<NODE_ID>KNOB_TRAFFICSELECTOR_FO</NODE_ID>
<PART_ID>KNOB_ATSAW_KNOB_TRAFFICSELECTOR_FO</PART_ID>
<ANIM_NAME_KNOB>KNOB_TRAFFICSELECTOR_FO</ANIM_NAME_KNOB>
<ANIM_NAME_PUSHPULL>PUSH_TRAFFICSELECTOR_FO</ANIM_NAME_PUSHPULL>
<ANIMREF_ID>-1</ANIMREF_ID>
<ANIMTIP_0>TT:COCKPIT.TOOLTIPS.AUTOPILOT_PANEL_ALT_DECREASE</ANIMTIP_0>
<ANIMTIP_0_ON_CURSOR>TurnLeft</ANIMTIP_0_ON_CURSOR>
<ANIMTIP_1>TT:COCKPIT.TOOLTIPS.AUTOPILOT_PANEL_ALT_INCREASE</ANIMTIP_1>
<ANIMTIP_1_ON_CURSOR>TurnRight</ANIMTIP_1_ON_CURSOR>
<ANIMTIP_2>TT:COCKPIT.TOOLTIPS.AUTOPILOT_PANEL_ENGAGE_MANAGED_ALTITUDE_MODE</ANIMTIP_2>
<ANIMTIP_2_ON_CURSOR>UpArrow</ANIMTIP_2_ON_CURSOR>
<ANIMTIP_3>TT:COCKPIT.TOOLTIPS.AUTOPILOT_PANEL_ENGAGE_SELECTED_ALTITUDE_MODE</ANIMTIP_3>
<ANIMTIP_3_ON_CURSOR>DownArrow</ANIMTIP_3_ON_CURSOR>
</UseTemplate>

<!-- F/O EFIS BKUP SPD ALT -->
<UseTemplate Name="FBW_Anim_Interactions">
<ANIM_TYPE>KORRY_BUTTON</ANIM_TYPE>
Expand Down
10 changes: 5 additions & 5 deletions hdw-a339x/src/behavior/src/A339X_Interior_ATSAW.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@
<Component ID="#NODE_ID#" Node="#NODE_ID#">
<UseTemplate Name="ASOBO_GT_Knob_Infinite_PushPull">
<ANTICLOCKWISE_CODE>
(&gt;H:A330_Neo_ATSAW_TRAFFIC_DEC)
(&gt;H:A330_Neo_#SIDE#_ATSAW_TRAFFIC_DEC)
</ANTICLOCKWISE_CODE>
<CLOCKWISE_CODE>
(&gt;H:A330_Neo_ATSAW_TRAFFIC_INC)
(&gt;H:A330_Neo_#SIDE#_ATSAW_TRAFFIC_INC)
</CLOCKWISE_CODE>
<PULL_CODE>
(&gt;H:A330_Neo_ATSAW_TRAFFIC_PULL)
(&gt;H:A330_Neo_#SIDE#_ATSAW_TRAFFIC_PULL)
</PULL_CODE>
<PUSH_CODE>
(&gt;H:A330_Neo_ATSAW_TRAFFIC_PUSH)
(&gt;H:A330_Neo_#SIDE#_ATSAW_TRAFFIC_PUSH)
</PUSH_CODE>

<CENTER_RADIUS>0</CENTER_RADIUS>
Expand All @@ -45,4 +45,4 @@
</UseTemplate>
</Component>
</Template>
</ModelBehaviors>
</ModelBehaviors>
28 changes: 18 additions & 10 deletions hdw-a339x/src/systems/instruments/src/ND/instrument.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,16 +188,24 @@ class NDInstrument implements FsInstrument {
}

public onInteractionEvent(args: string[]): void {
const trafficSelectorMap = {
"A330_Neo_ATSAW_TRAFFIC_DEC": ["traffic_selector_value", -1],
"A330_Neo_ATSAW_TRAFFIC_INC": ["traffic_selector_value", 1],
"A330_Neo_ATSAW_TRAFFIC_PULL": ["traffic_selector_state", true],
"A330_Neo_ATSAW_TRAFFIC_PUSH": ["traffic_selector_state", false],
}
if (args[0].endsWith(`A32NX_EFIS_${this.efisSide}_CHRONO_PUSHED`)) {
this.bus.getPublisher<NDControlEvents>().pub('chrono_pushed', undefined);
} else if (trafficSelectorMap[args[0]]) {
this.bus.getPublisher<NDControlEvents>().pub(trafficSelectorMap[args[0]][0], trafficSelectorMap[args[0]][1]);
switch(true) {
case args[0].endsWith(`A32NX_EFIS_${this.efisSide}_CHRONO_PUSHED`):
this.bus.getPublisher<NDControlEvents>().pub('chrono_pushed', undefined);
break;
case args[0].endsWith(`A330_Neo_${this.efisSide}_ATSAW_TRAFFIC_DEC`):
this.bus.getPublisher<NDControlEvents>().pub('traffic_selector_value', -1);
break;
case args[0].endsWith(`A330_Neo_${this.efisSide}_ATSAW_TRAFFIC_INC`):
this.bus.getPublisher<NDControlEvents>().pub('traffic_selector_value', 1);
break;
case args[0].endsWith(`A330_Neo_${this.efisSide}_ATSAW_TRAFFIC_PULL`):
this.bus.getPublisher<NDControlEvents>().pub('traffic_selector_state', true);
break;
case args[0].endsWith(`A330_Neo_${this.efisSide}_ATSAW_TRAFFIC_PUSH`):
this.bus.getPublisher<NDControlEvents>().pub('traffic_selector_state', false);
break;
default:
break;
}

this.hEventPublisher.dispatchHEvent(args[0]);
Expand Down
66 changes: 31 additions & 35 deletions hdw-a339x/src/systems/tcas/src/components/TcasComputer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,8 @@ export class TcasComputer implements TcasComponent {
this.upAdvisoryStatus = new LocalSimVar('L:A32NX_TCAS_RA_UP_ADVISORY_STATUS', 'Enum');
this.downAdvisoryStatus = new LocalSimVar('L:A32NX_TCAS_RA_DOWN_ADVISORY_STATUS', 'Enum');
this.selectedTrafficDataSource = ({"NONE": 0, "SIM": 1, "VATSIM": 2, "IVAO": 3})[NXDataStore.get("CONFIG_TRAFFIC_SOURCE", "NONE")];
SimVar.SetSimVarValue('L:A32NX_TRAFFIC_SELECTOR_SOURCE', 'number', this.selectedTrafficDataSource);
SimVar.SetSimVarValue('L:A32NX_TRAFFIC_SELECTOR_DISPLAY_HIDE_CALLSIGN', 'number', NXDataStore.get("CONFIG_TRAFFIC_DISPLAY_HIDE_CALLSIGN", "YES") === "YES" ? 1 : 0);
SimVar.SetSimVarValue('L:A339X_TRAFFIC_SELECTOR_SOURCE', 'number', this.selectedTrafficDataSource);
SimVar.SetSimVarValue('L:A339X_TRAFFIC_SELECTOR_DISPLAY_HIDE_CALLSIGN', 'number', NXDataStore.get("CONFIG_TRAFFIC_DISPLAY_HIDE_CALLSIGN", "YES") === "YES" ? 1 : 0);
this.airTraffic = [];
this.raTraffic = [];
this.sensitivity = new LocalSimVar('L:A32NX_TCAS_SENSITIVITY', 'number');
Expand All @@ -316,7 +316,7 @@ export class TcasComputer implements TcasComponent {
}

this.secondsSinceLastTrafficDataUpdate += _deltaTime / 1000;
if(this.secondsSinceLastTrafficDataUpdate < 5) {
if (this.secondsSinceLastTrafficDataUpdate < 5) {
return;
}

Expand All @@ -334,47 +334,39 @@ export class TcasComputer implements TcasComponent {
(traffic) =>
new Promise((resolve) => {
const existing = traffic.trafficData;
fetchPilotInfo(
traffic.ID,
port,
this.selectedTrafficDataSource
)
fetchPilotInfo(traffic.ID, port, this.selectedTrafficDataSource)
.then((resp) => {
const data = resp.data;
if (existing) {
existing.groundspeed = data.groundSpeed;
traffic.setTrafficData(existing);
} else {
let callsign = data.msfs.callsign;
const groundspeed = data.groundSpeed;
const transponder = data.transponder;
let wtc = data.msfs.wtc;

if (this.selectedTrafficDataSource === 2 && data.vatsim.callsign && data.vatsim.wtc) {
callsign = data.vatsim.callsign;
wtc = data.vatsim.wtc;
} else if (this.selectedTrafficDataSource === 3 && data.ivao.callsign && data.ivao.wtc) {
callsign = data.ivao.callsign;
wtc = data.ivao.wtc;
}
traffic.setTrafficData({
callsign,
groundspeed,
wtc,
transponder,
});

const trafficData = {
groundspeed: data.groundSpeed,
transponder: data.transponder,
wtc: 'M',
};
if (data.msfs) {
trafficData.callsign = data.msfs.callsign;
trafficData.wtc = data.msfs.wtc;
}

if (this.selectedTrafficDataSource === 2 && data.vatsim.callsign && data.vatsim.wtc) {
trafficData.callsign = data.vatsim.callsign;
trafficData.wtc = data.vatsim.wtc;
} else if (this.selectedTrafficDataSource === 3 && data.ivao.callsign && data.ivao.wtc) {
trafficData.callsign = data.ivao.callsign;
trafficData.wtc = data.ivao.wtc;
}
traffic.setTrafficData(trafficData);

resolve(null);
})
.catch((err) => {
resolve(null);
});
}),
),
)
.then((_unused) => {
).then((_unused) => {
this.secondsSinceLastTrafficDataUpdate = 0;
})
});
}
}
/**
Expand Down Expand Up @@ -421,8 +413,12 @@ export class TcasComputer implements TcasComponent {
? TcasMode.STBY
: this.tcasSwitchPos,
); // 34-43-00:A32

this.selectedTrafficDataSource = SimVar.GetSimVarValue("L:A32NX_TRAFFIC_SELECTOR_SOURCE", 'number');
const currentSource = this.selectedTrafficDataSource;
this.selectedTrafficDataSource = SimVar.GetSimVarValue("L:A339X_TRAFFIC_SELECTOR_SOURCE", 'number');
if(this.selectedTrafficDataSource === 0 && currentSource > 0) {
for(const entry of this.airTraffic)
entry.setTrafficData(null);
}
}

/**
Expand Down
4 changes: 2 additions & 2 deletions hdw-common/src/systems/instruments/src/EFB/Settings/Pages/AtsuAocPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ export const AtsuAocPage = () => {
const handleTrafficSourceChange = (entry: string) => {
const map = {"NONE": 0, "SIM":1, "VATSIM": 2, "IVAO": 3};
setTrafficSource(entry);
SimVar.SetSimVarValue('L:A32NX_TRAFFIC_SELECTOR_SOURCE', 'number', map[entry]);
SimVar.SetSimVarValue('L:A339X_TRAFFIC_SELECTOR_SOURCE', 'number', map[entry]);
}

const handleTrafficDefaultChange = (entry: string) => {
setTrafficDisplayHideCallsign(entry);
SimVar.SetSimVarValue('L:A32NX_TRAFFIC_SELECTOR_DISPLAY_HIDE_CALLSIGN', 'number', entry === "YES" ? 1 : 0);
SimVar.SetSimVarValue('L:A339X_TRAFFIC_SELECTOR_DISPLAY_HIDE_CALLSIGN', 'number', entry === "YES" ? 1 : 0);
}

const handleAcarsIdentifierInput = (network: string | AcarsNetwork, value: string) => {
Expand Down
Loading