Merge pull request #1119 from aaronwmorris/dev

special handling for indi_pylibcamera

Author: aaronwmorris

indi_allsky/camera/indi.py

@@ -1005,12 +1005,6 @@ def getCcdGain(self):
             'indi_qhy_ccd',
             'indi_simulator_ccd',
             'indi_rpicam',
-            'indi_pylibcamera',
-            'indi_pylibcamera.py',
-            './indi_pylibcamera.py',
-            '././indi_pylibcamera.py',
-            '/usr/bin/indi_pylibcamera',
-            '/usr/local/bin/indi_pylibcamera',
         ]:
             gain_ctl = self.get_control(self.ccd_device, 'CCD_GAIN', 'number')
             gain_index_dict = self.__map_indexes(gain_ctl, ['GAIN'])
@@ -1074,6 +1068,12 @@ def getCcdGain(self):
             return fake_gain_info
         elif indi_exec in ['rpicam-still', 'libcamera-still', 'indi_fake_ccd']:
             return self.ccd_device.getCcdGain()
+        elif 'indi_pylibcamera' in indi_exec:  # SPECIAL CASE
+            # the exec name can have many variations
+            gain_ctl = self.get_control(self.ccd_device, 'CCD_GAIN', 'number')
+            gain_index_dict = self.__map_indexes(gain_ctl, ['GAIN'])
+            index = gain_index_dict['GAIN']
+
         else:
             raise Exception('Gain config not implemented for {0:s}, open an enhancement request'.format(indi_exec))
 
@@ -1111,12 +1111,6 @@ def setCcdGain(self, gain_value):
             'indi_qhy_ccd',
             'indi_simulator_ccd',
             'indi_rpicam',
-            'indi_pylibcamera',
-            'indi_pylibcamera.py',
-            './indi_pylibcamera.py',
-            '././indi_pylibcamera.py',
-            '/usr/bin/indi_pylibcamera',
-            '/usr/local/bin/indi_pylibcamera',
         ]:
             gain_config = {
                 "PROPERTIES" : {
@@ -1183,6 +1177,15 @@ def setCcdGain(self, gain_value):
             gain_config = {}
         elif indi_exec in ['rpicam-still', 'libcamera-still', 'indi_fake_ccd']:
             return self.ccd_device.setCcdGain(gain_value)
+        elif 'indi_pylibcamera' in indi_exec:  # SPECIAL CASE
+            # the exec name can have many variations
+            gain_config = {
+                "PROPERTIES" : {
+                    "CCD_GAIN" : {
+                        "GAIN" : gain_value,
+                    },
+                },
+            }
         else:
             raise Exception('Gain config not implemented for {0:s}, open an enhancement request'.format(indi_exec))
 
@@ -1220,12 +1223,6 @@ def setCcdBinning(self, bin_value):
             'indi_rpicam',
             'indi_playerone_ccd',
             'indi_sx_ccd',
-            'indi_pylibcamera',
-            'indi_pylibcamera.py',
-            './indi_pylibcamera.py',
-            '././indi_pylibcamera.py',
-            '/usr/bin/indi_pylibcamera',
-            '/usr/local/bin/indi_pylibcamera',
         ]:
             binning_config = {
                 "PROPERTIES" : {
@@ -1252,6 +1249,16 @@ def setCcdBinning(self, bin_value):
             return
         elif indi_exec in ['rpicam-still', 'libcamera-still', 'indi_fake_ccd']:
             return self.ccd_device.setCcdBinMode(bin_value)
+        elif 'indi_pylibcamera' in indi_exec:  # SPECIAL CASE
+            # the exec name can have many variations
+            binning_config = {
+                "PROPERTIES" : {
+                    "CCD_BINNING" : {
+                        "HOR_BIN" : bin_value[0],
+                        "VER_BIN" : bin_value[1],
+                    },
+                },
+            }
         else:
             raise Exception('Binning config not implemented for {0:s}, open an enhancement request'.format(indi_exec))
 

service/indiserver.service

@@ -5,7 +5,7 @@ After=network.target
 [Service]
 #User=%INDISERVER_USER%
 #Environment="PATH=%ALLSKY_DIRECTORY%/virtualenv/indi-allsky/bin:/usr/local/bin:/usr/bin:/bin"
-#Environment="PYTHONPATH=/usr/local/lib/aarch64-linux-gnu/python3.11/site-packages"
+#Environment="PYTHONPATH=%ALLSKY_DIRECTORY%/virtualenv/indi-allsky/lib/python3.11/site-packages:/usr/local/lib/aarch64-linux-gnu/python3.11/site-packages"
 ExecStart=%INDI_DRIVER_PATH%/indiserver -p 7624 indi_simulator_telescope %INDI_CCD_DRIVER% %INDI_GPS_DRIVER%
 ExecStop=/bin/kill -TERM $MAINPID
 RestartSec=5