Skip to content

Fix H1 parsing #310

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

Merged
makrsmark merged 2 commits into from
Jan 31, 2026
Merged

Fix H1 parsing #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
848720e
Fix H1 parsing
makrsmark Jan 30, 2026
4a83700
feedback
makrsmark Jan 30, 2026
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
7 changes: 4 additions & 3 deletions lib/plugins/Label_1J_2J_FTX.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,12 @@ describe('Label 1J/2J FTX', () => {
expect(decodeResult.raw.flight_number).toBe('RCH4086');
expect(decodeResult.raw.mission_number).toBe('ABB02R70E037');
expect(decodeResult.raw.message_timestamp).toBe(1759367848);
expect(decodeResult.raw.fuel_burned).toBe(1791);
expect(decodeResult.raw.fuel_on_board).toBe(1791);
expect(decodeResult.raw.freetext).toBe('GOOD EVENING PLEASE PASS US THE SUPER BOWL SCORE WHEN ABLE. THANK YOU');
expect(decodeResult.raw.version).toBe(3.2);
expect(decodeResult.raw.checksum).toBe(0x8D70);
expect(decodeResult.formatted.items.length).toBe(5);
expect(decodeResult.remaining.text).toBe('M74/MR049,/VR032');
expect(decodeResult.formatted.items.length).toBe(6);
expect(decodeResult.remaining.text).toBe('M74/MR049,');
});

test('decodes <invalid>', () => {
Expand Down
7 changes: 4 additions & 3 deletions lib/plugins/Label_2P_POS.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@ describe('Label_2P Preamble POS', () => {
expect(decodeResult.raw.route.waypoints[0].time).toBe(19084);
expect(decodeResult.raw.route.waypoints[2].name).toBe('?');
expect(decodeResult.raw.altitude).toBe(35000);
expect(decodeResult.raw.fuel_burned).toBe(857);
expect(decodeResult.raw.fuel_on_board).toBe(857);
expect(decodeResult.raw.version).toBe(3.2);
expect(decodeResult.raw.checksum).toBe(0x2b89);
expect(decodeResult.formatted.items.length).toBe(11);
expect(decodeResult.remaining.text).toBe('M80/MR103,,084081,,/VR032');
expect(decodeResult.formatted.items.length).toBe(10);
expect(decodeResult.remaining.text).toBe('M80/MR103,,084081,');
});

test('<invalid>', () => {
Expand Down
12 changes: 7 additions & 5 deletions lib/plugins/Label_H1_POS.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,12 +295,14 @@ describe('Label_H1 POS', () => {
expect(decodeResult.raw.route.waypoints[1].name).toBe('WEDAK');
expect(decodeResult.raw.route.waypoints[1].time).toBe(11879);
expect(decodeResult.raw.route.waypoints[2].name).toBe('?');
expect(decodeResult.raw.mac).toBe(26.4);
expect(decodeResult.raw.trim).toBe(1.1);
expect(decodeResult.raw.fuel_burned).toBe(742);
expect(decodeResult.raw.center_of_gravity).toBe(26.4);
expect(decodeResult.raw.cg_lower_limit).toBe(11.0);
expect(decodeResult.raw.cg_upper_limit).toBe(36.0);
expect(decodeResult.raw.fuel_on_board).toBe(742);
expect(decodeResult.raw.version).toBe(3.2);
expect(decodeResult.raw.checksum).toBe(0x4e17);
expect(decodeResult.formatted.items.length).toBe(12);
expect(decodeResult.remaining.text).toBe('F37A#M1B/MR1,,267070,T468,360/VR32');
expect(decodeResult.formatted.items.length).toBe(14);
expect(decodeResult.remaining.text).toBe('F37A#M1B/MR1,,267070,T468');
});

test('variant 8', () => {
Expand Down
25 changes: 18 additions & 7 deletions lib/utils/h1_helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export class H1Helper {
processETA(data, decodeResult, fields, i);
break;
case 'FB':
ResultFormatter.burnedFuel(decodeResult, parseInt(data, 10));
ResultFormatter.currentFuel(decodeResult, parseInt(data, 10));
break;
case 'FN':
decodeResult.raw.flight_number = data;
Expand Down Expand Up @@ -78,13 +78,16 @@ export class H1Helper {
decodeResult.raw.serial_number = data;
break;
case 'TD':
processTimeOfDeparture(decodeResult, data.split(',')); // Strip off TD
processTimeOfDeparture(decodeResult, data.split(','));
break;
case 'TS':
H1Helper.processTimeStamp(decodeResult, data.split(','));
break;
case 'VR':
ResultFormatter.version(decodeResult, parseInt(data, 10)/10);
break;
case 'WD':
processWindData(decodeResult, data); // Strip off WD
processWindData(decodeResult, data);
break;
default:
ResultFormatter.unknown(decodeResult, fields[i], '/');
Expand Down Expand Up @@ -242,11 +245,19 @@ function processLandingReport(decodeResult: DecodeResult, data: string[]) {

function processCenterOfGravity(decodeResult: DecodeResult, data: string[]) {
if(data.length === 1) {
ResultFormatter.mac(decodeResult, parseInt(data[0], 10) / 10);
if(data[0] !== undefined && data[0] !== '') {
ResultFormatter.cg(decodeResult, parseInt(data[0], 10) / 10);
}
} else if (data.length === 3) {
ResultFormatter.mac(decodeResult, parseInt(data[0], 10) / 10);
ResultFormatter.trim(decodeResult, parseInt(data[1], 10) / 100);
ResultFormatter.unknown(decodeResult, data[2],',');
if(data[0] !== undefined && data[0] !== '') {
ResultFormatter.cg(decodeResult, parseInt(data[0], 10) / 10, 'center');
}
if(data[1] !== undefined && data[1] !== '') {
ResultFormatter.cg(decodeResult, parseInt(data[1], 10) / 10, 'lower');
}
if(data[2] !== undefined && data[2] !== '') {
ResultFormatter.cg(decodeResult, parseInt(data[2], 10) / 10, 'upper');
}

} else {
ResultFormatter.unknown(decodeResult, data.join(','));
Expand Down
42 changes: 42 additions & 0 deletions lib/utils/result_formatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,48 @@ export class ResultFormatter {
}
}

static cg(decodeResult: DecodeResult, value: number, type: "center" | "lower" | "upper" = "center") {
switch(type) {
case "center":
decodeResult.raw.center_of_gravity = value;
decodeResult.formatted.items.push({
type: "center_of_gravity",
code: "CG",
label: "Center of Gravity",
value: `${decodeResult.raw.center_of_gravity} %`,
});
break;
case "lower":
decodeResult.raw.cg_lower_limit = value;
decodeResult.formatted.items.push({
type: "cg_lower_limit",
code: "CG_LOWER",
label: "Center of Gravity Lower Limit",
value: `${decodeResult.raw.cg_lower_limit} %`,
});
break;
case "upper":
decodeResult.raw.cg_upper_limit = value;
decodeResult.formatted.items.push({
type: "cg_upper_limit",
code: "CG_UPPER",
label: "Center of Gravity Upper Limit",
value: `${decodeResult.raw.cg_upper_limit} %`,
});
break;
}
}

static version(decodeResult: DecodeResult, value: number) {
decodeResult.raw.version = value;
decodeResult.formatted.items.push({
type: "version",
code: "VERSION",
label: "Message Version",
value: `v${decodeResult.raw.version.toFixed(1)}`,
});
}

static unknown(decodeResult: DecodeResult, value: string, sep: string = ',') {
if (!decodeResult.remaining.text)
decodeResult.remaining.text = value;
Expand Down