Merge branch 'dev' of https://gitlab.irap.omp.eu/epallier/pyros into dev

Etienne Pallier
2 parents 7706b4d6 288832d5
Showing 3 changed files with 58 additions and 52 deletions Show diff stats
.gitignore
config/pyros/logo_pyros.png
privatedev/config/default/observatory_default.yml
@@ -13,6 +13,7 @@ BASE_TEMPLATE.HTML
  
 # Ignore all PNG files except from src/doc/ and src/core/pyros_django/misc/static/media/
 *.png
+!/config/pyros/*.png
 !src/doc/*.png
 !src/core/pyros_django/misc/static/media/*.png
  
@@ -8,52 +8,53 @@ OBSERVATORY:
  
     name: Default
  
-    # === Inventory of available devices
-    # A device is a hardware with a maximum of one connection to drive it with a computer.
-    # As a device can be shared with various units, it is defined at the observatory level.
-    DEVICES:
-    
-        # Each device is defined by a specific configuration file that enumarate the components.
+    INVENTORY:
+        # === Inventory of available devices
+        # A device is a hardware with a maximum of one connection to drive it with a computer.
+        # As a device can be shared with various units, it is defined at the observatory level.
+        DEVICES:
  
-        - DEVICE: 
-            name: AstroMecCA
-            file: device_Astromecca_TM350_default.yml
-            
-        - DEVICE: 
-            name: PLC_meteo
-            file: device_Raspberry_MiFe_default.yml
-            # Describe here the configuration of the device in operation
-            network_interface_index: 0
-            network_ip: 192.168.0.2
-            
-        - DEVICE: 
-            name: SkyWatcher_ED80
-            file: device_SkyWatcher_ED80_default.yml
-            
-            
-        - DEVICE: 
-            name: ZWO_ASI1600MMPro
-            file: device_ZWO_ASI1600MMPro_default.yml
+            # Each device is defined by a specific configuration file that enumarate the components.
  
-            
-    # === Inventory of available computers
-    # A computer is a hardware of a virtual machine.
-    # As a computer can be shared with various units, it is defined at the observatory level.
-    COMPUTERS:
-    
-        - COMPUTER:
-           name: MainComputer
-           file: computer_default.yml
-            # Describe here the configuration of the computer in operation
-           role: Main
-            # Choice of the interface to connect the computer to the network (cf.network_interfaces infile)
-           network_interface_index: 0
-            # IP attributed by the Router
-           network_ip: 192.168.0.11
+            - DEVICE: 
+                name: AstroMecCA
+                file: device_Astromecca_TM350_default.yml
+                
+            - DEVICE: 
+                name: PLC_meteo
+                file: device_Raspberry_MiFe_default.yml
+                # Describe here the configuration of the device in operation
+                network_interface_index: 0
+                network_ip: 192.168.0.2
+                
+            - DEVICE: 
+                name: SkyWatcher_ED80
+                file: device_SkyWatcher_ED80_default.yml
+                
+                
+            - DEVICE: 
+                name: ZWO_ASI1600MMPro
+                file: device_ZWO_ASI1600MMPro_default.yml
+                
+                
+        # === Inventory of available computers
+        # A computer is a hardware of a virtual machine.
+        # As a computer can be shared with various units, it is defined at the observatory level.
+        COMPUTERS:
+        
+            - COMPUTER:
+                name: MainComputer
+                file: computer_default.yml
+                    # Describe here the configuration of the computer in operation
+                role: Main
+                    # Choice of the interface to connect the computer to the network (cf.network_interfaces infile)
+                network_interface_index: 0
+                    # IP attributed by the Router
+                network_ip: 192.168.0.11
  
-            
-    # === Assembly of devices into units
-    # A unit is a robotic telescope 
+                
+        # === Assembly of devices into units
+        # A unit is a robotic telescope 
     UNITS: 
  
         - UNIT: 
@@ -116,7 +117,6 @@ OBSERVATORY:
                         - MountPointing: mount
  
                 CHANNELS:
-                              
                     - CHANNEL:
                         name: OpticalChannel
                         COMPONENT_AGENTS:
@@ -124,14 +124,19 @@ OBSERVATORY:
                             - DetectorSensor: camera
                             - DetectorShutter: camera
  
-                CHANNEL_GROUPS:
+                ALBUMS:
  
-                    logic: 'or' # opt
-                    GROUPS:
-                        - GROUP:
-                            logic: 'and' # opt
-                            name: MainChannel
-                            channels:
-                                - OpticalChannel
+                    - ALBUM :
+                        name: MainChannel
+                        description: "Album with one channel"
+                        CHANNELS:
+                            - OpticalChannel
+                
+                LAYOUTS:
+                    - LAYOUT:
+                        name: MainChannel
+                        description: Layout with one album
+                        ALBUMS:
+                            - MainChannel