Merge branch 'indilib:master' into patch-1

indilib · Dec 13, 2023 · acb6861 · acb6861
2 parents 61fb97a + d0c8f94
commit acb6861
Show file tree

Hide file tree

Showing 235 changed files with 670 additions and 491 deletions.
diff --git a/.github/docker/Dockerfile.debian b/.github/docker/Dockerfile.debian
@@ -1,5 +1,7 @@
 FROM debian:latest
 
+RUN cat /etc/os-release
+
 WORKDIR /tmp
 
 RUN apt-get update && apt-get -y upgrade && apt-get install -y \
@@ -18,8 +20,9 @@ RUN git clone https://github.com/google/googletest.git googletest && \
 # INDI 3rd Party
 RUN apt-get install -y \
     libftdi1-dev libavcodec-dev libavdevice-dev libavformat-dev libswscale-dev \
-    libgps-dev libraw-dev libdc1394-22-dev libgphoto2-dev \
-    libboost-dev libboost-regex-dev librtlsdr-dev liblimesuite-dev
+    libgps-dev libraw-dev libdc1394-dev libgphoto2-dev \
+    libboost-dev libboost-regex-dev librtlsdr-dev liblimesuite-dev \
+    libzmq3-dev
 
 # Install Qt5
 RUN apt-get install -y \

diff --git a/.github/docker/Dockerfile.debian-buster b/.github/docker/Dockerfile.debian-buster
@@ -1,5 +1,7 @@
 FROM debian:buster
 
+RUN cat /etc/os-release
+
 WORKDIR /tmp
 
 RUN apt-get update && apt-get -y upgrade && apt-get install -y \
@@ -19,7 +21,8 @@ RUN git clone https://github.com/google/googletest.git googletest && \
 RUN apt-get install -y \
     libftdi1-dev libavcodec-dev libavdevice-dev libavformat-dev libswscale-dev \
     libgps-dev libraw-dev libdc1394-22-dev libgphoto2-dev \
-    libboost-dev libboost-regex-dev librtlsdr-dev liblimesuite-dev
+    libboost-dev libboost-regex-dev librtlsdr-dev liblimesuite-dev \
+    libzmq3-dev
 
 # Install Qt5
 RUN apt-get install -y \

diff --git a/.github/docker/Dockerfile.debian-i386 b/.github/docker/Dockerfile.debian-i386
@@ -1,4 +1,4 @@
-FROM i386/debian
+FROM i386/debian:latest
 
 WORKDIR /tmp
 
@@ -18,8 +18,9 @@ RUN git clone https://github.com/google/googletest.git googletest && \
 # INDI 3rd Party
 RUN apt-get install -y \
     libftdi1-dev libavcodec-dev libavdevice-dev libavformat-dev libswscale-dev \
-    libgps-dev libraw-dev libdc1394-22-dev libgphoto2-dev \
-    libboost-dev libboost-regex-dev librtlsdr-dev liblimesuite-dev
+    libgps-dev libraw-dev libdc1394-dev libgphoto2-dev \
+    libboost-dev libboost-regex-dev librtlsdr-dev liblimesuite-dev \
+    libzmq3-dev
 
 # Install Qt5
 RUN apt-get install -y \

diff --git a/.github/docker/Dockerfile.fedora b/.github/docker/Dockerfile.fedora
@@ -1,5 +1,7 @@
 FROM fedora:latest
 
+RUN cat /etc/os-release
+
 WORKDIR /tmp
 
 RUN dnf -y upgrade && dnf -y install \
@@ -25,7 +27,8 @@ RUN dnf -y install \
     ffmpeg-devel \
     libftdi-devel \
     gpsd-devel LibRaw-devel libdc1394-devel libgphoto2-devel \
-    boost-devel rtl-sdr-devel
+    boost-devel rtl-sdr-devel \
+    zeromq-devel
 
 # Install Qt5
 RUN dnf -y install \

diff --git a/.github/docker/Dockerfile.ubuntu b/.github/docker/Dockerfile.ubuntu
@@ -1,5 +1,7 @@
 FROM ubuntu:latest
 
+RUN cat /etc/os-release
+
 WORKDIR /tmp
 
 RUN apt-get update && apt-get -y upgrade && apt-get install -y \
@@ -19,7 +21,8 @@ RUN git clone https://github.com/google/googletest.git googletest && \
 RUN apt-get install -y \
     libftdi1-dev libavcodec-dev libavdevice-dev libavformat-dev libswscale-dev \
     libgps-dev libraw-dev libdc1394-dev libgphoto2-dev \
