Skip to content

ASITiger: cleanup code #952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bls337 wants to merge 10 commits into
base: main
Choose a base branch
from
Open

ASITiger: cleanup code #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
237e92a
ASITiger: use #pragma once instead of header guard
May 26, 2026
12f158c
ASITiger: use in-class member initializers for CClocked device
May 26, 2026
7c7c583
ASITiger: use more in-class members initializers
May 26, 2026
73beb02
ASITiger: use more in-class member initialization
May 26, 2026
4fd7742
ASITiger: finish in-class member initializers
May 27, 2026
630cc5a
Merge branch 'micro-manager:main' into ASITiger4
bls337 May 28, 2026
144515d
ASITiger: improve readability in CRISP
May 28, 2026
d9c813a
ASITiger: use braced init for in-class member initializers
May 28, 2026
e100919
ASITiger: use braced init for saStateX and saStateY
May 28, 2026
356e237
ASITiger: replace RETURN_ON_MM_ERROR with C++17 style if statement fo…
May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 39 additions & 47 deletions DeviceAdapters/ASITiger/ASIBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -54,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)
Expand All @@ -72,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
Expand All @@ -99,31 +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
};

#endif // ASIBASE_H
Loading
Loading