PYROS-IRAP / pyros

Commit 03584bf53cf4d241bd312b89b700ad9679f2a214

Authored by Alexis Koralewski
1 parent eb71df09
Exists in dev

Add symbol attributes for Channels & albums in obsconfig

Showing 5 changed files with 42 additions and 9 deletions   Show diff stats
Inline Side-by-side
config/schemas/schema_observatory-2.0.yml
  Diff comments   View file @03584bf
... ... @@ -80,6 +80,9 @@ schema;schema_ALBUMS:
80 80  
81 81 schema;schema_ALBUM:
82 82 mapping:
  83 + symbol:
  84 + type: str
  85 + required: True
83 86 name:
84 87 type: str
85 88 required: True
... ... @@ -130,6 +133,9 @@ schema;schema_MOUNT:
130 133 schema;schema_CHANNEL:
131 134 type: map
132 135 mapping:
  136 + symbol:
  137 + type: str
  138 + required: True
133 139 name:
134 140 type: str
135 141 required: True
... ...
privatedev/config/default/observatory_default.yml
  Diff comments   View file @03584bf
... ... @@ -134,6 +134,7 @@ OBSERVATORY:
134 134 CHANNELS:
135 135 - CHANNEL:
136 136 name: OpticalChannel
  137 + symbol: MCH
137 138 COMPONENT_AGENTS:
138 139 - OpticImager: optic
139 140 - DetectorSensor: camera
... ... @@ -143,6 +144,7 @@ OBSERVATORY:
143 144  
144 145 - ALBUM :
145 146 name: MainChannel
  147 + symbol: MCH
146 148 description: "Album with one channel"
147 149 CHANNELS:
148 150 - OpticalChannel
... ...
privatedev/config/pyros/config_pyros.yml
  Diff comments   View file @03584bf
... ... @@ -10,5 +10,11 @@ OCF: ~
10 10 ENV:
11 11 time_history: 2
12 12 time_before_plot: 10
  13 + monitoring_names_to_be_plotted:
  14 + - Wind_direction
  15 + - Wind_speed
  16 + - Rain_boolean
  17 + - Temperature_outside
  18 + - Humidity_outside
13 19  
14 20  
15 21 \ No newline at end of file
... ...
privatedev/config/tnc/observatory_tnc.yml
  Diff comments   View file @03584bf
... ... @@ -199,7 +199,7 @@ OBSERVATORY:
199 199 install:
200 200 shell: /bin/sh
201 201 script: "guitastro/install/install.sh"
202   -
  202 +
203 203 MONITORING_DEVICES:
204 204 - TAROT_meteo
205 205  
... ... @@ -364,12 +364,13 @@ OBSERVATORY:
364 364 name: AgentImagesProcessor_tnc_up1_ako
365 365 computer: AKoralewskiPersoComputer
366 366 protocol: privatedev/plugin/agent/AgentImagesProcessor_tnc_up1.py
367   -
  367 + is_active: False
368 368 - AGENT:
369 369 name: AgentTriton
370 370 computer: AKoralewskiPersoComputer
371 371 protocol: private/plugin/agent/AgentTriton.py
372 372 path: private/plugin/agent/triton
  373 + is_active: False
373 374  
374 375 - AGENT_DEVICE:
375 376 name: AgentDevicePLC_ako
... ... @@ -378,7 +379,13 @@ OBSERVATORY:
378 379 device: TAROT_meteo
379 380 protocol: private/plugin/agent_devices/AgentDevicePLC.py
380 381 is_real: false
381   -#
  382 +
  383 + - AGENT:
  384 + name: AgentM_ako
  385 + computer: AKoralewskiPersoComputer
  386 + protocol: private/plugin/agent/AgentM.py
  387 + path: private/plugin/agent
  388 +
382 389 - AGENT:
383 390 name: AgentTriton_akz
384 391 computer: AKlotzPersoComputer
... ... @@ -457,19 +464,20 @@ OBSERVATORY:
457 464 protocol: private/plugin/agent/AgentTriton.py
458 465 path: private/plugin/agent/triton
459 466  
460   - - AGENT:
461   - name: AgentEnvMonitor
462   - computer: astroguitaComputer
463   - protocol: private/plugin/agent/AgentEnvMonitor.py
464   -
465 467 - AGENT_DEVICE:
466   - name: AgentDevicePLC
  468 + name: AgentDevicePLC_astroguita
