From 237e92abca440ad69c3e27df79f192fd02871a47 Mon Sep 17 00:00:00 2001
From: Brandon <brandon@asiimaging.com>
Date: Tue, 26 May 2026 11:00:24 -0700
Subject: [PATCH 1/9] ASITiger: use #pragma once instead of header guard

---
 DeviceAdapters/ASITiger/ASIBase.h           |  5 +---
 DeviceAdapters/ASITiger/ASICRISP.h          |  5 +---
 DeviceAdapters/ASITiger/ASIClocked.h        |  5 +---
 DeviceAdapters/ASITiger/ASIDac.h            |  5 +---
 DeviceAdapters/ASITiger/ASIDacXYStage.h     |  5 +---
 DeviceAdapters/ASITiger/ASIFWheel.h         |  5 +---
 DeviceAdapters/ASITiger/ASIHub.h            |  7 +-----
 DeviceAdapters/ASITiger/ASILED.h            |  5 +---
 DeviceAdapters/ASITiger/ASILens.h           |  5 +---
 DeviceAdapters/ASITiger/ASIPLogic.h         |  5 +---
 DeviceAdapters/ASITiger/ASIPeripheralBase.h |  8 +------
 DeviceAdapters/ASITiger/ASIPiezo.h          |  5 +---
 DeviceAdapters/ASITiger/ASIPmt.h            |  5 +---
 DeviceAdapters/ASITiger/ASIScanner.h        |  5 +---
 DeviceAdapters/ASITiger/ASITiger.h          |  4 +---
 DeviceAdapters/ASITiger/ASITigerComm.h      | 26 +++++++++------------
 DeviceAdapters/ASITiger/ASIXYStage.h        | 12 ++++------
 DeviceAdapters/ASITiger/ASIZStage.h         |  5 +---
 18 files changed, 31 insertions(+), 91 deletions(-)

diff --git a/DeviceAdapters/ASITiger/ASIBase.h b/DeviceAdapters/ASITiger/ASIBase.h
index e77e597e6..d5be7795c 100644
--- a/DeviceAdapters/ASITiger/ASIBase.h
+++ b/DeviceAdapters/ASITiger/ASIBase.h
@@ -20,8 +20,7 @@
 // AUTHOR:        Jon Daniels (jon@asiimaging.com) 09/2013
 //
 
-#ifndef ASIBASE_H
-#define ASIBASE_H
+#pragma once
 
 #include "MMDevice.h"
 #include "DeviceBase.h"
@@ -125,5 +124,3 @@ class ASIBase : public TDeviceBase<UConcreteDevice> {
       this->SetErrorText(ERR_INVALID_ADDRESS, g_Msg_ERR_INVALID_ADDRESS);
    }
 };
-
-#endif // ASIBASE_H
diff --git a/DeviceAdapters/ASITiger/ASICRISP.h b/DeviceAdapters/ASITiger/ASICRISP.h
index a8b5727e6..fbe8cf648 100644
--- a/DeviceAdapters/ASITiger/ASICRISP.h
+++ b/DeviceAdapters/ASITiger/ASICRISP.h
@@ -20,8 +20,7 @@
 // AUTHOR:        Jon Daniels (jon@asiimaging.com) 09/2013
 //
 
-#ifndef ASICRISP_H
-#define ASICRISP_H
+#pragma once
 
 #include "ASIPeripheralBase.h"
 #include "MMDevice.h"
@@ -135,5 +134,3 @@ class CCRISP : public ASIPeripheralBase<CAutoFocusBase, CCRISP> {
     // std::optional allows the table to be late-initialized while keeping its members const for immutability.
     std::optional<CommandTable> commands_;
 };
-
-#endif // ASICRISP_H
diff --git a/DeviceAdapters/ASITiger/ASIClocked.h b/DeviceAdapters/ASITiger/ASIClocked.h
index 72b9898d9..798b1af4c 100644
--- a/DeviceAdapters/ASITiger/ASIClocked.h
+++ b/DeviceAdapters/ASITiger/ASIClocked.h
@@ -20,8 +20,7 @@
 // AUTHOR:        Jon Daniels (jon@asiimaging.com) 09/2013
 //
 
-#ifndef ASICLOCKED_H
-#define ASICLOCKED_H
+#pragma once
 
 #include "ASIPeripheralBase.h"
 #include "MMDevice.h"
@@ -76,5 +75,3 @@ class CPortSwitch : public CClocked {
 
    int Initialize();
 };
-
-#endif // ASICLOCKED_H
diff --git a/DeviceAdapters/ASITiger/ASIDac.h b/DeviceAdapters/ASITiger/ASIDac.h
index d5a29e0db..51dcb9caa 100644
--- a/DeviceAdapters/ASITiger/ASIDac.h
+++ b/DeviceAdapters/ASITiger/ASIDac.h
@@ -20,8 +20,7 @@
 // AUTHOR:        Vikram Kopuri (vik@asiimaging.com) 08/2019
 //
 
-#ifndef ASIDAC_H
-#define ASIDAC_H
+#pragma once
 
 #include "ASIPeripheralBase.h"
 #include "MMDevice.h"
@@ -109,5 +108,3 @@ class CDAC : public ASIPeripheralBase<CSignalIOBase, CDAC>
 	bool ttl_trigger_enabled_;
 	std::vector<double> sequence_; // carries data in volts
 };
-
-#endif // ASIDAC_H
diff --git a/DeviceAdapters/ASITiger/ASIDacXYStage.h b/DeviceAdapters/ASITiger/ASIDacXYStage.h
index 91a3adda2..a6cee0601 100644
--- a/DeviceAdapters/ASITiger/ASIDacXYStage.h
+++ b/DeviceAdapters/ASITiger/ASIDacXYStage.h
@@ -20,8 +20,7 @@
 // AUTHOR:        Brandon Simpson (brandon@asiimaging.com) 2/2022
 //
 
-#ifndef ASIDACXYSTAGE_H
-#define ASIDACXYSTAGE_H
+#pragma once
 
 #include "ASIPeripheralBase.h"
 #include "MMDevice.h"
@@ -166,5 +165,3 @@ class CDACXYStage : public ASIPeripheralBase<CXYStageBase, CDACXYStage>
 	std::vector<double> sequenceX_;
 	std::vector<double> sequenceY_;
 };
-
-#endif // ASIDACXYSTAGE_H
diff --git a/DeviceAdapters/ASITiger/ASIFWheel.h b/DeviceAdapters/ASITiger/ASIFWheel.h
index 32118f2df..53c5e7525 100644
--- a/DeviceAdapters/ASITiger/ASIFWheel.h
+++ b/DeviceAdapters/ASITiger/ASIFWheel.h
@@ -20,8 +20,7 @@
 // AUTHOR:        Jon Daniels (jon@asiimaging.com) 09/2013
 //
 
-#ifndef ASIFWHEEL_H
-#define ASIFWHEEL_H
+#pragma once
 
 #include "ASIPeripheralBase.h"
 #include "MMDevice.h"
@@ -62,5 +61,3 @@ class CFWheel : public ASIPeripheralBase<CStateDeviceBase, CFWheel>
    std::string wheelNumber_;
    static std::string selectedWheel_; // which wheel is currently selected, shared among all instances of this class
 };
-
-#endif // ASIFWHEEL_H
diff --git a/DeviceAdapters/ASITiger/ASIHub.h b/DeviceAdapters/ASITiger/ASIHub.h
index c4ba1b5b2..798b9b7f7 100644
--- a/DeviceAdapters/ASITiger/ASIHub.h
+++ b/DeviceAdapters/ASITiger/ASIHub.h
@@ -20,8 +20,7 @@
 // AUTHOR:        Jon Daniels (jon@asiimaging.com) 09/2013
 //
 
-#ifndef ASIHUB_H
-#define ASIHUB_H
+#pragma once
 
 #include "ASIBase.h"
 #include "MMDevice.h"
@@ -169,7 +168,3 @@ class ASIHub : public ASIBase<HubBase, ASIHub>
    std::map<std::string, std::string> deviceMap_;  // to implement properties shared between devices
         // key is the device name, value is the Tiger address (normally a single character, see note about addressChar_ in ASIPeripheralBase
 };
-
-
-
-#endif // ASIHUB_H
diff --git a/DeviceAdapters/ASITiger/ASILED.h b/DeviceAdapters/ASITiger/ASILED.h
index a9a891c82..ec4263e75 100644
--- a/DeviceAdapters/ASITiger/ASILED.h
+++ b/DeviceAdapters/ASITiger/ASILED.h
@@ -20,8 +20,7 @@
 // AUTHOR:        Jon Daniels (jon@asiimaging.com) 05/2014
 //
 
-#ifndef ASILED_H
-#define ASILED_H
+#pragma once
 
 #include "ASIPeripheralBase.h"
 #include "MMDevice.h"
@@ -57,5 +56,3 @@ class CLED : public ASIPeripheralBase<CShutterBase, CLED>
    bool stablight_;
    int UpdateOpenIntensity();
 };
-
-#endif // ASILED_H
diff --git a/DeviceAdapters/ASITiger/ASILens.h b/DeviceAdapters/ASITiger/ASILens.h
index 290e2fd1e..4e5d2f992 100644
--- a/DeviceAdapters/ASITiger/ASILens.h
+++ b/DeviceAdapters/ASITiger/ASILens.h
@@ -21,8 +21,7 @@
 //                Modified for Tunable lens by Vik (vik@asiimaging.com)	05/2017
 //
 
-#ifndef ASILENS_H
-#define ASILENS_H
+#pragma once
 
 #include "ASIPeripheralBase.h"
 #include "MMDevice.h"
@@ -118,5 +117,3 @@ class CLens : public ASIPeripheralBase<CStageBase, CLens>
    bool ttl_trigger_enabled_;
    std::vector<double> sequence_;
 };
-
-#endif // ASILENS_H
diff --git a/DeviceAdapters/ASITiger/ASIPLogic.h b/DeviceAdapters/ASITiger/ASIPLogic.h
index 9fa01d96a..af8738e73 100644
--- a/DeviceAdapters/ASITiger/ASIPLogic.h
+++ b/DeviceAdapters/ASITiger/ASIPLogic.h
@@ -20,8 +20,7 @@
 // AUTHOR:        Jon Daniels (jon@asiimaging.com) 05/2014
 //
 
-#ifndef ASIPLOGIC_H
-#define ASIPLOGIC_H
+#pragma once
 
 #include "ASIPeripheralBase.h"
 #include "MMDevice.h"
@@ -104,5 +103,3 @@ class CPLogic : public ASIPeripheralBase<CShutterBase, CPLogic>
    int RefreshCurrentPosition();
    int RefreshEditCellPropertyValues();
 };
-
-#endif // ASIPLOGIC_H
diff --git a/DeviceAdapters/ASITiger/ASIPeripheralBase.h b/DeviceAdapters/ASITiger/ASIPeripheralBase.h
index f88f0a369..15fb32ddc 100644
--- a/DeviceAdapters/ASITiger/ASIPeripheralBase.h
+++ b/DeviceAdapters/ASITiger/ASIPeripheralBase.h
@@ -20,17 +20,14 @@
 // AUTHOR:        Jon Daniels (jon@asiimaging.com) 09/2013
 //
 
-#ifndef ASIPERIPHERALBASE_H
-#define ASIPERIPHERALBASE_H
+#pragma once
 
 #include "ASITiger.h"
 #include "ASIBase.h"
 #include "ASIHub.h"
 
-
 // See ASIBase.h for an explanation of how this class works.
 
-
 template <template <typename> class TDeviceBase, class UConcreteDevice>
 class ASIPeripheralBase : public ASIBase<TDeviceBase, UConcreteDevice>
 {
@@ -242,6 +239,3 @@ class ASIPeripheralBase : public ASIBase<TDeviceBase, UConcreteDevice>
    }
 
 };
-
-
-#endif // ASIPERIPHERALBASE_H
diff --git a/DeviceAdapters/ASITiger/ASIPiezo.h b/DeviceAdapters/ASITiger/ASIPiezo.h
index 924d125c2..8fbae9894 100644
--- a/DeviceAdapters/ASITiger/ASIPiezo.h
+++ b/DeviceAdapters/ASITiger/ASIPiezo.h
@@ -20,8 +20,7 @@
 // AUTHOR:        Jon Daniels (jon@asiimaging.com) 09/2013
 //
 
-#ifndef ASIPIEZO_H
-#define ASIPIEZO_H
+#pragma once
 
 #include "ASIPeripheralBase.h"
 #include "MMDevice.h"
@@ -127,5 +126,3 @@ class CPiezo : public ASIPeripheralBase<CStageBase, CPiezo>
    bool runningFastSequence_;
    std::vector<double> sequence_;
 };
-
-#endif // ASIPIEZO_H
diff --git a/DeviceAdapters/ASITiger/ASIPmt.h b/DeviceAdapters/ASITiger/ASIPmt.h
index bcbd37d96..1b07f5592 100644
--- a/DeviceAdapters/ASITiger/ASIPmt.h
+++ b/DeviceAdapters/ASITiger/ASIPmt.h
@@ -20,8 +20,7 @@
 // AUTHOR:        Vikram Kopuri (vik@asiimaging.com) 04/2016
 //
 
-#ifndef ASIPMT_H
-#define ASIPMT_H
+#pragma once
 
 #include "ASIPeripheralBase.h"
 #include "MMDevice.h"
@@ -66,5 +65,3 @@ class CPMT : public ASIPeripheralBase<CSignalIOBase, CPMT>
    int UpdateGain();
    int UpdateAvg();
  };
-
-#endif // ASIPMT_H
diff --git a/DeviceAdapters/ASITiger/ASIScanner.h b/DeviceAdapters/ASITiger/ASIScanner.h
index 150d0d6a7..2c9bc6b1b 100644
--- a/DeviceAdapters/ASITiger/ASIScanner.h
+++ b/DeviceAdapters/ASITiger/ASIScanner.h
@@ -20,8 +20,7 @@
 // AUTHOR:        Jon Daniels (jon@asiimaging.com) 09/2013
 //
 
-#ifndef ASISCANNER_H
-#define ASISCANNER_H
+#pragma once
 
 #include "ASIPeripheralBase.h"
 #include "MMDevice.h"
@@ -199,5 +198,3 @@ class CScanner : public ASIPeripheralBase<CGalvoBase, CScanner>
    bool dac4ch_;
    bool signalDAC_;
 };
-
-#endif // ASISCANNER_H
diff --git a/DeviceAdapters/ASITiger/ASITiger.h b/DeviceAdapters/ASITiger/ASITiger.h
index 728e6ddff..a14a23f5a 100644
--- a/DeviceAdapters/ASITiger/ASITiger.h
+++ b/DeviceAdapters/ASITiger/ASITiger.h
@@ -22,8 +22,7 @@
 // AUTHOR:        Jon Daniels (jon@asiimaging.com) 09/2013
 //
 
-#ifndef ASITIGER_H
-#define ASITIGER_H
+#pragma once
 
 #include <string>
 #include <vector>
@@ -770,4 +769,3 @@ struct FirmwareBuild
 // define names
 const char* const g_Define_SINGLEAXIS_FUNCTION = "SINGLEAXIS_FUNCTION";
 
-#endif // ASITIGER_H
diff --git a/DeviceAdapters/ASITiger/ASITigerComm.h b/DeviceAdapters/ASITiger/ASITigerComm.h
index 3de8c4125..b8e5f94be 100644
--- a/DeviceAdapters/ASITiger/ASITigerComm.h
+++ b/DeviceAdapters/ASITiger/ASITigerComm.h
@@ -20,8 +20,7 @@
 // AUTHOR:        Jon Daniels (jon@asiimaging.com) 09/2013
 //
 
-#ifndef ASITIGERCOMM_H
-#define ASITIGERCOMM_H
+#pragma once
 
 #include "ASIHub.h"
 #include "MMDevice.h"
@@ -42,23 +41,20 @@
 // HubBase in DeviceBase.h, at which point it would have to be merged
 // with TigerComm to work.  So that refactoring path was abandoned for now.
 // - Jon (14-May-2014)
-class CTigerCommHub : public ASIHub
-{
+class CTigerCommHub : public ASIHub {
 public:
-    explicit CTigerCommHub();
+    CTigerCommHub();
     ~CTigerCommHub() = default;
 
-   // Device API
-   int Initialize();
-   bool Busy();
+    // Device API
+    int Initialize();
+    bool Busy();
 
-   // Hub API
-   bool SupportsDeviceDetection();
-   MM::DeviceDetectionStatus DetectDevice();
-   int DetectInstalledDevices();
+    // Hub API
+    bool SupportsDeviceDetection();
+    MM::DeviceDetectionStatus DetectDevice();
+    int DetectInstalledDevices();
 
 private:
-   int TalkToTiger();
+    int TalkToTiger();
 };
-
-#endif // ASITIGERCOMM_H
diff --git a/DeviceAdapters/ASITiger/ASIXYStage.h b/DeviceAdapters/ASITiger/ASIXYStage.h
index 0b6ee89d8..d2bb48512 100644
--- a/DeviceAdapters/ASITiger/ASIXYStage.h
+++ b/DeviceAdapters/ASITiger/ASIXYStage.h
@@ -20,8 +20,7 @@
 // AUTHOR:        Jon Daniels (jon@asiimaging.com) 09/2013
 //
 
-#ifndef ASIXYSTAGE_H
-#define ASIXYSTAGE_H
+#pragma once
 
 #include "ASIPeripheralBase.h"
 #include "MMDevice.h"
@@ -155,8 +154,10 @@ class CXYStage : public ASIPeripheralBase<CXYStageBase, CXYStage>
    int OnVectorX(MM::PropertyBase* pProp, MM::ActionType eAct) { return OnVectorGeneric(pProp, eAct, axisLetterX_); }
    int OnVectorY(MM::PropertyBase* pProp, MM::ActionType eAct) { return OnVectorGeneric(pProp, eAct, axisLetterY_); }
 
-
 private:
+    int OnSaveJoystickSettings();
+    int getMinMaxSpeed(const std::string& axisLetter, double& minSpeed, double& maxSpeed);
+
    double unitMultX_;
    double unitMultY_;
    double stepSizeXUm_;
@@ -173,9 +174,4 @@ class CXYStage : public ASIPeripheralBase<CXYStageBase, CXYStage>
    bool ttl_trigger_enabled_;
    std::vector<double> sequenceX_;
    std::vector<double> sequenceY_;
-
-   int OnSaveJoystickSettings();
-   int getMinMaxSpeed(const std::string& axisLetter, double& minSpeed, double& maxSpeed);
 };
-
-#endif // ASIXYSTAGE_H
diff --git a/DeviceAdapters/ASITiger/ASIZStage.h b/DeviceAdapters/ASITiger/ASIZStage.h
index 930096e58..84b583043 100644
--- a/DeviceAdapters/ASITiger/ASIZStage.h
+++ b/DeviceAdapters/ASITiger/ASIZStage.h
@@ -20,8 +20,7 @@
 // AUTHOR:        Jon Daniels (jon@asiimaging.com) 09/2013
 //
 
-#ifndef ASIZSTAGE_H
-#define ASIZSTAGE_H
+#pragma once
 
 #include "ASIPeripheralBase.h"
 #include "MMDevice.h"
@@ -138,5 +137,3 @@ class CZStage : public ASIPeripheralBase<CStageBase, CZStage> {
    unsigned int axisIndex_;
    std::vector<double> sequence_;
 };
-
-#endif // ASIZSTAGE_H

From 12f158c14d87f5d67adf3262908c5f8be115699e Mon Sep 17 00:00:00 2001
From: Brandon <brandon@asiimaging.com>
Date: Tue, 26 May 2026 12:05:29 -0700
Subject: [PATCH 2/9] ASITiger: use in-class member initializers for CClocked
 device

---
 DeviceAdapters/ASITiger/ASIClocked.cpp | 60 ++++++++------------------
 DeviceAdapters/ASITiger/ASIClocked.h   | 34 +++++++--------
 2 files changed, 34 insertions(+), 60 deletions(-)

diff --git a/DeviceAdapters/ASITiger/ASIClocked.cpp b/DeviceAdapters/ASITiger/ASIClocked.cpp
index 1dfbcb3fb..b7c0a3f0e 100644
--- a/DeviceAdapters/ASITiger/ASIClocked.cpp
+++ b/DeviceAdapters/ASITiger/ASIClocked.cpp
@@ -32,23 +32,15 @@
 #include <vector>
 #include <string>
 
