ilabs-flir 2.4.5 → 2.4.7

package/android/Flir/src/main/java/flir/android/FlirManager.kt

@@ -86,16 +86,6 @@ object FlirManager {
     
     fun setPalette(name: String) {
         sdkManager?.setPalette(name)
-        // Also try to update the app's global Var.cool if possible
-        try {
-            val palettes = getAvailablePalettes()
-            val idx = palettes.indexOfFirst { it.equals(name, ignoreCase = true) }
-            if (idx != -1) {
-                updateAcol(idx.toFloat())
-            }
-        } catch (e: Exception) {
-            Log.e(TAG, "setPalette: Failed to update Var.cool", e)
-        }
     }
     
     fun getAvailablePalettes(): List<String> {
@@ -254,20 +244,19 @@ object FlirManager {
         val bitmap = latestBitmap ?: return null
         
         // Map UI normalized (0..1) to Raw sensor normalized (0..1) based on display rotation
-        val rawCoords = when (rotation) {
-            0 -> Pair(nx, ny)
-            90, -270 -> Pair(ny, 1.0 - nx)
-            180, -180 -> Pair(1.0 - nx, 1.0 - ny)
-            270, -90 -> Pair(1.0 - ny, nx)
-            else -> Pair(1.0 - ny, nx) // Default to -90 for backward compatibility
-        }
+        // Using generic trigonometric rotation formula for total precision
+        val angle = -rotation.toDouble() // Inverse the display rotation
+        val rad = Math.toRadians(angle)
+        val cosA = Math.cos(rad)
+        val sinA = Math.sin(rad)
         
-        val rawX = rawCoords.first
-        val rawY = rawCoords.second
+        // Rotate around center (0.5, 0.5)
+        val dx = nx - 0.5
+        val dy = ny - 0.5
+        val rawX = dx * cosA - dy * sinA + 0.5
+        val rawY = dx * sinA + dy * cosA + 0.5
         
-        val px = (rawX * bitmap.width).toInt().coerceIn(0, bitmap.width - 1)
-        val py = (rawY * bitmap.height).toInt().coerceIn(0, bitmap.height - 1)
-        return getTemperatureAt(px, py)
+        return FlirSdkManager.getInstance(reactContext).getTemperatureAtNormalized(rawX, rawY)
     }
     
     fun getTemperatureAtPoint(x: Int, y: Int): Double? = getTemperatureAt(x, y)
@@ -464,15 +453,6 @@ object FlirManager {
             }
             
             coolField?.set(null, shaderIdx)
-
-            // Standard FLIR palette list
-            val paletteNames = getAvailablePalettes()
-            val maxEff = paletteNames.size
-            val paletteIdx = rawIdx % maxEff
-            val safeIdx = if (paletteIdx < 0) paletteIdx + maxEff else paletteIdx
-            
-            val targetPaletteName = paletteNames[safeIdx]
-            sdkManager?.setPalette(targetPaletteName)
             
         } catch (e: Throwable) {
             Log.w(TAG, "updateAcol reflection failed: ${e.message}")

package/android/Flir/src/main/java/flir/android/FlirModule.kt

@@ -34,7 +34,7 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
     // Simple placeholder conversion: converts an ARGB color to a pseudo-temperature value.
     // Replace with SDK call when integrating thermalsdk APIs.
     @ReactMethod
-    fun getTemperatureFromColor(color: Int, promise: com.facebook.react.bridge.Promise?) {
+    fun getTemperatureFromColor(color: Int, promise: Promise?) {
         try {
             val r = (color shr 16) and 0xFF
             val g = (color shr 8) and 0xFF
@@ -305,17 +305,18 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
     
     @ReactMethod
     fun stopFlir(promise: Promise?) {
-        if (isDebounced()) {
-            promise?.resolve(false)
-            return
-        }
-        try {
-            FlirManager.stop()
-            promise?.resolve(true)
-        } catch (e: Exception) {
-            promise?.reject("ERR_FLIR_STOP", e)
-        }
-    }
+    if (isDebounced()) {
+        promise?.resolve(false)
+        return
+    }
+    try {
+        FlirManager.stop()
+        promise?.resolve(true)
+     } catch (e: Exception) {
+        promise?.reject("ERR_FLIR_STOP", e)
+    }
+   }
+ 
 
     @ReactMethod
     fun simulateFlirContextLoss(promise: Promise?) {
@@ -440,7 +441,7 @@ class FlirModule(private val reactContext: ReactApplicationContext) : ReactConte
     }
     
     @ReactMethod
-    fun getDebugInfo(promise: com.facebook.react.bridge.Promise?) {
+    fun getDebugInfo(promise: Promise?) {
         try {
             val result = com.facebook.react.bridge.Arguments.createMap()
             

package/android/Flir/src/main/java/flir/android/FlirSdkManager.java

@@ -134,12 +134,17 @@ public class FlirSdkManager {
                 notifyError("SDK not initialized");
                 return;
             }
-            if (isScanning)
-                return;
+            if (isScanning) {
+                Log.d(TAG, "Discovery already running, ensuring clean state...");
+                try {
+                    DiscoveryFactory.getInstance().stop();
+                } catch (Throwable ignored) {}
+                isScanning = false;
+            }
 
             isScanning = true;
             discoveredDevices.clear();
-            Log.d(TAG, "Starting discovery...");
+            Log.d(TAG, "Starting discovery for all interfaces...");
 
             try {
                 DiscoveryFactory.getInstance().scan(
@@ -157,19 +162,23 @@ public class FlirSdkManager {
     }
 
     public void stopScan() {
-        if (!isScanning) return;
-        isScanning = false;
-        executor.execute(this::stopScanInternal);
+        executor.execute(() -> {
+            if (!isScanning) return;
+            isScanning = false;
+            stopScanInternal();
+        });
     }
 
     private void stopScanInternal() {
         try {
-            Log.d(TAG, "Stopping discovery...");
+            Log.d(TAG, "Stopping all discovery scanners...");
             // Use zero-arg stop() as seen in official samples to stop all scanners
             DiscoveryFactory.getInstance().stop();
             Log.d(TAG, "Discovery stopped successfully");
-        } catch (Exception e) {
-            Log.w(TAG, "Stop scan warning (internal SDK): " + e.getMessage());
+        } catch (Throwable t) {
+            // This catches the notorious 'Receiver not registered' IllegalArgumentException
+            // and any other JNI-bubbled exceptions during teardown.
+            Log.w(TAG, "Stop scan suppressed (SDK internal race): " + t.getMessage());
         }
     }
 
@@ -297,6 +306,10 @@ public class FlirSdkManager {
 
     public void disconnect() {
         executor.execute(() -> {
+            if (isScanning) {
+                isScanning = false;
+                stopScanInternal();
+            }
             stopStreamInternal();
 
             if (camera != null) {
@@ -579,6 +592,37 @@ public class FlirSdkManager {
         return result[0];
     }
 
+    /**
+     * Samples temperature using normalized coordinates (0.0 to 1.0)
+     * This avoids clamping bugs when UI dimensions differ from sensor dimensions.
+     */
+    public double getTemperatureAtNormalized(double nx, double ny) {
+        final double[] result = { Double.NaN };
+        synchronized (this) {
+            if (streamer == null) return Double.NaN;
+            try {
+                streamer.withThermalImage(thermalImage -> {
+                    try {
+                        int w = thermalImage.getWidth();
+                        int h = thermalImage.getHeight();
+                        // Map normalized 0..1 to sensor pixels 0..w-1
+                        int cx = (int) Math.max(0, Math.min(w - 1, nx * w));
+                        int cy = (int) Math.max(0, Math.min(h - 1, ny * h));
+                        ThermalValue value = thermalImage.getValueAt(new Point(cx, cy));
+                        if (value != null) {
+                            result[0] = value.asCelsius().value;
+                        }
+                    } catch (Exception e) {
+                        Log.w(TAG, "Normalized temp query error", e);
+                    }
+                });
+            } catch (Exception e) {
+                Log.w(TAG, "Normalized temp query failed", e);
+            }
+        }
+        return result[0];
+    }
+
     // ==================== LISTENERS ====================
     
     public void setPalette(String paletteName) {

package/ios/Flir/src/FlirManager.swift

@@ -478,22 +478,17 @@ import ThermalSDK
             let h = Double(thermalImage.getHeight())
             
             // Map UI normalized (0..1) to Raw sensor normalized (0..1) based on display rotation
-            var rawX = nx
-            var rawY = y
+            // Using generic trigonometric rotation formula for total precision
+            let angle = -Double(rotation) // Inverse the display rotation
+            let rad = angle * .pi / 180.0
+            let cosA = cos(rad)
+            let sinA = sin(rad)
             
-            switch rotation {
-            case 90, -270:
-                rawX = y
-                rawY = 1.0 - nx
-            case 180, -180:
-                rawX = 1.0 - nx
-                rawY = 1.0 - y
-            case 270, -90:
-                rawX = 1.0 - y
-                rawY = nx
-            default:
-                break // 0 deg or default
-            }
+            // Rotate around center (0.5, 0.5)
+            let dx = nx - 0.5
+            let dy = y - 0.5
+            let rawX = dx * cosA - dy * sinA + 0.5
+            let rawY = dx * sinA + dy * cosA + 0.5
             
             // Map normalized (0.0 - 1.0) to actual sensor pixels
             let cx = max(0, min(Int(w) - 1, Int(rawX * w)))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ilabs-flir",
-  "version": "2.4.5",
+  "version": "2.4.7",
   "description": "FLIR Thermal SDK for React Native - iOS & Android (bundled at compile time via postinstall)",
   "main": "src/index.js",
   "types": "src/index.d.ts",