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.

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

Don't display camera model twice #3974

Merged
merged 3 commits into from
Nov 20, 2024

Conversation

EricClaeys
Copy link
Collaborator

The Camera Model was displayed twice in the debug log.
Only display once.

They are displayed via ASI_functions.cpp
It was displayed as part of "settings", but it makes more sense to display as part of Camera Information.

Also:
* Remove redundant word "Camera".
* Display the camera model two ways.  If they are ALWAYS the same, then remove the "getCameraModel()" version.  Some ZWO cameras have "ZWO" in the model name, which getCameraModel() deletes.
ZWO cameras don't use "-cmd command" so pass "" for the command.  Ignore that so checks for "if (cmdToUse == NULL)" work.
@EricClaeys EricClaeys merged commit ec3ad57 into v2024.xx.xx Nov 20, 2024
1 check passed
@EricClaeys EricClaeys deleted the Don't-display-camera-model-twice branch November 20, 2024 09:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant