Merge branch 'indilib:master' into master

karlrees · Jun 20, 2024 · 4d8afea · 4d8afea
2 parents 47189d0 + 440a6bf
commit 4d8afea
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 36 deletions.
diff --git a/debian/indi-full/changelog b/debian/indi-full/changelog
@@ -1,3 +1,9 @@
+indi-full (2.0.8) jammy; urgency=medium
+
+  * Minor release.
+
+ -- Jasem Mutlaq <[email protected]>  Sat, 1 Jun 2024 09:00:00 +0300
+
 indi-full (2.0.7) jammy; urgency=medium
 
   * Minor release.

diff --git a/debian/libasi/changelog b/debian/libasi/changelog
@@ -1,3 +1,15 @@
+libasi (1.35) jammy; urgency=medium
+
+  * ASI Camera SDK 1.35 release. Change log:
+
+    New Features
+    1. None.
+
+    Bug fix
+    1. Fixed some issues of ASI676.
+
+ -- Jarno Paananen <[email protected]>  Thu, 23 May 2024 21:06:06 +0300
+
 libasi (1.34) jammy; urgency=medium
 
   * ASI Camera SDK 1.34 release. Change log:

diff --git a/indi-aagcloudwatcher-ng/indi_aagcloudwatcher_ng.cpp b/indi-aagcloudwatcher-ng/indi_aagcloudwatcher_ng.cpp
@@ -71,8 +71,11 @@ bool AAGCloudWatcher::Handshake()
 
         if (m_FirmwareVersion >= 5.6)
         {
-            addParameter("WEATHER_HUMIDITY", "Relative Humidity (%)", 0, 100, 10);
-            setCriticalParameter("WEATHER_HUMIDITY");
+            // add humidity parameter, if not already present
+            if (!ParametersNP.findWidgetByName("WEATHER_HUMIDITY")) {
+                addParameter("WEATHER_HUMIDITY", "Relative Humidity (%)", 0, 100, 10);
+                setCriticalParameter("WEATHER_HUMIDITY");
+            }
         }
 
         return true;