-    libboost-dev libboost-regex-dev librtlsdr-dev liblimesuite-dev
+    libboost-dev libboost-regex-dev librtlsdr-dev liblimesuite-dev \
+    libzmq3-dev
 
 # Install Qt5
 RUN apt-get install -y \

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -21,14 +21,14 @@ jobs:
 
     steps:
       - name: Login to Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           file: ./.github/docker/Dockerfile.${{ matrix.container }}
           push: true

diff --git a/.github/workflows/linux-i386.yml b/.github/workflows/linux-i386.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Get INDI Sources
-        uses: actions/checkout@v1
+        uses: actions/checkout@v1 # Only v1 is compatible because of the different arch
 
       - name: Build INDI Core
         run: |

diff --git a/.github/workflows/linux-packages.yml b/.github/workflows/linux-packages.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Get INDI Sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: 'indi'
 

diff --git a/.github/workflows/linux-pyindi.yml b/.github/workflows/linux-pyindi.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Get INDI Sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: 'indi'
 

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Get INDI Sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: 'indi'
 

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Get INDI Sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: 'indi'
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -45,7 +45,7 @@ endif()
 # ####################################  INDI version  ################################################
 set(CMAKE_INDI_VERSION_MAJOR 2)
 set(CMAKE_INDI_VERSION_MINOR 0)
