ilabs-flir 2.1.38 → 2.1.401

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

@@ -88,14 +88,14 @@ object FlirManager {
         // Store react context for event emission if it's a React context
         // Always update if we get a valid ReactContext (in case previous was stale)
         if (context is ReactContext) {
-            Log.d(TAG, "Storing ReactContext for event emission: ${context.javaClass.simpleName}")
+            Log.d(TAG, "[Flir-BRIDGE-LOAD] Storing ReactContext for event emission: ${context.javaClass.simpleName}")
             reactContext = context
         } else {
-            Log.d(TAG, "Context is not ReactContext: ${context.javaClass.simpleName}")
+            Log.d(TAG, "[Flir-BRIDGE-LOAD] Context is not ReactContext: ${context.javaClass.simpleName}")
         }
         
         if (isInitialized) {
-            Log.d(TAG, "Already initialized")
+            Log.d(TAG, "[Flir-BRIDGE-LOAD] Already initialized")
             return
         }
         
@@ -106,14 +106,14 @@ object FlirManager {
         sdkManager?.initialize()
         
         isInitialized = true
-        Log.i(TAG, "FlirManager initialized")
+        Log.i(TAG, "[Flir-BRIDGE-LOAD] FlirManager initialized")
     }
     
     /**
      * Start scanning for devices (USB, Network, Emulator - ALL types)
      */
     fun startDiscovery(retry: Boolean = false) {
-        Log.i(TAG, "startDiscovery(retry=$retry)")
+        Log.i(TAG, "[Flir-BRIDGE-DISCOVERY] startDiscovery(retry=$retry)")
         
         if (!isInitialized && appContext != null) {
             init(appContext!!)
@@ -141,7 +141,7 @@ object FlirManager {
      * Stop scanning
      */
     fun stopDiscovery() {
-        Log.i(TAG, "stopDiscovery")
+        Log.i(TAG, "[Flir-BRIDGE-DISCOVERY] stopDiscovery")
         sdkManager?.stop()
         isScanning = false
     }
@@ -156,9 +156,10 @@ object FlirManager {
         val identity = devices.find { it.deviceId == deviceId }
         
         if (identity != null) {
+            Log.i(TAG, "[Flir-BRIDGE-CONNECTION] Connecting to found device: $deviceId")
             sdkManager?.connect(identity)
         } else {
-            Log.e(TAG, "Device not found: $deviceId")
+            Log.e(TAG, "[Flir-BRIDGE-ERROR] Device not found: $deviceId")
             emitError("Device not found: $deviceId")
         }
     }
@@ -191,7 +192,7 @@ object FlirManager {
      * Stop streaming
      */
     fun stopStream() {
-        Log.i(TAG, "stopStream")
+        Log.i(TAG, "[Flir-BRIDGE-STREAMING] stopStream")
         sdkManager?.stopStream()
         isStreaming = false
     }
@@ -200,7 +201,7 @@ object FlirManager {
      * Disconnect from current device
      */
     fun disconnect() {
-        Log.i(TAG, "disconnect")
+        Log.i(TAG, "[Flir-BRIDGE-DISCONNECT] disconnect")
         sdkManager?.disconnect()
         isConnected = false
         isStreaming = false
@@ -318,7 +319,7 @@ object FlirManager {
         }
         
         override fun onDisconnected() {
-            Log.i(TAG, "Disconnected")
+            Log.i(TAG, "[Flir-BRIDGE-DISCONNECT] Disconnected callback")
             isConnected = false
             isStreaming = false
             connectedDeviceId = null
@@ -354,7 +355,7 @@ object FlirManager {
         }
 
         override fun onBatteryUpdated(level: Int, isCharging: Boolean) {
-            Log.d(TAG, "onBatteryUpdated: level=$level charging=$isCharging")
+            Log.d(TAG, "[Flir-BRIDGE-BATTERY] onBatteryUpdated: level=$level charging=$isCharging")
             emitBatteryState(level, isCharging)
         }
     }
@@ -382,10 +383,10 @@ object FlirManager {
     private fun emitDeviceState(state: String) {
         val ctx = reactContext
         if (ctx == null) {
-            Log.e(TAG, "Cannot emit FlirDeviceConnected($state) - reactContext is null!")
+            Log.e(TAG, "[Flir-BRIDGE-ERROR] Cannot emit FlirDeviceConnected($state) - reactContext is null!")
             return
         }
-        Log.d(TAG, "Emitting FlirDeviceConnected: $state")
+        Log.d(TAG, "[Flir-BRIDGE-CONNECTION] Emitting FlirDeviceConnected: $state")
         try {
             val params = Arguments.createMap().apply {
                 putString("state", state)
@@ -428,9 +429,9 @@ object FlirManager {
             
             ctx.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
                 .emit("FlirDevicesFound", params)
-            Log.d(TAG, "Successfully emitted FlirDevicesFound")
+            Log.d(TAG, "[Flir-BRIDGE-DISCOVERY] Successfully emitted FlirDevicesFound (${devices.size} devices)")
         } catch (e: Exception) {
-            Log.e(TAG, "Failed to emit devices found", e)
+            Log.e(TAG, "[Flir-BRIDGE-ERROR] Failed to emit devices found", e)
         }
     }
 

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

@@ -175,9 +175,9 @@ public class FlirSdkManager {
 
             ThermalSdkAndroid.init(context);
             isInitialized = true;
-            Log.d(TAG, "SDK initialized successfully");
+            Log.d(TAG, "[Flir-LOAD] SDK initialized successfully");
         } catch (Exception e) {
-            Log.e(TAG, "Failed to initialize SDK", e);
+            Log.e(TAG, "[Flir-ERROR] Failed to initialize SDK", e);
             notifyError("SDK initialization failed: " + e.getMessage());
         }
     }
@@ -208,7 +208,7 @@ public class FlirSdkManager {
         isScanning = true;
         discoveredDevices.clear();
 
-        Log.d(TAG, "Starting discovery for EMULATOR, NETWORK, USB...");
+        Log.d(TAG, "[Flir-DISCOVERY] Starting discovery for EMULATOR, NETWORK, USB...");
 
         try {
             DiscoveryFactory.getInstance().scan(
@@ -241,7 +241,7 @@ public class FlirSdkManager {
         }
 
         isScanning = false;
-        Log.d(TAG, "Discovery stopped");
+        Log.d(TAG, "[Flir-DISCOVERY] Discovery stopped");
     }
 
     /**
@@ -273,7 +273,7 @@ public class FlirSdkManager {
                 camera = new Camera();
                 camera.connect(identity, connectionStatusListener, new ConnectParameters());
 
-                Log.d(TAG, "Connected to camera");
+                Log.d(TAG, "[Flir-CONNECTION] Connected to camera: " + identity.deviceId);
 
                 if (listener != null) {
                     listener.onConnected(identity);
@@ -309,7 +309,7 @@ public class FlirSdkManager {
             listener.onDisconnected();
         }
 
-        Log.d(TAG, "Disconnected");
+        Log.d(TAG, "[Flir-DISCONNECT] Disconnected");
     }
 
     /**
@@ -397,10 +397,10 @@ public class FlirSdkManager {
                             notifyError("Stream error: " + error);
                         });
 
-                Log.d(TAG, "Streaming started");
+                Log.d(TAG, "[Flir-STREAMING] Streaming started");
 
             } catch (Exception e) {
-                Log.e(TAG, "Failed to start stream", e);
+                Log.e(TAG, "[Flir-ERROR] Failed to start stream", e);
                 notifyError("Stream failed: " + e.getMessage());
             }
         });
@@ -425,7 +425,7 @@ public class FlirSdkManager {
         isProcessingFrame = false;
         lastFrameProcessedMs = 0;
 
-        Log.d(TAG, "Streaming stopped");
+        Log.d(TAG, "[Flir-STREAMING] Streaming stopped");
     }
 
     /**
@@ -522,12 +522,13 @@ public class FlirSdkManager {
                     streamer.withThermalImage(thermalImage -> {
                         thermalImage.setPalette(palette);
                     });
-                    Log.d(TAG, "Palette set to: " + paletteName);
+                    Log.d(TAG, "[Flir-STREAMING] Palette set to: " + paletteName);
                 }
             } catch (Exception e) {
                 Log.e(TAG, "Error setting palette", e);
             }
         });
+
     }
 
     /**
@@ -644,8 +645,8 @@ public class FlirSdkManager {
         @Override
         public void onCameraFound(DiscoveredCamera discoveredCamera) {
             Identity identity = discoveredCamera.getIdentity();
-            Log.d(TAG, "Device found: " + identity.deviceId +
-                    " type=" + identity.communicationInterface);
+            Log.d(TAG,
+                    "[Flir-DISCOVERY] Device found: " + identity.deviceId + " type=" + identity.communicationInterface);
 
             // Add to list if not already present
             synchronized (discoveredDevices) {
@@ -669,7 +670,7 @@ public class FlirSdkManager {
 
         @Override
         public void onCameraLost(Identity identity) {
-            Log.d(TAG, "Device lost: " + identity.deviceId);
+            Log.d(TAG, "[Flir-DISCOVERY] Device lost: " + identity.deviceId);
 
             synchronized (discoveredDevices) {
                 discoveredDevices.removeIf(d -> d.deviceId.equals(identity.deviceId));
@@ -682,13 +683,13 @@ public class FlirSdkManager {
 
         @Override
         public void onDiscoveryError(CommunicationInterface iface, ErrorCode error) {
-            Log.e(TAG, "Discovery error: " + iface + " - " + error);
+            Log.e(TAG, "[Flir-ERROR] Discovery error: " + iface + " - " + error);
             notifyError("Discovery error: " + error);
         }
 
         @Override
         public void onDiscoveryFinished(CommunicationInterface iface) {
-            Log.d(TAG, "Discovery finished for: " + iface);
+            Log.d(TAG, "[Flir-DISCOVERY] Discovery finished for: " + iface);
         }
     };
 
@@ -739,6 +740,9 @@ public class FlirSdkManager {
                     if (level != lastPolledBatteryLevel || charging != lastPolledCharging) {
                         lastPolledBatteryLevel = level;
                         lastPolledCharging = charging;
+
+                        Log.d(TAG, String.format("[Flir-BATTERY] Level: %d%%, Charging: %b", level, charging));
+
                         if (listener != null) {
                             try {
                                 listener.onBatteryUpdated(level, charging);

package/ios/Flir/src/FlirLogger.swift

@@ -0,0 +1,135 @@
+//
+//  FlirLogger.swift
+//  Flir
+//
+//  Comprehensive lifecycle logging for FLIR camera operations
+//  Helps debug: load → discovery → connection → streaming → frame → battery
+//
+
+import Foundation
+
+/// Lifecycle stages for FLIR operations
+@objc public enum FlirLifecycleStage: Int {
+    case load       // SDK initialization
+    case discovery  // Device scanning
+    case connection // Device pairing/connecting
+    case streaming  // Stream start/stop
+    case frame      // Frame receiving
+    case battery    // Battery polling
+    case error      // Error states
+    case disconnect // Disconnection events
+    
+    var tag: String {
+        switch self {
+        case .load: return "LOAD"
+        case .discovery: return "DISCOVERY"
+        case .connection: return "CONNECTION"
+        case .streaming: return "STREAMING"
+        case .frame: return "FRAME"
+        case .battery: return "BATTERY"
+        case .error: return "ERROR"
+        case .disconnect: return "DISCONNECT"
+        }
+    }
+}
+
+/// Centralized logger for FLIR operations with consistent formatting
+@objc public class FlirLogger: NSObject {
+    
+    /// Frame counter for periodic frame logging
+    private static var frameCount: Int = 0
+    private static let frameLogInterval: Int = 100  // Log every 100 frames
+    
+    /// Log a message at a specific lifecycle stage
+    @objc public static func log(_ stage: FlirLifecycleStage, _ message: String) {
+        let timestamp = Date()
+        let formatter = DateFormatter()
+        formatter.dateFormat = "HH:mm:ss.SSS"
+        let timeStr = formatter.string(from: timestamp)
+        NSLog("[Flir-\(stage.tag)] [\(timeStr)] \(message)")
+    }
+    
+    /// Log an error with optional Error object
+    @objc public static func logError(_ stage: FlirLifecycleStage, _ message: String, error: Error? = nil) {
+        let errorDesc = error?.localizedDescription ?? "no error details"
+        log(stage, "❌ \(message) - \(errorDesc)")
+    }
+    
+    /// Log frame received (rate-limited to avoid log spam)
+    @objc public static func logFrame(width: Int, height: Int) {
+        logFrame(width: width, height: height, temperature: 0)
+    }
+    
+    /// Log frame received with temperature (rate-limited to avoid log spam)
+    @objc public static func logFrame(width: Int, height: Int, temperature: Double) {
+        frameCount += 1
+        if frameCount % frameLogInterval == 0 {
+            var msg = "Frame #\(frameCount) received (\(width)x\(height))"
+            if !temperature.isNaN {
+                msg += " temp=\(String(format: "%.1f", temperature))°C"
+            }
+            log(.frame, msg)
+        }
+    }
+    
+    /// Internal implementation for logFrame with optional temperature
+    private static func logFrame(width: Int, height: Int, temperature: Double?) {
+        frameCount += 1
+        if frameCount % frameLogInterval == 0 {
+            var msg = "Frame #\(frameCount) received (\(width)x\(height))"
+            if let temp = temperature, !temp.isNaN {
+                msg += " temp=\(String(format: "%.1f", temp))°C"
+            }
+            log(.frame, msg)
+        }
+    }
+    
+    /// Reset frame counter (call on disconnect)
+    @objc public static func resetFrameCounter() {
+        frameCount = 0
+    }
+    
+    /// Log discovery interface status (important for debugging network vs lightning)
+    @objc public static func logDiscoveryInterfaces(lightning: Bool, network: Bool, wireless: Bool, emulator: Bool) {
+        var interfaces: [String] = []
+        if lightning { interfaces.append("Lightning") }
+        if network { interfaces.append("Network") }
+        if wireless { interfaces.append("FlirOneWireless") }
+        if emulator { interfaces.append("Emulator") }
+        
+        log(.discovery, "Starting discovery on interfaces: \(interfaces.joined(separator: ", "))")
+        
+        if !network {
+            log(.discovery, "⚠️ Network discovery DISABLED - requires paid iOS Developer License with NSLocalNetworkUsageDescription")
+        }
+    }
+    
+    /// Log device found with details
+    @objc public static func logDeviceFound(deviceId: String, name: String, type: String, isEmulator: Bool) {
+        var msg = "Device found: '\(name)' (id=\(deviceId), type=\(type))"
+        if isEmulator {
+            msg += " [EMULATOR]"
+        }
+        log(.discovery, msg)
+    }
+    
+    /// Log connection attempt
+    @objc public static func logConnectionAttempt(deviceId: String) {
+        log(.connection, "Attempting connection to: \(deviceId)")
+    }
+    
+    /// Log connection success with stream info
+    @objc public static func logConnectionSuccess(deviceId: String, streamCount: Int, hasThermal: Bool) {
+        log(.connection, "✅ Connected to: \(deviceId) - \(streamCount) stream(s), thermal=\(hasThermal)")
+    }
+    
+    /// Log battery state
+    @objc public static func logBattery(level: Int, isCharging: Bool) {
+        if level >= 0 {
+            let chargingStr = isCharging ? "charging" : "not charging"
+            log(.battery, "Level: \(level)%, \(chargingStr)")
+        } else {
+            log(.battery, "Battery info unavailable")
+        }
+    }
+}

package/ios/Flir/src/FlirManager.swift

@@ -75,6 +75,11 @@ import ThermalSDK
     private var activeClients: Set<String> = []
     private var shutdownWorkItem: DispatchWorkItem? = nil
     
+    // Battery polling timer (like Android)
+    private var batteryPollingTimer: Timer?
+    private var lastPolledBatteryLevel: Int = -1
+    private var lastPolledCharging: Bool = false
+    
 #if FLIR_ENABLED
     private var discovery: FLIRDiscovery?
     private var camera: FLIRCamera?
@@ -85,7 +90,12 @@ import ThermalSDK
     
     private override init() {
         super.init()
-        NSLog("[FlirManager] Initialized")
+        FlirLogger.log(.load, "FlirManager singleton initialized")
+        #if FLIR_ENABLED
+        FlirLogger.log(.load, "✅ FLIR SDK is ENABLED (ThermalSDK available)")
+        #else
+        FlirLogger.log(.load, "⚠️ FLIR SDK is DISABLED (FLIR_ENABLED not defined)")
+        #endif
     }
     
     // MARK: - Public State Accessors
@@ -335,11 +345,11 @@ import ThermalSDK
     // MARK: - Discovery
     
     @objc public func startDiscovery() {
-        NSLog("[FlirManager] Starting discovery...")
+        FlirLogger.log(.discovery, "Starting discovery...")
         
 #if FLIR_ENABLED
         if isScanning {
-            NSLog("[FlirManager] Already scanning")
+            FlirLogger.log(.discovery, "Already scanning - skipping")
             return
         }
         
@@ -349,6 +359,7 @@ import ThermalSDK
         if discovery == nil {
             discovery = FLIRDiscovery()
             discovery?.delegate = self
+            FlirLogger.log(.discovery, "Created FLIRDiscovery instance")
         }
         
         // Build interfaces based on available permissions
@@ -362,19 +373,24 @@ import ThermalSDK
         // Only add network discovery if NSLocalNetworkUsageDescription is present
         // This prevents crashes/errors when user doesn't have iOS developer registration
         // or hasn't declared network permission
-        if shouldEnableNetworkDiscovery() {
+        let networkEnabled = shouldEnableNetworkDiscovery()
+        if networkEnabled {
             interfaces.insert(.network)
-            NSLog("[FlirManager] Network discovery enabled (NSLocalNetworkUsageDescription present)")
-        } else {
-            NSLog("[FlirManager] Network discovery disabled (no NSLocalNetworkUsageDescription)")
         }
         
+        // Log which interfaces are enabled (important for debugging)
+        FlirLogger.logDiscoveryInterfaces(
+            lightning: true,
+            network: networkEnabled,
+            wireless: true,
+            emulator: true
+        )
+        
         discovery?.start(interfaces)
         
         emitStateChange("discovering")
-        NSLog("[FlirManager] Discovery started on interfaces: Lightning, \(interfaces.contains(.network) ? "Network, " : "")FlirOneWireless, Emulator")
 #else
-        NSLog("[FlirManager] FLIR SDK not available - discovery disabled")
+        FlirLogger.logError(.discovery, "FLIR SDK not available - discovery disabled")
         delegate?.onError("FLIR SDK not available")
 #endif
     }
@@ -399,28 +415,28 @@ import ThermalSDK
     /// Allow explicit override of network discovery (called from React Native)
     @objc public func setNetworkDiscoveryEnabled(_ enabled: Bool) {
         UserDefaults.standard.set(enabled, forKey: "ilabsFlir.networkDiscoveryEnabled")
-        NSLog("[FlirManager] Network discovery override set to: \(enabled)")
+        FlirLogger.log(.discovery, "Network discovery override set to: \(enabled)")
     }
     
     @objc public func stopDiscovery() {
-        NSLog("[FlirManager] Stopping discovery...")
+        FlirLogger.log(.discovery, "Stopping discovery...")
         
 #if FLIR_ENABLED
         discovery?.stop()
         isScanning = false
-        NSLog("[FlirManager] Discovery stopped")
+        FlirLogger.log(.discovery, "Discovery stopped")
 #endif
     }
     
     // MARK: - Connection
     
     @objc public func connectToDevice(_ deviceId: String) {
-        NSLog("[FlirManager] Connecting to device: \(deviceId)")
+        FlirLogger.logConnectionAttempt(deviceId: deviceId)
         
 #if FLIR_ENABLED
         // Find the identity for this device
         guard let identity = findIdentity(for: deviceId) else {
-            NSLog("[FlirManager] Device not found: \(deviceId)")
+            FlirLogger.logError(.connection, "Device not found in identity map: \(deviceId)")
             delegate?.onError("Device not found: \(deviceId)")
             return
         }
@@ -429,6 +445,7 @@ import ThermalSDK
             self?.performConnection(identity: identity)
         }
 #else
+        FlirLogger.logError(.connection, "FLIR SDK not available")
         delegate?.onError("FLIR SDK not available")
 #endif
     }
@@ -443,14 +460,16 @@ import ThermalSDK
     private func performConnection(identity: FLIRIdentity) {
         // Use the proven connection pattern from FLIR SDK samples:
         // FLIROneCameraSwift uses: pair(identity, code:) then connect()
+        FlirLogger.log(.connection, "performConnection starting for: \(identity.deviceId())")
         
         if camera == nil {
             camera = FLIRCamera()
             camera?.delegate = self
+            FlirLogger.log(.connection, "Created new FLIRCamera instance")
         }
         
         guard let cam = camera else {
-            NSLog("[FlirManager] Failed to create FLIRCamera")
+            FlirLogger.logError(.connection, "Failed to create FLIRCamera instance")
             DispatchQueue.main.async { [weak self] in
                 self?.delegate?.onError("Failed to create camera instance")
             }
@@ -459,27 +478,30 @@ import ThermalSDK
         
         // Handle authentication for generic cameras (network cameras)
         if identity.cameraType() == .generic {
+            FlirLogger.log(.connection, "Generic/network camera - starting authentication...")
             let certName = getCertificateName()
             var status = FLIRAuthenticationStatus.pending
             while status == .pending {
                 status = cam.authenticate(identity, trustedConnectionName: certName)
                 if status == .pending {
-                    NSLog("[FlirManager] Waiting for camera authentication approval...")
+                    FlirLogger.log(.connection, "Waiting for camera authentication approval...")
                     Thread.sleep(forTimeInterval: 1.0)
                 }
             }
-            NSLog("[FlirManager] Authentication status: \(status.rawValue)")
+            FlirLogger.log(.connection, "Authentication status: \(status.rawValue)")
         }
         
         do {
             // Step 1: Pair with identity (required for FLIR One devices)
             // The code parameter is for BLE pairing, 0 for direct connection
+            FlirLogger.log(.connection, "Step 1: Pairing with device...")
             try cam.pair(identity, code: 0)
-            NSLog("[FlirManager] Paired with: \(identity.deviceId())")
+            FlirLogger.log(.connection, "✅ Paired successfully with: \(identity.deviceId())")
             
             // Step 2: Connect (no identity parameter - uses paired identity)
+            FlirLogger.log(.connection, "Step 2: Connecting to device...")
             try cam.connect()
-            NSLog("[FlirManager] Connected to: \(identity.deviceId())")
+            FlirLogger.log(.connection, "✅ Connected successfully to: \(identity.deviceId())")
             
             // Update state
             connectedIdentity = identity
@@ -490,23 +512,27 @@ import ThermalSDK
             // Get camera info if available
             if let remoteControl = cam.getRemoteControl(),
                let cameraInfo = try? remoteControl.getCameraInformation() {
-                NSLog("[FlirManager] Camera info: \(cameraInfo)")
+                FlirLogger.log(.connection, "Camera info: \(cameraInfo)")
             }
             
             // Get streams
             let streams = cam.getStreams()
+            let thermalCount = streams.filter { $0.isThermal }.count
+            FlirLogger.logConnectionSuccess(deviceId: identity.deviceId(), streamCount: streams.count, hasThermal: thermalCount > 0)
+            
             if !streams.isEmpty {
-                NSLog("[FlirManager] Found \(streams.count) streams")
-
                 // Find and start the first thermal stream (preferred) or any stream
                 let thermalStream = streams.first { $0.isThermal } ?? streams.first
                 if let streamToStart = thermalStream {
                     startStreamInternal(streamToStart)
                 }
             } else {
-                NSLog("[FlirManager] No streams available on camera")
+                FlirLogger.log(.streaming, "⚠️ No streams available on camera")
             }
             
+            // Start battery polling (like Android does)
+            startBatteryPolling()
+            
             // Notify delegate on main thread
             DispatchQueue.main.async { [weak self] in
                 guard let self = self else { return }
@@ -521,7 +547,7 @@ import ThermalSDK
             }
             
         } catch {
-            NSLog("[FlirManager] Connection failed: \(error.localizedDescription)")
+            FlirLogger.logError(.connection, "Connection failed", error: error)
             _isConnected = false
             camera = nil
             DispatchQueue.main.async { [weak self] in
@@ -558,7 +584,7 @@ import ThermalSDK
     @objc public func startStream() {
 #if FLIR_ENABLED
         guard let streams = camera?.getStreams(), !streams.isEmpty else {
-            NSLog("[FlirManager] No streams available")
+            FlirLogger.log(.streaming, "⚠️ No streams available")
             return
         }
         startStreamInternal(streams[0])
@@ -566,7 +592,7 @@ import ThermalSDK
     }
     
     @objc public func stopStream() {
-        NSLog("[FlirManager] Stopping stream...")
+        FlirLogger.log(.streaming, "Stopping stream...")
         
 #if FLIR_ENABLED
         stream?.stop()
@@ -574,18 +600,20 @@ import ThermalSDK
         streamer = nil
         _isStreaming = false
         emitStateChange("connected")
+        FlirLogger.log(.streaming, "Stream stopped")
 #endif
     }
     
 #if FLIR_ENABLED
     private func startStreamInternal(_ newStream: FLIRStream) {
-        NSLog("[FlirManager] Starting stream...")
+        FlirLogger.log(.streaming, "Starting stream (thermal=\(newStream.isThermal))...")
         
         stream?.stop()
         stream = newStream
         
         if newStream.isThermal {
             streamer = FLIRThermalStreamer(stream: newStream)
+            FlirLogger.log(.streaming, "Created FLIRThermalStreamer for thermal stream")
         }
         
         newStream.delegate = self
@@ -594,9 +622,9 @@ import ThermalSDK
             try newStream.start()
             _isStreaming = true
             emitStateChange("streaming")
-            NSLog("[FlirManager] Stream started (thermal: \(newStream.isThermal))")
+            FlirLogger.log(.streaming, "✅ Stream started successfully (thermal=\(newStream.isThermal))")
         } catch {
-            NSLog("[FlirManager] Stream start failed: \(error)")
+            FlirLogger.logError(.streaming, "Stream start failed", error: error)
             stream = nil
             streamer = nil
             delegate?.onError("Stream start failed: \(error.localizedDescription)")
@@ -607,9 +635,12 @@ import ThermalSDK
     // MARK: - Disconnect
     
     @objc public func disconnect() {
-        NSLog("[FlirManager] Disconnecting...")
+        FlirLogger.log(.disconnect, "Disconnecting...")
         
 #if FLIR_ENABLED
+        // Stop battery polling
+        stopBatteryPolling()
+        
         stopStream()
         camera?.disconnect()
         camera = nil
@@ -620,14 +651,19 @@ import ThermalSDK
         _isStreaming = false
         _latestImage = nil
         
+        // Reset frame counter for next connection
+        FlirLogger.resetFrameCounter()
+        
         DispatchQueue.main.async { [weak self] in
             self?.delegate?.onDeviceDisconnected()
             self?.emitStateChange("disconnected")
         }
+        FlirLogger.log(.disconnect, "Disconnected successfully")
 #endif
     }
     
     @objc public func stop() {
+        FlirLogger.log(.disconnect, "stop() called - full shutdown")
         stopStream()
         disconnect()
         stopDiscovery()
@@ -658,10 +694,56 @@ import ThermalSDK
         return lastTemperature
     }
     
+    // MARK: - Battery Polling (like Android)
+    
+    private func startBatteryPolling() {
+        FlirLogger.log(.battery, "Starting battery polling timer (5s interval)")
+        
+        // Cancel any existing timer
+        stopBatteryPolling()
+        
+        // Schedule timer on main run loop
+        DispatchQueue.main.async { [weak self] in
+            self?.batteryPollingTimer = Timer.scheduledTimer(withTimeInterval: 5.0, repeats: true) { [weak self] _ in
+                self?.pollBatteryState()
+            }
+            // Run immediately once
+            self?.pollBatteryState()
+        }
+    }
+    
+    private func stopBatteryPolling() {
+        if batteryPollingTimer != nil {
+            FlirLogger.log(.battery, "Stopping battery polling timer")
+        }
+        batteryPollingTimer?.invalidate()
+        batteryPollingTimer = nil
+    }
+    
+    private func pollBatteryState() {
+        let level = getBatteryLevel()
+        let charging = isBatteryCharging()
+        
+        // Only log and emit if values changed
+        if level != lastPolledBatteryLevel || charging != lastPolledCharging {
+            lastPolledBatteryLevel = level
+            lastPolledCharging = charging
+            
+            FlirLogger.logBattery(level: level, isCharging: charging)
+            
+            // Emit to delegate/RN via notification
+            NotificationCenter.default.post(
+                name: Notification.Name("FlirBatteryUpdated"),
+                object: nil,
+                userInfo: ["level": level, "isCharging": charging]
+            )
+        }
+    }
+    
     // MARK: - Emulator
     
     @objc public func startEmulator(type: String) {
-        NSLog("[FlirManager] Starting emulator: \(type)")
+        FlirLogger.log(.connection, "Starting emulator with type: \(type)")
         
 #if FLIR_ENABLED
         // Create emulator identity
@@ -671,6 +753,7 @@ import ThermalSDK
         } else if type.lowercased().contains("pro") {
             cameraType = .flirOneEdgePro
         }
+        FlirLogger.log(.connection, "Emulator camera type: \(cameraType)")
         
         if let emulatorIdentity = FLIRIdentity(emulatorType: cameraType) {
             discoveredDevices.append(FlirDeviceInfo(
@@ -680,11 +763,15 @@ import ThermalSDK
                 isEmulator: true
             ))
             identityMap[emulatorIdentity.deviceId()] = emulatorIdentity
+            FlirLogger.log(.connection, "Emulator identity created: \(emulatorIdentity.deviceId())")
             
             // Auto-connect to emulator
             performConnection(identity: emulatorIdentity)
+        } else {
+            FlirLogger.logError(.connection, "Failed to create emulator identity for type: \(type)")
         }
 #else
+        FlirLogger.logError(.connection, "FLIR SDK not available - emulator disabled")
         delegate?.onError("FLIR SDK not available - emulator disabled")
 #endif
     }
@@ -764,8 +851,12 @@ extension FlirManager: FLIRDiscoveryEventDelegate {
     public func cameraDiscovered(_ discoveredCamera: FLIRDiscoveredCamera) {
         let identity = discoveredCamera.identity
         let deviceId = identity.deviceId()
+        let displayName = discoveredCamera.displayName ?? deviceId
+        let commType = communicationInterfaceName(identity.communicationInterface())
+        let isEmulator = identity.communicationInterface() == .emulator
         
-        NSLog("[FlirManager] Camera discovered: \(deviceId)")
+        // Use FlirLogger for consistent logging
+        FlirLogger.logDeviceFound(deviceId: deviceId, name: displayName, type: commType, isEmulator: isEmulator)
         
         // Store identity for later connection
         identityMap[deviceId] = identity
@@ -773,14 +864,15 @@ extension FlirManager: FLIRDiscoveryEventDelegate {
         // Create device info
         let deviceInfo = FlirDeviceInfo(
             deviceId: deviceId,
-            name: discoveredCamera.displayName ?? deviceId,
-            communicationType: communicationInterfaceName(identity.communicationInterface()),
-            isEmulator: identity.communicationInterface() == .emulator
+            name: displayName,
+            communicationType: commType,
+            isEmulator: isEmulator
         )
         
         // Add to discovered list if not already present
         if !discoveredDevices.contains(where: { $0.deviceId == deviceId }) {
             discoveredDevices.append(deviceInfo)
+            FlirLogger.log(.discovery, "Total discovered devices: \(discoveredDevices.count)")
         }
         
         // Notify delegate
@@ -792,13 +884,14 @@ extension FlirManager: FLIRDiscoveryEventDelegate {
     
     public func cameraLost(_ cameraIdentity: FLIRIdentity) {
         let deviceId = cameraIdentity.deviceId()
-        NSLog("[FlirManager] Camera lost: \(deviceId)")
+        FlirLogger.log(.discovery, "Camera lost: \(deviceId)")
         
         identityMap.removeValue(forKey: deviceId)
         discoveredDevices.removeAll { $0.deviceId == deviceId }
         
         // If this was our connected device, handle disconnect
         if connectedDeviceId == deviceId {
+            FlirLogger.log(.disconnect, "Lost connected device - triggering disconnect")
             disconnect()
         }
         
@@ -809,7 +902,7 @@ extension FlirManager: FLIRDiscoveryEventDelegate {
     }
     
     public func discoveryError(_ error: String, netServiceError nsnetserviceserror: Int32, on iface: FLIRCommunicationInterface) {
-        NSLog("[FlirManager] Discovery error: \(error) (\(nsnetserviceserror)) on interface: \(iface)")
+        FlirLogger.logError(.discovery, "Discovery error: \(error) (code=\(nsnetserviceserror)) on interface: \(iface)")
         
         DispatchQueue.main.async { [weak self] in
             self?.delegate?.onError("Discovery error: \(error)")
@@ -817,7 +910,7 @@ extension FlirManager: FLIRDiscoveryEventDelegate {
     }
     
     public func discoveryFinished(_ iface: FLIRCommunicationInterface) {
-        NSLog("[FlirManager] Discovery finished on interface: \(iface)")
+        FlirLogger.log(.discovery, "Discovery finished on interface: \(iface)")
         isScanning = false
     }
 }
@@ -826,13 +919,19 @@ extension FlirManager: FLIRDiscoveryEventDelegate {
 
 extension FlirManager: FLIRDataReceivedDelegate {
     public func onDisconnected(_ camera: FLIRCamera, withError error: Error?) {
-        NSLog("[FlirManager] Camera disconnected: \(error?.localizedDescription ?? "no error")")
+        FlirLogger.logError(.disconnect, "Camera disconnected callback", error: error)
+        
+        // Stop battery polling
+        stopBatteryPolling()
         
         _isConnected = false
         _isStreaming = false
         connectedDeviceId = nil
         connectedDeviceName = nil
         
+        // Reset frame counter
+        FlirLogger.resetFrameCounter()
+        
         DispatchQueue.main.async { [weak self] in
             self?.delegate?.onDeviceDisconnected()
             self?.emitStateChange("disconnected")
@@ -844,7 +943,7 @@ extension FlirManager: FLIRDataReceivedDelegate {
 
 extension FlirManager: FLIRStreamDelegate {
     public func onError(_ error: Error) {
-        NSLog("[FlirManager] Stream error: \(error)")
+        FlirLogger.logError(.streaming, "Stream error", error: error)
         
         DispatchQueue.main.async { [weak self] in
             self?.delegate?.onError("Stream error: \(error.localizedDescription)")
@@ -884,6 +983,9 @@ extension FlirManager: FLIRStreamDelegate {
                     }
                 }
                 
+                // Rate-limited frame logging
+                FlirLogger.logFrame(width: Int(image.size.width), height: Int(image.size.height), temperature: lastTemperature)
+                
                 DispatchQueue.main.async { [weak self] in
                     guard let self = self else { return }
                     self.delegate?.onFrameReceived(
@@ -911,7 +1013,7 @@ extension FlirManager: FLIRStreamDelegate {
                 }
             }
         } catch {
-            NSLog("[FlirManager] Streamer update error: \(error)")
+            FlirLogger.logError(.frame, "Streamer update error", error: error)
         }
     }
 }

package/ios/Flir/src/FlirModule.m

@@ -136,8 +136,12 @@ RCT_EXPORT_METHOD(removeListeners : (NSInteger)count) {
 
 + (void)emitBatteryUpdateWithLevel:(NSInteger)level charging:(BOOL)charging {
   NSDictionary *payload = @{@"level" : @(level), @"isCharging" : @(charging)};
-  [[FlirEventEmitter shared] sendDeviceEvent:@"FlirBatteryUpdated"
-                                        body:payload];
+  NSLog(@"[FlirModule] Emitting battery update - level: %ld, charging: %d", (long)level, charging);
+  
+  // Note: This is a class method, so we need to get the module instance
+  // For now, we'll just log - in production you'd need to get the module instance
+  // or convert this to an instance method
+  // [[FlirModule sharedInstance] sendEventWithName:@"FlirBatteryUpdated" body:payload];
 }
 
 #pragma mark - Methods
@@ -405,9 +409,10 @@ RCT_EXPORT_METHOD(isPreferSdkRotation : (RCTPromiseResolveBlock)
                           objc_msgSend)(d, sel_registerName("toDictionary"))];
     }
   }
-  [[FlirEventEmitter shared]
-      sendDeviceEvent:@"FlirDevicesFound"
-                 body:@{@"devices" : arr, @"count" : @(arr.count)}];
+  
+  NSLog(@"[FlirModule] onDevicesFound - emitting FlirDevicesFound with %lu devices", (unsigned long)arr.count);
+  [self sendEventWithName:@"FlirDevicesFound" 
+                     body:@{@"devices" : arr, @"count" : @(arr.count)}];
 }
 
 - (void)onDeviceConnected:(id)device {
@@ -425,31 +430,31 @@ RCT_EXPORT_METHOD(isPreferSdkRotation : (RCTPromiseResolveBlock)
                                      device, sel_registerName("toDictionary"))];
   }
 
-  [[FlirEventEmitter shared] sendDeviceEvent:@"FlirDeviceConnected" body:body];
+  NSLog(@"[FlirModule] onDeviceConnected - emitting FlirDeviceConnected event");
+  [self sendEventWithName:@"FlirDeviceConnected" body:body];
 }
 
 - (void)onDeviceDisconnected {
-  [[FlirEventEmitter shared] sendDeviceEvent:@"FlirDeviceDisconnected"
-                                        body:@{}];
+  NSLog(@"[FlirModule] onDeviceDisconnected - emitting FlirDeviceDisconnected event");
+  [self sendEventWithName:@"FlirDeviceDisconnected" body:@{}];
 }
 
 - (void)onFrameReceived:(UIImage *)image
                   width:(NSInteger)width
                  height:(NSInteger)height {
   // Also emit event for JS consumers (though slow, some might use it)
-  [[FlirEventEmitter shared]
-      sendDeviceEvent:@"FlirFrameReceived"
-                 body:@{
-                   @"width" : @(width),
-                   @"height" : @(height),
-                   @"timestamp" :
-                       @([[NSDate date] timeIntervalSince1970] * 1000)
-                 }];
+  [self sendEventWithName:@"FlirFrameReceived"
+                     body:@{
+                       @"width" : @(width),
+                       @"height" : @(height),
+                       @"timestamp" :
+                           @([[NSDate date] timeIntervalSince1970] * 1000)
+                     }];
 }
 
 - (void)onFrameReceivedRaw:(NSData *)data width:(NSInteger)width height:(NSInteger)height bytesPerRow:(NSInteger)bytesPerRow timestamp:(double)timestamp {
   // Emit a lightweight event to notify JS that a raw bitmap is available; raw bytes are available via getLatestFrameBitmap()
-  [[FlirEventEmitter shared] sendDeviceEvent:@"FlirFrameBitmapAvailable" body:@{
+  [self sendEventWithName:@"FlirFrameBitmapAvailable" body:@{
     @"width": @(width),
     @"height": @(height),
     @"bytesPerRow": @(bytesPerRow),
@@ -463,9 +468,9 @@ RCT_EXPORT_METHOD(isPreferSdkRotation : (RCTPromiseResolveBlock)
     self.connectResolve = nil;
     self.connectReject = nil;
   }
-  [[FlirEventEmitter shared]
-      sendDeviceEvent:@"FlirError"
-                 body:@{@"error" : message ?: @"Unknown error"}];
+  NSLog(@"[FlirModule] onError - emitting FlirError: %@", message);
+  [self sendEventWithName:@"FlirError"
+                     body:@{@"error" : message ?: @"Unknown error"}];
 }
 
 - (void)onStateChanged:(NSString *)state
@@ -478,7 +483,8 @@ RCT_EXPORT_METHOD(isPreferSdkRotation : (RCTPromiseResolveBlock)
     @"isStreaming" : @(isStreaming),
     @"isEmulator" : @(isEmulator)
   };
-  [[FlirEventEmitter shared] sendDeviceEvent:@"FlirStateChanged" body:body];
+  NSLog(@"[FlirModule] onStateChanged - state: %@, connected: %d, streaming: %d", state, isConnected, isStreaming);
+  [self sendEventWithName:@"FlirStateChanged" body:body];
 }
 
 @end

package/package.json

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