[api]: Fix ASCOM Camera and Focuser thermometer

tiagohm · Apr 19, 2024 · 7597dab · 7597dab
1 parent ba5e796
commit 7597dab
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 23 deletions.
diff --git a/nebulosa-alpaca-indi/src/main/kotlin/nebulosa/alpaca/indi/device/cameras/ASCOMCamera.kt b/nebulosa-alpaca-indi/src/main/kotlin/nebulosa/alpaca/indi/device/cameras/ASCOMCamera.kt
@@ -281,13 +281,13 @@ data class ASCOMCamera(
 
     override fun close() {
         if (hasThermometer) {
-            sender.unregisterThermometer(this)
             hasThermometer = false
+            sender.unregisterThermometer(this)
         }
 
         if (canPulseGuide) {
-            sender.unregisterGuideOutput(this)
             canPulseGuide = false
+            sender.unregisterGuideOutput(this)
         }
 
         super.close()
@@ -591,8 +591,10 @@ data class ASCOMCamera(
                         sender.registerThermometer(this)
                     }
 
-                    temperature = it.value
-                    sender.fireOnEventReceived(CameraTemperatureChanged(this))
+                    if (it.value != temperature) {
+                        temperature = it.value
+                        sender.fireOnEventReceived(CameraTemperatureChanged(this))
+                    }
                 }
             }
         }

diff --git a/nebulosa-alpaca-indi/src/main/kotlin/nebulosa/alpaca/indi/device/focusers/ASCOMFocuser.kt b/nebulosa-alpaca-indi/src/main/kotlin/nebulosa/alpaca/indi/device/focusers/ASCOMFocuser.kt
@@ -5,13 +5,8 @@ import nebulosa.alpaca.api.ConfiguredDevice
 import nebulosa.alpaca.indi.client.AlpacaClient
 import nebulosa.alpaca.indi.device.ASCOMDevice
 import nebulosa.indi.device.Device
-import nebulosa.indi.device.focuser.Focuser
-import nebulosa.indi.device.focuser.FocuserCanAbsoluteMoveChanged
-import nebulosa.indi.device.focuser.FocuserMovingChanged
-import nebulosa.indi.device.focuser.FocuserPositionChanged
+import nebulosa.indi.device.focuser.*
 import nebulosa.indi.device.thermometer.ThermometerAttached
-import nebulosa.indi.device.thermometer.ThermometerDetached
-import nebulosa.indi.device.thermometer.ThermometerTemperatureChanged
 import nebulosa.indi.protocol.INDIProtocol
 
 @Suppress("RedundantModalityModifier")
@@ -75,7 +70,6 @@ data class ASCOMFocuser(
     override fun onConnected() {
         processCapabilities()
         processPosition()
-        processTemperature()
     }
 
     override fun onDisconnected() {
@@ -99,20 +93,20 @@ data class ASCOMFocuser(
     }
 
     override fun close() {
-        super.close()
-
         if (hasThermometer) {
             hasThermometer = false
-            sender.fireOnEventReceived(ThermometerDetached(this))
+            sender.unregisterThermometer(this)
         }
+
+        super.close()
     }
 
     override fun refresh(elapsedTimeInSeconds: Long) {
         super.refresh(elapsedTimeInSeconds)
 
         processMoving()
         processPosition()
-        processTemperature()
+        processTemperature(false)
     }
 
     private fun processCapabilities() {
@@ -127,6 +121,8 @@ data class ASCOMFocuser(
             hasThermometer = true
             sender.fireOnEventReceived(ThermometerAttached(this))
         }
+
+        processTemperature(true)
     }
 
     private fun processMoving() {
@@ -149,13 +145,19 @@ data class ASCOMFocuser(
         }
     }
 
-    private fun processTemperature() {
-        if (hasThermometer) {
+    private fun processTemperature(init: Boolean) {
+        if (hasThermometer || init) {
             service.temperature(device.number).doRequest {
-                if (it.value != temperature) {
-                    temperature = it.value
-
-                    sender.fireOnEventReceived(ThermometerTemperatureChanged(this))
+                if (it.errorNumber == 0) {
+                    if (!hasThermometer) {
+                        hasThermometer = true
+                        sender.registerThermometer(this)
+                    }
+
+                    if (it.value != temperature) {
+                        temperature = it.value
+                        sender.fireOnEventReceived(FocuserTemperatureChanged(this))
+                    }
                 }
             }
         }

diff --git a/nebulosa-indi-client/src/main/kotlin/nebulosa/indi/client/device/cameras/INDICamera.kt b/nebulosa-indi-client/src/main/kotlin/nebulosa/indi/client/device/cameras/INDICamera.kt
@@ -397,13 +397,13 @@ internal open class INDICamera(
 
     override fun close() {
         if (hasThermometer) {
-            sender.unregisterThermometer(this)
             hasThermometer = false
+            sender.unregisterThermometer(this)
         }
 
         if (canPulseGuide) {
-            sender.unregisterGuideOutput(this)
             canPulseGuide = false
+            sender.unregisterGuideOutput(this)
         }
 
         if (guideHead != null) {