-set(CMAKE_INDI_VERSION_RELEASE 4)
+set(CMAKE_INDI_VERSION_RELEASE 5)
 
 set(INDI_SOVERSION ${CMAKE_INDI_VERSION_MAJOR})
 set(CMAKE_INDI_VERSION_STRING "${CMAKE_INDI_VERSION_MAJOR}.${CMAKE_INDI_VERSION_MINOR}.${CMAKE_INDI_VERSION_RELEASE}")

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,29 @@
++ From 2.0.4 to 2.0.5
+
+      4729c8b1e 2023-11-25 Jasem Mutlaq         Another attempt at fixing MINGW32. Needs to test with CYGWIN                                                                                          
+      a223fb69c 2023-11-25 Jasem Mutlaq         Fix on MINGW                                                                                                                                          
+      ddf44bde7 2023-11-25 Jasem Mutlaq         Use _WIN32 as the standard preprocessor macro for Windows builds                                                                                      
+      b24472523 2023-11-09 Orestes Sanchez      Snapcap driver with network connections (#1961)                                                                                                       
+      d045d17f3 2023-11-08 Jasem Mutlaq         Fix issue with reporting updated measurements due to creep in from cumulative threshold                                                               
+      d7c3b1b93 2023-11-02 James Amendolagine   Added several missing commands: (#1957)                                                                                                               
+      16fef45f2 2023-10-28 Jasem Mutlaq         Escape backslashes in custom FITS values. Do not add TELESCOP keyword if already exists in custom headers                                             
+      1a85d8117 2023-10-27 Alain                On step work (#1958)                                                                                                                                  
+      58ae68b81 2023-10-23 Alain                Fixed 9 Stars Align (#1956)                                                                                                                           
+      408b89251 2023-10-19 James Amendolagine   Handling tracking mode in the pegasus driver, and enable King mode. (#1954)                                                                           
+      b01e72046 2023-10-11 Sonny Cavazos        Update ioptronv3driver.cpp (#1952)                                                                                                                    
+      d670b6acf 2023-10-10 Ladislav Heller      Windows/Cygwin support (#1950)                                                                                                                        
+      63757a06e 2023-10-10 Jasem Mutlaq         Remove old package name. Fixes #1949                                                                                                                  
+      7f9f9645f 2023-10-10 Jasem Mutlaq         Fix issue with temperature update. Fixes #1951                                                                                                        
+      bff9ddf06 2023-10-04 Jasem Mutlaq         Do not turn cooler on if target temperature is higher than current                                                                                    
+      7eb84626f 2023-10-09 Jasem Mutlaq         Set park type per dome type                                                                                                                           
+      b38785840 2023-10-06 Mattia Verga         Option to use system provided httplib (#1946)                                                                                                         
+      ef37011d0 2023-10-06 Paweł Soja           Fix PyIndi build fail - revert code formatting changes (#1948)                                                                                        
+      ac22c6c11 2023-10-05 Jasem Mutlaq         Add option to toggle between dome and rolloff types                                                                                                   
+      769623ac3 2023-10-02 Jasem Mutlaq         Add one more check to ensure minimum count is met (#1903)                                                                                             
+      f5ad7924f 2023-10-02 Jasem Mutlaq         Remove all scope configuration from INDI::Telescope class as it was already moved to INDI::CCD class in prior releases and what is left in INDI::Tel..
+      6f156b476 2023-10-01 Jasem Mutlaq         Only start if period is not zero                                                                                                                      
+      f81ced61d 2023-09-30 d33psky              Fix issue 1938 (#1945)
+
 + From 2.0.3 to 2.0.4
 
       be521c4f3 2023-09-30 anjok                Openastrotech (#1943)                                                                                                                                 

diff --git a/README.md b/README.md
@@ -256,7 +256,7 @@ You can base a new driver from an existing driver. Look in either the examples o
 
 # Unit tests
 
-In order to run the unit test suite you must first install the [Google Test Framework](https://github.com/google/googletest). You will need to build and install this from source code as Google does not recommend package managers for distributing distros.(This is because each build system is often unique and a one size fits all aproach does not work well).
+In order to run the unit test suite you must first install the [Google Test Framework](https://github.com/google/googletest). You will need to build and install this from source code as Google does not recommend package managers for distributing distros.(This is because each build system is often unique and a one size fits all approach does not work well).
 
 Once you have the Google Test Framework installed follow this alternative build sequence:-
 

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+libindi (2.0.5) focal; urgency=medium
+
+  * Minor release.
+
+ -- Jasem Mutlaq <[email protected]>  Fri, 1 Dec 2023 10:00:00 +0300
+
 libindi (2.0.4) focal; urgency=medium
 
   * Minor release.

diff --git a/drivers.xml b/drivers.xml
@@ -111,10 +111,6 @@
             <driver name="Astro-Electronic FS-2">indi_lx200fs2</driver>
             <version>2.3</version>
         </device>
-        <device label="Avalon Legacy" manufacturer="Avalon">
-            <driver name="LX200 Basic">indi_lx200basic</driver>
-            <version>2.1</version>
-        </device>
         <device label="Paramount" manufacturer="Software Bisque">
             <driver name="Paramount">indi_paramount_telescope</driver>
             <version>1.1</version>
@@ -491,7 +487,7 @@
         </device>
         <device label="Starlight EFS" manufacturer="Starlight Instruments">
             <driver name="SI EFS">indi_siefs_focus</driver>
-            <version>0.1</version>
+            <version>0.2</version>
         </device>
         <device label="Lacerta MFOC" manufacturer="Lacerta Optics">
             <driver name="Lacerta MFOC">indi_lacerta_mfoc_focus</driver>

diff --git a/drivers/README.md b/drivers/README.md
@@ -110,7 +110,7 @@ sudo apt-get update &amp;&amp; sudo apt-get install indi-DRIVER_NAME
 </ul>
 <p class="alert alert-info">The <b>Slew Rate</b> dropdown is used to control the <b>manual</b> speeds when using the NSWE controls either directly or via a joystick. To set the <b>GOTO</b> speeds (when mount moves from one target to another via a GOTO command), you need to update the <b>Custom Speeds</b> control.</p>
 <h3>Site Management</h3>
-<p>Time, Locaiton, and Park settings are configured in the Site Management tab.</p>
+<p>Time, Location, and Park settings are configured in the Site Management tab.</p>
 <p><img style="display: block; margin-right: auto; margin-left: auto;" src="/images/devices/DRIVER_NAME/site_management.jpg" alt="Site Management" /></p>
 <ul>
 	<li><strong>UTC</strong>: UTC time and offsets must be set for proper operation of the driver upon connection. The UTC offset is in hours. East is positive and west is negative.</li>

diff --git a/drivers/auxiliary/STAR2kdriver.c b/drivers/auxiliary/STAR2kdriver.c
@@ -106,7 +106,7 @@ int ConnectSTAR2k(char *port)
 }
 
 /* Start a slew in chosen direction at slewRate */
-/* Use auxilliary NexStar command set through the hand control computer */
+/* Use auxiliary NexStar command set through the hand control computer */
 
 void StartPulse(int direction)
 {

diff --git a/drivers/auxiliary/astrometrydriver.cpp b/drivers/auxiliary/astrometrydriver.cpp
@@ -297,7 +297,7 @@ bool AstrometryDriver::processBLOB(uint8_t *data, uint32_t size, uint32_t len)
 
         if (destLen != size)
         {
-            LOGF_WARN("Discrepency between uncompressed data size %ld and expected size %ld",
+            LOGF_WARN("Discrepancy between uncompressed data size %ld and expected size %ld",
                       size, destLen);
         }
 

diff --git a/drivers/auxiliary/astrometrydriver.h b/drivers/auxiliary/astrometrydriver.h
@@ -39,7 +39,7 @@
  * The solver settings should be set before running the solver in order to ensure correct and timely response from astrometry.net
  * It is assumed that astrometry.net is property set-up in the same machine the driver is running along with the appropriate index files.
  *
- * If the solver is successfull, the driver sets the solver results which include:
+ * If the solver is successful, the driver sets the solver results which include:
  * + Pixel Scale (arcsec/pixel).
  * + Orientation (E or W) degrees.
  * + Center RA (J2000) Hours.

diff --git a/drivers/auxiliary/mydcp4esp32.cpp b/drivers/auxiliary/mydcp4esp32.cpp
@@ -305,7 +305,7 @@ bool MyDCP4ESP::sendCommand(const char *cmd, char *resp)
 
 // Determine which of the 4 channels have temperature probes attached. Only those with probes can be active
 // except for Channel 3 which can mirrior Channels 1 & 2 or be controlled manually.
-// Check to see if each channel can be set to Overide if it doesn't currently have a power output
+// Check to see if each channel can be set to Override if it doesn't currently have a power output
 bool MyDCP4ESP::getActiveChannels()
 {
     char cmd[MDCP_CMD_LENGTH] = {};
@@ -519,7 +519,7 @@ bool MyDCP4ESP::setAmbientOffset(float value)
     return sendCommand(cmd, nullptr); 
 }
 
-// set or reset Channel overide. Channel = 5 resets all channels
+// set or reset Channel override. Channel = 5 resets all channels
 bool MyDCP4ESP::setChannelBoost( unsigned int channel, unsigned int value)
 {
     char cmd[MDCP_CMD_LENGTH] = {};
@@ -839,7 +839,7 @@ bool MyDCP4ESP::readSettings()
 
     if ((ok == 1) && (ch3_mode <= 4))
     {
-        // Enabel/Disable Ch3 Manual Power setting if Ch3 Mode Manual enabled
+        // Enable/Disable Ch3 Manual Power setting if Ch3 Mode Manual enabled
         if ((ch3_mode == CH3MODE_MANUAL) && (!ch3ManualPower))
         {
             defineProperty(Ch3ManualPowerNP);

diff --git a/drivers/auxiliary/mydcp4esp32.h b/drivers/auxiliary/mydcp4esp32.h
@@ -85,7 +85,7 @@
 #define MDCP_GET_ALL_CH_POWER_CMD           ":40#"    // Get the power settings for ch1/ch2/ch3/ch4 - Response: lch1pwr,ch2pwr,ch3pwr,ch4pwr#
 #define MDCP_SET_CH3_MODE_CMD               ":41%d#"  // Set the Channel 3 mode (0=disabled, 1=dewstrap1, 2=dewstrap2, 3=Manual, 4=use temp probe3) - Response: none
 #define MDCP_GET_CH3_MODE_CMD               ":42#"    // Get the Channel 3 mode (0=disabled, 1=dewstrap1, 2=dewstrap2, 3=Manual, 4=use temp probe3) - Response: mmode#
-#define MDCP_SET_CH3_MANUAL_POWER_CMD       ":43%d#"  // Set the Channel 3 power to a manual seting of Num - Response: none    
+#define MDCP_SET_CH3_MANUAL_POWER_CMD       ":43%d#"  // Set the Channel 3 power to a manual setting of Num - Response: none    
 
 /**************************** myDCP4ESP32 Command Responses **************************/
 
@@ -128,7 +128,7 @@
 #define MDCP_GET_ALL_CH_POWER_RES           "l%d,%d,%d,%d"    // Get the power settings for ch1/ch2/ch3/ch4 - Response: lch1pwr,ch2pwr,ch3pwr,ch4pwr#
 #define MDCP_SET_CH3_MODE_RES               ""      // Set the Channel 3 mode (0=disabled, 1=dewstrap1, 2=dewstrap2, 3=Manual, 4=use temp probe3) - Response: none
 #define MDCP_GET_CH3_MODE_RES               "m%d"   // Get the Channel 3 mode (0=disabled, 1=dewstrap1, 2=dewstrap2, 3=Manual, 4=use temp probe3) - Response: mmode#
-#define MDCP_SET_CH3_MANUAL_POWER_RES       ""      // Set the Channel 3 power to a manual seting of Num - Response: none 
+#define MDCP_SET_CH3_MANUAL_POWER_RES       ""      // Set the Channel 3 power to a manual setting of Num - Response: none 
 
 /******************************************************************************/
 

diff --git a/drivers/auxiliary/pegasus_upb.cpp b/drivers/auxiliary/pegasus_upb.cpp
@@ -98,7 +98,7 @@ bool PegasusUPB::initProperties()
     /// Power Group
     ////////////////////////////////////////////////////////////////////////////
 
-    // Dew Labels. Need to delare them here to use in the Power usage section
+    // Dew Labels. Need to declare them here to use in the Power usage section
     IUFillText(&DewControlsLabelsT[0], "DEW_LABEL_1", "Dew A", "Dew A");
     IUFillText(&DewControlsLabelsT[1], "DEW_LABEL_2", "Dew B", "Dew B");
     IUFillText(&DewControlsLabelsT[2], "DEW_LABEL_3", "Dew C", "Dew C");

diff --git a/drivers/auxiliary/planewave_delta.h b/drivers/auxiliary/planewave_delta.h
@@ -116,7 +116,7 @@ class DeltaT : public INDI::DefaultDevice
         /// Properties
         ///////////////////////////////////////////////////////////////////////////////////
 
-        // Delta-T Informatin
+        // Delta-T Information
         ITextVectorProperty InfoTP;
         IText InfoT[1] {};
         enum

diff --git a/drivers/auxiliary/skysafariclient.cpp b/drivers/auxiliary/skysafariclient.cpp
@@ -187,7 +187,7 @@ bool SkySafariClient::setSlewRate(int slewRate)
 
     int finalSlewRate = slewRate;
 
-    // If slew rate is betwee min and max, we intepolate
+    // If slew rate is between min and max, we interpolate
     if (slewRate > 0 && slewRate < maxSlewRate)
         finalSlewRate = static_cast<int>(ceil(slewRate * maxSlewRate / 3.0));
 

diff --git a/drivers/auxiliary/sqm.h b/drivers/auxiliary/sqm.h
@@ -103,6 +103,6 @@ class SQM : public INDI::DefaultDevice
         static const char DRIVER_STOP_CHAR { 0x0A };
         // Wait up to a maximum of 3 seconds for serial input
         static constexpr const uint8_t DRIVER_TIMEOUT {3};
-        // Maximum buffer for sending/receving.
+        // Maximum buffer for sending/receiving.
         static constexpr const uint8_t DRIVER_LEN {128};
 };
diff --git a/drivers/auxiliary/wanderer_cover.cpp b/drivers/auxiliary/wanderer_cover.cpp
@@ -124,7 +124,7 @@ bool WandererCover::Handshake()
 {
     if (isSimulation())
     {
-        LOGF_INFO("Connected successfuly to simulated %s. Retrieving startup data...", getDeviceName());
+        LOGF_INFO("Connected successfully to simulated %s. Retrieving startup data...", getDeviceName());
 
         // SetTimer(getCurrentPollingPeriod());
         IUSaveText(&FirmwareT[0], "Simulation version");
@@ -716,7 +716,7 @@ void WandererCover::displayConfigurationMessage()
     LOG_WARN(" - Click on 'Set current position as close' to define the park position");
     LOG_WARN(" - Use again the select list to move your cover panel in close position on the scope");
     LOG_WARN(" - Click on 'Set current position as open' to define the unpark position");
-    LOG_WARN(" - Use the select controler to move your panel to the open position");
+    LOG_WARN(" - Use the select controller to move your panel to the open position");
     LOG_WARN("In order to do so, go to 'Dust cover configurtation' tab and do the following steps :");
     LOG_WARN("Before first use, or when you change your setup, you need to configure Open and closed position first in 'Dust cover configurtation' tab.");
 }
diff --git a/drivers/auxiliary/watchdog.cpp b/drivers/auxiliary/watchdog.cpp
@@ -606,7 +606,7 @@ void WatchDog::TimerHit()
                 break;
             }
 
-            // Watch mount if requied
+            // Watch mount if required
             if (ShutdownProcedureS[PARK_MOUNT].s == ISS_ON)
                 m_WatchDogClientInstance->setMount(ActiveDeviceT[ACTIVE_TELESCOPE].text);
             // Watch dome