layout tracker fields differently

This commit is contained in:
2023-09-13 15:44:16 -05:00
parent c610b4e858
commit 5b163bf120
3 changed files with 39 additions and 12 deletions
+9 -5
View File
@@ -47,11 +47,15 @@ class Decoder {
if (this.data.trackers[tracker.id] === undefined) {
this.data.trackers[tracker.id] = {};
}
tracker.fields?.forEach((field) => {
Object.entries(field).forEach(([key, value]) => {
this.data.trackers[tracker.id][key] = value;
});
});
this.data.trackers[tracker.id] = {
pos: tracker.pos,
speed: tracker.speed,
ori: tracker.ori,
status: tracker.status,
accel: tracker.accel,
trgtpos: tracker.trgtpos,
timestamp: tracker.timestamp,
};
});
}
});
+5 -5
View File
@@ -18,12 +18,12 @@ module.exports = new Parser()
.choice('data', {
tag: 'id',
choices: {
0x0000: new Parser().floatle('pos_x').floatle('pos_y').floatle('pos_z'),
0x0001: new Parser().floatle('speed_x').floatle('speed_y').floatle('speed_z'),
0x0002: new Parser().floatle('ori_x').floatle('ori_y').floatle('ori_z'),
0x0000: new Parser().floatle('x').floatle('y').floatle('z'),
0x0001: new Parser().floatle('x').floatle('y').floatle('z'),
0x0002: new Parser().floatle('x').floatle('y').floatle('z'),
0x0003: new Parser().floatle('validity'),
0x0004: new Parser().floatle('accel_x').floatle('accel_y').floatle('accel_z'),
0x0005: new Parser().floatle('trgtpos_x').floatle('trgtpos_y').floatle('trgtpos_z'),
0x0004: new Parser().floatle('x').floatle('y').floatle('z'),
0x0005: new Parser().floatle('x').floatle('y').floatle('z'),
0x0006: new Parser().uint64le('tracker_timestamp'),
},
});
+25 -2
View File
@@ -35,9 +35,32 @@ class DataPacket {
})
.parse(tracker.data);
if (fields.fields) {
tracker.fields = [];
fields.fields.forEach((field) => {
tracker.fields.push(field.data);
switch (field.id) {
case 0x0000:
tracker.pos = field.data;
break;
case 0x0001:
tracker.speed = field.data;
break;
case 0x0002:
tracker.ori = field.data;
break;
case 0x0003:
tracker.status = field.data;
break;
case 0x0004:
tracker.accel = field.data;
break;
case 0x0005:
tracker.trgtpos = field.data;
break;
case 0x0006:
tracker.timestamp = field.data;
break;
default:
break;
}
});
}
}