diff --git a/raptor_eagle_ccd.cpp b/raptor_eagle_ccd.cpp index 32f769d..991cede 100644 --- a/raptor_eagle_ccd.cpp +++ b/raptor_eagle_ccd.cpp @@ -1178,8 +1178,8 @@ void RaptorEagleCCD::initAttrComm() addAttribute( CAMERA_ATTR_CAMERA_STATUS, [this]() { - logTrace("Return current camera status as {}", _cameraStatus); - return _cameraStatus; + logTrace("Return current camera status as {}", _cameraStatus.load()); + return _cameraStatus.load(); }, [this](const std::string_view& status) { logDebug("Try to set current status to {}", status); @@ -1191,7 +1191,7 @@ void RaptorEagleCCD::initAttrComm() } _cameraStatus = status; - logDebug("Camera status is {}", _cameraStatus); + logDebug("Camera status is {}", _cameraStatus.load()); }, adc::utils::AdcDefaultValueConverter<>::serialize, [&comp_case_ignore](const attribute_t::serialized_t& v) { diff --git a/raptor_eagle_ccd.h b/raptor_eagle_ccd.h index 855f3a5..a180fd5 100644 --- a/raptor_eagle_ccd.h +++ b/raptor_eagle_ccd.h @@ -246,11 +246,11 @@ private: // attributes inner variables std::atomic_size_t _frameNumbers; - std::string _currentFitsFile; // current acquisition FITS filename - std::string _currentTemplateFile; // CFITSIO template filename - std::vector _currentFitsKeywords{}; // current acquisition FITS keywords - std::vector _permanentFitsKeywords{}; // permanent user FITS keywords - std::string_view _cameraStatus = CAMERA_ATTR_CAMERA_STATUS_IDLE; // camera current status + std::string _currentFitsFile; // current acquisition FITS filename + std::string _currentTemplateFile; // CFITSIO template filename + std::vector _currentFitsKeywords{}; // current acquisition FITS keywords + std::vector _permanentFitsKeywords{}; // permanent user FITS keywords + std::atomic _cameraStatus = CAMERA_ATTR_CAMERA_STATUS_IDLE; // camera current status // std::list> _acqRingBuffer; std::list, size_t>> _acqRingBuffer; diff --git a/raptor_eaglev_server.cpp b/raptor_eaglev_server.cpp index 00b15bf..167146d 100644 --- a/raptor_eaglev_server.cpp +++ b/raptor_eaglev_server.cpp @@ -16,7 +16,7 @@ int main(int argc, char* argv[]) int exit_code = 0; asio::io_context ctx; std::vector threads; - std::size_t Nthreads = 2; + std::size_t Nthreads = 3; /* COMMANDLINE OPTS */ cxxopts::Options options(argv[0], "ADC-library test device network server (ASIO implementation)\n");