PYROS-IRAP / pyros

Commit 7ce93a0a26a58e063ccf573dae725c913e7637c1

Authored by Alain Klotz
1 parent 7d631846
Exists in dev

Ajout des mots clé de config pour les ports de communication.

Showing 4 changed files with 273 additions and 265 deletions   Show diff stats
Inline Side-by-side
config/devices/device_Astromecca_TM350_generic.yml
  Diff comments   View file @7ce93a0
... ... @@ -23,6 +23,7 @@ DEVICE:
23 23 languages: ["ASCOM", "LX200"]
24 24 support: "TCP"
25 25 language: "ASCOM"
  26 + tcp_port: 1111
26 27  
27 28 CAPABILITIES:
28 29  
... ...
config/schemas/schema_device-2.0.yml
  Diff comments   View file @7ce93a0
... ... @@ -125,6 +125,9 @@ schema;schema_device:
125 125 language:
126 126 type: str
127 127 required: False
  128 + tcp_port:
  129 + type: int
  130 + required: False
128 131  
129 132 os:
130 133 type: str
... ...
config/schemas/schema_observatory-2.0.yml
  Diff comments   View file @7ce93a0
1   -schema;schema_DATABASE:
2   - required: True
3   - type: map
4   - mapping:
5   - computer:
6   - type: str
7   - required: True
8   - file:
9   - type: str
10   - required: True
11   -
12   -schema;schema_AGENT_DEVICE:
13   - type: map
14   - required: True
15   - mapping:
16   - computer:
17   - type: str
18   - required: True
19   - name:
20   - type: str
21   - required: True
22   - path:
23   - type: str
24   - device:
25   - type: str
26   - protocol:
27   - type: str
28   - is_real:
29   - type: bool
30   - required: True
31   -
32   -schema;schema_AGENT:
33   - type: map
34   - required: True
35   - mapping:
36   - computer:
37   - type: str
38   - required: True
39   - name:
40   - type: str
41   - required: True
42   - path:
43   - type: str
44   -
45   -schema;schema_GROUP:
46   - type: map
47   - required: True
48   - mapping:
49   - GROUP:
50   - type: map
51   - mapping:
52   - logic:
53   - type: str
54   - channels:
55   - type: seq
56   - required: True
57   - sequence:
58   - - type: str
59   -
60   -schema;schema_CHANNEL_GROUPS:
61   - type: map
62   - required: True
63   - mapping:
64   - logic:
65   - type: str
66   - GROUPS:
67   - type: seq
68   - sequence:
69   - - include: schema_GROUP
70   -
71   -schema;schema_MOUNT:
72   - type: map
73   - mapping:
74   - name:
75   - type: str
76   - required: True
77   - COMPONENT_AGENTS:
78   - type: seq
79   - required: True
80   - sequence:
81   - - type: any
82   -
83   -schema;schema_CHANNEL:
84   - type: map
85   - mapping:
86   - name:
87   - type: str
88   - required: True
89   - COMPONENT_AGENTS:
90   - type: seq
91   - required: True
92   - sequence:
93   - - type: any
94   -
95   -
96   -schema;schema_SECURITY:
97   - type: map
98   - required: True
99   - mapping:
100   - name:
101   - type: str
102   - required: True
103   - COMPONENT_AGENTS:
104   - type: seq
105   - required: True
106   - sequence:
107   - - type: any
108   -
109   -
110   -schema;schema_TOPOLOGY:
111   - required: True
112   - type: map
113   - mapping:
114   - SECURITY:
115   - include: schema_SECURITY
116   - MOUNT:
117   - include: schema_MOUNT
118   - CHANNELS:
119   - include: schema_CHANNELS
120   - CHANNEL_GROUPS:
121   - include: schema_CHANNEL_GROUPS
122   -
123   -
124   -
125   -schema;schema_COMPUTER:
126   - type: map
127   - mapping:
128   - name:
129   - type: str
130   - required: True
131   - file:
132   - type: str
133   - required: True
134   - role:
135   - type: str
136   - required: False
137   - network_interface_index:
138   - type: text
139   - network_ip:
140   - type: str
141   -
142   -
143   -schema;schema_AGENTS:
144   - required: True
145   - type: seq
146   - matching: "any"
147   - sequence:
148   - - type: map
149   - mapping:
150   - AGENT_DEVICE:
151   - include: schema_AGENT_DEVICE
152   - - type: map
153   - mapping:
154   - AGENT:
155   - include: schema_AGENT
156   -
157   -schema;schema_COMPUTERS:
158   - type: seq
159   - sequence:
160   - - type: map
161   - mapping:
162   - COMPUTER:
163   - include: schema_COMPUTER
164   -
165   -schema;schema_UNIT:
166   - type: map
167   - required: True
168   - mapping:
169   - name:
170   - type: str
171   - required: True
172   - home:
173   - type: str
174   - required: True
175   - horizon:
176   - type: map
177   - required: True
178   - mapping:
179   - type:
180   - type: str
181   - required: True
182   - line:
183   - type: seq
184   - required: True
185   - sequence:
186   - - type: seq
187   - sequence:
188   - - type: number
189   - DATABASE:
190   - include: schema_DATABASE
191   - AGENTS:
192   - include: schema_AGENTS
193   - TOPOLOGY:
194   - include: schema_TOPOLOGY
195   -
196   -
197   -schema;schema_UNITS:
198   - type: seq
199   - required: True
200   - sequence:
201   - - type: map
202   - mapping :
203   - UNIT:
204   - include: schema_UNIT
205   -
206   -
207   -
208   -schema;schema_CHANNELS:
209   - type: seq
210   - required: True
211   - sequence:
212   - - type : map
213   - mapping:
214   - CHANNEL:
215   - include: schema_CHANNEL
216   -
217   -
218   -
219   -schema;schema_DEVICE:
220   - type: map
221   - required: True
222   - mapping:
223   - name:
224   - type: str
225   - required: True
226   - file:
227   - type: str
228   - required: True
229   - network_interface_index:
230   - type: text
231   - network_ip:
232   - type: str
233   -
234   -
235   -schema;schema_DEVICES:
236   - type: seq
237   - required: True
238   - sequence:
239   - - type: map
240   - mapping:
241   - DEVICE:
242   - include: schema_DEVICE
243   -
244   -
245   -schema;schema_OBSERVATORY:
246   - type: map
247   - required: True
248   - mapping:
249   - name:
250   - type: str
251   - required: True
252   - DEVICES:
253   - include: schema_DEVICES
254   - COMPUTERS:
255   - include: schema_COMPUTERS
256   - UNITS:
257   - include: schema_UNITS
258   -
259   -type: map
260   -mapping:
261   - schema:
262   - type: str
263   - required: True
264   - OBSERVATORY:
265   - include: schema_OBSERVATORY
  1 +schema;schema_DATABASE:
  2 + required: True
  3 + type: map
  4 + mapping:
  5 + computer:
  6 + type: str
  7 + required: True
  8 + file:
  9 + type: str
  10 + required: True
  11 +
  12 +schema;schema_AGENT_DEVICE:
  13 + type: map
  14 + required: True
  15 + mapping:
  16 + computer:
  17 + type: str
  18 + required: True
  19 + comm_access:
  20 + type: str
  21 + required: False
  22 + name:
  23 + type: str
  24 + required: True
  25 + path:
  26 + type: str
  27 + device:
  28 + type: str
  29 + protocol:
  30 + type: str
  31 + is_real:
  32 + type: bool
  33 + required: True
  34 +
  35 +schema;schema_AGENT:
  36 + type: map
  37 + required: True
  38 + mapping:
  39 + computer:
  40 + type: str
  41 + required: True
  42 + name:
  43 + type: str
  44 + required: True
  45 + path:
  46 + type: str
  47 +
  48 +schema;schema_GROUP:
  49 + type: map
  50 + required: True
  51 + mapping:
  52 + GROUP:
  53 + type: map
  54 + mapping:
  55 + logic:
  56 + type: str
  57 + channels:
  58 + type: seq
  59 + required: True
  60 + sequence:
  61 + - type: str
  62 +
  63 +schema;schema_CHANNEL_GROUPS:
  64 + type: map
  65 + required: True
  66 + mapping:
  67 + logic:
  68 + type: str
  69 + GROUPS:
  70 + type: seq
  71 + sequence:
  72 + - include: schema_GROUP
  73 +
  74 +schema;schema_MOUNT:
  75 + type: map
  76 + mapping:
  77 + name:
  78 + type: str
  79 + required: True
  80 + COMPONENT_AGENTS:
  81 + type: seq
  82 + required: True
  83 + sequence:
  84 + - type: any
  85 +
  86 +schema;schema_CHANNEL:
  87 + type: map
  88 + mapping:
  89 + name:
  90 + type: str
  91 + required: True
  92 + COMPONENT_AGENTS:
  93 + type: seq
  94 + required: True
  95 + sequence:
  96 + - type: any
  97 +
  98 +
  99 +schema;schema_SECURITY:
  100 + type: map
  101 + required: True
  102 + mapping:
  103 + name:
  104 + type: str
  105 + required: True
  106 + COMPONENT_AGENTS:
  107 + type: seq
  108 + required: True
  109 + sequence:
  110 + - type: any
  111 +
  112 +
  113 +schema;schema_TOPOLOGY:
  114 + required: True
  115 + type: map
  116 + mapping:
  117 + SECURITY:
  118 + include: schema_SECURITY
  119 + MOUNT:
  120 + include: schema_MOUNT
  121 + CHANNELS:
  122 + include: schema_CHANNELS
  123 + CHANNEL_GROUPS:
  124 + include: schema_CHANNEL_GROUPS
  125 +
  126 +
  127 +
  128 +schema;schema_COMPUTER:
  129 + type: map
  130 + mapping:
  131 + name:
  132 + type: str
  133 + required: True
  134 + file:
  135 + type: str
  136 + required: True
  137 + role:
  138 + type: str
  139 + required: False
  140 + network_interface_index:
  141 + type: text
  142 + network_ip:
  143 + type: str
  144 +
  145 +
  146 +schema;schema_AGENTS:
  147 + required: True
  148 + type: seq
  149 + matching: "any"
  150 + sequence:
  151 + - type: map
  152 + mapping:
  153 + AGENT_DEVICE:
  154 + include: schema_AGENT_DEVICE
  155 + - type: map
  156 + mapping:
  157 + AGENT:
  158 + include: schema_AGENT
  159 +
  160 +schema;schema_COMPUTERS:
  161 + type: seq
  162 + sequence:
  163 + - type: map
  164 + mapping:
  165 + COMPUTER:
  166 + include: schema_COMPUTER
  167 +
  168 +schema;schema_UNIT:
  169 + type: map
  170 + required: True
  171 + mapping:
  172 + name:
  173 + type: str
  174 + required: True
  175 + home:
  176 + type: str
  177 + required: True
  178 + horizon:
  179 + type: map
  180 + required: True
  181 + mapping:
  182 + type:
  183 + type: str
  184 + required: True
  185 + line:
  186 + type: seq
  187 + required: True
  188 + sequence:
  189 + - type: seq
  190 + sequence:
  191 + - type: number
  192 + DATABASE:
  193 + include: schema_DATABASE
  194 + AGENTS:
  195 + include: schema_AGENTS
  196 + TOPOLOGY:
  197 + include: schema_TOPOLOGY
  198 +
  199 +
  200 +schema;schema_UNITS:
  201 + type: seq
  202 + required: True
  203 + sequence:
  204 + - type: map
  205 + mapping :
  206 + UNIT:
  207 + include: schema_UNIT
  208 +
  209 +
  210 +
  211 +schema;schema_CHANNELS:
  212 + type: seq
  213 + required: True
  214 + sequence:
  215 + - type : map
  216 + mapping:
  217 + CHANNEL:
  218 + include: schema_CHANNEL
  219 +
  220 +
  221 +
  222 +schema;schema_DEVICE:
  223 + type: map
  224 + required: True
  225 + mapping:
  226 + name:
  227 + type: str
  228 + required: True
  229 + file:
  230 + type: str
  231 + required: True
  232 + network_interface_index:
  233 + type: text
  234 + network_ip:
  235 + type: str
  236 +
  237 +
  238 +schema;schema_DEVICES:
  239 + type: seq
  240 + required: True
  241 + sequence:
  242 + - type: map
  243 + mapping:
  244 + DEVICE:
  245 + include: schema_DEVICE
  246 +
  247 +
  248 +schema;schema_OBSERVATORY:
  249 + type: map
  250 + required: True
  251 + mapping:
  252 + name:
  253 + type: str
  254 + required: True
  255 + DEVICES:
  256 + include: schema_DEVICES
  257 + COMPUTERS:
  258 + include: schema_COMPUTERS
  259 + UNITS:
  260 + include: schema_UNITS
  261 +
  262 +type: map
  263 +mapping:
  264 + schema:
  265 + type: str
  266 + required: True
  267 + OBSERVATORY:
  268 + include: schema_OBSERVATORY
... ...
privatedev/config/guitalens/observatory_guitalens.yml
  Diff comments   View file @7ce93a0
... ... @@ -87,6 +87,7 @@ OBSERVATORY:
87 87  
88 88 - AGENT_DEVICE:
89 89 computer: MainComputer
  90 + comm_access: "//./COM3" # parameters of the comm: support of the device
90 91 name: mount
91 92 path: private/plugin/agent_devices
92 93 device: AstroMecCA_TM350
... ...