fix(touptek): rework exposure timeout to use elapsed timer utility.

Author: TallFurryMan

indi-toupbase/indi_toupbase.cpp

@@ -1450,6 +1450,8 @@ bool ToupBase::StartExposure(float duration)
         m_CurrentTriggerMode = TRIGGER_SOFTWARE;
     }
 
+    m_ExposureTimer.start();
+
     timeval current_time, exposure_time;
     exposure_time.tv_sec = uSecs / 1000000;
     exposure_time.tv_usec = uSecs % 1000000;
@@ -1473,6 +1475,7 @@ bool ToupBase::AbortExposure()
 {
     FP(Trigger(m_Handle, 0));
     InExposure = false;
+    m_ExposureTimer.invalidate();
     return true;
 }
 
@@ -1571,44 +1574,13 @@ void ToupBase::TimerHit()
     if (isConnected() == false)
         return;
 
-    // Exposure timeout logic
     if (InExposure)
     {
-        timeval curtime, diff;
-        gettimeofday(&curtime, nullptr);
-        timersub(&m_ExposureEnd, &curtime, &diff);
-        double timeleft = diff.tv_sec + diff.tv_usec / 1e6;
+        double elapsed = m_ExposureTimer.elapsed() / 1000.0; // ms to seconds
+        double timeleft = m_ExposureRequest - elapsed;
         if (timeleft < 0)
             timeleft = 0;
         PrimaryCCD.setExposureLeft(timeleft);
-
-        // Timeout check
-        // Calculate allowed timeout using m_TimeoutFactorN
-        double timeout_factor = m_TimeoutFactorN.value;
-        timeval allowed_end = m_ExposureEnd;
-        if (timeout_factor > 1.0)
-        {
-            // Add extra time to m_ExposureEnd
-            double extra = (timeout_factor - 1.0) * m_ExposureRequest;
-            long extra_sec = static_cast<long>(extra);
-            long extra_usec = static_cast<long>((extra - extra_sec) * 1e6);
-            allowed_end.tv_sec += extra_sec;
-            allowed_end.tv_usec += extra_usec;
-            if (allowed_end.tv_usec >= 1000000)
-            {
-                allowed_end.tv_sec += allowed_end.tv_usec / 1000000;
-                allowed_end.tv_usec = allowed_end.tv_usec % 1000000;
-            }
-        }
-
-        timeval now;
-        gettimeofday(&now, nullptr);
-        if (timercmp(&now, &allowed_end, >))
-        {
-            LOG_ERROR("Exposure timed out waiting for image frame.");
-            InExposure = false;
-            PrimaryCCD.setExposureFailed();
-        }
     }
 
     if (m_Instance->model->flag & CP(FLAG_GETTEMPERATURE))
@@ -1925,7 +1897,7 @@ void ToupBase::eventCallBack(unsigned event)
             {
                 InExposure = false;
                 PrimaryCCD.setExposureLeft(0);
-
+                m_ExposureTimer.invalidate();
                 XP(FrameInfoV2) info;
                 memset(&info, 0, sizeof(XP(FrameInfoV2)));
 

indi-toupbase/indi_toupbase.h

@@ -23,6 +23,7 @@
 
 #include <indiccd.h>
 #include <inditimer.h>
+#include <indielapsedtimer.h> // Use INDI::ElapsedTimer
 #include "libtoupbase.h"
 
 class ToupBase : public INDI::CCD
@@ -296,4 +297,6 @@ class ToupBase : public INDI::CCD
         int32_t m_rgbBufferSize { 0 };
 
         int m_ConfigResolutionIndex {-1};
+
+        INDI::ElapsedTimer m_ExposureTimer;
 };