467 469 computer: astroguitaComputer
468 470 path: private/plugin/agent_devices
469 471 device: TAROT_meteo
470 472 protocol: private/plugin/agent_devices/AgentDevicePLC.py
471 473 is_real: false
472 474  
  475 + - AGENT:
  476 + name: AgentM_astroguita
  477 + computer: astroguitaComputer
  478 + protocol: private/plugin/agent/AgentM.py
  479 + path: private/plugin/agent
  480 +
473 481  
474 482 TOPOLOGY:
475 483  
... ... @@ -488,6 +496,7 @@ OBSERVATORY:
488 496  
489 497 - CHANNEL:
490 498 name: OpticalChannel_up1
  499 + symbol: CH1
491 500 COMPONENT_AGENTS:
492 501 - OpticImager: optic_up1
493 502 - DetectorFocuser: focuser_up1
... ... @@ -497,6 +506,7 @@ OBSERVATORY:
497 506  
498 507 - CHANNEL:
499 508 name: OpticalChannel_up2
  509 + symbol: CH2
500 510 COMPONENT_AGENTS:
501 511 - OpticImager: optic_up2
502 512 - DetectorFocuser: focuser_up2
... ... @@ -506,6 +516,7 @@ OBSERVATORY:
506 516  
507 517 - CHANNEL:
508 518 name: OpticalChannel_down1
  519 + symbol: CH3
509 520 COMPONENT_AGENTS:
510 521 - OpticImager: optic_down1
511 522 - DetectorFocuser: focuser_down1
... ... @@ -515,6 +526,7 @@ OBSERVATORY:
515 526  
516 527 - CHANNEL:
517 528 name: OpticalChannel_down2
  529 + symbol: CH4
518 530 COMPONENT_AGENTS:
519 531 - OpticImager: optic_down2
520 532 - DetectorFocuser: focuser_down2
... ... @@ -526,6 +538,7 @@ OBSERVATORY:
526 538  
527 539 - ALBUM :
528 540 name: Altogether
  541 + symbol: ATG
529 542 description: All channels
530 543 CHANNELS:
531 544 - OpticalChannel_down2
... ... @@ -535,12 +548,14 @@ OBSERVATORY:
535 548  
536 549 - ALBUM :
537 550 name: TwoDown
  551 + symbol: 2DN
538 552 description: Two channel of the down side
539 553 CHANNELS:
540 554 - OpticalChannel_down2
541 555 - OpticalChannel_down1
542 556 - ALBUM :
543 557 name: TwoUp
  558 + symbol: 2UP
544 559 description: Two channel of the up side
545 560 CHANNELS:
546 561 - OpticalChannel_up2
... ... @@ -548,6 +563,7 @@ OBSERVATORY:
548 563  
549 564 - ALBUM :
550 565 name: Three
  566 + symbol: 3A1
551 567 description: Two channel of the down side and one up side (2nd up)
552 568 CHANNELS:
553 569 - OpticalChannel_down2
... ... @@ -556,6 +572,7 @@ OBSERVATORY:
556 572  
557 573 - ALBUM :
558 574 name: One
  575 + symbol: ONE
559 576 description: One up channel (first)
560 577 CHANNELS:
561 578 - OpticalChannel_up1
... ...
src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ok_simple.yml
  Diff comments   View file @03584bf
... ... @@ -134,6 +134,7 @@ OBSERVATORY:
134 134  
135 135 - CHANNEL:
136 136 name: OpticalChannel
  137 + symbol: test
137 138 COMPONENT_AGENTS:
138 139 - OpticImager: optic
139 140 - DetectorSensor: camera
... ... @@ -142,6 +143,7 @@ OBSERVATORY:
142 143 ALBUMS:
143 144 - ALBUM:
144 145 name: test_album
  146 + symbol: test
145 147 CHANNELS:
146 148 - OpticalChannel
147 149  
... ...