Skip to content
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

SVBONY CCD firmware and SDK version information logs added #810

Merged
merged 3 commits into from
Jul 2, 2023
Merged

SVBONY CCD firmware and SDK version information logs added #810

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f9c7c2
SVBONY CCD firmware and SDK version information logs added
jctk Jul 2, 2023
558f9f5
Updated documentation for indi-svbony version 1.3.8
jctk Jul 2, 2023
e8b7a42
Removed newline code from LOG_ERROR.
jctk Jul 2, 2023
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
6 changes: 6 additions & 0 deletions debian/indi-svbony/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
indi-svbony (1.3.8) bionic; urgency=low

* SVBONY CCD firmware and SDK version information logs added

-- Tetsuya Kakura <[email protected]> Wed, 2 Jul 2023 06:00:00 +0900

indi-svbony (1.3.7) bionic; urgency=low

* Fixed Conflict of private variables in SVBONYCCD class.
Expand Down
2 changes: 1 addition & 1 deletion indi-svbony/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ include(GNUInstallDirs)

set (SVBONY_VERSION_MAJOR 1)
set (SVBONY_VERSION_MINOR 3)
set (SVBONY_VERSION_PATCH 7)
set (SVBONY_VERSION_PATCH 8)

find_package(CFITSIO REQUIRED)
find_package(INDI REQUIRED)
Expand Down
1 change: 1 addition & 0 deletions indi-svbony/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ Limitations
Changelog
=========

+ 1.3.8 : SVBONY CCD firmware and SDK version information logs added.
+ 1.3.7 : Fixed Conflict of private variables in SVBONYCCD class.
+ 1.3.6 : Disabled workaround code for bug #666 "the problem that the last exposure image may be read in soft trigger mode".
+ 1.3.5 : Added process to initialize Camera parameters when Camera is connected.
Expand Down
2 changes: 1 addition & 1 deletion indi-svbony/doc/svbony-doc.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Family : CCDs
Manufacturer : SVBONY
Platforms : Linux (Intel, ARM),Mac OS X 64 bits
Author : Blaise-Florentin Collin & Tetsuya Kakura
Version : 1.3.3
Version : 1.3.8

![SV305 camera](./SV305.jpg)

Expand Down
13 changes: 13 additions & 0 deletions indi-svbony/svbony_ccd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,19 @@ bool SVBONYCCD::Connect()
return false;
}

// Get Camera Firmware Version
status = SVBGetCameraFirmwareVersion(cameraID, cameraFirmwareVersion);
if (status == SVB_SUCCESS)
{
LOGF_INFO("Camera Firmware Version:%s", cameraFirmwareVersion);
}
else {
LOG_ERROR("Error, getting Camera Firmware Version failed.\n");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for \n

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I committed it with newline code removed form LOG_ERROR.

}
// Get SVBONY Camera SDK Version
SDKVersion = SVBGetSDKVersion();
LOGF_INFO("SVBONY Camera SDK Version:%s", SDKVersion);

// wait a bit for the camera to get ready
usleep(0.5 * 1e6);

Expand Down
5 changes: 5 additions & 0 deletions indi-svbony/svbony_ccd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,11 @@ class SVBONYCCD : public INDI::CCD
// pixel size
float pixelSize;

// Camera Firmware version number
char cameraFirmwareVersion[65];
// SVBONY Camera SDK version number
const char* SDKVersion;
Comment on lines +113 to +115
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you're only using this to report version information once in Connect, is there a reason to keep it as class variable? or is this used elsewhere?

Copy link
Contributor Author

@jctk jctk Jul 2, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If EKOS is used, this information is output to the log and need not be retained.
If non-EKOS clients use it without logging, I will retain this information for reference when debugging.
I also plan to display this information in the INDI control panel in the future, so we decided to keep it.


// hCamera mutex protection
pthread_mutex_t cameraID_mutex;

Expand Down