indi-asi-power Replace pigpiod package and minor message and logic fix (

#353)
indilib · Mar 12, 2021 · b15adb6 · b15adb6
1 parent dc02153
commit b15adb6
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/debian/indi-asi-power/changelog b/debian/indi-asi-power/changelog
@@ -1,3 +1,11 @@
+indi-asi-power (0.92) buster; urgency=medium
+
+  * Fix install for Raspbian - clash with pigpiod
+  * Minor fix to messages
+  * Fix return from ISNewSwitch for DSLR
+
+ -- Ken Self <ken.kgself@gmail.com>  Fri, 12 Mar 2021 22:40:00 +1100
+
 indi-asi-power (0.91) buster; urgency=medium
 
   * Add DSLR port control

diff --git a/debian/indi-asi-power/control b/debian/indi-asi-power/control
@@ -9,6 +9,7 @@ Package: indi-asi-power
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libindi1, libpigpiod-if2-1
 Recommends: pigpio-tools
+Replaces: pigpiod
 Description: INDI Driver for RaspberryPi GPIO
  INDI Driver for RaspberryPi GPIO on/off and PWM
  This driver is compatible with any INDI client but only works on Raspberry Pi devices

diff --git a/indi-asi-power/CMakeLists.txt b/indi-asi-power/CMakeLists.txt
@@ -6,7 +6,7 @@ LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake_modules/")
 include(GNUInstallDirs)
 
 set (VERSION_MAJOR 0)
-set (VERSION_MINOR 91)
+set (VERSION_MINOR 92)
 
 find_package(INDI REQUIRED)
 find_package(Threads REQUIRED)

diff --git a/indi-asi-power/Changelog b/indi-asi-power/Changelog
@@ -1,3 +1,8 @@
+v0.92
+* Fix install for Raspbian - clash with pigpiod
+* Minor fix to messages
+* Fix return from ISNewSwitch for DSLR
+
 v0.91
 * Add DSLR port control
 

diff --git a/indi-asi-power/README.md b/indi-asi-power/README.md
@@ -34,7 +34,6 @@ cd indi-3rdparty
 Compile and install the driver and pigpiod
 ```
 cd ~/Projects/indi-3rd-party
-git checkout asipower
 mkdir -p ~/projects/build/indi-asi-power
 cmake -DCMAKE_INSTALL_PREFIX=/usr ~/Projects/indi-3rdparty/indi-asi-power
 make

diff --git a/indi-asi-power/asipower.cpp b/indi-asi-power/asipower.cpp
@@ -237,7 +237,7 @@ bool IndiAsiPower::ISNewNumber (const char *dev, const char *name, double values
                 {
                     DutyCycleNP[i].s = IPS_ALERT;
                     IDSetNumber(&DutyCycleNP[i], nullptr);
-                    DEBUGF(INDI::Logger::DBG_ERROR, "Value %0.0f is not a valid Duty Cycle!", values[0]);
+                    DEBUGF(INDI::Logger::DBG_ERROR, "%s Duty Cycle %0.0f is not a valid value", DeviceSP[i].label, values[0]);
                     return false;
                 }
                 // cannot alter duty cycle on a non-PWM device -except to maximum
@@ -395,7 +395,7 @@ bool IndiAsiPower::ISNewSwitch (const char *dev, const char *name, ISState *stat
                 DslrChange(true);
                 DslrExpNP.s = IPS_BUSY;
                 IDSetNumber(&DslrExpNP, nullptr);
-                return false;
+                return true;
             }
             if( DslrS[1].s == ISS_ON )
             {
@@ -405,10 +405,11 @@ bool IndiAsiPower::ISNewSwitch (const char *dev, const char *name, ISState *stat
                 DEBUG(INDI::Logger::DBG_SESSION, "DSLR Stop exposure");
                 DslrExpNP.s = IPS_IDLE;
                 IDSetNumber(&DslrExpNP, nullptr);
-                return false;
+                return true;
             }
-            DslrSP.s = IPS_OK;
+            DslrSP.s = IPS_ALERT;
             IDSetSwitch(&DslrSP, nullptr);
+            return false;
         }
     }
     return INDI::DefaultDevice::ISNewSwitch (dev, name, states, names, n);