Merge branch 'indilib:master' into master

karlrees · Jul 4, 2024 · 24f38ac · 24f38ac
2 parents 4d8afea + f884411
commit 24f38ac
Show file tree

Hide file tree

Showing 16 changed files with 377 additions and 364 deletions.
diff --git a/debian/indi-gphoto/changelog b/debian/indi-gphoto/changelog
@@ -1,3 +1,9 @@
+indi-gphoto (3.3) jammy; urgency=medium
+
+  * Updated INDI properties.
+
+ -- Jasem Mutlaq <[email protected]>  Fri, 28 Jun 2024 20:00:00 +0300
+
 indi-gphoto (3.2) jammy; urgency=medium
 
   * Fixed opening of remote serial shutter.

diff --git a/debian/libsvbony/changelog b/debian/libsvbony/changelog
@@ -1,3 +1,12 @@
+libsvbony (1.12.8) bionic; urgency=low
+
+  * Upgraded to upstream SVBONY SDK vers. 1.12.8 :
+  * Fixed the problem that the program occasionally exits abnormally under macOS
+  * Fixed the issue where the cooling power value obtained when cooling is turned off is greater than 0
+  * MaxBitDepth in SVB_CAMERA_PROPERTY returns the actual bit width of the sensor
+
+ -- Tetsuya Kakura <[email protected]>  Mon, 24 Jun 2024 10:00:00 +0900
+
 libsvbony (1.12.6) bionic; urgency=low
 
   * Upgraded to upstream SVBONY SDK vers. 1.12.6 :

diff --git a/indi-aagcloudwatcher-ng/CloudWatcherController_ng.cpp b/indi-aagcloudwatcher-ng/CloudWatcherController_ng.cpp
@@ -756,19 +756,24 @@ bool CloudWatcherController::getValues(int *internalSupplyVoltage, int *ambientT
     {
         char inputBuffer[BLOCK_SIZE * 4] = {0};
 
-        int r = getCloudWatcherAnswer(inputBuffer, 5);
+        auto blocks = 4;
+        if (sqmSensorStatus == SQM_UNDETECTED)
+            blocks = 3;
 
-        if (!r)
+        getCloudWatcherAnswer(inputBuffer, blocks);
+
+        if (blocks == 4)
         {
-            return false;
+            auto res = sscanf(inputBuffer, "!6         %d!4         %d!8         %d!5         %d", &zenerV, &ldrRes, &ldrFreq, &rainSensTemp);
+            // If SQM Light sensor is not installed, then we skip the !8 block and read the rest
+            sqmSensorStatus = (res == 4) ? SQM_DETECTED : SQM_UNDETECTED;
         }
-
-        int res = sscanf(inputBuffer, "!6         %d!4         %d!8         %d!5         %d", &zenerV, &ldrRes, &ldrFreq,
-                         &rainSensTemp);
-
-        if (res != 4)
+        // In case above fails due to undetected SQM, fallback here
+        if (blocks == 3 || sqmSensorStatus == SQM_UNDETECTED)
         {
-            return false;
+            auto res = sscanf(inputBuffer, "!6         %d!4         %d!5         %d", &zenerV, &ldrRes, &rainSensTemp);
+            if (res != 3)
+                return false;
         }
     }
     else if (m_FirmwareVersion >= 3)

diff --git a/indi-aagcloudwatcher-ng/CloudWatcherController_ng.h b/indi-aagcloudwatcher-ng/CloudWatcherController_ng.h
@@ -266,6 +266,19 @@ class CloudWatcherController
         */
         int totalReadings = 0;
 
+
+        /**
+        * is SQM selector detected?
+        */
+        enum
+        {
+            SQM_UNKNOWN,
+            SQM_DETECTED,
+            SQM_UNDETECTED,
+        };
+        int sqmSensorStatus = SQM_UNKNOWN;
+
+
         /**
         * Print a buffer of chars. Just for debugging
         * @param buffer the buffer to be printed
@@ -379,7 +392,7 @@ class CloudWatcherController
         * and Rain Sensor Temperature values of the AAG Cloud Watcher
         * @param internalSupplyVoltage where the sensor value will be stored
         * @param ambientTemperature where the sensor value will be stored
-        * @param ldrValue where the sensor value will be 
+        * @param ldrValue where the sensor value will be
         * @param ldrFreqValue where the sensor value in K will be stored, if Firmware >= 5.88
         * @param rainSensorTemperature where the sensor value will be stored
         * @return true if succesfully read. false otherwise.

diff --git a/indi-gphoto/CMakeLists.txt b/indi-gphoto/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16)
 PROJECT(indi_gphoto C CXX)
 
 set(INDI_GPHOTO_VERSION_MAJOR 3)
-set(INDI_GPHOTO_VERSION_MINOR 2)
+set(INDI_GPHOTO_VERSION_MINOR 3)
 
 LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")
 LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake_modules/")