ham/meshcore.ts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix incorrect lat/lon decoding

Browse Source
This commit is contained in:
maze
2026-03-12 17:14:43 +01:00
parent 614b1858cb
commit 7a23440666
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/packet.ts
View File

@@ -225,8 +225,6 @@ export class Packet implements IPacket {
throw new Error(`Unsupported payload type: ${this.payloadType}`); throw new Error(`Unsupported payload type: ${this.payloadType}`);
} }
console.log('packet decode with structure:', typeof withStructure, withStructure, { result });
if (typeof withStructure === "boolean" && withStructure && "segment" in result && "payload" in result) { if (typeof withStructure === "boolean" && withStructure && "segment" in result && "payload" in result) {
this.ensureStructure(); this.ensureStructure();
const structure = [ ...this.structure!, result.segment ]; const structure = [ ...this.structure!, result.segment ];
@@ -408,8 +406,8 @@ export class Packet implements IPacket {
} }
if (appdata.hasLocation) { if (appdata.hasLocation) {
const lat = reader.readInt32LE() / 100000; const lat = reader.readInt32LE() / 1000000;
const lon = reader.readInt32LE() / 100000; const lon = reader.readInt32LE() / 1000000;
appdata.location = [lat, lon]; appdata.location = [lat, lon];
if (typeof withSegment === "boolean" && withSegment) { if (typeof withSegment === "boolean" && withSegment) {
segment!.fields.push({ type: FieldType.UINT32_LE, name: "latitude", size: 4, value: lat }); segment!.fields.push({ type: FieldType.UINT32_LE, name: "latitude", size: 4, value: lat });

4
test/packet.test.ts
View File

@@ -94,8 +94,8 @@ describe('Packet.fromBytes', () => {
expect(adv.appdata.hasName).toBe(true); expect(adv.appdata.hasName).toBe(true);
// location values: parser appears to scale values by 10 here, accept that // location values: parser appears to scale values by 10 here, accept that
expect(adv.appdata.location).toBeDefined(); expect(adv.appdata.location).toBeDefined();
expect(adv.appdata.location![0] / 10).toBeCloseTo(51.45986, 5); expect(adv.appdata.location![0] / 10).toBeCloseTo(5.145986, 5);
expect(adv.appdata.location![1] / 10).toBeCloseTo(5.45422, 5); expect(adv.appdata.location![1] / 10).toBeCloseTo(0.545422, 5);
expect(adv.appdata.name).toBe('NL-EHV-VBGB-RPTR'); expect(adv.appdata.name).toBe('NL-EHV-VBGB-RPTR');
expect(pkt.hash().toUpperCase()).toBe('67C10F75168ECC8C'); expect(pkt.hash().toUpperCase()).toBe('67C10F75168ECC8C');
}); });