fix: localisation algorithms for thermopile sensors

Previously the coordinates order was flipped ([y, x] instead of [x, y]) and the clustering was too aggressive.
mKeRix · Feb 11, 2020 · cc67cf1 · cc67cf1
1 parent f451303
commit cc67cf1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/integrations/thermopile/cluster.ts b/src/integrations/thermopile/cluster.ts
@@ -17,8 +17,9 @@ export class Cluster {
     return (
       this.pixels.find(value => {
         return (
-          (value.x >= pixel.x - 1 && value.x <= pixel.x + 1) ||
-          (value.y >= pixel.y - 1 && value.y <= pixel.y + 1)
+          value.x >= pixel.x - 1 &&
+          value.x <= pixel.x + 1 &&
+          value.y >= pixel.y - 1 && value.y <= pixel.y + 1
         );
       }) !== undefined
     );

diff --git a/src/integrations/thermopile/thermopile-occupancy.sensor.ts b/src/integrations/thermopile/thermopile-occupancy.sensor.ts
@@ -21,8 +21,8 @@ export abstract class ThermopileOccupancySensor {
     const threshold = mean + deltaThreshold;
 
     const relevantPixels: Pixel[] = [];
-    for (const [x, row] of data.entries()) {
-      for (const [y, value] of row.entries()) {
+    for (const [y, row] of data.entries()) {
+      for (const [x, value] of row.entries()) {
         if (value >= threshold) {
           relevantPixels.push(new Pixel(x, y, value));
         }