Update CCD Crash Property

indilib · Feb 8, 2024 · b5d2d3a · b5d2d3a
1 parent cc74fcf
commit b5d2d3a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/drivers/ccd/ccd_simulator.cpp b/drivers/ccd/ccd_simulator.cpp
@@ -149,8 +149,8 @@ bool CCDSim::initProperties()
                        SIMULATOR_TAB, IP_RW, 60, IPS_IDLE);
 
     // Simulate Crash
-    IUFillSwitch(&CrashS[0], "CRASH", "Crash driver", ISS_OFF);
-    IUFillSwitchVector(&CrashSP, CrashS, 1, getDeviceName(), "CCD_SIMULATE_CRASH", "Crash", SIMULATOR_TAB, IP_WO,
+    CrashSP[CRASH].fill("CRASH", "Crash driver", ISS_OFF);
+    CrashSP.fill(getDeviceName(), "CCD_SIMULATE_CRASH", "Crash", SIMULATOR_TAB, IP_WO,
                        ISR_ATMOST1, 0, IPS_IDLE);
 
     // Periodic Error
@@ -266,7 +266,7 @@ void CCDSim::ISGetProperties(const char * dev)
     defineProperty(&EqPENP);
     defineProperty(&FocusSimulationNP);
     defineProperty(SimulateBayerSP);
-    defineProperty(&CrashSP);
+    defineProperty(CrashSP);
 }
 
 bool CCDSim::updateProperties()
@@ -1240,7 +1240,7 @@ bool CCDSim::ISNewSwitch(const char * dev, const char * name, ISState * states,
             }
             return true;
         }
-        else if (strcmp(name, CrashSP.name) == 0)
+        else if (CrashSP.isNameMatch(name))
         {
             abort();
         }

diff --git a/drivers/ccd/ccd_simulator.h b/drivers/ccd/ccd_simulator.h
@@ -243,7 +243,12 @@ class CCDSim : public INDI::CCD, public INDI::FilterInterface
         INDI::PropertyText DirectoryTP {1};
         INDI::PropertySwitch DirectorySP {2};
 
-        ISwitchVectorProperty CrashSP;
+        INDI::PropertySwitch CrashSP {1};
+        enum
+        {
+            CRASH
+        };
+
         ISwitch CrashS[1];
 
         INDI::PropertySwitch ResolutionSP {2};