diff --git a/indi-gphoto/gphoto_ccd.cpp b/indi-gphoto/gphoto_ccd.cpp
@@ -1505,7 +1505,7 @@ bool GPhotoCCD::grabImage()
 ISwitch * GPhotoCCD::create_switch(const char * basestr, char ** options, int max_opts, int setidx)
 {
     int i;
-    ISwitch * sw     = static_cast<ISwitch *>(calloc(sizeof(ISwitch), max_opts));
+    ISwitch * sw     = static_cast<ISwitch *>(calloc(max_opts, sizeof(ISwitch)));
     ISwitch * one_sw = sw;
 
     char sw_name[MAXINDINAME];

diff --git a/indi-gphoto/gphoto_driver.cpp b/indi-gphoto/gphoto_driver.cpp
@@ -256,7 +256,7 @@ int gphoto_read_widget(gphoto_widget *widget)
             if (!widget->choices)
             {
                 widget->choice_cnt = gp_widget_count_choices(widget->widget);
-                widget->choices    = (char **)calloc(sizeof(char *), widget->choice_cnt + 1);
+                widget->choices    = (char **)calloc(widget->choice_cnt + 1, sizeof(char *));
             }
 
             for (i = 0; i < widget->choice_cnt; i++)
@@ -286,7 +286,7 @@ int gphoto_read_widget(gphoto_widget *widget)
 
 static gphoto_widget *find_widget(gphoto_driver *gphoto, const char *name)
 {
-    gphoto_widget *widget = (gphoto_widget *)calloc(sizeof(gphoto_widget), 1);
+    gphoto_widget *widget = (gphoto_widget *)calloc(1, sizeof(gphoto_widget));
     int ret;
 
     widget->name = lookup_widget(gphoto->config, name, &widget->widget);
@@ -467,7 +467,7 @@ static double *parse_shutterspeed(gphoto_driver *gphoto, gphoto_widget *widget)
         gphoto->exposure_presets_count = widget->choice_cnt;
     }
 
-    exposure = (double *)calloc(sizeof(double), widget->choice_cnt);
+    exposure = (double *)calloc(widget->choice_cnt, sizeof(double));
 
     for (i = 0; i < widget->choice_cnt; i++)
     {
@@ -1690,7 +1690,7 @@ gphoto_driver *gphoto_open(Camera *camera, GPContext *context, const char *model
         }
     }
 
-    gphoto                         = (gphoto_driver *)calloc(sizeof(gphoto_driver), 1);
+    gphoto                         = (gphoto_driver *)calloc(1, sizeof(gphoto_driver));
     gphoto->camera                 = camera;
     gphoto->context                = context;
     gphoto->exposure_presets       = nullptr;
@@ -2005,7 +2005,7 @@ static void find_all_widgets(gphoto_driver *gphoto, CameraWidget *widget, char *
             return;
         }
         list                 = (gphoto_widget_list *)calloc(1, sizeof(gphoto_widget_list));
-        list->widget         = (gphoto_widget *)calloc(sizeof(gphoto_widget), 1);
+        list->widget         = (gphoto_widget *)calloc(1, sizeof(gphoto_widget));
         list->widget->widget = widget;
         list->widget->type   = type;
         list->widget->name   = uselabel;

diff --git a/indi-sx/sxccd.cpp b/indi-sx/sxccd.cpp
@@ -202,21 +202,19 @@ bool SXCCD::updateProperties()
 
 bool SXCCD::UpdateCCDFrame(int x, int y, int w, int h)
 {
-    /* Add the X and Y offsets */
-    long x_1 = x / PrimaryCCD.getBinX();
-    long y_1 = y / PrimaryCCD.getBinY();
+    uint32_t binX = PrimaryCCD.getBinX();
+    uint32_t binY = PrimaryCCD.getBinY();
+    uint32_t subW = w / binX;
+    uint32_t subH = h / binY;
 
-    long x_2 = x_1 + (w / PrimaryCCD.getBinX());
-    long y_2 = y_1 + (h / PrimaryCCD.getBinY());
-
-    if (x_2 > PrimaryCCD.getXRes())
+    if (subW > static_cast<uint32_t>(PrimaryCCD.getXRes() / binX))
     {
-        LOGF_ERROR("Error: Requested image out of bounds (%ld, %ld)", x_2, y_2);
+        LOGF_INFO("Invalid width request %d", w);
         return false;
     }
-    else if (y_2 > PrimaryCCD.getYRes())
+    if (subH > static_cast<uint32_t>(PrimaryCCD.getYRes() / binY))
     {
-        LOGF_ERROR("Error: Requested image out of bounds (%ld, %ld)", x_2, y_2);
+        LOGF_INFO("Invalid height request %d", h);
         return false;
     }
 
@@ -753,13 +751,6 @@ void SXCCD::NSGuiderTimerHit()
     GuideComplete(AXIS_DE);
 }
 
-void SXCCD::ISGetProperties(const char *dev)
-{
-    INDI_UNUSED(dev);
-    INDI::CCD::ISGetProperties(name);
-    addDebugControl();
-}
-
 bool SXCCD::ISNewSwitch(const char *dev, const char *name, ISState *states, char *names[], int n)
 {
     bool result = false;
@@ -805,9 +796,3 @@ bool SXCCD::ISNewSwitch(const char *dev, const char *name, ISState *states, char
     return result;
 }
 
-//bool SXCCD::saveConfigItems(FILE *fp)
-//{
-//    INDI::CCD::saveConfigItems(fp);
-//    IUSaveConfigSwitch(fp, &BayerSP);
-//    return true;
-//}
diff --git a/indi-sx/sxccd.h b/indi-sx/sxccd.h
@@ -88,7 +88,6 @@ class SXCCD : public INDI::CCD
         void GuideExposureTimerHit();
         void WEGuiderTimerHit();
         void NSGuiderTimerHit();
-        //bool saveConfigItems(FILE *fp);
         IPState GuideWest(uint32_t ms);
         IPState GuideEast(uint32_t ms);
         IPState GuideNorth(uint32_t ms);
@@ -104,7 +103,6 @@ class SXCCD : public INDI::CCD
         virtual ~SXCCD();
         void debugTriggered(bool enable);
         void simulationTriggered(bool enable);
-        void ISGetProperties(const char *dev);
         bool ISNewSwitch(const char *dev, const char *name, ISState *states, char *names[], int n);
 
         friend void ::ExposureTimerCallback(void *p);

diff --git a/libasi/CMakeLists.txt b/libasi/CMakeLists.txt
@@ -1,12 +1,12 @@
 cmake_minimum_required(VERSION 3.16)
 project (libasi)
 
-# Using ASI Camera SDK Version 1.34 updated on 2024-03-29
+# Using ASI Camera SDK Version 1.35 updated on 2024-05-23
 # Using ASI EFW SDK Version 1.7 updated on 2021-05-17
 # Using ASI ST4 SDK Version 1.0 updated on 2018-07-23
 # Using ASI EAF SDK Version 1.6 updated on 2023-03-16
 
-set (ASICAM_VERSION "1.34")
+set (ASICAM_VERSION "1.35")
 set (ASICAM_SOVERSION "1")
 
 set (ASIEFW_VERSION "1.7")

diff --git a/libasi/armv6/libASICamera2.bin b/libasi/armv6/libASICamera2.bin
diff --git a/libasi/armv7/libASICamera2.bin b/libasi/armv7/libASICamera2.bin
diff --git a/libasi/armv8/libASICamera2.bin b/libasi/armv8/libASICamera2.bin
diff --git a/libasi/mac/libASICamera2.bin b/libasi/mac/libASICamera2.bin
diff --git a/libasi/x64/libASICamera2.bin b/libasi/x64/libASICamera2.bin
diff --git a/libasi/x86/libASICamera2.bin b/libasi/x86/libASICamera2.bin
diff --git a/libastroasis/CMakeLists.txt b/libastroasis/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 project (libastroasis)
 
-set (OASIS_FOCUSER_VERSION "1.0.5")
+set (OASIS_FOCUSER_VERSION "1.0.7")
 set (OASIS_FOCUSER_SOVERSION "1")
 
 set (OASIS_FILTER_WHEEL_VERSION "1.0.0")

diff --git a/libastroasis/arm64/liboasisfocuser.bin b/libastroasis/arm64/liboasisfocuser.bin
diff --git a/libastroasis/armhf/liboasisfocuser.bin b/libastroasis/armhf/liboasisfocuser.bin
diff --git a/libastroasis/x64/liboasisfocuser.bin b/libastroasis/x64/liboasisfocuser.bin