Mirror/intercept
1
0
Fork 0
mirror of https://github.com/smittix/intercept.git synced 2026-06-08 14:11:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix VDL2 messages not appearing in aircraft datalink panel

Browse Source 
Root cause: dumpvdl2 outputs nested JSON (vdl2.avlc.acars.flight) but
FlightCorrelator only checks top-level fields. VDL2 messages were stored
in the correlator but never matched to any aircraft.

Fix: Promote identifying fields (flight, reg, tail, icao, addr, label,
text) from the nested VDL2 structure to top-level before storing in the
correlator. Also promote AVLC source address as ICAO when src.type is
"Aircraft".

Also fix VDL2 sidebar timestamps to use global InterceptTime setting.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
mitchross
2026-03-25 01:43:15 -04:00
parent 7d704c9d42
commit b66ac935b7
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
routes/vdl2.py
+25 -3
View File
@@ -83,11 +83,33 @@ def stream_vdl2_output(process: subprocess.Popen, is_text_mode: bool = False) ->
data['type'] = 'vdl2'
data['timestamp'] = datetime.utcnow().isoformat() + 'Z'
# Enrich with translated ACARS label at top level (consistent with ACARS route)
# Flatten nested VDL2 identifying fields to top level for correlator matching
# dumpvdl2 nests flight/reg inside vdl2.avlc.acars and ICAO in avlc.src.addr
try:
vdl2_inner = data.get('vdl2', data)
acars_payload = (vdl2_inner.get('avlc') or {}).get('acars')
if acars_payload and acars_payload.get('label'):
avlc = vdl2_inner.get('avlc') or {}
acars_payload = avlc.get('acars') or {}
# Promote ACARS fields to top level so FlightCorrelator can match them
if acars_payload.get('flight'):
data['flight'] = acars_payload['flight']
if acars_payload.get('reg'):
data['reg'] = acars_payload['reg']
data['tail'] = acars_payload['reg']
if acars_payload.get('label'):
data['label'] = acars_payload['label']
if acars_payload.get('msg_text'):
data['text'] = acars_payload['msg_text']
# Promote AVLC source address (often ICAO hex for aircraft)
src_addr = (avlc.get('src') or {}).get('addr', '')
src_type = (avlc.get('src') or {}).get('type', '')
if src_addr and src_type == 'Aircraft':
data['icao'] = src_addr
data['addr'] = src_addr
# Enrich with translated ACARS label (consistent with ACARS route)
if acars_payload.get('label'):
translation = translate_message({
'label': acars_payload.get('label'),
'text': acars_payload.get('msg_text', ''),
templates/adsb_dashboard.html
+3 -1
View File
@@ -4930,7 +4930,9 @@ sudo make install</code>
const acars = avlc.acars || {};
const flight = acars.flight || '';
const msgText = acars.msg_text || '';
const time = new Date().toLocaleTimeString();
const time = typeof InterceptTime !== 'undefined'
? InterceptTime.shortTime(new Date()) + InterceptTime.tzSuffix()
: new Date().toLocaleTimeString();
const freq = inner.freq ? (inner.freq / 1000000).toFixed(3) : '';
// Store for CSV export