Some minor bugs fixed

Alain Klotz
1 parent 7957f9e5
Showing 3 changed files with 42 additions and 6 deletions Show diff stats
src/guitastro_device_flipro/component_detector_shutter_flipro.py
src/guitastro_device_flipro/component_sensor_detector_flipro.py
src/wrapper_flipro/setup.py
@@ -113,7 +113,7 @@ if __name__ == &quot;__main__&quot;:
         Basic example. Only simulation
         """
         comp = ComponentDetectorShutterFlipro("IRIS", name="test")
-        comp.init("IRIS", name="Shutter", manufacturer="FLI")
+        comp.init("IRIS", name="Shutter", manufacturer="FLIPRO")
         comp.verbose = 1
         res = comp.command("DO", "CLOSE")
         res = comp.command("GET", "state")
@@ -123,6 +123,13 @@ class ComponentSensorDetectorFlipro(ComponentSensorDetector):
             self._wrapper_flipro = kwargs['wrapper_flipro']
         self._image = []
+    SENSOR_STATE_UNKNOWN = -1
+    SENSOR_STATE_STOPED = 0
+    SENSOR_STATE_IDLE = 1
+    SENSOR_STATE_EXPOSING = 2
+    SENSOR_STATE_READING = 3
+
+
     # ------------ del
     def __del__(self):
@@ -243,7 +250,7 @@ if __name__ == &quot;__main__&quot;:
         Basic example. Only simulation
         """
         comp = ComponentSensorDetectorFlipro("Z", name="test")
-        comp.init("Z", name="Camera", manufacturer="FLI")
+        comp.init("Z", name="Camera", manufacturer="FLIPRO")
         param = {}
         param["exptime"] = 1.0 # inc/s
         param["binning"] = (1,1)
@@ -23,15 +23,36 @@ elif psystem == &quot;Darwin&quot;:
     distro_name = psystem
     distro_version = distribution[0]
 elif psystem == "Linux":
-    release = platform.release
+    release = platform.release()
     if "microsoft" in release:
         # release = '5.10.16.3-microsoft-standard-WSL2'
         distro_name = release.split("-")[3]
         distro_version = release.split("-")[0]
     else:
-        distribution = platform.freedesktop_os_release()
-        distro_name = distribution['NAME']
-        distro_version = distribution['VERSION_ID']
+        try:
+            # --- Python >= 3.10
+            distribution = platform.freedesktop_os_release()
+            distro_name = distribution['NAME']
+            distro_version = distribution['VERSION_ID']
+        except:
+            try:
+                # --- Python <= 3.7
+                # platform.linux_distribution()
+                # ('Red Hat Enterprise Linux', '8.8', 'Ootpa')
+                dist = platform.dist()
+                # ('redhat', '8.8', 'Ootpa')
+                distro_name = dist[0]
+                distro_version = dist[1]
+            except:
+                # --- Python == 3.8 or 3.9
+                uname = platform.uname()
+                # uname_result(system='Linux', node='ceres', release='6.2.0-33-generic', version='#33~22.04.1-Ubuntu SMP PREEMPT_DYNAMIC Thu Sep  7 10:33:52 UTC 2', machine='x86_64')
+                version = uname[3]
+                vs =  version.split()
+                vvs =  vs[0].split("-")
+                distro_name = vvs[-1]
+                distro_version = '?'
+                
 print(f"\n{distro_name=}")
 print(f"\n{distro_version=}")
@@ -50,6 +71,8 @@ if distro_name == &quot;Windows&quot;:
     path_manufacturer = "libflipro-Version-1.12.59-Windows"
 elif distro_name == "Ubuntu" or distro_name == "Fedora":
     path_manufacturer = "libflipro-Version-2.0.5-"
+elif distro_name == "redhat" :
+    path_manufacturer = "libflipro-Version-1.12.59-CentOSLinux"
 # =====================================================
 # === Copy manufacturer resources (libraires, etc.) ===
@@ -64,6 +87,10 @@ elif distro_name == &quot;Ubuntu&quot; or distro_name == &quot;Fedora&quot;:
     library_dirs = [os.path.join(path_external, path_manufacturer + distro_name)]
     for library_dir in library_dirs:
         srcs.extend( glob.glob(os.path.join(library_dir, "*.so*")) )
+elif distro_name == "redhat":
+    library_dirs = [os.path.join(path_external, path_manufacturer)]
+    for library_dir in library_dirs:
+        srcs.extend( glob.glob(os.path.join(library_dir, "*.so*")) )
 else:
     raise("No compilation found for your distribution")
 # --- Copy the resource files into the current working directory
@@ -95,6 +122,8 @@ elif distro_name == &quot;Ubuntu&quot; or distro_name == &quot;Fedora&quot;:
     #extra_link_args.append("-lm")
     extra_link_args.append("-lusb-1.0") 
     #extra_link_args.append("-lstdc++")    
+elif distro_name == "redhat":
+    extra_link_args.append("-lusb-1.0") 
 # --- Any platform includes
 include_dirs.append(numpy.get_include()) # numpy
 include_dirs.append(os.path.join("audela",      "src","include")) # sysexp.h