From 662b235331ce741c5fd87550c1a1ef5fd14f056f Mon Sep 17 00:00:00 2001
From: Eric Claeys <83164203+EricClaeys@users.noreply.github.com>
Date: Wed, 20 Nov 2024 03:38:09 -0600
Subject: [PATCH] Update ASI_functions.cpp: display Camera Number

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.
---
 src/ASI_functions.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/ASI_functions.cpp b/src/ASI_functions.cpp
index 6966f0516..c474a6488 100644
--- a/src/ASI_functions.cpp
+++ b/src/ASI_functions.cpp
@@ -1902,11 +1902,13 @@ void outputCameraInfo(ASI_CAMERA_INFO cameraInfo, config cg,
 {
 	printf(" Camera Information:\n");
 	printf("  - Type: %s\n", CAMERA_TYPE);
-	printf("  - Model: %s\n", getCameraModel(cameraInfo.Name));
+	printf("  - Model: %s (%s)\n", getCameraModel(cameraInfo.Name), cg.cm);
 #ifdef IS_ZWO
-	printf("  - Camera ID: %s\n", cID);
+	printf("  - ID: %s\n", cID);
 #endif
-	printf("  - Camera Serial Number: %s\n", getSerialNumber(cameraInfo.CameraID));
+	printf("  - Serial Number: %s\n", getSerialNumber(cameraInfo.CameraID));
+	if (cg.cameraNumber > 0)
+		printf("   Camera number: %d\n", cg.cameraNumber);
 	printf("  - Native Resolution: %ldx%ld\n", width, height);
 	printf("  - Pixel Size: %1.2f microns\n", pixelSize);
 	printf("  - Supported Bins: ");
@@ -2496,3 +2498,4 @@ bool validateSettings(config *cg, ASI_CAMERA_INFO ci)
 
 	return(ok);
 }
+