-
-///////////////////////////////////////////////////////////////////////////////
-// CClocked
-// this is a superclass for any clocked devices (except filterwheels which use a different command set)
-//   including turrets and filter sliders
-//
+// Superclass for any clocked devices (except filterwheels which use a different command set)
+// includes turrets and filter sliders
 CClocked::CClocked(const char* name) :
-   ASIPeripheralBase< ::CStateDeviceBase, CClocked >(name),
-   numPositions_(0),  // will read actual number of positions
-   curPosition_(0),   // will read actual position
-   axisLetter_(g_EmptyAxisLetterStr)
-{
-   if (IsExtendedName(name))  // only set up these properties if we have the required information in the name
-   {
-      axisLetter_ = GetAxisLetterFromExtName(name);
-      CreateProperty(g_AxisLetterPropertyName, axisLetter_.c_str(), MM::String, true);
-   }
+    ASIPeripheralBase< ::CStateDeviceBase, CClocked >(name) {
+    // only set up these properties if we have the required information in the name
+    if (IsExtendedName(name)) {
+        axisLetter_ = GetAxisLetterFromExtName(name);
+        CreateProperty(g_AxisLetterPropertyName, axisLetter_.c_str(), MM::String, true);
+    }
 }
 
 int CClocked::Initialize()
@@ -295,14 +287,9 @@ int CClocked::OnJoystickSelect(MM::PropertyBase* pProp, MM::ActionType eAct)
    return DEVICE_OK;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-// CFSlider
-// mostly just inherits from CClocked, except description
-//
-CFSlider::CFSlider(const char* name) :
-      CClocked(name)
-{
-
+// Filter Slider
+CFSlider::CFSlider(const char* name) : CClocked(name) {
+    // inherits from CClocked, description has been changed
 }
 
 int CFSlider::Initialize()
@@ -312,7 +299,6 @@ int CFSlider::Initialize()
    std::ostringstream command;
 
    // create MM description; this doesn't work during hardware configuration wizard but will work afterwards
-   command.str("");
    command << g_FSliderDeviceDescription << " Axis=" << axisLetter_ << " HexAddr=" << addressString_;
    CreateProperty(MM::g_Keyword_Description, command.str().c_str(), MM::String, true);
 
@@ -320,14 +306,9 @@ int CFSlider::Initialize()
    return DEVICE_OK;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-// CPortSwitch
-// mostly just inherits from CClocked, except description
-//
-CPortSwitch::CPortSwitch(const char* name) :
-      CClocked(name)
-{
-
+// Port Switch
+CPortSwitch::CPortSwitch(const char* name) : CClocked(name) {
+    // inherits from CClocked, description has been changed
 }
 
 int CPortSwitch::Initialize()
@@ -337,7 +318,6 @@ int CPortSwitch::Initialize()
    std::ostringstream command;
 
    // create MM description; this doesn't work during hardware configuration wizard but will work afterwards
-   command.str("");
    command << g_PortSwitchDeviceDescription << " Axis=" << axisLetter_ << " HexAddr=" << addressString_;
    CreateProperty(MM::g_Keyword_Description, command.str().c_str(), MM::String, true);
 
@@ -345,14 +325,9 @@ int CPortSwitch::Initialize()
    return DEVICE_OK;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-// CTurret
-// mostly just inherits from CClocked, except description
-//
-CTurret::CTurret(const char* name) :
-      CClocked(name)
-{
-
+// Turret
+CTurret::CTurret(const char* name) : CClocked(name) {
+    // inherits from CClocked, description has been changed
 }
 
 int CTurret::Initialize()
@@ -362,7 +337,6 @@ int CTurret::Initialize()
    std::ostringstream command;
 
    // create MM description; this doesn't work during hardware configuration wizard but will work afterwards
-   command.str("");
    command << g_TurretDeviceDescription << " Axis=" << axisLetter_ << " HexAddr=" << addressString_;
    CreateProperty(MM::g_Keyword_Description, command.str().c_str(), MM::String, true);
 
diff --git a/DeviceAdapters/ASITiger/ASIClocked.h b/DeviceAdapters/ASITiger/ASIClocked.h
index 798b1af4c..f48fc8c08 100644
--- a/DeviceAdapters/ASITiger/ASIClocked.h
+++ b/DeviceAdapters/ASITiger/ASIClocked.h
@@ -31,47 +31,47 @@ class CClocked : public ASIPeripheralBase<CStateDeviceBase, CClocked> {
     explicit CClocked(const char* name);
     ~CClocked() = default;
 
-   // Generic device API
-   int Initialize();
-   bool Busy();
+    // Generic device API
+    int Initialize();
+    bool Busy();
 
-   // State device API
-   unsigned long GetNumberOfPositions() const { return numPositions_; }
+    // State device API
+    unsigned long GetNumberOfPositions() const { return numPositions_; }
 
-   // action interface
-   int OnState                (MM::PropertyBase* pProp, MM::ActionType eAct);
-   int OnLabel                (MM::PropertyBase* pProp, MM::ActionType eAct);
-   int OnSaveCardSettings     (MM::PropertyBase* pProp, MM::ActionType eAct);
-   int OnRefreshProperties    (MM::PropertyBase* pProp, MM::ActionType eAct);
-   int OnJoystickSelect       (MM::PropertyBase* pProp, MM::ActionType eAct);
+    // action interface
+    int OnState(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnLabel(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnSaveCardSettings(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnRefreshProperties(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnJoystickSelect(MM::PropertyBase* pProp, MM::ActionType eAct);
 
 private:
     int OnSaveJoystickSettings();
 
-   unsigned int numPositions_;
-   unsigned int curPosition_;
+    unsigned int numPositions_ = 0; // will read actual number of positions
+    unsigned int curPosition_ = 0;  // will read actual position
 
 protected:
-   std::string axisLetter_;
+    std::string axisLetter_ = g_EmptyAxisLetterStr;
 };
 
 class CFSlider : public CClocked {
 public:
     explicit CFSlider(const char* name);
 
-   int Initialize();
+    int Initialize();
 };
 
 class CTurret : public CClocked {
 public:
     explicit CTurret(const char* name);
 
-   int Initialize();
+    int Initialize();
 };
 
 class CPortSwitch : public CClocked {
 public:
     explicit CPortSwitch(const char* name);
 
-   int Initialize();
+    int Initialize();
 };

From 7c7c583672c35a919dbb92a6c93721d6eacb8b7d Mon Sep 17 00:00:00 2001
From: Brandon <brandon@asiimaging.com>
Date: Tue, 26 May 2026 13:24:48 -0700
Subject: [PATCH 3/9] ASITiger: use more in-class members initializers

---
 DeviceAdapters/ASITiger/ASIBase.h    | 81 +++++++++++++---------------
 DeviceAdapters/ASITiger/ASICRISP.cpp |  6 +--
 DeviceAdapters/ASITiger/ASICRISP.h   |  8 ++-
 3 files changed, 42 insertions(+), 53 deletions(-)

diff --git a/DeviceAdapters/ASITiger/ASIBase.h b/DeviceAdapters/ASITiger/ASIBase.h
index d5be7795c..e8066e601 100644
--- a/DeviceAdapters/ASITiger/ASIBase.h
+++ b/DeviceAdapters/ASITiger/ASIBase.h
@@ -53,14 +53,11 @@
 template <template <typename> class TDeviceBase, class UConcreteDevice>
 class ASIBase : public TDeviceBase<UConcreteDevice> {
 public:
-    explicit ASIBase(const char* name) :
-        initialized_(false),
-        firmwareVersion_(0.0) {
-
+    explicit ASIBase(const char* name) {
         this->InitializeDefaultErrorMessages();
         InitializeASIErrorMessages();
 
-        // note that this name is different from the label that MM uses in e.g. SetProperty()
+        // Note: this name is different from the label that MM uses in e.g. SetProperty()
 
         // name property will be used to re-create the object by calling CreateDevice again with this parameter
         // if name isn't specified then skip this step (=> method for parent objects to delay setting name until child created)
@@ -71,21 +68,20 @@ class ASIBase : public TDeviceBase<UConcreteDevice> {
 
     virtual ~ASIBase() = default;
 
-   int Shutdown()
-   {
-      initialized_ = false;
-      return DEVICE_OK;
-   }
+    int Shutdown() {
+        initialized_ = false;
+        return DEVICE_OK;
+    }
 
-   void GetName(char* pszName) const
-   {
-      char name[MM::MaxStrLength];
-      if (this->HasProperty(MM::g_Keyword_Name))
-         this->GetProperty(MM::g_Keyword_Name, name);
-      else
-         strcpy(name, "Undefined");
-      CDeviceUtils::CopyLimitedString(pszName, name);
-   }
+    void GetName(char* pszName) const {
+        char name[MM::MaxStrLength];
+        if (this->HasProperty(MM::g_Keyword_Name)) {
+            this->GetProperty(MM::g_Keyword_Name, name);
+        } else {
+            strcpy(name, "Undefined");
+        }
+        CDeviceUtils::CopyLimitedString(pszName, name);
+    }
 
     bool Busy() { 
         // default: hardware is always ready; override in derived class if the hardware requires it
@@ -98,29 +94,28 @@ class ASIBase : public TDeviceBase<UConcreteDevice> {
     }
 
 protected:
-   bool initialized_;      // used to signal that device properties have been read from controller
-   double firmwareVersion_; // firmware version
-   std::string firmwareDate_;    // firmware compile date
-   std::string firmwareBuild_;   // firmware build name
+    void InitializeASIErrorMessages() {
+        this->SetErrorText(ERR_UNRECOGNIZED_ANSWER, g_Msg_ERR_UNRECOGNIZED_ANSWER);
+        this->SetErrorText(ERR_FILTER_WHEEL_NOT_READY, g_Msg_ERR_FILTER_WHEEL_NOT_READY);
+        this->SetErrorText(ERR_FILTER_WHEEL_SPINNING, g_Msg_ERR_FILTER_WHEEL_SPINNING);
+        this->SetErrorText(ERR_NOT_ENOUGH_AXES, g_Msg_ERR_NOT_ENOUGH_AXES);
+        this->SetErrorText(ERR_TOO_LARGE_ADDRESSES, g_Msg_ERR_TOO_LARGE_ADDRESSES);
+        this->SetErrorText(ERR_INFO_COMMAND_NOT_SUPPORTED, g_Msg_ERR_INFO_COMMAND_NOT_SUPPORTED);
+        this->SetErrorText(ERR_TIGER_PAIR_NOT_PRESENT, g_Msg_ERR_TIGER_PAIR_NOT_PRESENT);
+        this->SetErrorText(ERR_TIGER_DEV_NOT_SUPPORTED, g_Msg_ERR_TIGER_DEV_NOT_SUPPORTED);
+        this->SetErrorText(ERR_CRISP_NOT_CALIBRATED, g_Msg_ERR_CRISP_NOT_CALIBRATED);
+        this->SetErrorText(ERR_CRISP_NOT_LOCKED, g_Msg_ERR_CRISP_NOT_LOCKED);
+        this->SetErrorText(ERR_UNKNOWN_COMMAND, g_Msg_ERR_UNKNOWN_COMMAND);
+        this->SetErrorText(ERR_UNKNOWN_AXIS, g_Msg_ERR_UNKNOWN_AXIS);
+        this->SetErrorText(ERR_MISSING_PARAM, g_Msg_ERR_MISSING_PARAM);
+        this->SetErrorText(ERR_PARAM_OUT_OF_RANGE, g_Msg_ERR_PARAM_OUT_OF_RANGE);
+        this->SetErrorText(ERR_OPERATION_FAILED, g_Msg_ERR_OPERATION_FAILED);
+        this->SetErrorText(ERR_UNDEFINED_ERROR, g_Msg_ERR_UNDEFINED_ERROR);
+        this->SetErrorText(ERR_INVALID_ADDRESS, g_Msg_ERR_INVALID_ADDRESS);
+    }
 
-   void InitializeASIErrorMessages()
-   {
-      this->SetErrorText(ERR_UNRECOGNIZED_ANSWER, g_Msg_ERR_UNRECOGNIZED_ANSWER);
-      this->SetErrorText(ERR_FILTER_WHEEL_NOT_READY, g_Msg_ERR_FILTER_WHEEL_NOT_READY);
-      this->SetErrorText(ERR_FILTER_WHEEL_SPINNING, g_Msg_ERR_FILTER_WHEEL_SPINNING);
-      this->SetErrorText(ERR_NOT_ENOUGH_AXES, g_Msg_ERR_NOT_ENOUGH_AXES);
-      this->SetErrorText(ERR_TOO_LARGE_ADDRESSES, g_Msg_ERR_TOO_LARGE_ADDRESSES);
-      this->SetErrorText(ERR_INFO_COMMAND_NOT_SUPPORTED, g_Msg_ERR_INFO_COMMAND_NOT_SUPPORTED);
-      this->SetErrorText(ERR_TIGER_PAIR_NOT_PRESENT, g_Msg_ERR_TIGER_PAIR_NOT_PRESENT);
-      this->SetErrorText(ERR_TIGER_DEV_NOT_SUPPORTED, g_Msg_ERR_TIGER_DEV_NOT_SUPPORTED);
-      this->SetErrorText(ERR_CRISP_NOT_CALIBRATED, g_Msg_ERR_CRISP_NOT_CALIBRATED);
-      this->SetErrorText(ERR_CRISP_NOT_LOCKED, g_Msg_ERR_CRISP_NOT_LOCKED);
-      this->SetErrorText(ERR_UNKNOWN_COMMAND, g_Msg_ERR_UNKNOWN_COMMAND);
-      this->SetErrorText(ERR_UNKNOWN_AXIS, g_Msg_ERR_UNKNOWN_AXIS);
-      this->SetErrorText(ERR_MISSING_PARAM, g_Msg_ERR_MISSING_PARAM);
-      this->SetErrorText(ERR_PARAM_OUT_OF_RANGE, g_Msg_ERR_PARAM_OUT_OF_RANGE);
-      this->SetErrorText(ERR_OPERATION_FAILED, g_Msg_ERR_OPERATION_FAILED);
-      this->SetErrorText(ERR_UNDEFINED_ERROR, g_Msg_ERR_UNDEFINED_ERROR);
-      this->SetErrorText(ERR_INVALID_ADDRESS, g_Msg_ERR_INVALID_ADDRESS);
-   }
+    bool initialized_ = false;
+    double firmwareVersion_ = 0.0; // firmware version
+    std::string firmwareDate_;     // firmware compile date
+    std::string firmwareBuild_;    // firmware build name
 };
diff --git a/DeviceAdapters/ASITiger/ASICRISP.cpp b/DeviceAdapters/ASITiger/ASICRISP.cpp
index c7e8c209c..751a2e86e 100644
--- a/DeviceAdapters/ASITiger/ASICRISP.cpp
+++ b/DeviceAdapters/ASITiger/ASICRISP.cpp
@@ -27,7 +27,6 @@
 #include "DeviceBase.h"
 #include "MMDevice.h"
 
-
 // shared properties not implemented for CRISP because as of mid-2017 only can have one per card
 
 namespace {
@@ -65,11 +64,8 @@ constexpr char SetLockOffset[] = "Set Lock Offset (Advanced Users Only)";
 namespace Props = Properties;
 } // namespace
 
-
 CCRISP::CCRISP(const char* name) :
-    ASIPeripheralBase<::CAutoFocusBase, CCRISP>(name),
-    axisLetter_(g_EmptyAxisLetterStr), // value determined by extended name
-    waitAfterLock_(1000) {
+    ASIPeripheralBase<::CAutoFocusBase, CCRISP>(name) {
 
     // only set up these properties if we have the required information in the name
     if (IsExtendedName(name)) {
diff --git a/DeviceAdapters/ASITiger/ASICRISP.h b/DeviceAdapters/ASITiger/ASICRISP.h
index fbe8cf648..99072252f 100644
--- a/DeviceAdapters/ASITiger/ASICRISP.h
+++ b/DeviceAdapters/ASITiger/ASICRISP.h
@@ -29,7 +29,6 @@
 #include <string>
 #include <string_view>
 
-
 // The serial command set for a device property.
 struct Command {
     const std::string get;      // read from hardware (e.g. "2LR Z?")
@@ -97,7 +96,6 @@ class CCRISP : public ASIPeripheralBase<CAutoFocusBase, CCRISP> {
     int OnLEDIntensity(MM::PropertyBase* pProp, MM::ActionType eAct);
     int OnLoopGainMultiplier(MM::PropertyBase* pProp, MM::ActionType eAct);
     int OnNumAvg(MM::PropertyBase* pProp, MM::ActionType eAct);
-    int OnLogAmpAGC(MM::PropertyBase* pProp, MM::ActionType eAct);
     int OnNumSkips(MM::PropertyBase* pProp, MM::ActionType eAct);
     int OnInFocusRange(MM::PropertyBase* pProp, MM::ActionType eAct);
 
@@ -126,9 +124,9 @@ class CCRISP : public ASIPeripheralBase<CAutoFocusBase, CCRISP> {
     void CreateSetLogAmpAGCProperty();
     void CreateSetLockOffsetProperty();
 
-    std::string axisLetter_;
-    std::string focusState_;
-    long waitAfterLock_;
+    std::string axisLetter_ = g_EmptyAxisLetterStr; // value determined by extended name
+    std::string focusState_ = g_CRISP_Unknown; // read from controller
+    long waitAfterLock_ = 1000;
 
     // The CommandTable is created in Initialize() once we know the card address and firmware version.
     // std::optional allows the table to be late-initialized while keeping its members const for immutability.

From 73beb02b637a1d3d96575a723a8fe1dcae6c90ee Mon Sep 17 00:00:00 2001
From: Brandon <brandon@asiimaging.com>
Date: Tue, 26 May 2026 14:22:44 -0700
Subject: [PATCH 4/9] ASITiger: use more in-class member initialization

---
 DeviceAdapters/ASITiger/ASICRISP.h        |   2 +-
 DeviceAdapters/ASITiger/ASIClocked.cpp    |   2 -
 DeviceAdapters/ASITiger/ASIDac.cpp        |  21 +---
 DeviceAdapters/ASITiger/ASIDac.h          | 131 +++++++++++-----------
 DeviceAdapters/ASITiger/ASIDacXYStage.cpp |   3 +-
 DeviceAdapters/ASITiger/ASIFWheel.cpp     |  27 +----
 DeviceAdapters/ASITiger/ASIFWheel.h       |  12 +-
 DeviceAdapters/ASITiger/ASITigerComm.cpp  |  13 +--
 DeviceAdapters/ASITiger/ASITigerComm.h    |   1 -
 9 files changed, 86 insertions(+), 126 deletions(-)

diff --git a/DeviceAdapters/ASITiger/ASICRISP.h b/DeviceAdapters/ASITiger/ASICRISP.h
index 99072252f..0073fdeb2 100644
--- a/DeviceAdapters/ASITiger/ASICRISP.h
+++ b/DeviceAdapters/ASITiger/ASICRISP.h
@@ -125,7 +125,7 @@ class CCRISP : public ASIPeripheralBase<CAutoFocusBase, CCRISP> {
     void CreateSetLockOffsetProperty();
 
     std::string axisLetter_ = g_EmptyAxisLetterStr; // value determined by extended name
-    std::string focusState_ = g_CRISP_Unknown; // read from controller
+    std::string focusState_ = g_CRISP_Unknown; // will read actual focus state
     long waitAfterLock_ = 1000;
 
     // The CommandTable is created in Initialize() once we know the card address and firmware version.
diff --git a/DeviceAdapters/ASITiger/ASIClocked.cpp b/DeviceAdapters/ASITiger/ASIClocked.cpp
index b7c0a3f0e..f4129c47f 100644
--- a/DeviceAdapters/ASITiger/ASIClocked.cpp
+++ b/DeviceAdapters/ASITiger/ASIClocked.cpp
@@ -19,8 +19,6 @@
 //
 // AUTHOR:        Jon Daniels (jon@asiimaging.com) 09/2013
 //
-// BASED ON:      ASIStage.cpp and others
-//
 
 #include "ASITiger.h"
 #include "ASIClocked.h"
diff --git a/DeviceAdapters/ASITiger/ASIDac.cpp b/DeviceAdapters/ASITiger/ASIDac.cpp
index 19c1c0b7d..6e481397d 100644
--- a/DeviceAdapters/ASITiger/ASIDac.cpp
+++ b/DeviceAdapters/ASITiger/ASIDac.cpp
@@ -19,8 +19,6 @@
 //
 // AUTHOR:        Vikram Kopuri (vik@asiimaging.com) 08/2019
 //
-// BASED ON:      ASILED.c, ASIPmt.c and others
-//
 
 #include "ASIDac.h"
 #include "ASITiger.h"
@@ -35,23 +33,10 @@
 #include <string>
 #include <vector>
 
-
-///////////////////////////////////////////////////////////////////////////////
-// CDAC
-//
 CDAC::CDAC(const char* name) :
-	ASIPeripheralBase< ::CSignalIOBase, CDAC >(name),
-	unitMult_(g_DACDefaultUnitMult),   // later will try to read actual setting
-	axisLetter_(g_EmptyAxisLetterStr), // value determined by extended name
-	maxvolts_(0.0),
-	minvolts_(0.0),
-	ring_buffer_supported_(false),
-	ring_buffer_capacity_(0),
-	ttl_trigger_supported_(false),
-	ttl_trigger_enabled_(false)
-{
-	if (IsExtendedName(name))  // only set up these properties if we have the required information in the name
-	{
+	ASIPeripheralBase< ::CSignalIOBase, CDAC >(name) {
+	// only set up these properties if we have the required information in the name
+	if (IsExtendedName(name)) {
 		axisLetter_ = GetAxisLetterFromExtName(name);
 		CreateProperty(g_AxisLetterPropertyName, axisLetter_.c_str(), MM::String, true);
 	}
diff --git a/DeviceAdapters/ASITiger/ASIDac.h b/DeviceAdapters/ASITiger/ASIDac.h
index 51dcb9caa..02cd902b7 100644
--- a/DeviceAdapters/ASITiger/ASIDac.h
+++ b/DeviceAdapters/ASITiger/ASIDac.h
@@ -26,85 +26,82 @@
 #include "MMDevice.h"
 #include "DeviceBase.h"
 
-class CDAC : public ASIPeripheralBase<CSignalIOBase, CDAC>
-{
+class CDAC : public ASIPeripheralBase<CSignalIOBase, CDAC> {
 public:
     explicit CDAC(const char* name);
     ~CDAC() = default;
 
-	// Device API
-	int Initialize();
-	bool Busy() { return false; };
+    // Device API
+    int Initialize();
+    bool Busy() { return false; };
 
-	// DAC API
-	int SetGateOpen(bool open);
-	int GetGateOpen(bool& open);
-	int SetSignal(double volts);
-	int GetSignal(double& volts);
-	int GetLimits(double& minVolts, double& maxVolts);
+    // DAC API
+    int SetGateOpen(bool open);
+    int GetGateOpen(bool& open);
+    int SetSignal(double volts);
+    int GetSignal(double& volts);
+    int GetLimits(double& minVolts, double& maxVolts);
 
-	// Sequence commands ie Ring Buffer needs TTL 
-	
-	int IsDASequenceable(bool& isSequenceable) const { isSequenceable = ttl_trigger_enabled_; return DEVICE_OK; }
-	int GetDASequenceMaxLength(long &nrEvents) const { nrEvents = ring_buffer_capacity_; return DEVICE_OK; }
-	int StartDASequence();
-	int StopDASequence();
-	int ClearDASequence();
-	int AddToDASequence(double voltage);
-	int SendDASequence();
+    // Sequence commands ie Ring Buffer needs TTL
+    int IsDASequenceable(bool& isSequenceable) const { isSequenceable = ttl_trigger_enabled_; return DEVICE_OK; }
+    int GetDASequenceMaxLength(long &nrEvents) const { nrEvents = ring_buffer_capacity_; return DEVICE_OK; }
+    int StartDASequence();
+    int StopDASequence();
+    int ClearDASequence();
+    int AddToDASequence(double voltage);
+    int SendDASequence();
 
-	// action interface
-	int OnSaveCardSettings(MM::PropertyBase* pProp, MM::ActionType eAct);
-	int OnRefreshProperties(MM::PropertyBase* pProp, MM::ActionType eAct);
+    // action interface
+    int OnSaveCardSettings(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnRefreshProperties(MM::PropertyBase* pProp, MM::ActionType eAct);
 
-	//Signal DAC specific properties
-	int OnDACMode(MM::PropertyBase* pProp, MM::ActionType eAct);
-	int OnDACVoltage(MM::PropertyBase* pProp, MM::ActionType eAct);
-	int OnDACGate(MM::PropertyBase* pProp, MM::ActionType eAct);
-	int OnCutoffFreq(MM::PropertyBase* pProp, MM::ActionType eAct);
+    //Signal DAC specific properties
+    int OnDACMode(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnDACVoltage(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnDACGate(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnCutoffFreq(MM::PropertyBase* pProp, MM::ActionType eAct);
 
-	// single axis properties
-	int OnSAAmplitude(MM::PropertyBase* pProp, MM::ActionType eAct);
-	int OnSAOffset(MM::PropertyBase* pProp, MM::ActionType eAct);
-	int OnSAPeriod(MM::PropertyBase* pProp, MM::ActionType eAct);
-	int OnSAMode(MM::PropertyBase* pProp, MM::ActionType eAct);
-	int OnSAPattern(MM::PropertyBase* pProp, MM::ActionType eAct);
-	int OnSAAdvanced(MM::PropertyBase* pProp, MM::ActionType eAct);
-	int OnSAClkSrc(MM::PropertyBase* pProp, MM::ActionType eAct);
-	int OnSAClkPol(MM::PropertyBase* pProp, MM::ActionType eAct);
-	int OnSATTLOut(MM::PropertyBase* pProp, MM::ActionType eAct);
-	int OnSATTLPol(MM::PropertyBase* pProp, MM::ActionType eAct);
-	int OnSAPatternByte(MM::PropertyBase* pProp, MM::ActionType eAct);
+    // single axis properties
+    int OnSAAmplitude(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnSAOffset(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnSAPeriod(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnSAMode(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnSAPattern(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnSAAdvanced(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnSAClkSrc(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnSAClkPol(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnSATTLOut(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnSATTLPol(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnSAPatternByte(MM::PropertyBase* pProp, MM::ActionType eAct);
 
-	// ring buffer properties
-	int OnRBDelayBetweenPoints(MM::PropertyBase* pProp, MM::ActionType eAct);
-	int OnRBMode(MM::PropertyBase* pProp, MM::ActionType eAct);
-	int OnRBTrigger(MM::PropertyBase* pProp, MM::ActionType eAct);
-	int OnRBRunning(MM::PropertyBase* pProp, MM::ActionType eAct);
-	int OnUseSequence(MM::PropertyBase* pProp, MM::ActionType eAct);
-	int OnRBSequenceState(MM::PropertyBase* pProp, MM::ActionType eAct);
-	int OnAddtoRBSequence(MM::PropertyBase* pProp, MM::ActionType eAct);
-	
-	//Others
-	int OnTTLin(MM::PropertyBase* pProp, MM::ActionType eAct);
-	int OnTTLout(MM::PropertyBase* pProp, MM::ActionType eAct);
+    // ring buffer properties
+    int OnRBDelayBetweenPoints(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnRBMode(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnRBTrigger(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnRBRunning(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnUseSequence(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnRBSequenceState(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnAddtoRBSequence(MM::PropertyBase* pProp, MM::ActionType eAct);
+
+    int OnTTLin(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnTTLout(MM::PropertyBase* pProp, MM::ActionType eAct);
 
 private:
-	int GetMaxVolts(double& volts);
-	int GetMinVolts(double& volts);
-	int SetSignalmv(double millivolts);
-	int GetSignalmv(double& millivolts);
+    int GetMaxVolts(double& volts);
+    int GetMinVolts(double& volts);
+    int SetSignalmv(double millivolts);
+    int GetSignalmv(double& millivolts);
 
-	// Properties
-	void CreateSingleAxisRiseTimeProperty();
+    // Properties
+    void CreateSingleAxisRiseTimeProperty();
 
-	double unitMult_;
-	std::string axisLetter_;
-	double maxvolts_;
-	double minvolts_;
-	bool ring_buffer_supported_;
-	long ring_buffer_capacity_;
-	bool ttl_trigger_supported_;
-	bool ttl_trigger_enabled_;
-	std::vector<double> sequence_; // carries data in volts
+    std::string axisLetter_ = g_EmptyAxisLetterStr; // value determined by extended name
+    double unitMult_ = g_DACDefaultUnitMult; // will read actual unit multiplier
+    double maxvolts_ = 0.0;
+    double minvolts_ = 0.0;
+    long ring_buffer_capacity_ = 0;
+    bool ring_buffer_supported_ = false;
+    bool ttl_trigger_supported_ = false;
+    bool ttl_trigger_enabled_ = false;
+    std::vector<double> sequence_; // carries data in volts
 };
diff --git a/DeviceAdapters/ASITiger/ASIDacXYStage.cpp b/DeviceAdapters/ASITiger/ASIDacXYStage.cpp
index 257198f85..a150df742 100644
--- a/DeviceAdapters/ASITiger/ASIDacXYStage.cpp
+++ b/DeviceAdapters/ASITiger/ASIDacXYStage.cpp
@@ -19,8 +19,7 @@
 //
 // AUTHOR:        Brandon Simpson (brandon@asiimaging.com) 2/2022
 //
-// BASED ON:      ASIStage.cpp and others
-//
+
 
 #include "ASIDacXYStage.h"
 #include "ASITiger.h"
diff --git a/DeviceAdapters/ASITiger/ASIFWheel.cpp b/DeviceAdapters/ASITiger/ASIFWheel.cpp
index a16552025..c5975badc 100644
--- a/DeviceAdapters/ASITiger/ASIFWheel.cpp
+++ b/DeviceAdapters/ASITiger/ASIFWheel.cpp
@@ -19,8 +19,6 @@
 //
 // AUTHOR:        Jon Daniels (jon@asiimaging.com) 09/2013
 //
-// BASED ON:      ASIStage.cpp and others
-//
 
 #include "ASITiger.h"
 #include "ASIFWheel.h"
@@ -32,28 +30,15 @@
 #include <vector>
 #include <string>
 
-
 // shared properties not implemented for filter wheel except for save settings because no shared properties
 
-///////////////////////////////////////////////////////////////////////////////
-// CFWheel
-//
-
-// initialize static member
-std::string CFWheel::selectedWheel_ = g_EmptyAxisLetterStr;
-
 CFWheel::CFWheel(const char* name) :
-   ASIPeripheralBase< ::CStateDeviceBase, CFWheel >(name),
-   numPositions_(0),  // will read actual number of positions
-   curPosition_(0),   // will read actual position
-   spinning_(false),
-   wheelNumber_(g_EmptyAxisLetterStr)  // 0..9 for filter wheels instead of A..Z
-{
-   if (IsExtendedName(name))  // only set up these properties if we have the required information in the name
-   {
-      wheelNumber_ = GetAxisLetterFromExtName(name);
-      CreateProperty(g_AxisLetterPropertyName, wheelNumber_.c_str(), MM::String, true);
-   }
+    ASIPeripheralBase< ::CStateDeviceBase, CFWheel >(name) {
+    // only set up these properties if we have the required information in the name
+    if (IsExtendedName(name)) {
+        wheelNumber_ = GetAxisLetterFromExtName(name);
+        CreateProperty(g_AxisLetterPropertyName, wheelNumber_.c_str(), MM::String, true);
+    }
 }
 
 int CFWheel::Initialize()
diff --git a/DeviceAdapters/ASITiger/ASIFWheel.h b/DeviceAdapters/ASITiger/ASIFWheel.h
index 53c5e7525..8b7e2095e 100644
--- a/DeviceAdapters/ASITiger/ASIFWheel.h
+++ b/DeviceAdapters/ASITiger/ASIFWheel.h
@@ -55,9 +55,11 @@ class CFWheel : public ASIPeripheralBase<CStateDeviceBase, CFWheel>
     int SelectWheel();
     void ForcePropertyRefresh();
 
-   unsigned int numPositions_;
-   unsigned int curPosition_;
-   bool spinning_;
-   std::string wheelNumber_;
-   static std::string selectedWheel_; // which wheel is currently selected, shared among all instances of this class
+    // currently selected wheel, shared among all instances of this class
+    inline static std::string selectedWheel_ = g_EmptyAxisLetterStr;
+
+    std::string wheelNumber_ = g_EmptyAxisLetterStr; // 0..9 for filter wheels instead of A..Z
+    unsigned int numPositions_ = 0; // will read actual number of positions
+    unsigned int curPosition_ = 0;  // will read actual position
+    bool spinning_ = false;
 };
diff --git a/DeviceAdapters/ASITiger/ASITigerComm.cpp b/DeviceAdapters/ASITiger/ASITigerComm.cpp
index 23741755f..c6b83930c 100644
--- a/DeviceAdapters/ASITiger/ASITigerComm.cpp
+++ b/DeviceAdapters/ASITiger/ASITigerComm.cpp
@@ -22,21 +22,16 @@
 
 #include "ASITiger.h"
 #include "ASITigerComm.h"
-#include <cstdio>
-#include <string>
 #include "MMDevice.h"
 #include "DeviceBase.h"
 #include "ModuleInterface.h"
+#include <cstdio>
 #include <iostream>
+#include <string>
 #include <vector>
 
-
-///////////////////////////////////////////////////////////////////////////////
-// CTigerHub implementation
-//
-CTigerCommHub::CTigerCommHub()
-{
-   CreateProperty(MM::g_Keyword_Name, g_TigerCommHubName, MM::String, true);
+CTigerCommHub::CTigerCommHub() {
+    CreateProperty(MM::g_Keyword_Name, g_TigerCommHubName, MM::String, true);
 }
 
 int CTigerCommHub::Initialize()
diff --git a/DeviceAdapters/ASITiger/ASITigerComm.h b/DeviceAdapters/ASITiger/ASITigerComm.h
index b8e5f94be..c1ac17971 100644
--- a/DeviceAdapters/ASITiger/ASITigerComm.h
+++ b/DeviceAdapters/ASITiger/ASITigerComm.h
@@ -26,7 +26,6 @@
 #include "MMDevice.h"
 #include "DeviceBase.h"
 
-
 ///////////////////////////////////////////////////////
 // ***** TIGER-specific *******************************
 ///////////////////////////////////////////////////////

From 4fd7742eb360caa988ba0b329fdd13e769639059 Mon Sep 17 00:00:00 2001
From: Brandon <brandon@asiimaging.com>
Date: Tue, 26 May 2026 17:26:38 -0700
Subject: [PATCH 5/9] ASITiger: finish in-class member initializers

---
 DeviceAdapters/ASITiger/ASICRISP.cpp        |  1 -
 DeviceAdapters/ASITiger/ASIDacXYStage.cpp   | 20 +------
 DeviceAdapters/ASITiger/ASIDacXYStage.h     | 27 +++++----
 DeviceAdapters/ASITiger/ASIHub.cpp          | 19 +-----
 DeviceAdapters/ASITiger/ASIHub.h            | 30 +++++-----
 DeviceAdapters/ASITiger/ASILED.cpp          | 26 ++-------
 DeviceAdapters/ASITiger/ASILED.h            | 42 +++++++-------
 DeviceAdapters/ASITiger/ASILens.cpp         | 26 +++------
 DeviceAdapters/ASITiger/ASILens.h           | 16 +++---
 DeviceAdapters/ASITiger/ASIPLogic.cpp       | 37 ++++--------
 DeviceAdapters/ASITiger/ASIPLogic.h         | 55 +++++++++---------
 DeviceAdapters/ASITiger/ASIPeripheralBase.h | 43 ++++++--------
 DeviceAdapters/ASITiger/ASIPiezo.cpp        | 25 ++------
 DeviceAdapters/ASITiger/ASIPiezo.h          | 21 ++++---
 DeviceAdapters/ASITiger/ASIPmt.cpp          | 36 ++++--------
 DeviceAdapters/ASITiger/ASIPmt.h            | 15 ++---
 DeviceAdapters/ASITiger/ASIScanner.cpp      | 64 +++++----------------
 DeviceAdapters/ASITiger/ASIScanner.h        | 57 +++++++++---------
 DeviceAdapters/ASITiger/ASITiger.cpp        |  3 -
 DeviceAdapters/ASITiger/ASIXYStage.cpp      | 37 +++---------
 DeviceAdapters/ASITiger/ASIXYStage.h        | 34 ++++++-----
 DeviceAdapters/ASITiger/ASIZStage.cpp       | 29 ++--------
 DeviceAdapters/ASITiger/ASIZStage.h         | 26 ++++-----
 23 files changed, 252 insertions(+), 437 deletions(-)

diff --git a/DeviceAdapters/ASITiger/ASICRISP.cpp b/DeviceAdapters/ASITiger/ASICRISP.cpp
index 751a2e86e..9edb60bce 100644
--- a/DeviceAdapters/ASITiger/ASICRISP.cpp
+++ b/DeviceAdapters/ASITiger/ASICRISP.cpp
@@ -66,7 +66,6 @@ namespace Props = Properties;
 
 CCRISP::CCRISP(const char* name) :
     ASIPeripheralBase<::CAutoFocusBase, CCRISP>(name) {
-
     // only set up these properties if we have the required information in the name
     if (IsExtendedName(name)) {
         axisLetter_ = GetAxisLetterFromExtName(name);
diff --git a/DeviceAdapters/ASITiger/ASIDacXYStage.cpp b/DeviceAdapters/ASITiger/ASIDacXYStage.cpp
index a150df742..823fbd263 100644
--- a/DeviceAdapters/ASITiger/ASIDacXYStage.cpp
+++ b/DeviceAdapters/ASITiger/ASIDacXYStage.cpp
@@ -20,7 +20,6 @@
 // AUTHOR:        Brandon Simpson (brandon@asiimaging.com) 2/2022
 //
 
-
 #include "ASIDacXYStage.h"
 #include "ASITiger.h"
 #include "ASIHub.h"
@@ -32,22 +31,9 @@
 #include <string>
 
 CDACXYStage::CDACXYStage(const char* name) :
-	ASIPeripheralBase< ::CXYStageBase, CDACXYStage >(name),
-	axisLetterX_(g_EmptyAxisLetterStr),    // value determined by extended name
-	axisLetterY_(g_EmptyAxisLetterStr),    // value determined by extended name
-	maxvoltsX_(0.0), // X axis limits
-	minvoltsX_(0.0),
-	maxvoltsY_(0.0), // Y axis limits
-	minvoltsY_(0.0),
-	ring_buffer_supported_(false),
-	ring_buffer_capacity_(0),
-	ttl_trigger_supported_(false),
-	ttl_trigger_enabled_(false),
-	umToMvX_(1),
-	umToMvY_(1)
-{
-	if (IsExtendedName(name))  // only set up these properties if we have the required information in the name
-	{
+	ASIPeripheralBase< ::CXYStageBase, CDACXYStage >(name) {
+	// only set up these properties if we have the required information in the name
+	if (IsExtendedName(name)) {
 		axisLetterX_ = GetAxisLetterFromExtName(name);
 		CreateProperty(g_AxisLetterXPropertyName, axisLetterX_.c_str(), MM::String, true);
 		axisLetterY_ = GetAxisLetterFromExtName(name, 1);
diff --git a/DeviceAdapters/ASITiger/ASIDacXYStage.h b/DeviceAdapters/ASITiger/ASIDacXYStage.h
index a6cee0601..03d9b5f94 100644
--- a/DeviceAdapters/ASITiger/ASIDacXYStage.h
+++ b/DeviceAdapters/ASITiger/ASIDacXYStage.h
@@ -26,8 +26,7 @@
 #include "MMDevice.h"
 #include "DeviceBase.h"
 
-class CDACXYStage : public ASIPeripheralBase<CXYStageBase, CDACXYStage>
-{
+class CDACXYStage : public ASIPeripheralBase<CXYStageBase, CDACXYStage> {
 public:
     explicit CDACXYStage(const char* name);
     ~CDACXYStage() = default;
@@ -150,18 +149,18 @@ class CDACXYStage : public ASIPeripheralBase<CXYStageBase, CDACXYStage>
 	// Properties
 	void CreateSingleAxisRiseTimeProperty(const char axisChar, std::string axisLetter);
 
-	std::string axisLetterX_;
-	std::string axisLetterY_;
-	double maxvoltsX_; // X axis limits
-	double minvoltsX_;
-	double maxvoltsY_; // Y axis limits
-	double minvoltsY_;
-	bool ring_buffer_supported_;
-	long ring_buffer_capacity_;
-	bool ttl_trigger_supported_;
-	bool ttl_trigger_enabled_;
-	long umToMvX_; // microns to millivolts conversion factors
-	long umToMvY_;
+	std::string axisLetterX_ = g_EmptyAxisLetterStr; // value determined by extended name
+	std::string axisLetterY_ = g_EmptyAxisLetterStr; // value determined by extended name
+	double maxvoltsX_ = 0.0; // X axis limits
+	double minvoltsX_ = 0.0;
+	double maxvoltsY_ = 0.0; // Y axis limits
+	double minvoltsY_ = 0.0;
+	long ring_buffer_capacity_ = 0;
+	bool ring_buffer_supported_ = false;
+	bool ttl_trigger_supported_ = false;
+	bool ttl_trigger_enabled_ = false;
+	long umToMvX_ = 1; // microns to millivolts conversion factors
+	long umToMvY_ = 1;
 	std::vector<double> sequenceX_;
 	std::vector<double> sequenceY_;
 };
diff --git a/DeviceAdapters/ASITiger/ASIHub.cpp b/DeviceAdapters/ASITiger/ASIHub.cpp
index e967bbe46..d5f141471 100644
--- a/DeviceAdapters/ASITiger/ASIHub.cpp
+++ b/DeviceAdapters/ASITiger/ASIHub.cpp
@@ -30,23 +30,10 @@
 #include <string>
 #include <vector>
 
-
-///////////////////////////////////////////////////////////////////////////////
-// ASIHub implementation
-// this implements serial communication, and could be used as parent class
-//   for future hubs besides TigerComm
+// ASIHub implements serial communication
 ASIHub::ASIHub() :
-      ASIBase< ::HubBase, ASIHub >(""), // do not pass a name
-      port_("Undefined"),
-      serialAnswer_(""),
-      manualSerialAnswer_(""),
-      serialCommand_(""),
-      serialTerminator_(g_SerialTerminatorDefault),
-      serialRepeatDuration_(0),
-      serialRepeatPeriod_(500),
-      serialOnlySendChanged_(true),
-      updatingSharedProperties_(false)
-{
+    ASIBase< ::HubBase, ASIHub >("") { // Note: do not pass a name
+
    CPropertyAction* pAct = new CPropertyAction(this, &ASIHub::OnPort);
    CreateProperty(MM::g_Keyword_Port, "Undefined", MM::String, false, pAct, true);
 
diff --git a/DeviceAdapters/ASITiger/ASIHub.h b/DeviceAdapters/ASITiger/ASIHub.h
index 798b9b7f7..43a0aaf87 100644
--- a/DeviceAdapters/ASITiger/ASIHub.h
+++ b/DeviceAdapters/ASITiger/ASIHub.h
@@ -28,7 +28,6 @@
 #include "DeviceThreads.h"
 #include <string>
 
-
 ////////////////////////////////////////////////////////////////
 // *********** generic ASI comm class *************************
 // implements a "hub" device with communication abilities
@@ -38,8 +37,7 @@
 // inherits from this class.
 ////////////////////////////////////////////////////////////////
 
-class ASIHub : public ASIBase<HubBase, ASIHub>
-{
+class ASIHub : public ASIBase<HubBase, ASIHub> {
 public:
     explicit ASIHub();
     ~ASIHub() = default;
@@ -147,7 +145,7 @@ class ASIHub : public ASIBase<HubBase, ASIHub>
    int OnSerialCommandOnlySendChanged(MM::PropertyBase* pProp, MM::ActionType eAct);
 
 protected:
-   std::string port_;         // port to use for communication
+    std::string port_ = "Undefined"; // serial port to use for communication
 
 private:
 	int ParseErrorReply() const;
@@ -156,15 +154,17 @@ class ASIHub : public ASIBase<HubBase, ASIHub>
 	static std::vector<char> ConvertStringVector2CharVector(const std::vector<std::string> &v);
 	static std::vector<int> ConvertStringVector2IntVector(const std::vector<std::string> &v);
 
-   std::string serialAnswer_;      // the last answer received from any communication with the controller
-   std::string manualSerialAnswer_; // last answer received when the SerialCommand property was used
-   std::string serialCommand_;     // the last command sent, or can be set for calling commands without args
-   std::string serialTerminator_;  // only used when parsing command sent via OnSerialCommand action handler
-   long serialRepeatDuration_; // for how long total time the command is repeatedly sent
-   long serialRepeatPeriod_;  // how often in ms the command is sent
-   bool serialOnlySendChanged_;        // if true the serial command is only sent when it has changed
-   MMThreadLock threadLock_;  // used to lock thread during serial transaction
-   bool updatingSharedProperties_;
-   std::map<std::string, std::string> deviceMap_;  // to implement properties shared between devices
-        // key is the device name, value is the Tiger address (normally a single character, see note about addressChar_ in ASIPeripheralBase
+    MMThreadLock threadLock_; // used to lock thread during serial transaction
+
+    std::map<std::string, std::string> deviceMap_; // to implement properties shared between devices
+    // key is the device name, value is the Tiger address (normally a single character, see note about addressChar_ in ASIPeripheralBase
+
+    std::string serialAnswer_;       // last answer received from any communication with the controller
+    std::string manualSerialAnswer_; // last answer received when the SerialCommand property was used
+    std::string serialCommand_;      // last command sent, or can be set for calling commands without args
+    std::string serialTerminator_ = g_SerialTerminatorDefault; // only used when parsing command sent via OnSerialCommand action handler
+    long serialRepeatDuration_ = 0; // for how long total time the command is repeatedly sent
+    long serialRepeatPeriod_ = 500; // how often in ms the command is sent
+    bool serialOnlySendChanged_ = true; // if true the serial command is only sent when it has changed
+    bool updatingSharedProperties_ = false;
 };
diff --git a/DeviceAdapters/ASITiger/ASILED.cpp b/DeviceAdapters/ASITiger/ASILED.cpp
index e814d1adf..ce8418382 100644
--- a/DeviceAdapters/ASITiger/ASILED.cpp
+++ b/DeviceAdapters/ASITiger/ASILED.cpp
@@ -19,9 +19,6 @@
 //
 // AUTHOR:        Jon Daniels (jon@asiimaging.com) 05/2014
 //
-// BASED ON:      ASIStage.cpp and others
-//
-
 
 #include "ASILED.h"
 #include "ASITiger.h"
@@ -36,25 +33,14 @@
 #include <string>
 #include <vector>
 
-
-///////////////////////////////////////////////////////////////////////////////
-// CLED
-//
 CLED::CLED(const char* name) :
-   ASIPeripheralBase< ::CShutterBase, CLED >(name),
-   open_(false),
-   intensity_(50),
-   channel_(0),  // 0 for LED on 2-axis card
-   channelAxisChar_('X'),
-   stablight_(false)
-{
-   //Figure out what channel we are on
-   if (IsExtendedName(name))  // only set up these properties if we have the required information in the name
-   {
-      channel_= GetChannelFromExtName(name);
-   }
+    ASIPeripheralBase< ::CShutterBase, CLED >(name) {
+    // only set up these properties if we have the required information in the name
+    if (IsExtendedName(name)) {
+        channel_= GetChannelFromExtName(name); // figure out what channel we are on
+    }
 
-   //Pick AxisChar to use.
+    // select axis character
    switch(channel_)
    {
    case 2:
diff --git a/DeviceAdapters/ASITiger/ASILED.h b/DeviceAdapters/ASITiger/ASILED.h
index ec4263e75..53d6b59b5 100644
--- a/DeviceAdapters/ASITiger/ASILED.h
+++ b/DeviceAdapters/ASITiger/ASILED.h
@@ -26,33 +26,33 @@
 #include "MMDevice.h"
 #include "DeviceBase.h"
 
-class CLED : public ASIPeripheralBase<CShutterBase, CLED>
-{
+class CLED : public ASIPeripheralBase<CShutterBase, CLED> {
 public:
     explicit CLED(const char* name);
     ~CLED() = default;
 
-   // Device API
-   int Initialize();
-   bool Busy() { return false; }
+    // Device API
+    int Initialize();
+    bool Busy() { return false; }
 
-   // Shutter API
-   int SetOpen(bool open = true);
-   int GetOpen(bool& open);
-   int Fire(double /*deltaT*/) { return DEVICE_UNSUPPORTED_COMMAND;  }
+    // Shutter API
+    int SetOpen(bool open = true);
+    int GetOpen(bool& open);
+    int Fire(double /*deltaT*/) { return DEVICE_UNSUPPORTED_COMMAND;  }
 
-   // action interface
-   int OnSaveCardSettings     (MM::PropertyBase* pProp, MM::ActionType eAct);
-   int OnRefreshProperties    (MM::PropertyBase* pProp, MM::ActionType eAct);
-   int OnIntensity            (MM::PropertyBase* pProp, MM::ActionType eAct);
-   int OnState                (MM::PropertyBase* pProp, MM::ActionType eAct);
-   int OnCurrentLimit         (MM::PropertyBase* pProp, MM::ActionType eAct);
+    // action interface
+    int OnSaveCardSettings(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnRefreshProperties(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnIntensity(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnState(MM::PropertyBase* pProp, MM::ActionType eAct);
+    int OnCurrentLimit(MM::PropertyBase* pProp, MM::ActionType eAct);
 
 private:
-   bool open_;       // true when LED turned on
-   int intensity_;   // intensity from 1 to 100 (controller reports 0 intensity if off, we use that to set open_)
-   int channel_;     // 0 for LED on 2-axis card, 1-4 for TGLED card
-   char channelAxisChar_;
-   bool stablight_;
-   int UpdateOpenIntensity();
+    int UpdateOpenIntensity();
+
+    bool open_ = false;  // true when LED turned on
+    int intensity_ = 50; // intensity from 1 to 100 (controller reports 0 intensity if off, we use that to set open_)
+    int channel_ = 0;    // 0 for LED on 2-axis card, 1-4 for TGLED card
+    char channelAxisChar_ = 'X';
+    bool stablight_ = false;
 };
diff --git a/DeviceAdapters/ASITiger/ASILens.cpp b/DeviceAdapters/ASITiger/ASILens.cpp
index 4c27250db..36b91dd58 100644
--- a/DeviceAdapters/ASITiger/ASILens.cpp
+++ b/DeviceAdapters/ASITiger/ASILens.cpp
@@ -18,7 +18,7 @@
 //                INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES.
 //
 // AUTHOR:        Jon Daniels (jon@asiimaging.com) 09/2013
-//				  Modified for Tunable lens by Vik (vik@asiimaging.com)	05/2017
+//                Modified for Tunable lens by Vik (vik@asiimaging.com)	05/2017
 //
 
 #include "ASILens.h"
@@ -34,25 +34,13 @@
 #include <string>
 #include <vector>
 
-
-///////////////////////////////////////////////////////////////////////////////
-// CLens
-//
 CLens::CLens(const char* name) :
-   ASIPeripheralBase< ::CStageBase, CLens >(name),
-   axisLetter_(g_EmptyAxisLetterStr),  // value determined by extended name
-   unitMult_(g_StageDefaultUnitMult),  // later will try to read actual setting
-   stepSizeUm_(g_StageMinStepSize),    // we'll use 1 nm as our smallest possible step size, this is somewhat arbitrary and doesn't change during the program
-   ring_buffer_supported_(false),
-   ring_buffer_capacity_(0),
-   ttl_trigger_supported_(false),
-   ttl_trigger_enabled_(false)
-{
-   if (IsExtendedName(name))  // only set up these properties if we have the required information in the name
-   {
-      axisLetter_ = GetAxisLetterFromExtName(name);
-      CreateProperty(g_AxisLetterPropertyName, axisLetter_.c_str(), MM::String, true);
-   }
+    ASIPeripheralBase< ::CStageBase, CLens >(name) {
+    // only set up these properties if we have the required information in the name
+    if (IsExtendedName(name)) {
+        axisLetter_ = GetAxisLetterFromExtName(name);
+        CreateProperty(g_AxisLetterPropertyName, axisLetter_.c_str(), MM::String, true);
+    }
 }
 
 int CLens::Initialize()
diff --git a/DeviceAdapters/ASITiger/ASILens.h b/DeviceAdapters/ASITiger/ASILens.h
index 4e5d2f992..1fef9c954 100644
--- a/DeviceAdapters/ASITiger/ASILens.h
+++ b/DeviceAdapters/ASITiger/ASILens.h
@@ -108,12 +108,12 @@ class CLens : public ASIPeripheralBase<CStageBase, CLens>
     // Properties
     void CreateSingleAxisRiseTimeProperty();
 
-    std::string axisLetter_;
-   double unitMult_;
-   double stepSizeUm_;
-   bool ring_buffer_supported_;
-   long ring_buffer_capacity_;
-   bool ttl_trigger_supported_;
-   bool ttl_trigger_enabled_;
-   std::vector<double> sequence_;
+    std::string axisLetter_ = g_EmptyAxisLetterStr; // value determined by extended name
+    double unitMult_ = g_StageDefaultUnitMult; // later will try to read actual setting
+    double stepSizeUm_ = g_StageMinStepSize; // we'll use 1 nm as our smallest possible step size, this is somewhat arbitrary and doesn't change during the program
+    long ring_buffer_capacity_ = 0;
+    bool ring_buffer_supported_ = false;
+    bool ttl_trigger_supported_ = false;
+    bool ttl_trigger_enabled_ = false;
+    std::vector<double> sequence_;
 };
diff --git a/DeviceAdapters/ASITiger/ASIPLogic.cpp b/DeviceAdapters/ASITiger/ASIPLogic.cpp
index 0d25e14ef..3cc59b677 100644
--- a/DeviceAdapters/ASITiger/ASIPLogic.cpp
+++ b/DeviceAdapters/ASITiger/ASIPLogic.cpp
@@ -19,17 +19,14 @@
 //
 // AUTHOR:        Jon Daniels (jon@asiimaging.com) 10/2014
 //
-// BASED ON:      ASIStage.cpp and others
-//
-
 
 #include "ASIPLogic.h"
 #include "ASITiger.h"
 #include "ASIHub.h"
-#include "../../MMDevice/ModuleInterface.h"
-#include "../../MMDevice/DeviceUtils.h"
-#include "../../MMDevice/DeviceBase.h"
-#include "../../MMDevice/MMDevice.h"
+#include "ModuleInterface.h"
+#include "DeviceUtils.h"
+#include "DeviceBase.h"
+#include "MMDevice.h"
 #include <iostream>
 #include <cmath>
 #include <sstream>
@@ -50,30 +47,18 @@ constexpr unsigned int PLOGIC_PHYSICAL_IO_NUM = PLOGIC_PHYSICAL_IO_END_ADDRESS -
 
 // ASI Tiger Programmable Logic Card
 CPLogic::CPLogic(const char* name) :
-   ASIPeripheralBase< ::CShutterBase, CPLogic >(name),
-   axisLetter_(g_EmptyAxisLetterStr),    // value determined by extended name
-   numCells_(16),
-   currentPosition_(1),
-   useAsdiSPIMShutter_(false),
-   useAs4ChShutter_(false),
-   useAs7ChShutter_(false),
-   shutterOpen_(false),
-   advancedPropsEnabled_(false),
-   editCellUpdates_(true)
-{
-   if (IsExtendedName(name))  // only set up these properties if we have the required information in the name
-   {
-      axisLetter_ = GetAxisLetterFromExtName(name);
-      CreateProperty(g_AxisLetterPropertyName, axisLetter_.c_str(), MM::String, true);
-   }
-
-   CPropertyAction* pAct;
+    ASIPeripheralBase< ::CShutterBase, CPLogic >(name) {
+    // only set up these properties if we have the required information in the name
+    if (IsExtendedName(name)) {
+        axisLetter_ = GetAxisLetterFromExtName(name);
+        CreateProperty(g_AxisLetterPropertyName, axisLetter_.c_str(), MM::String, true);
+    }
 
    // pre-init property to say how PLogic card is used
    // diSPIM shutter has shutter functionality for diSPIM (laser controls on BNCs 5-8)
    // 7-channel shutter has laser controls on BNCs 1-7
    // 7-channel TTL shutter has laser controls on BNCs 1-7 and single camera control on BNC 8
-   pAct = new CPropertyAction (this, &CPLogic::OnPLogicMode);
+   CPropertyAction* pAct = new CPropertyAction(this, &CPLogic::OnPLogicMode);
    CreateProperty(g_PLogicModePropertyName, g_PLogicModeNone, MM::String, false, pAct, true);
    AddAllowedValue(g_PLogicModePropertyName, g_PLogicModeNone);
    AddAllowedValue(g_PLogicModePropertyName, g_PLogicModediSPIMShutter);
diff --git a/DeviceAdapters/ASITiger/ASIPLogic.h b/DeviceAdapters/ASITiger/ASIPLogic.h
index af8738e73..f7dab7685 100644
--- a/DeviceAdapters/ASITiger/ASIPLogic.h
+++ b/DeviceAdapters/ASITiger/ASIPLogic.h
@@ -71,35 +71,34 @@ class CPLogic : public ASIPeripheralBase<CShutterBase, CPLogic>
    int OnIOType               (MM::PropertyBase* pProp, MM::ActionType eAct, long index);
    int OnIOSourceAddress      (MM::PropertyBase* pProp, MM::ActionType eAct, long index);
 
-
 private:
-   std::string axisLetter_;
-   unsigned int numCells_;
-   unsigned int currentPosition_;  // cached value of current position
-   
-   // PLogic Mode Table
-   // --------------------
-   // diSPIM | 4ch | 7ch | (useAsdiSPIMShutter_, useAs4ChShutter_, useAs7ChShutter_)
-   // --------------------
-   //     0  |  0  |  0  | "None"
-   //     1  |  1  |  0  | "diSPIM Shutter"
-   //     0  |  1  |  0  | "Four-channel shutter"
-   //     0  |  0  |  1  | "Seven-channel shutter"
-   //     1  |  0  |  1  | "Seven-channel TTL shutter"
-   bool useAsdiSPIMShutter_;
-   bool useAs4ChShutter_;
-   bool useAs7ChShutter_;
-   // used together with either useAs4ChShutter_ or useAs7ChShutter_,
-   // takes into account address 41 backplane (TTL0 for CameraA)
+    int SetPositionDirectly(unsigned int position);
+    int GetCellPropertyName(long index, const std::string& suffix, char* name);
+    int GetIOPropertyName(long index, const std::string& suffix, char* name);
+    int RefreshAdvancedCellPropertyValues(long index);
+    int RefreshCurrentPosition();
+    int RefreshEditCellPropertyValues();
+
+    std::string axisLetter_ = g_EmptyAxisLetterStr; // value determined by extended name
+    unsigned int numCells_ = 16; // will read actual number of positions later
+    unsigned int currentPosition_ = 1; // cached value of current position
 
-   bool shutterOpen_;
-   bool editCellUpdates_;
-   bool advancedPropsEnabled_; // flag to only create advanced properties once
+    // PLogic Mode Table
+    // --------------------
+    // diSPIM | 4ch | 7ch | (useAsdiSPIMShutter_, useAs4ChShutter_, useAs7ChShutter_)
+    // --------------------
+    //     0  |  0  |  0  | "None"
+    //     1  |  1  |  0  | "diSPIM Shutter"
+    //     0  |  1  |  0  | "Four-channel shutter"
+    //     0  |  0  |  1  | "Seven-channel shutter"
+    //     1  |  0  |  1  | "Seven-channel TTL shutter"
+    bool useAsdiSPIMShutter_ = false;
+    bool useAs4ChShutter_ = false;
+    bool useAs7ChShutter_ = false;
+    // used together with either useAs4ChShutter_ or useAs7ChShutter_,
+    // takes into account address 41 backplane (TTL0 for CameraA)
 
-   int SetPositionDirectly(unsigned int position);
-   int GetCellPropertyName(long index, const std::string& suffix, char* name);
-   int GetIOPropertyName(long index, const std::string& suffix, char* name);
-   int RefreshAdvancedCellPropertyValues(long index);
-   int RefreshCurrentPosition();
-   int RefreshEditCellPropertyValues();
+    bool shutterOpen_ = false;
+    bool editCellUpdates_ = true;
+    bool advancedPropsEnabled_ = false; // flag to only create advanced properties once
 };
diff --git a/DeviceAdapters/ASITiger/ASIPeripheralBase.h b/DeviceAdapters/ASITiger/ASIPeripheralBase.h
index 15fb32ddc..787df585d 100644
--- a/DeviceAdapters/ASITiger/ASIPeripheralBase.h
+++ b/DeviceAdapters/ASITiger/ASIPeripheralBase.h
@@ -29,29 +29,20 @@
 // See ASIBase.h for an explanation of how this class works.
 
 template <template <typename> class TDeviceBase, class UConcreteDevice>
-class ASIPeripheralBase : public ASIBase<TDeviceBase, UConcreteDevice>
-{
+class ASIPeripheralBase : public ASIBase<TDeviceBase, UConcreteDevice> {
 public:
     explicit ASIPeripheralBase(const char* name) :
-      ASIBase<TDeviceBase, UConcreteDevice>(name),
-      hub_(nullptr),
-      addressString_(g_EmptyCardAddressStr),
-      addressChar_(g_EmptyCardAddressChar),
-      refreshProps_(false),
-      refreshOverride_(false)
-   {
-      // sometimes constructor gets called without the full name like in the case of the hub
-      //   so only set up these properties if we have the required information
-      if (IsExtendedName(name))
-      {
-         addressString_ = GetHexAddrFromExtName(name);
-         if (addressString_ != g_EmptyCardAddressStr)
-         {
-            this->CreateProperty(g_TigerHexAddrPropertyName, addressString_.c_str(), MM::String, true);
-            addressChar_ = ConvertToTigerRawAddress(addressString_);
-         }
-      }
-   }
+        ASIBase<TDeviceBase, UConcreteDevice>(name) {
+        // sometimes constructor gets called without the full name like in the case of the hub
+        //   so only set up these properties if we have the required information
+        if (IsExtendedName(name)) {
+            addressString_ = GetHexAddrFromExtName(name);
+            if (addressString_ != g_EmptyCardAddressStr) {
+                this->CreateProperty(g_TigerHexAddrPropertyName, addressString_.c_str(), MM::String, true);
+                addressChar_ = ConvertToTigerRawAddress(addressString_);
+            }
+        }
+    }
 
    int Shutdown()
    {
@@ -129,11 +120,11 @@ class ASIPeripheralBase : public ASIBase<TDeviceBase, UConcreteDevice>
    }
 
 protected:
-   ASIHub *hub_;           // pointer to hub object used for serial communication
-   std::string addressString_;  // address within hub, in hex format, should be two characters (e.g. '31')
-   std::string addressChar_;    // address within hub, in single character (allowed to be extended ASCII so use string to store)
-   bool refreshProps_;     // true when property values should be read anew from controller each time
-   bool refreshOverride_;  // true when device wants to manually force refreshes temporarily
+   ASIHub *hub_ = nullptr; // pointer to hub object used for serial communication
+   std::string addressString_ = g_EmptyCardAddressStr; // address within hub, in hex format, should be two characters (e.g. '31')
+   std::string addressChar_ = g_EmptyCardAddressChar;  // address within hub, in single character (allowed to be extended ASCII so use string to store)
+   bool refreshProps_ = false;    // true when property values should be read anew from controller each time
+   bool refreshOverride_ = false; // true when device wants to manually force refreshes temporarily
 
    // related to creating "extended" names containing address and axis letters
    static bool IsExtendedName(const char* name)
diff --git a/DeviceAdapters/ASITiger/ASIPiezo.cpp b/DeviceAdapters/ASITiger/ASIPiezo.cpp
index a605acbd5..f43f87bc9 100644
--- a/DeviceAdapters/ASITiger/ASIPiezo.cpp
+++ b/DeviceAdapters/ASITiger/ASIPiezo.cpp
@@ -33,30 +33,17 @@
 #include <string>
 #include <vector>
 
-
 // Shared properties not implemented for piezo because as of mid-2017 any piezo
 //   occupies an entire card and so never would have another device sharing the same card.
 //   Exception is save settings b/c focus device could be on the same card but they won't share any properties.
 
-///////////////////////////////////////////////////////////////////////////////
-// CPiezo
-//
 CPiezo::CPiezo(const char* name) :
-   ASIPeripheralBase< ::CStageBase, CPiezo >(name),
-   axisLetter_(g_EmptyAxisLetterStr),  // value determined by extended name
-   unitMult_(g_StageDefaultUnitMult),  // later will try to read actual setting
-   stepSizeUm_(g_StageMinStepSize),    // we'll use 1 nm as our smallest possible step size, this is somewhat arbitrary and doesn't change during the program
-   ring_buffer_supported_(false),
-   ring_buffer_capacity_(0),
-   ttl_trigger_supported_(false),
-   ttl_trigger_enabled_(false),
-   runningFastSequence_(false)
-{
-   if (IsExtendedName(name))  // only set up these properties if we have the required information in the name
-   {
-      axisLetter_ = GetAxisLetterFromExtName(name);
-      CreateProperty(g_AxisLetterPropertyName, axisLetter_.c_str(), MM::String, true);
-   }
+    ASIPeripheralBase< ::CStageBase, CPiezo >(name) {
+    // only set up these properties if we have the required information in the name
+    if (IsExtendedName(name)) {
+        axisLetter_ = GetAxisLetterFromExtName(name);
+        CreateProperty(g_AxisLetterPropertyName, axisLetter_.c_str(), MM::String, true);
+    }
 }
 
 int CPiezo::Initialize()
diff --git a/DeviceAdapters/ASITiger/ASIPiezo.h b/DeviceAdapters/ASITiger/ASIPiezo.h
index 8fbae9894..6ce9426ca 100644
--- a/DeviceAdapters/ASITiger/ASIPiezo.h
+++ b/DeviceAdapters/ASITiger/ASIPiezo.h
@@ -26,8 +26,7 @@
 #include "MMDevice.h"
 #include "DeviceBase.h"
 
-class CPiezo : public ASIPeripheralBase<CStageBase, CPiezo>
-{
+class CPiezo : public ASIPeripheralBase<CStageBase, CPiezo> {
 public:
     explicit CPiezo(const char* name);
     ~CPiezo() = default;
@@ -116,13 +115,13 @@ class CPiezo : public ASIPeripheralBase<CStageBase, CPiezo>
     // Properties
     void CreateSingleAxisRiseTimeProperty();
 
-    std::string axisLetter_;
-   double unitMult_;
-   double stepSizeUm_;
-   bool ring_buffer_supported_;
-   long ring_buffer_capacity_;
-   bool ttl_trigger_supported_;
-   bool ttl_trigger_enabled_;
-   bool runningFastSequence_;
-   std::vector<double> sequence_;
+    std::string axisLetter_ = g_EmptyAxisLetterStr; // value determined by extended name
+    double unitMult_ = g_StageDefaultUnitMult; // later will try to read actual setting
+    double stepSizeUm_ = g_StageMinStepSize;
+    long ring_buffer_capacity_ = 0;
+    bool ring_buffer_supported_ = false;
+    bool ttl_trigger_supported_ = false;
+    bool ttl_trigger_enabled_ = false;
+    bool runningFastSequence_ = false;
+    std::vector<double> sequence_;
 };
diff --git a/DeviceAdapters/ASITiger/ASIPmt.cpp b/DeviceAdapters/ASITiger/ASIPmt.cpp
index 8ab74ca64..2989a6865 100644
--- a/DeviceAdapters/ASITiger/ASIPmt.cpp
+++ b/DeviceAdapters/ASITiger/ASIPmt.cpp
@@ -19,8 +19,6 @@
 //
 // AUTHOR:        Vikram Kopuri (vik@asiimaging.com) 04/2016
 //
-// BASED ON:      ASILED.c and others
-//
 
 #include "ASIPmt.h"
 #include "ASITiger.h"
@@ -35,26 +33,16 @@
 #include <string>
 #include <vector>
 
-
-///////////////////////////////////////////////////////////////////////////////
-// CPMT
-//
 CPMT::CPMT(const char* name) :
-   ASIPeripheralBase< ::CSignalIOBase, CPMT >(name),
-   channel_(1),
-   channelAxisChar_('X'), 
-   axisLetter_(g_EmptyAxisLetterStr),
-   gain_(0),
-   avg_length_(0)
-{
-   //Figure out what channel we are on
-   if (IsExtendedName(name))  // only set up these properties if we have the required information in the name
-   {
-      channel_= GetChannelFromExtName(name);
-	   axisLetter_ = GetAxisLetterFromExtName(name);
-   }
+    ASIPeripheralBase< ::CSignalIOBase, CPMT >(name) {
+    // figure out what channel we are on
+    // only set up these properties if we have the required information in the name
+    if (IsExtendedName(name)) {
+        channel_= GetChannelFromExtName(name);
+        axisLetter_ = GetAxisLetterFromExtName(name);
+    }
 
-   //Pick AxisChar to use.
+    // select axis character
    switch(channel_)
    {
    case 1:
@@ -208,7 +196,7 @@ int CPMT::UpdateAvg()
    replyprefix << ":" << axisLetter_ << "=";
    RETURN_ON_MM_ERROR( hub_->QueryCommandVerify(command.str(), replyprefix.str()) );
    RETURN_ON_MM_ERROR( hub_->ParseAnswerAfterEquals(tmp) );
-   avg_length_ = tmp;
+   avgLength_ = tmp;
 
    return DEVICE_OK;
 }
@@ -302,15 +290,15 @@ int CPMT::OnAverage(MM::PropertyBase* pProp, MM::ActionType eAct)
    { //Query the controller for gain
       if (!refreshProps_ && initialized_)
          return DEVICE_OK;
-      UpdateAvg();  // will set avg_length_ 
-      if (!pProp->Set((long)avg_length_ ))
+      UpdateAvg(); // will set avgLength_
+      if (!pProp->Set((long)avgLength_ ))
          return DEVICE_INVALID_PROPERTY_VALUE;
    }
    else if (eAct == MM::AfterSet) {
       pProp->Get(tmp);
       command << "E " << axisLetter_ << "=" << tmp;
       RETURN_ON_MM_ERROR( hub_->QueryCommandVerify(command.str(), ":A") );
-      avg_length_ = tmp;
+      avgLength_ = tmp;
    }
    return DEVICE_OK;
 }
diff --git a/DeviceAdapters/ASITiger/ASIPmt.h b/DeviceAdapters/ASITiger/ASIPmt.h
index 1b07f5592..0887aed8f 100644
--- a/DeviceAdapters/ASITiger/ASIPmt.h
+++ b/DeviceAdapters/ASITiger/ASIPmt.h
@@ -57,11 +57,12 @@ class CPMT : public ASIPeripheralBase<CSignalIOBase, CPMT>
    int OnOverloadReset        (MM::PropertyBase* pProp, MM::ActionType eAct);
 
 private:
-   int channel_; 
-   char channelAxisChar_;
-   std::string axisLetter_;
-   int gain_;
-   int avg_length_;
-   int UpdateGain();
-   int UpdateAvg();
+    int UpdateGain();
+    int UpdateAvg();
+
+    std::string axisLetter_ = g_EmptyAxisLetterStr; // value determined by extended name
+    int channel_ = 1;
+    char channelAxisChar_ = 'X';
+    int gain_ = 0;
+    int avgLength_ = 0;
  };
diff --git a/DeviceAdapters/ASITiger/ASIScanner.cpp b/DeviceAdapters/ASITiger/ASIScanner.cpp
index f8f418bb3..bcd35e441 100644
--- a/DeviceAdapters/ASITiger/ASIScanner.cpp
+++ b/DeviceAdapters/ASITiger/ASIScanner.cpp
@@ -19,8 +19,6 @@
 //
 // AUTHOR:        Jon Daniels (jon@asiimaging.com) 09/2013
 //
-// BASED ON:      MicroPoint.cpp and others
-//
 
 #include "ASIScanner.h"
 #include "ASITiger.h"
@@ -36,55 +34,21 @@
 
 // as of mid-2017 assume that have only single (two-axis) mmTarget device per Tiger card
 
-///////////////////////////////////////////////////////////////////////////////
-// CScanner
-//
 CScanner::CScanner(const char* name) :
-   ASIPeripheralBase< ::CGalvoBase, CScanner >(name),
-   axisLetterX_(g_EmptyAxisLetterStr),    // value determined by extended name
-   axisLetterY_(g_EmptyAxisLetterStr),    // value determined by extended name
-   unitMultX_(g_ScannerDefaultUnitMult),  // later will try to read actual setting
-   unitMultY_(g_ScannerDefaultUnitMult),  // later will try to read actual setting
-   upperLimitX_(0),   // later will try to read actual setting
-   upperLimitY_(0),   // later will try to read actual setting
-   lowerLimitX_(0),   // later will try to read actual setting
-   lowerLimitY_(0),   // later will try to read actual setting
-   shutterX_(0), // home position, used to turn beam off
-   shutterY_(0), // home position, used to turn beam off
-   lastX_(0),    // cached position before blanking, used for SetIlluminationState
-   lastY_(0),    // cached position before blanking, used for SetIlluminationState
-   illuminationState_(true),
-   saStateX_(),
-   saStateY_(),
-   polygonRepetitions_(0),
-   ring_buffer_supported_(false),
-   laser_side_(0),   // will be set to 1 or 2 if used
-   laserTTLenabled_(false),
-   mmTarget_(false),
-   mmFastCircles_(false),
-   laserTriggerPLogic_(false),
-   targetExposure_(0),
-   targetSettling_(5),
-   axisIndexX_(0),
-   axisIndexY_(1),
-   fastCirclesOn_(false),
-   dac4ch_(false),
-   signalDAC_(false)
-{
-
-   // initialize these structs
-   saStateX_.mode = -1;
-   saStateX_.pattern = -1;
-   saStateY_.mode = -1;
-   saStateY_.pattern = -1;
-
-   if (IsExtendedName(name))  // only set up these properties if we have the required information in the name
-   {
-      axisLetterX_ = GetAxisLetterFromExtName(name);
-      CreateProperty(g_AxisLetterXPropertyName, axisLetterX_.c_str(), MM::String, true);
-      axisLetterY_ = GetAxisLetterFromExtName(name,1);
-      CreateProperty(g_AxisLetterYPropertyName, axisLetterY_.c_str(), MM::String, true);
-   }
+    ASIPeripheralBase< ::CGalvoBase, CScanner >(name) {
+    // initialize single axis states
+    saStateX_.mode = -1;
+    saStateX_.pattern = -1;
+    saStateY_.mode = -1;
+    saStateY_.pattern = -1;
+
+    // only set up these properties if we have the required information in the name
+    if (IsExtendedName(name)) {
+        axisLetterX_ = GetAxisLetterFromExtName(name);
+        CreateProperty(g_AxisLetterXPropertyName, axisLetterX_.c_str(), MM::String, true);
+        axisLetterY_ = GetAxisLetterFromExtName(name, 1);
+        CreateProperty(g_AxisLetterYPropertyName, axisLetterY_.c_str(), MM::String, true);
+    }
 }
 
 int CScanner::Initialize()
diff --git a/DeviceAdapters/ASITiger/ASIScanner.h b/DeviceAdapters/ASITiger/ASIScanner.h
index 2c9bc6b1b..e512bb749 100644
--- a/DeviceAdapters/ASITiger/ASIScanner.h
+++ b/DeviceAdapters/ASITiger/ASIScanner.h
@@ -26,8 +26,7 @@
 #include "MMDevice.h"
 #include "DeviceBase.h"
 
-class CScanner : public ASIPeripheralBase<CGalvoBase, CScanner>
-{
+class CScanner : public ASIPeripheralBase<CGalvoBase, CScanner> {
 public:
     explicit CScanner(const char* name);
     ~CScanner() = default;
@@ -156,26 +155,26 @@ class CScanner : public ASIPeripheralBase<CGalvoBase, CScanner>
     // Properties
     void CreateSingleAxisRiseTimeProperty(const char axisChar, std::string axisLetter);
 
-   std::string axisLetterX_;
-   std::string axisLetterY_;
-   double unitMultX_;  // units per degree
-   double unitMultY_;  // units per degree
-   double upperLimitX_;   // positive limit only (on power-up things are symmetric about 0)
-   double upperLimitY_;   // positive limit only (on power-up things are symmetric about 0)
-   double lowerLimitX_;   // negative limit (on power-up things are symmetric about 0)
-   double lowerLimitY_;   // negative limit (on power-up things are symmetric about 0)
-   double shutterX_; // home position, used to turn beam off (in degrees)
-   double shutterY_; // home position, used to turn beam off (in degrees)
-   double lastX_;    // used to cache position (in degrees)
-   double lastY_;    // used to cache position (in degrees)
-   bool illuminationState_;  // true if on, false if beam is turned off
-   bool mmTarget_;    // true iff MM_TARGET firmware in place for phototargeting
-   bool mmFastCircles_;   // true iff FAST_CIRCLES firmware in place (usually together with MM_TARGET)
-   bool laserTriggerPLogic_;  // true iff using PLogic for laser trigger (currently equivalent to LED Z=3 mode)
-   long targetExposure_;  // exposure time for targeting, stored locally
-   long targetSettling_;  // settling time for targeting, stored locally
-   unsigned int axisIndexX_;
-   unsigned int axisIndexY_;
+    std::string axisLetterX_ = g_EmptyAxisLetterStr; // value determined by extended name
+    std::string axisLetterY_ = g_EmptyAxisLetterStr; // value determined by extended name
+    double unitMultX_ = g_ScannerDefaultUnitMult;  // units per degree, later will try to read actual setting
+    double unitMultY_ = g_ScannerDefaultUnitMult;  // units per degree, later will try to read actual setting
+    double upperLimitX_ = 0; // positive limit only (on power-up things are symmetric about 0), later will try to read actual setting
+    double upperLimitY_ = 0; // positive limit only (on power-up things are symmetric about 0), later will try to read actual setting
+    double lowerLimitX_ = 0; // negative limit (on power-up things are symmetric about 0), later will try to read actual setting
+    double lowerLimitY_ = 0; // negative limit (on power-up things are symmetric about 0), later will try to read actual setting
+    double shutterX_ = 0; // home position, used to turn beam off (in degrees)
+    double shutterY_ = 0; // home position, used to turn beam off (in degrees)
+    double lastX_ = 0; // used to cache position (in degrees)
+    double lastY_ = 0; // used to cache position (in degrees)
+    bool illuminationState_ = true; // true if on, false if beam is turned off
+    bool mmTarget_ = false; // true iff MM_TARGET firmware in place for phototargeting
+    bool mmFastCircles_ = false; // true iff FAST_CIRCLES firmware in place (usually together with MM_TARGET)
+    bool laserTriggerPLogic_ = false; // true iff using PLogic for laser trigger (currently equivalent to LED Z=3 mode)
+    long targetExposure_ = 0;  // exposure time for targeting, stored locally
+    long targetSettling_ = 5; // settling time for targeting, stored locally
+    unsigned int axisIndexX_ = 0;
+    unsigned int axisIndexY_ = 1;
 
    struct SingleAxisState {
       long mode;
@@ -187,14 +186,14 @@ class CScanner : public ASIPeripheralBase<CGalvoBase, CScanner>
 
    // for polygons
    std::vector<std::pair<double,double> > polygons_;
-   long polygonRepetitions_;
-   bool ring_buffer_supported_;
+   long polygonRepetitions_ = 0;
+   bool ring_buffer_supported_ = false;
 
-   unsigned char laser_side_;  // code for corresponding laser line: 0 for none, 1 for side0, 2 for side1
-   bool laserTTLenabled_;      // whether it has MM_LASER_TTL module
+   unsigned char laser_side_ = 0; // code for corresponding laser line: 0 for none, 1 for side0, 2 for side1
+   bool laserTTLenabled_ = false; // whether it has MM_LASER_TTL module
 
-   bool fastCirclesOn_;
+   bool fastCirclesOn_ = false;
 
-   bool dac4ch_;
-   bool signalDAC_;
+   bool dac4ch_ = false;
+   bool signalDAC_ = false;
 };
diff --git a/DeviceAdapters/ASITiger/ASITiger.cpp b/DeviceAdapters/ASITiger/ASITiger.cpp
index d81153922..7f5c83135 100644
--- a/DeviceAdapters/ASITiger/ASITiger.cpp
+++ b/DeviceAdapters/ASITiger/ASITiger.cpp
@@ -21,9 +21,6 @@
 //
 // AUTHOR:        Jon Daniels (jon@asiimaging.com) 09/2013
 //
-// BASED ON:      ASIStage.cpp, ASIFW1000.cpp, Arduino.cpp, and DemoCamera.cpp
-//
-//
 
 #include "ASITiger.h"
 #include "ASITigerComm.h"
diff --git a/DeviceAdapters/ASITiger/ASIXYStage.cpp b/DeviceAdapters/ASITiger/ASIXYStage.cpp
index a5b73c8d1..2a6c0099e 100644
--- a/DeviceAdapters/ASITiger/ASIXYStage.cpp
+++ b/DeviceAdapters/ASITiger/ASIXYStage.cpp
@@ -19,8 +19,6 @@
 //
 // AUTHOR:        Jon Daniels (jon@asiimaging.com) 09/2013
 //
-// BASED ON:      ASIStage.cpp and others
-//
 
 #include "ASIXYStage.h"
 #include "ASITiger.h"
@@ -34,36 +32,17 @@
 #include <sstream>
 #include <string>
 
-
 // TODO faster busy check for typical case where axes are on same card by just querying card busy
 
-///////////////////////////////////////////////////////////////////////////////
-// CXYStage
-//
 CXYStage::CXYStage(const char* name) :
-   ASIPeripheralBase< ::CXYStageBase, CXYStage >(name),
-   unitMultX_(g_StageDefaultUnitMult),  // later will try to read actual setting
-   unitMultY_(g_StageDefaultUnitMult),  // later will try to read actual setting
-   stepSizeXUm_(g_StageMinStepSize),    // we'll use 1 nm as our smallest possible step size, this is somewhat arbitrary
-   stepSizeYUm_(g_StageMinStepSize),    //   and doesn't change during the program
-   axisLetterX_(g_EmptyAxisLetterStr),    // value determined by extended name
-   axisLetterY_(g_EmptyAxisLetterStr),    // value determined by extended name
-   advancedPropsEnabled_(false),
-   speedTruth_(false),
-   lastSpeedX_(1.0),
-   lastSpeedY_(1.0),
-   ring_buffer_supported_(false),
-   ring_buffer_capacity_(0),
-   ttl_trigger_supported_(false),
-   ttl_trigger_enabled_(false)
-{
-   if (IsExtendedName(name))  // only set up these properties if we have the required information in the name
-   {
-      axisLetterX_ = GetAxisLetterFromExtName(name);
-      CreateProperty(g_AxisLetterXPropertyName, axisLetterX_.c_str(), MM::String, true);
-      axisLetterY_ = GetAxisLetterFromExtName(name,1);
-      CreateProperty(g_AxisLetterYPropertyName, axisLetterY_.c_str(), MM::String, true);
-   }
+    ASIPeripheralBase< ::CXYStageBase, CXYStage >(name) {
+    // only set up these properties if we have the required information in the name
+    if (IsExtendedName(name)) {
+        axisLetterX_ = GetAxisLetterFromExtName(name);
+        CreateProperty(g_AxisLetterXPropertyName, axisLetterX_.c_str(), MM::String, true);
+        axisLetterY_ = GetAxisLetterFromExtName(name, 1);
+        CreateProperty(g_AxisLetterYPropertyName, axisLetterY_.c_str(), MM::String, true);
+    }
 }
 
 int CXYStage::Initialize()
diff --git a/DeviceAdapters/ASITiger/ASIXYStage.h b/DeviceAdapters/ASITiger/ASIXYStage.h
index d2bb48512..8fa629ab0 100644
--- a/DeviceAdapters/ASITiger/ASIXYStage.h
+++ b/DeviceAdapters/ASITiger/ASIXYStage.h
@@ -33,12 +33,10 @@ class CXYStage : public ASIPeripheralBase<CXYStageBase, CXYStage>
     ~CXYStage() = default;
 
    // Device API
-   // ----------
    int Initialize();
    bool Busy();
 
    // XYStage API
-   // -----------
    int Stop();
 
    // XYStageBase uses these functions to move the stage
@@ -158,20 +156,20 @@ class CXYStage : public ASIPeripheralBase<CXYStageBase, CXYStage>
     int OnSaveJoystickSettings();
     int getMinMaxSpeed(const std::string& axisLetter, double& minSpeed, double& maxSpeed);
 
-   double unitMultX_;
-   double unitMultY_;
-   double stepSizeXUm_;
-   double stepSizeYUm_;
-   std::string axisLetterX_;
-   std::string axisLetterY_;
-   bool advancedPropsEnabled_;
-   bool speedTruth_;
-   double lastSpeedX_;
-   double lastSpeedY_;
-   bool ring_buffer_supported_;
-   long ring_buffer_capacity_;
-   bool ttl_trigger_supported_;
-   bool ttl_trigger_enabled_;
-   std::vector<double> sequenceX_;
-   std::vector<double> sequenceY_;
+    std::string axisLetterX_ = g_EmptyAxisLetterStr; // value determined by extended name
+    std::string axisLetterY_ = g_EmptyAxisLetterStr; // value determined by extended name
+    double unitMultX_ = g_StageDefaultUnitMult; // later will try to read actual setting
+    double unitMultY_ = g_StageDefaultUnitMult; // later will try to read actual setting
+    double stepSizeXUm_ = g_StageMinStepSize; // we'll use 1 nm as our smallest possible step size, this is somewhat arbitrary
+    double stepSizeYUm_ = g_StageMinStepSize; //   and doesn't change during the program
+    double lastSpeedX_ = 1.0;
+    double lastSpeedY_ = 1.0;
+    long ring_buffer_capacity_ = 0;
+    bool ring_buffer_supported_ = false;
+    bool ttl_trigger_supported_ = false;
+    bool ttl_trigger_enabled_ = false;
+    bool advancedPropsEnabled_ = false;
+    bool speedTruth_ = false;
+    std::vector<double> sequenceX_;
+    std::vector<double> sequenceY_;
 };
diff --git a/DeviceAdapters/ASITiger/ASIZStage.cpp b/DeviceAdapters/ASITiger/ASIZStage.cpp
index ed0c278b9..88f07d840 100644
--- a/DeviceAdapters/ASITiger/ASIZStage.cpp
+++ b/DeviceAdapters/ASITiger/ASIZStage.cpp
@@ -32,30 +32,13 @@
 #include <sstream>
 #include <string>
 
-
-///////////////////////////////////////////////////////////////////////////////
-// CZStage
-//
 CZStage::CZStage(const char* name) :
-   ASIPeripheralBase< ::CStageBase, CZStage >(name),
-   axisLetter_(g_EmptyAxisLetterStr),   // value determined by extended name
-   unitMult_(g_StageDefaultUnitMult),  // later will try to read actual setting
-   stepSizeUm_(g_StageMinStepSize),    // we'll use 1 nm as our smallest possible step size, this is somewhat arbitrary and doesn't change during the program
-   advancedPropsEnabled_(false),
-   speedTruth_(false),
-   lastSpeed_(1.0),
-   ring_buffer_supported_(false),
-   ring_buffer_capacity_(0),
-   ttl_trigger_supported_(false),
-   ttl_trigger_enabled_(false),
-   runningFastSequence_(false),
-   axisIndex_(0)
-{
-   if (IsExtendedName(name))  // only set up these properties if we have the required information in the name
-   {
-      axisLetter_ = GetAxisLetterFromExtName(name);
-      CreateProperty(g_AxisLetterPropertyName, axisLetter_.c_str(), MM::String, true);
-   }
+    ASIPeripheralBase< ::CStageBase, CZStage >(name) {
+    // only set up these properties if we have the required information in the name
+    if (IsExtendedName(name))  {
+        axisLetter_ = GetAxisLetterFromExtName(name);
+        CreateProperty(g_AxisLetterPropertyName, axisLetter_.c_str(), MM::String, true);
+    }
 }
 
 int CZStage::Initialize()
diff --git a/DeviceAdapters/ASITiger/ASIZStage.h b/DeviceAdapters/ASITiger/ASIZStage.h
index 84b583043..f5b61e5f2 100644
--- a/DeviceAdapters/ASITiger/ASIZStage.h
+++ b/DeviceAdapters/ASITiger/ASIZStage.h
@@ -123,17 +123,17 @@ class CZStage : public ASIPeripheralBase<CStageBase, CZStage> {
     // Properties
     void CreateSingleAxisRiseTimeProperty();
 
-    std::string axisLetter_;
-   double unitMult_;
-   double stepSizeUm_;
-   bool advancedPropsEnabled_;
-   bool speedTruth_;
-   double lastSpeed_;
-   bool ring_buffer_supported_;
-   long ring_buffer_capacity_;
-   bool ttl_trigger_supported_;
-   bool ttl_trigger_enabled_;
-   bool runningFastSequence_;
-   unsigned int axisIndex_;
-   std::vector<double> sequence_;
+    std::string axisLetter_ = g_EmptyAxisLetterStr; // value determined by extended name
+    double unitMult_ = g_StageDefaultUnitMult; // later will try to read actual setting
+    double stepSizeUm_ = g_StageMinStepSize; // we'll use 1 nm as our smallest possible step size, this is somewhat arbitrary and doesn't change during the program
+    double lastSpeed_ = 1.0;
+    unsigned int axisIndex_ = 0;
+    long ring_buffer_capacity_ = 0;
+    bool ring_buffer_supported_ = false;
+    bool ttl_trigger_supported_ = false;
+    bool ttl_trigger_enabled_ = false;
+    bool runningFastSequence_ = false;
+    bool advancedPropsEnabled_ = false;
+    bool speedTruth_ = false;
+    std::vector<double> sequence_;
 };

From 144515d24d934d31e4ead7aa04fa0edeac3f1ebe Mon Sep 17 00:00:00 2001
From: Brandon <brandon@asiimaging.com>
Date: Thu, 28 May 2026 12:54:09 -0700
Subject: [PATCH 6/9] ASITiger: improve readability in CRISP

---
 DeviceAdapters/ASITiger/ASICRISP.cpp | 229 +++++++++++++--------------
 1 file changed, 114 insertions(+), 115 deletions(-)

diff --git a/DeviceAdapters/ASITiger/ASICRISP.cpp b/DeviceAdapters/ASITiger/ASICRISP.cpp
index 9edb60bce..d24de59a3 100644
--- a/DeviceAdapters/ASITiger/ASICRISP.cpp
+++ b/DeviceAdapters/ASITiger/ASICRISP.cpp
@@ -138,8 +138,8 @@ void CCRISP::LogFirmwareSupport(const bool hasLockQueries, const bool hasExShort
 
 int CCRISP::Initialize() {
     // call generic Initialize first, this gets hub
-    if (const int error = PeripheralInitialize()) {
-        return error;
+    if (const int status = PeripheralInitialize(); status != DEVICE_OK) {
+        return status;
     }
 
     // create CommandTable after PeripheralInitialize()
@@ -231,14 +231,14 @@ bool CCRISP::Busy() {
 int CCRISP::SetContinuousFocusing(bool state) {
     bool isFocusing = false;
     // will update focusState_
-    if (const int error = GetContinuousFocusing(isFocusing)) {
-        return error;
+    if (const int status = GetContinuousFocusing(isFocusing); status != DEVICE_OK) {
+        return status;
     }
     if (isFocusing && !state) {
         // was on, turn off
         const Command& cmd = commands_->unlock;
-        if (const int error = hub_->QueryCommandVerify(cmd.set, cmd.setReply)) {
-            return error;
+        if (const int status = hub_->QueryCommandVerify(cmd.set, cmd.setReply); status != DEVICE_OK) {
+            return status;
         }
     } else if (!isFocusing && state) {
         // was off, turn on
@@ -246,11 +246,11 @@ int CCRISP::SetContinuousFocusing(bool state) {
             return SetFocusState(g_CRISP_K);
         } else {
             // need to move to ready state, then turn on
-            if (const int error = SetFocusState(g_CRISP_R)) {
-                return error;
+            if (const int status = SetFocusState(g_CRISP_R); status != DEVICE_OK) {
+                return status;
             }
-            if (const int error = SetFocusState(g_CRISP_K)) {
-                return error;
+            if (const int status = SetFocusState(g_CRISP_K); status != DEVICE_OK) {
+                return status;
             }
         }
     }
@@ -260,8 +260,8 @@ int CCRISP::SetContinuousFocusing(bool state) {
 
 // Update focusState_ from the controller and check if focus is locked or trying to lock ('F' or 'K' state).
 int CCRISP::GetContinuousFocusing(bool& state) {
-    if (const int error = UpdateFocusState()) {
-        return error;
+    if (const int status = UpdateFocusState(); status != DEVICE_OK) {
+        return status;
     }
     state = (focusState_ == g_CRISP_K) || (focusState_ == g_CRISP_F);
     return DEVICE_OK;
@@ -274,8 +274,8 @@ bool CCRISP::IsContinuousFocusLocked() {
 
 // Does a "one-shot" autofocus: locks and then unlocks again
 int CCRISP::FullFocus() {
-    if (const int error = SetContinuousFocusing(true)) {
-        return error;
+    if (const int status = SetContinuousFocusing(true); status != DEVICE_OK) {
+        return status;
     }
 
     const MM::MMTime startTime = GetCurrentMMTime();
@@ -301,16 +301,16 @@ int CCRISP::IncrementalFocus() {
 int CCRISP::GetCurrentFocusScore(double& score) {
     score = 0.0; // default to 0 if serial read fails
     const Command& cmd = commands_->focusScore;
-    if (const int error = hub_->QueryCommandVerify(cmd.get, cmd.getReply)) {
-        return error;
+    if (const int status = hub_->QueryCommandVerify(cmd.get, cmd.getReply); status != DEVICE_OK) {
+        return status;
     }
     return hub_->ParseAnswerAfterPosition3(score);
 }
 
 int CCRISP::GetOffset(double& offset) {
     const Command& cmd = commands_->lockOffset;
-    if (const int error = hub_->QueryCommandVerify(cmd.get, cmd.getReply)) {
-        return error;
+    if (const int status = hub_->QueryCommandVerify(cmd.get, cmd.getReply); status != DEVICE_OK) {
+        return status;
     }
     return hub_->ParseAnswerAfterPosition3(offset);
 }
@@ -318,8 +318,8 @@ int CCRISP::GetOffset(double& offset) {
 int CCRISP::SetOffset(double offset) {
     const Command& cmd = commands_->setLockOffset;
     const std::string command = cmd.set + std::to_string(offset);
-    if (const int error = hub_->QueryCommandVerify(command, cmd.setReply)) {
-        return error;
+    if (const int status = hub_->QueryCommandVerify(command, cmd.setReply); status != DEVICE_OK) {
+        return status;
     }
     return DEVICE_OK;
 }
@@ -327,14 +327,14 @@ int CCRISP::SetOffset(double offset) {
 int CCRISP::UpdateFocusState() {
     // get the state
     const Command& cmd = commands_->state;
-    if (const int error = hub_->QueryCommandVerify(cmd.get, cmd.getReply)) {
-        return error;
+    if (const int status = hub_->QueryCommandVerify(cmd.get, cmd.getReply); status != DEVICE_OK) {
+        return status;
     }
 
     // get the state character
     char state = '\0';
-    if (const int error = hub_->GetAnswerCharAtPosition3(state)) {
-        return error;
+    if (const int status = hub_->GetAnswerCharAtPosition3(state); status != DEVICE_OK) {
+        return status;
     }
 
     switch (state) {
@@ -407,12 +407,11 @@ int CCRISP::SetFocusState(const std::string& focusState) {
         return DEVICE_OK;
     }
 
-    if (const int error = ForceSetFocusState(focusState)) {
-        return error;
+    if (const int status = ForceSetFocusState(focusState); status != DEVICE_OK) {
+        return status;
     }
 
     focusState_ = focusState;
-
     return DEVICE_OK;
 }
 
@@ -468,11 +467,11 @@ int CCRISP::OnNA(MM::PropertyBase* pProp, MM::ActionType eAct)
       if (!refreshProps_ && initialized_) {
           return DEVICE_OK;
       }
-      if (const int error = hub_->QueryCommandVerify(cmd.get, cmd.getReply)) {
-          return error;
+      if (const int status = hub_->QueryCommandVerify(cmd.get, cmd.getReply); status != DEVICE_OK) {
+          return status;
       }
-      if (const int error = hub_->ParseAnswerAfterEquals(tmp)) {
-          return error;
+      if (const int status = hub_->ParseAnswerAfterEquals(tmp); status != DEVICE_OK) {
+          return status;
       }
       if (!pProp->Set(tmp)) {
           return DEVICE_INVALID_PROPERTY_VALUE;
@@ -482,8 +481,8 @@ int CCRISP::OnNA(MM::PropertyBase* pProp, MM::ActionType eAct)
    {
       pProp->Get(tmp);
       const std::string command = cmd.set + std::to_string(tmp);
-      if (const int error = hub_->QueryCommandVerify(command, cmd.setReply)) {
-          return error;
+      if (const int status = hub_->QueryCommandVerify(command, cmd.setReply); status != DEVICE_OK) {
+          return status;
       }
       refreshOverride_ = true;
       // update dependent properties
@@ -506,11 +505,11 @@ int CCRISP::OnCalGain(MM::PropertyBase* pProp, MM::ActionType eAct)
       if (!refreshProps_ && initialized_) {
           return DEVICE_OK;
       }
-      if (const int error = hub_->QueryCommandVerify(cmd.get, cmd.getReply)) {
-          return error;
+      if (const int status = hub_->QueryCommandVerify(cmd.get, cmd.getReply); status != DEVICE_OK) {
+          return status;
       }
-      if (const int error = hub_->ParseAnswerAfterEquals(tmp)) {
-          return error;
+      if (const int status = hub_->ParseAnswerAfterEquals(tmp); status != DEVICE_OK) {
+          return status;
       }
       if (!pProp->Set(tmp)) {
           return DEVICE_INVALID_PROPERTY_VALUE;
@@ -520,8 +519,8 @@ int CCRISP::OnCalGain(MM::PropertyBase* pProp, MM::ActionType eAct)
    {
       pProp->Get(tmp);
       const std::string command = cmd.set + std::to_string(tmp);
-      if (const int error = hub_->QueryCommandVerify(command, cmd.setReply)) {
-          return error;
+      if (const int status = hub_->QueryCommandVerify(command, cmd.setReply); status != DEVICE_OK) {
+          return status;
       }
    }
    return DEVICE_OK;
@@ -537,11 +536,11 @@ int CCRISP::OnCalRange(MM::PropertyBase* pProp, MM::ActionType eAct)
         if (!refreshProps_ && initialized_ && !refreshOverride_) {
             return DEVICE_OK;
         }
-        if (const int error = hub_->QueryCommandVerify(cmd.get, cmd.getReply)) {
-            return error;
+        if (const int status = hub_->QueryCommandVerify(cmd.get, cmd.getReply); status != DEVICE_OK) {
+            return status;
         }
-        if (const int error = hub_->ParseAnswerAfterEquals(tmp)) {
-            return error;
+        if (const int status = hub_->ParseAnswerAfterEquals(tmp); status != DEVICE_OK) {
+            return status;
         }
         if (!pProp->Set(tmp * 1000.0)) {
             return DEVICE_INVALID_PROPERTY_VALUE;
@@ -551,8 +550,8 @@ int CCRISP::OnCalRange(MM::PropertyBase* pProp, MM::ActionType eAct)
     {
         pProp->Get(tmp);
         const std::string command = cmd.set + std::to_string(tmp / 1000.0);
-        if (const int error = hub_->QueryCommandVerify(command, cmd.setReply)) {
-            return error;
+        if (const int status = hub_->QueryCommandVerify(command, cmd.setReply); status != DEVICE_OK) {
+            return status;
         }
     }
     return DEVICE_OK;
@@ -567,11 +566,11 @@ int CCRISP::OnLockRange(MM::PropertyBase* pProp, MM::ActionType eAct)
       if (!refreshProps_ && initialized_) {
           return DEVICE_OK;
       }
-      if (const int error = hub_->QueryCommandVerify(cmd.get, cmd.getReply)) {
-          return error;
+      if (const int status = hub_->QueryCommandVerify(cmd.get, cmd.getReply); status != DEVICE_OK) {
+          return status;
       }
-      if (const int error = hub_->ParseAnswerAfterEquals(tmp)) {
-          return error;
+      if (const int status = hub_->ParseAnswerAfterEquals(tmp); status != DEVICE_OK) {
+          return status;
       }
       if (!pProp->Set(tmp)) {
           return DEVICE_INVALID_PROPERTY_VALUE;
@@ -581,8 +580,8 @@ int CCRISP::OnLockRange(MM::PropertyBase* pProp, MM::ActionType eAct)
    {
       pProp->Get(tmp);
       const std::string command = cmd.set + std::to_string(tmp);
-      if (const int error = hub_->QueryCommandVerify(command, cmd.setReply)) {
-          return error;
+      if (const int status = hub_->QueryCommandVerify(command, cmd.setReply); status != DEVICE_OK) {
+          return status;
       }
    }
    return DEVICE_OK;
@@ -597,11 +596,11 @@ int CCRISP::OnLEDIntensity(MM::PropertyBase* pProp, MM::ActionType eAct)
       if (!refreshProps_ && initialized_) {
           return DEVICE_OK;
       }
-      if (const int error = hub_->QueryCommandVerify(cmd.get, cmd.getReply)) {
-          return error;
+      if (const int status = hub_->QueryCommandVerify(cmd.get, cmd.getReply); status != DEVICE_OK) {
+          return status;
       }
-      if (const int error = hub_->ParseAnswerAfterEquals(tmp)) {
-          return error;
+      if (const int status = hub_->ParseAnswerAfterEquals(tmp); status != DEVICE_OK) {
+          return status;
       }
       if (!pProp->Set(tmp)) {
           return DEVICE_INVALID_PROPERTY_VALUE;
@@ -611,8 +610,8 @@ int CCRISP::OnLEDIntensity(MM::PropertyBase* pProp, MM::ActionType eAct)
    {
       pProp->Get(tmp);
       const std::string command = cmd.set + std::to_string(tmp);
-      if (const int error = hub_->QueryCommandVerify(command, cmd.setReply)) {
-          return error;
+      if (const int status = hub_->QueryCommandVerify(command, cmd.setReply); status != DEVICE_OK) {
+          return status;
       }
    }
    return DEVICE_OK;
@@ -627,11 +626,11 @@ int CCRISP::OnLoopGainMultiplier(MM::PropertyBase* pProp, MM::ActionType eAct)
       if (!refreshProps_ && initialized_) {
           return DEVICE_OK;
       }
-      if (const int error = hub_->QueryCommandVerify(cmd.get, cmd.getReply)) {
-          return error;
+      if (const int status = hub_->QueryCommandVerify(cmd.get, cmd.getReply); status != DEVICE_OK) {
+          return status;
       }
-      if (const int error = hub_->ParseAnswerAfterEquals(tmp)) {
-          return error;
+      if (const int status = hub_->ParseAnswerAfterEquals(tmp); status != DEVICE_OK) {
+          return status;
       }
       if (!pProp->Set(tmp)) {
           return DEVICE_INVALID_PROPERTY_VALUE;
@@ -641,8 +640,8 @@ int CCRISP::OnLoopGainMultiplier(MM::PropertyBase* pProp, MM::ActionType eAct)
    {
       pProp->Get(tmp);
       const std::string command = cmd.set + std::to_string(tmp);
-      if (const int error = hub_->QueryCommandVerify(command, cmd.setReply)) {
-          return error;
+      if (const int status = hub_->QueryCommandVerify(command, cmd.setReply); status != DEVICE_OK) {
+          return status;
       }
    }
    return DEVICE_OK;
@@ -657,11 +656,11 @@ int CCRISP::OnNumAvg(MM::PropertyBase* pProp, MM::ActionType eAct)
       if (!refreshProps_ && initialized_) {
           return DEVICE_OK;
       }
-      if (const int error = hub_->QueryCommandVerify(cmd.get, cmd.getReply)) {
-          return error;
+      if (const int status = hub_->QueryCommandVerify(cmd.get, cmd.getReply); status != DEVICE_OK) {
+          return status;
       }
-      if (const int error = hub_->ParseAnswerAfterEquals(tmp)) {
-          return error;
+      if (const int status = hub_->ParseAnswerAfterEquals(tmp); status != DEVICE_OK) {
+          return status;
       }
       if (!pProp->Set(tmp)) {
           return DEVICE_INVALID_PROPERTY_VALUE;
@@ -671,8 +670,8 @@ int CCRISP::OnNumAvg(MM::PropertyBase* pProp, MM::ActionType eAct)
    {
       pProp->Get(tmp);
       const std::string command = cmd.set + std::to_string(tmp);
-      if (const int error = hub_->QueryCommandVerify(command, cmd.setReply)) {
-          return error;
+      if (const int status = hub_->QueryCommandVerify(command, cmd.setReply); status != DEVICE_OK) {
+          return status;
       }
    }
    return DEVICE_OK;
@@ -687,11 +686,11 @@ int CCRISP::OnNumSkips(MM::PropertyBase* pProp, MM::ActionType eAct)
       if (!refreshProps_ && initialized_) {
           return DEVICE_OK;
       }
-      if (const int error = hub_->QueryCommandVerify(cmd.get, cmd.getReply)) {
-          return error;
+      if (const int status = hub_->QueryCommandVerify(cmd.get, cmd.getReply); status != DEVICE_OK) {
+          return status;
       }
-      if (const int error = hub_->ParseAnswerAfterEquals(tmp)) {
-          return error;
+      if (const int status = hub_->ParseAnswerAfterEquals(tmp); status != DEVICE_OK) {
+          return status;
       }
       if (!pProp->Set(tmp)) {
           return DEVICE_INVALID_PROPERTY_VALUE;
@@ -701,8 +700,8 @@ int CCRISP::OnNumSkips(MM::PropertyBase* pProp, MM::ActionType eAct)
    {
       pProp->Get(tmp);
       const std::string command = cmd.set + std::to_string(tmp);
-      if (const int error = hub_->QueryCommandVerify(command, cmd.setReply)) {
-          return error;
+      if (const int status = hub_->QueryCommandVerify(command, cmd.setReply); status != DEVICE_OK) {
+          return status;
       }
    }
    return DEVICE_OK;
@@ -718,11 +717,11 @@ int CCRISP::OnInFocusRange(MM::PropertyBase* pProp, MM::ActionType eAct)
       if (!refreshProps_ && initialized_ && !refreshOverride_) {
           return DEVICE_OK;
       }
-      if (const int error = hub_->QueryCommandVerify(cmd.get, cmd.getReply)) {
-          return error;
+      if (const int status = hub_->QueryCommandVerify(cmd.get, cmd.getReply); status != DEVICE_OK) {
+          return status;
       }
-      if (const int error = hub_->ParseAnswerAfterEquals(tmp)) {
-          return error;
+      if (const int status = hub_->ParseAnswerAfterEquals(tmp); status != DEVICE_OK) {
+          return status;
       }
       if (!pProp->Set(tmp * 1000.0)) {
           return DEVICE_INVALID_PROPERTY_VALUE;
@@ -732,8 +731,8 @@ int CCRISP::OnInFocusRange(MM::PropertyBase* pProp, MM::ActionType eAct)
    {
       pProp->Get(tmp);
       const std::string command = cmd.set + std::to_string(tmp / 1000.0);
-      if (const int error = hub_->QueryCommandVerify(command, cmd.setReply)) {
-          return error;
+      if (const int status = hub_->QueryCommandVerify(command, cmd.setReply); status != DEVICE_OK) {
+          return status;
       }
    }
    return DEVICE_OK;
@@ -747,15 +746,15 @@ void CCRISP::CreateFocusStateProperty() {
         Props::State, "Idle", false,
         new MM::ActionLambda([this](MM::PropertyBase* pProp, MM::ActionType eAct) {
             if (eAct == MM::BeforeGet) {
-                if (const int error = UpdateFocusState()) {
-                    return error;
+                if (const int status = UpdateFocusState(); status != DEVICE_OK) {
+                    return status;
                 }
                 pProp->Set(focusState_.c_str());
             } else if (eAct == MM::AfterSet) {
                 std::string focusState;
                 pProp->Get(focusState);
-                if (const int error = SetFocusState(focusState)) {
-                    return error;
+                if (const int status = SetFocusState(focusState); status != DEVICE_OK) {
+                    return status;
                 }
             }
             return DEVICE_OK;
@@ -788,11 +787,11 @@ void CCRISP::CreateStateProperty() {
             if (eAct == MM::BeforeGet) {
                 char tmp = '\0';
                 const Command& cmd = commands_->stateChar;
-                if (const int error = hub_->QueryCommandVerify(cmd.get, cmd.getReply)) {
-                    return error;
+                if (const int status = hub_->QueryCommandVerify(cmd.get, cmd.getReply); status != DEVICE_OK) {
+                    return status;
                 }
-                if (const int error = hub_->GetAnswerCharAtPosition3(tmp)) {
-                    return error;
+                if (const int status = hub_->GetAnswerCharAtPosition3(tmp); status != DEVICE_OK) {
+                    return status;
                 }
                 const std::string str(1, tmp);
                 if (!pProp->Set(str.c_str())) {
@@ -814,11 +813,11 @@ void CCRISP::CreateSNRProperty() {
             if (eAct == MM::BeforeGet) {
                 double tmp = 0.0;
                 const Command& cmd = commands_->signalNoiseRatio;
-                if (const int error = hub_->QueryCommand(cmd.get)) {
-                    return error;
+                if (const int status = hub_->QueryCommand(cmd.get); status != DEVICE_OK) {
+                    return status;
                 }
-                if (const int error = hub_->ParseAnswerAfterPosition(0, tmp)) {
-                    return error;
+                if (const int status = hub_->ParseAnswerAfterPosition(0, tmp); status != DEVICE_OK) {
+                    return status;
                 }
                 if (!pProp->Set(tmp)) {
                     return DEVICE_INVALID_PROPERTY_VALUE;
@@ -841,8 +840,8 @@ void CCRISP::CreateLockOffsetProperty() {
                     return DEVICE_OK;
                 }
                 double tmp = 0.0; // Note: autofocus API requires double
-                if (const int error = GetOffset(tmp)) {
-                    return error;
+                if (const int status = GetOffset(tmp); status != DEVICE_OK) {
+                    return status;
                 }
                 // convert to long for integer property
                 if (!pProp->Set(static_cast<long>(tmp))) {
@@ -868,11 +867,11 @@ void CCRISP::CreateSumProperty() {
                 if (eAct == MM::BeforeGet) {
                     long tmp = 0;
                     const Command& cmd = commands_->sum;
-                    if (const int error = hub_->QueryCommandVerify(cmd.get, cmd.getReply)) {
-                        return error;
+                    if (const int status = hub_->QueryCommandVerify(cmd.get, cmd.getReply); status != DEVICE_OK) {
+                        return status;
                     }
-                    if (const int error = hub_->ParseAnswerAfterPosition3(tmp)) {
-                        return error;
+                    if (const int status = hub_->ParseAnswerAfterPosition3(tmp); status != DEVICE_OK) {
+                        return status;
                     }
                     if (!pProp->Set(tmp)) {
                         return DEVICE_INVALID_PROPERTY_VALUE;
@@ -891,8 +890,8 @@ void CCRISP::CreateSumProperty() {
             new MM::ActionLambda([this](MM::PropertyBase* pProp, MM::ActionType eAct) {
                 if (eAct == MM::BeforeGet) {
                     const Command& cmd = commands_->sum;
-                    if (const int error = hub_->QueryCommand(cmd.get)) {
-                        return error;
+                    if (const int status = hub_->QueryCommand(cmd.get); status != DEVICE_OK) {
+                        return status;
                     }
                     const std::vector<std::string> reply = hub_->SplitAnswerOnSpace();
                     if (reply.size() <= 2) {
@@ -922,11 +921,11 @@ void CCRISP::CreateDitherErrorProperty() {
                 if (eAct == MM::BeforeGet) {
                     long tmp = 0;
                     const Command& cmd = commands_->ditherError;
-                    if (const int error = hub_->QueryCommandVerify(cmd.get, cmd.getReply)) {
-                        return error;
+                    if (const int status = hub_->QueryCommandVerify(cmd.get, cmd.getReply); status != DEVICE_OK) {
+                        return status;
                     }
-                    if (const int error = hub_->ParseAnswerAfterPosition3(tmp)) {
-                        return error;
+                    if (const int status = hub_->ParseAnswerAfterPosition3(tmp); status != DEVICE_OK) {
+                        return status;
                     }
                     if (!pProp->Set(tmp)) {
                         return DEVICE_INVALID_PROPERTY_VALUE;
@@ -945,8 +944,8 @@ void CCRISP::CreateDitherErrorProperty() {
             new MM::ActionLambda([this](MM::PropertyBase* pProp, MM::ActionType eAct) {
                 if (eAct == MM::BeforeGet) {
                     const Command& cmd = commands_->ditherError;
-                    if (const int error = hub_->QueryCommand(cmd.get)) {
-                        return error;
+                    if (const int status = hub_->QueryCommand(cmd.get); status != DEVICE_OK) {
+                        return status;
                     }
                     const std::vector<std::string> reply = hub_->SplitAnswerOnSpace();
                     if (reply.size() <= 2) {
@@ -972,11 +971,11 @@ void CCRISP::CreateLogAmpAGCProperty() {
             if (eAct == MM::BeforeGet) {
                 double tmp = 0.0; // Note: response is ":A X=1.000000", parse as double
                 const Command& cmd = commands_->logAmpAGC;
-                if (const int error = hub_->QueryCommandVerify(cmd.get, cmd.getReply)) {
-                    return error;
+                if (const int status = hub_->QueryCommandVerify(cmd.get, cmd.getReply); status != DEVICE_OK) {
+                    return status;
                 }
-                if (const int error = hub_->ParseAnswerAfterEquals(tmp)) {
-                    return error;
+                if (const int status = hub_->ParseAnswerAfterEquals(tmp); status != DEVICE_OK) {
+                    return status;
                 }
                 // convert to long for integer property
                 if (!pProp->Set(static_cast<long>(tmp))) {
@@ -1004,8 +1003,8 @@ void CCRISP::CreateSetLogAmpAGCProperty() {
                 if (logAmpAGC != 0) {
                     const Command& cmd = commands_->setLogAmpAGC;
                     const std::string command = cmd.set + std::to_string(logAmpAGC);
-                    if (const int error = hub_->QueryCommandVerify(command, cmd.setReply)) {
-                        return error;
+                    if (const int status = hub_->QueryCommandVerify(command, cmd.setReply); status != DEVICE_OK) {
+                        return status;
                     }
                 }
             }
@@ -1028,8 +1027,8 @@ void CCRISP::CreateSetLockOffsetProperty() {
                 if (offset != 0) {
                     const Command& cmd = commands_->setLockOffset;
                     const std::string command = cmd.set + std::to_string(offset);
-                    if (const int error = hub_->QueryCommandVerify(command, cmd.setReply)) {
-                        return error;
+                    if (const int status = hub_->QueryCommandVerify(command, cmd.setReply); status != DEVICE_OK) {
+                        return status;
                     }
                     refreshOverride_ = true;
                     UpdateProperty(Props::LockOffset);

From d9c813aaf6dae270ad696c138ac01407abc9297a Mon Sep 17 00:00:00 2001
From: Brandon <brandon@asiimaging.com>
Date: Thu, 28 May 2026 16:22:40 -0700
Subject: [PATCH 7/9] ASITiger: use braced init for in-class member
 initializers

---
 DeviceAdapters/ASITiger/ASIBase.h       | 4 ++--
 DeviceAdapters/ASITiger/ASICRISP.h      | 2 +-
 DeviceAdapters/ASITiger/ASIDac.h        | 2 +-
 DeviceAdapters/ASITiger/ASIDacXYStage.h | 4 ++--
 DeviceAdapters/ASITiger/ASIHub.h        | 8 ++++----
 DeviceAdapters/ASITiger/ASILens.h       | 2 +-
 DeviceAdapters/ASITiger/ASIPiezo.h      | 2 +-
 DeviceAdapters/ASITiger/ASIScanner.h    | 6 +++---
 DeviceAdapters/ASITiger/ASIXYStage.h    | 4 ++--
 DeviceAdapters/ASITiger/ASIZStage.h     | 2 +-
 10 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/DeviceAdapters/ASITiger/ASIBase.h b/DeviceAdapters/ASITiger/ASIBase.h
index e8066e601..1cdadb292 100644
--- a/DeviceAdapters/ASITiger/ASIBase.h
+++ b/DeviceAdapters/ASITiger/ASIBase.h
@@ -116,6 +116,6 @@ class ASIBase : public TDeviceBase<UConcreteDevice> {
 
     bool initialized_ = false;
     double firmwareVersion_ = 0.0; // firmware version
-    std::string firmwareDate_;     // firmware compile date
-    std::string firmwareBuild_;    // firmware build name
+    std::string firmwareDate_{};   // firmware compile date
+    std::string firmwareBuild_{};  // firmware build name
 };
diff --git a/DeviceAdapters/ASITiger/ASICRISP.h b/DeviceAdapters/ASITiger/ASICRISP.h
index 0073fdeb2..78f2a655a 100644
--- a/DeviceAdapters/ASITiger/ASICRISP.h
+++ b/DeviceAdapters/ASITiger/ASICRISP.h
@@ -130,5 +130,5 @@ class CCRISP : public ASIPeripheralBase<CAutoFocusBase, CCRISP> {
 
     // The CommandTable is created in Initialize() once we know the card address and firmware version.
     // std::optional allows the table to be late-initialized while keeping its members const for immutability.
-    std::optional<CommandTable> commands_;
+    std::optional<CommandTable> commands_{};
 };
diff --git a/DeviceAdapters/ASITiger/ASIDac.h b/DeviceAdapters/ASITiger/ASIDac.h
index 02cd902b7..ab06767af 100644
--- a/DeviceAdapters/ASITiger/ASIDac.h
+++ b/DeviceAdapters/ASITiger/ASIDac.h
@@ -103,5 +103,5 @@ class CDAC : public ASIPeripheralBase<CSignalIOBase, CDAC> {
     bool ring_buffer_supported_ = false;
     bool ttl_trigger_supported_ = false;
     bool ttl_trigger_enabled_ = false;
-    std::vector<double> sequence_; // carries data in volts
+    std::vector<double> sequence_{}; // carries data in volts
 };
diff --git a/DeviceAdapters/ASITiger/ASIDacXYStage.h b/DeviceAdapters/ASITiger/ASIDacXYStage.h
index 03d9b5f94..4263ba596 100644
--- a/DeviceAdapters/ASITiger/ASIDacXYStage.h
+++ b/DeviceAdapters/ASITiger/ASIDacXYStage.h
@@ -161,6 +161,6 @@ class CDACXYStage : public ASIPeripheralBase<CXYStageBase, CDACXYStage> {
 	bool ttl_trigger_enabled_ = false;
 	long umToMvX_ = 1; // microns to millivolts conversion factors
 	long umToMvY_ = 1;
-	std::vector<double> sequenceX_;
-	std::vector<double> sequenceY_;
+	std::vector<double> sequenceX_{};
+	std::vector<double> sequenceY_{};
 };
diff --git a/DeviceAdapters/ASITiger/ASIHub.h b/DeviceAdapters/ASITiger/ASIHub.h
index 43a0aaf87..323b4e1b7 100644
--- a/DeviceAdapters/ASITiger/ASIHub.h
+++ b/DeviceAdapters/ASITiger/ASIHub.h
@@ -156,12 +156,12 @@ class ASIHub : public ASIBase<HubBase, ASIHub> {
 
     MMThreadLock threadLock_; // used to lock thread during serial transaction
 
-    std::map<std::string, std::string> deviceMap_; // to implement properties shared between devices
+    std::map<std::string, std::string> deviceMap_{}; // to implement properties shared between devices
     // key is the device name, value is the Tiger address (normally a single character, see note about addressChar_ in ASIPeripheralBase
 
-    std::string serialAnswer_;       // last answer received from any communication with the controller
-    std::string manualSerialAnswer_; // last answer received when the SerialCommand property was used
-    std::string serialCommand_;      // last command sent, or can be set for calling commands without args
+    std::string serialAnswer_{};       // last answer received from any communication with the controller
+    std::string manualSerialAnswer_{}; // last answer received when the SerialCommand property was used
+    std::string serialCommand_{};      // last command sent, or can be set for calling commands without args
     std::string serialTerminator_ = g_SerialTerminatorDefault; // only used when parsing command sent via OnSerialCommand action handler
     long serialRepeatDuration_ = 0; // for how long total time the command is repeatedly sent
     long serialRepeatPeriod_ = 500; // how often in ms the command is sent
diff --git a/DeviceAdapters/ASITiger/ASILens.h b/DeviceAdapters/ASITiger/ASILens.h
index 1fef9c954..1cb36cb1e 100644
--- a/DeviceAdapters/ASITiger/ASILens.h
+++ b/DeviceAdapters/ASITiger/ASILens.h
@@ -115,5 +115,5 @@ class CLens : public ASIPeripheralBase<CStageBase, CLens>
     bool ring_buffer_supported_ = false;
     bool ttl_trigger_supported_ = false;
     bool ttl_trigger_enabled_ = false;
-    std::vector<double> sequence_;
+    std::vector<double> sequence_{};
 };
diff --git a/DeviceAdapters/ASITiger/ASIPiezo.h b/DeviceAdapters/ASITiger/ASIPiezo.h
index 6ce9426ca..2b96e8ae8 100644
--- a/DeviceAdapters/ASITiger/ASIPiezo.h
+++ b/DeviceAdapters/ASITiger/ASIPiezo.h
@@ -123,5 +123,5 @@ class CPiezo : public ASIPeripheralBase<CStageBase, CPiezo> {
     bool ttl_trigger_supported_ = false;
     bool ttl_trigger_enabled_ = false;
     bool runningFastSequence_ = false;
-    std::vector<double> sequence_;
+    std::vector<double> sequence_{};
 };
diff --git a/DeviceAdapters/ASITiger/ASIScanner.h b/DeviceAdapters/ASITiger/ASIScanner.h
index e512bb749..450d50b64 100644
--- a/DeviceAdapters/ASITiger/ASIScanner.h
+++ b/DeviceAdapters/ASITiger/ASIScanner.h
@@ -181,11 +181,11 @@ class CScanner : public ASIPeripheralBase<CGalvoBase, CScanner> {
       long pattern;
    };
 
-   SingleAxisState saStateX_;
-   SingleAxisState saStateY_;
+   SingleAxisState saStateX_{};
+   SingleAxisState saStateY_{};
 
    // for polygons
-   std::vector<std::pair<double,double> > polygons_;
+   std::vector<std::pair<double, double>> polygons_{};
    long polygonRepetitions_ = 0;
    bool ring_buffer_supported_ = false;
 
diff --git a/DeviceAdapters/ASITiger/ASIXYStage.h b/DeviceAdapters/ASITiger/ASIXYStage.h
index 8fa629ab0..d6de4f017 100644
--- a/DeviceAdapters/ASITiger/ASIXYStage.h
+++ b/DeviceAdapters/ASITiger/ASIXYStage.h
@@ -170,6 +170,6 @@ class CXYStage : public ASIPeripheralBase<CXYStageBase, CXYStage>
     bool ttl_trigger_enabled_ = false;
     bool advancedPropsEnabled_ = false;
     bool speedTruth_ = false;
-    std::vector<double> sequenceX_;
-    std::vector<double> sequenceY_;
+    std::vector<double> sequenceX_{};
+    std::vector<double> sequenceY_{};
 };
diff --git a/DeviceAdapters/ASITiger/ASIZStage.h b/DeviceAdapters/ASITiger/ASIZStage.h
index f5b61e5f2..2907b36b2 100644
--- a/DeviceAdapters/ASITiger/ASIZStage.h
+++ b/DeviceAdapters/ASITiger/ASIZStage.h
@@ -135,5 +135,5 @@ class CZStage : public ASIPeripheralBase<CStageBase, CZStage> {
     bool runningFastSequence_ = false;
     bool advancedPropsEnabled_ = false;
     bool speedTruth_ = false;
-    std::vector<double> sequence_;
+    std::vector<double> sequence_{};
 };

From e10091971c52e65a629e5db5d6a9e6349bd4428e Mon Sep 17 00:00:00 2001
From: Brandon <brandon@asiimaging.com>
Date: Thu, 28 May 2026 16:27:38 -0700
Subject: [PATCH 8/9] ASITiger: use braced init for saStateX and saStateY

---
 DeviceAdapters/ASITiger/ASIScanner.cpp | 6 ------
 DeviceAdapters/ASITiger/ASIScanner.h   | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/DeviceAdapters/ASITiger/ASIScanner.cpp b/DeviceAdapters/ASITiger/ASIScanner.cpp
index bcd35e441..1f86e7709 100644
--- a/DeviceAdapters/ASITiger/ASIScanner.cpp
+++ b/DeviceAdapters/ASITiger/ASIScanner.cpp
@@ -36,12 +36,6 @@
 
 CScanner::CScanner(const char* name) :
     ASIPeripheralBase< ::CGalvoBase, CScanner >(name) {
-    // initialize single axis states
-    saStateX_.mode = -1;
-    saStateX_.pattern = -1;
-    saStateY_.mode = -1;
-    saStateY_.pattern = -1;
-
     // only set up these properties if we have the required information in the name
     if (IsExtendedName(name)) {
         axisLetterX_ = GetAxisLetterFromExtName(name);
diff --git a/DeviceAdapters/ASITiger/ASIScanner.h b/DeviceAdapters/ASITiger/ASIScanner.h
index 450d50b64..9d3b601c9 100644
--- a/DeviceAdapters/ASITiger/ASIScanner.h
+++ b/DeviceAdapters/ASITiger/ASIScanner.h
@@ -177,8 +177,8 @@ class CScanner : public ASIPeripheralBase<CGalvoBase, CScanner> {
     unsigned int axisIndexY_ = 1;
 
    struct SingleAxisState {
-      long mode;
-      long pattern;
+      long mode = -1;
+      long pattern = -1;
    };
 
    SingleAxisState saStateX_{};

From 356e237e97a7a9b9e08e13667c9f5b7a1cda20d4 Mon Sep 17 00:00:00 2001
From: Brandon <brandon@asiimaging.com>
Date: Thu, 28 May 2026 16:49:58 -0700
Subject: [PATCH 9/9] ASITiger: replace RETURN_ON_MM_ERROR with C++17 style if
 statement for PeripheralInitialize()

---
 DeviceAdapters/ASITiger/ASIClocked.cpp    | 30 +++++++++++++----------
 DeviceAdapters/ASITiger/ASIDac.cpp        |  9 +++----
 DeviceAdapters/ASITiger/ASIDacXYStage.cpp |  7 +++---
 DeviceAdapters/ASITiger/ASIFWheel.cpp     |  9 ++++---
 DeviceAdapters/ASITiger/ASILED.cpp        |  9 ++++---
 DeviceAdapters/ASITiger/ASILens.cpp       |  9 ++++---
 DeviceAdapters/ASITiger/ASIPLogic.cpp     |  9 ++++---
 DeviceAdapters/ASITiger/ASIPiezo.cpp      |  9 ++++---
 DeviceAdapters/ASITiger/ASIPmt.cpp        |  9 ++++---
 DeviceAdapters/ASITiger/ASIScanner.cpp    |  9 ++++---
 DeviceAdapters/ASITiger/ASIXYStage.cpp    |  9 ++++---
 DeviceAdapters/ASITiger/ASIZStage.cpp     |  9 ++++---
 12 files changed, 70 insertions(+), 57 deletions(-)

diff --git a/DeviceAdapters/ASITiger/ASIClocked.cpp b/DeviceAdapters/ASITiger/ASIClocked.cpp
index f4129c47f..ce27ee88f 100644
--- a/DeviceAdapters/ASITiger/ASIClocked.cpp
+++ b/DeviceAdapters/ASITiger/ASIClocked.cpp
@@ -41,10 +41,11 @@ CClocked::CClocked(const char* name) :
     }
 }
 
-int CClocked::Initialize()
-{
-   // call generic Initialize first, this gets hub
-   RETURN_ON_MM_ERROR( PeripheralInitialize() );
+int CClocked::Initialize() {
+    // call generic Initialize first, this gets hub
+    if (const int status = PeripheralInitialize(); status != DEVICE_OK) {
+        return status;
+    }
 
    std::ostringstream command;
 
@@ -290,9 +291,10 @@ CFSlider::CFSlider(const char* name) : CClocked(name) {
     // inherits from CClocked, description has been changed
 }
 
-int CFSlider::Initialize()
-{
-   RETURN_ON_MM_ERROR( CClocked::Initialize() );
+int CFSlider::Initialize() {
+    if (const int status = CClocked::Initialize(); status != DEVICE_OK) {
+        return status;
+    }
 
    std::ostringstream command;
 
@@ -309,9 +311,10 @@ CPortSwitch::CPortSwitch(const char* name) : CClocked(name) {
     // inherits from CClocked, description has been changed
 }
 
-int CPortSwitch::Initialize()
-{
-   RETURN_ON_MM_ERROR( CClocked::Initialize() );
+int CPortSwitch::Initialize() {
+    if (const int status = CClocked::Initialize(); status != DEVICE_OK) {
+        return status;
+    }
 
    std::ostringstream command;
 
@@ -328,9 +331,10 @@ CTurret::CTurret(const char* name) : CClocked(name) {
     // inherits from CClocked, description has been changed
 }
 
-int CTurret::Initialize()
-{
-   RETURN_ON_MM_ERROR( CClocked::Initialize() );
+int CTurret::Initialize() {
+    if (const int status = CClocked::Initialize(); status != DEVICE_OK) {
+        return status;
+    }
 
    std::ostringstream command;
 
diff --git a/DeviceAdapters/ASITiger/ASIDac.cpp b/DeviceAdapters/ASITiger/ASIDac.cpp
index 6e481397d..cfe597281 100644
--- a/DeviceAdapters/ASITiger/ASIDac.cpp
+++ b/DeviceAdapters/ASITiger/ASIDac.cpp
@@ -42,17 +42,16 @@ CDAC::CDAC(const char* name) :
 	}
 }
 
-int CDAC::Initialize()
-{
-	// call generic Initialize first, this gets hub
-	RETURN_ON_MM_ERROR(PeripheralInitialize());
+int CDAC::Initialize() {
+	if (const int status = PeripheralInitialize(); status != DEVICE_OK) {
+		return status;
+	}
 
 	std::ostringstream command;
 	CPropertyAction* pAct;
 	double tmp;
 
 	// create MM description; this doesn't work during hardware configuration wizard but will work afterwards
-	command.str("");
 	command << g_DacDeviceDescription << " Axis=" << axisLetter_ << " HexAddr=" << addressString_;
 	CreateProperty(MM::g_Keyword_Description, command.str().c_str(), MM::String, true);
 
diff --git a/DeviceAdapters/ASITiger/ASIDacXYStage.cpp b/DeviceAdapters/ASITiger/ASIDacXYStage.cpp
index 823fbd263..320a1ec20 100644
--- a/DeviceAdapters/ASITiger/ASIDacXYStage.cpp
+++ b/DeviceAdapters/ASITiger/ASIDacXYStage.cpp
@@ -54,10 +54,11 @@ CDACXYStage::CDACXYStage(const char* name) :
 	UpdateProperty(g_DACMicronsPerMvYPropertyName);
 }
 
-int CDACXYStage::Initialize()
-{
+int CDACXYStage::Initialize() {
 	// call generic Initialize first, this gets the hub
-	RETURN_ON_MM_ERROR(PeripheralInitialize());
+	if (const int status = PeripheralInitialize(); status != DEVICE_OK) {
+		return status;
+	}
 
 	CPropertyAction* pAct;
 
diff --git a/DeviceAdapters/ASITiger/ASIFWheel.cpp b/DeviceAdapters/ASITiger/ASIFWheel.cpp
index c5975badc..2c82ed1da 100644
--- a/DeviceAdapters/ASITiger/ASIFWheel.cpp
+++ b/DeviceAdapters/ASITiger/ASIFWheel.cpp
@@ -41,10 +41,11 @@ CFWheel::CFWheel(const char* name) :
     }
 }
 
-int CFWheel::Initialize()
-{
-   // call generic Initialize first, this gets hub
-   RETURN_ON_MM_ERROR( PeripheralInitialize(true) );
+int CFWheel::Initialize() {
+    // call generic Initialize first, this gets hub
+    if (const int status = PeripheralInitialize(true); status != DEVICE_OK) {
+        return status;
+    }
 
    std::ostringstream command;
 
diff --git a/DeviceAdapters/ASITiger/ASILED.cpp b/DeviceAdapters/ASITiger/ASILED.cpp
index ce8418382..0f668f1ea 100644
--- a/DeviceAdapters/ASITiger/ASILED.cpp
+++ b/DeviceAdapters/ASITiger/ASILED.cpp
@@ -66,10 +66,11 @@ CLED::CLED(const char* name) :
    }
 }
 
-int CLED::Initialize()
-{
-   // call generic Initialize first, this gets hub
-   RETURN_ON_MM_ERROR( PeripheralInitialize() );
+int CLED::Initialize() {
+    // call generic Initialize first, this gets hub
+    if (const int status = PeripheralInitialize(); status != DEVICE_OK) {
+        return status;
+    }
 
    // create MM description; this doesn't work during hardware configuration wizard but will work afterwards
    std::ostringstream command;
diff --git a/DeviceAdapters/ASITiger/ASILens.cpp b/DeviceAdapters/ASITiger/ASILens.cpp
index 36b91dd58..07a6ed74d 100644
--- a/DeviceAdapters/ASITiger/ASILens.cpp
+++ b/DeviceAdapters/ASITiger/ASILens.cpp
@@ -43,10 +43,11 @@ CLens::CLens(const char* name) :
     }
 }
 
-int CLens::Initialize()
-{
-   // call generic Initialize first, this gets hub
-   RETURN_ON_MM_ERROR( PeripheralInitialize() );
+int CLens::Initialize() {
+    // call generic Initialize first, this gets hub
+    if (const int status = PeripheralInitialize(); status != DEVICE_OK) {
+        return status;
+    }
 
    // read the unit multiplier
    // ASI's unit multiplier is how many units per mm, so divide by 1000 here to get units per micron
diff --git a/DeviceAdapters/ASITiger/ASIPLogic.cpp b/DeviceAdapters/ASITiger/ASIPLogic.cpp
index 3cc59b677..f6ffca10a 100644
--- a/DeviceAdapters/ASITiger/ASIPLogic.cpp
+++ b/DeviceAdapters/ASITiger/ASIPLogic.cpp
@@ -67,10 +67,11 @@ CPLogic::CPLogic(const char* name) :
    AddAllowedValue(g_PLogicModePropertyName, g_PLogicMode7ChTTLShutter);
 }
 
-int CPLogic::Initialize()
-{
-   // call generic Initialize first, this gets hub
-   RETURN_ON_MM_ERROR( PeripheralInitialize() );
+int CPLogic::Initialize() {
+    // call generic Initialize first, this gets hub
+    if (const int status = PeripheralInitialize(); status != DEVICE_OK) {
+        return status;
+    }
 
    // create MM description; this doesn't work during hardware configuration wizard but will work afterwards
    std::ostringstream command;
diff --git a/DeviceAdapters/ASITiger/ASIPiezo.cpp b/DeviceAdapters/ASITiger/ASIPiezo.cpp
index f43f87bc9..6aab90816 100644
--- a/DeviceAdapters/ASITiger/ASIPiezo.cpp
+++ b/DeviceAdapters/ASITiger/ASIPiezo.cpp
@@ -46,10 +46,11 @@ CPiezo::CPiezo(const char* name) :
     }
 }
 
-int CPiezo::Initialize()
-{
-   // call generic Initialize first, this gets hub
-   RETURN_ON_MM_ERROR( PeripheralInitialize() );
+int CPiezo::Initialize() {
+    // call generic Initialize first, this gets hub
+    if (const int status = PeripheralInitialize(); status != DEVICE_OK) {
+        return status;
+    }
 
    // read the unit multiplier
    // ASI's unit multiplier is how many units per mm, so divide by 1000 here to get units per micron
diff --git a/DeviceAdapters/ASITiger/ASIPmt.cpp b/DeviceAdapters/ASITiger/ASIPmt.cpp
index 2989a6865..b74951539 100644
--- a/DeviceAdapters/ASITiger/ASIPmt.cpp
+++ b/DeviceAdapters/ASITiger/ASIPmt.cpp
@@ -69,10 +69,11 @@ CPMT::CPMT(const char* name) :
    }
 }
 
-int CPMT::Initialize()
-{
-   // call generic Initialize first, this gets hub
-   RETURN_ON_MM_ERROR( PeripheralInitialize() );
+int CPMT::Initialize() {
+    // call generic Initialize first, this gets hub
+    if (const int status = PeripheralInitialize(); status != DEVICE_OK) {
+        return status;
+    }
 
    // create MM description; this doesn't work during hardware configuration wizard but will work afterwards
    std::ostringstream command;
diff --git a/DeviceAdapters/ASITiger/ASIScanner.cpp b/DeviceAdapters/ASITiger/ASIScanner.cpp
index 1f86e7709..7513278d7 100644
--- a/DeviceAdapters/ASITiger/ASIScanner.cpp
+++ b/DeviceAdapters/ASITiger/ASIScanner.cpp
@@ -45,10 +45,11 @@ CScanner::CScanner(const char* name) :
     }
 }
 
-int CScanner::Initialize()
-{
-   // call generic Initialize first, this gets hub
-   RETURN_ON_MM_ERROR( PeripheralInitialize() );
+int CScanner::Initialize() {
+    // call generic Initialize first, this gets hub
+    if (const int status = PeripheralInitialize(); status != DEVICE_OK) {
+        return status;
+    }
 
    // read the unit multiplier for X and Y axes
    // ASI's unit multiplier is how many units per degree rotation for the micromirror card
diff --git a/DeviceAdapters/ASITiger/ASIXYStage.cpp b/DeviceAdapters/ASITiger/ASIXYStage.cpp
index 2a6c0099e..5b377529a 100644
--- a/DeviceAdapters/ASITiger/ASIXYStage.cpp
+++ b/DeviceAdapters/ASITiger/ASIXYStage.cpp
@@ -45,10 +45,11 @@ CXYStage::CXYStage(const char* name) :
     }
 }
 
-int CXYStage::Initialize()
-{
-   // call generic Initialize first, this gets hub
-   RETURN_ON_MM_ERROR( PeripheralInitialize() );
+int CXYStage::Initialize() {
+    // call generic Initialize first, this gets hub
+    if (const int status = PeripheralInitialize(); status != DEVICE_OK) {
+        return status;
+    }
 
    // read the unit multiplier for X and Y axes
    // ASI's unit multiplier is how many units per mm, so divide by 1000 here to get units per micron
diff --git a/DeviceAdapters/ASITiger/ASIZStage.cpp b/DeviceAdapters/ASITiger/ASIZStage.cpp
index 88f07d840..9622a4648 100644
--- a/DeviceAdapters/ASITiger/ASIZStage.cpp
+++ b/DeviceAdapters/ASITiger/ASIZStage.cpp
@@ -41,10 +41,11 @@ CZStage::CZStage(const char* name) :
     }
 }
 
-int CZStage::Initialize()
-{
-   // call generic Initialize first, this gets hub
-   RETURN_ON_MM_ERROR( PeripheralInitialize() );
+int CZStage::Initialize() {
+    // call generic Initialize first, this gets hub
+    if (const int status = PeripheralInitialize(); status != DEVICE_OK) {
+        return status;
+    }
 
    // read the unit multiplier
    // ASI's unit multiplier is how many units per mm, so divide by 1000 here to get units per micron