From 69db5340421011d1317fb66b1a81fb45274877c5 Mon Sep 17 00:00:00 2001 From: Scott Bell Date: Fri, 2 Aug 2024 17:58:14 +0200 Subject: [PATCH] adding works --- src/plugins/comps/CompsManager.js | 6 ++++-- src/plugins/comps/CompsMathWorker.js | 10 +++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/plugins/comps/CompsManager.js b/src/plugins/comps/CompsManager.js index febf4f663f..045b6159fc 100644 --- a/src/plugins/comps/CompsManager.js +++ b/src/plugins/comps/CompsManager.js @@ -47,9 +47,11 @@ export default class CompsManager extends EventEmitter { return underlyingTelemetry; } - #telemetryProcessor(telemetryObjects) { + #telemetryProcessor = (telemetryObjects) => { + // new data! + console.debug(`🎉 new data!`, telemetryObjects); this.emit('underlyingTelemetryUpdated', telemetryObjects); - } + }; #clearData() { console.debug('Clear Data'); diff --git a/src/plugins/comps/CompsMathWorker.js b/src/plugins/comps/CompsMathWorker.js index 3b8ced7690..66aaf1cdae 100644 --- a/src/plugins/comps/CompsMathWorker.js +++ b/src/plugins/comps/CompsMathWorker.js @@ -32,16 +32,16 @@ function calculate(telemetryForComps, expression) { const dataSet2 = Object.values(telemetryForComps)[1]; // Organize data by utc for quick access - const utcMap1 = new Map(dataSet1.map((item) => [item.utc, item.sin])); - const utcMap2 = new Map(dataSet2.map((item) => [item.utc, item.sin])); + const utcMap1 = new Map(dataSet1.map((item) => [item.utc, item])); + const utcMap2 = new Map(dataSet2.map((item) => [item.utc, item])); const sumResults = []; // Iterate over the first dataset and check for matching utc in the second dataset - for (const [utc, sin1] of utcMap1.entries()) { + for (const [utc, item1] of utcMap1.entries()) { if (utcMap2.has(utc)) { - const sin2 = utcMap2.get(utc); - const output = evaluate(expression, { a: sin1, b: sin2 }); + const item2 = utcMap2.get(utc); + const output = evaluate(expression, { a: item1.sin, b: item2.sin }); sumResults.push({ utc, output }); } }