Skip to content

Commit 8b70d15

Browse files
tribeirotribeiro
committed
Merge branch 'develop'
* develop: Add compose files for atptg and attcs. Add readme for some places. Add compose for DIMM. Hexapod ip fixed Updated simulators Add serial port to device Add serial port configuration to electrometer and README file Add changes to README file Add X11 from local computer to docker-compose for electrometer Rename Hexapod to ATHexapod, Add Electrometer CSC
2 parents 5c1924b + fdb2868 commit 8b70d15

22 files changed

+300
-85
lines changed

‎AT_CSC/ATDome/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This compose will start the ATDome CSC that talks to the real hardware.

‎AT_CSC/ATDome/docker-compose.yaml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ version: '3.6'
33
services:
44

55
atdome-csc:
6-
image: lsstts/at_dome_sim:3.9-0.5
7-
container_name: atdome-sim
6+
image: lsstts/at_dome:3.9-0.5
7+
container_name: atdome
88
environment:
99
- OSPL_URI=${OSPL_URI}
1010
- LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
@@ -14,3 +14,15 @@ services:
1414

1515
entrypoint: ["/home/saluser/.setup.sh"]
1616

17+
atdometrajectory-sim:
18+
image: lsstts/at_dome_trajectory_sim:3.9-0.6a
19+
container_name: atdometrajectory
20+
environment:
21+
- OSPL_URI=${OSPL_URI}
22+
- LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
23+
network_mode: "host"
24+
volumes:
25+
- ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
26+
27+
entrypoint: ["/home/saluser/.setup.sh"]
28+

AT_CSC/Hexapod/docker-compose.yaml renamed to AT_CSC/ATHexapod/docker-compose.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@ version: "3"
22

33
services:
44
HexapodCSC:
5-
image: lsstts/ts_athexapod
5+
image: lsstts/ts_athexapod:3.9-dm-19762
66
environment:
77
- LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
8+
- OSPL_URI=${OSPL_URI}
89
network_mode: "host"
910
volumes:
1011
- ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
1112
- ./startCSC.sh:/home/saluser/startCSC.sh
1213
- ./tcpConfiguration.yaml:/home/saluser/repos/ts_salobjATHexapod/bin/settingFiles/Test/1/tcpConfiguration.yaml
1314
entrypoint: ["/home/saluser/startCSC.sh"]
1415
HexapodGUI:
15-
image: lsstts/ts_athexapod
16+
image: lsstts/ts_athexapod:3.9-dm-19762
1617
environment:
1718
- LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
18-
- DISPLAY=139.229.136.136:0
19+
- DISPLAY=192.168.1.51:0
1920
network_mode: "host"
2021
volumes:
2122
- ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}

‎AT_CSC/ATHexapod/startCSC.sh‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/bin/bash
2+
3+
echo "#"
4+
echo "# Loading LSST Stack"
5+
. /opt/lsst/software/stack/loadLSST.bash
6+
setup lsst_distrib
7+
echo "#"
8+
echo "# Loading sal environment"
9+
. repos/ts_sal/setup.env
10+
echo "#"
11+
echo "# Setting up sal, salobj and scriptqueue"
12+
13+
setup ts_xml -t current
14+
setup ts_sal -t current
15+
setup ts_salobj -t current
16+
setup ts_scriptqueue -t current
17+
setup ts_salobjATHexapod -t current
18+
cd /home/saluser/repos/ts_salobjATHexapod/bin/
19+
while :
20+
do
21+
echo "# Starting CSC"
22+
python ./runATHexapodCSC.py 0
23+
echo "# CSC finished..."
24+
done

AT_CSC/Hexapod/startGUI.sh renamed to AT_CSC/ATHexapod/startGUI.sh

File renamed without changes.

AT_CSC/Hexapod/tcpConfiguration.yaml renamed to AT_CSC/ATHexapod/tcpConfiguration.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
host: "192.168.1.31"
1+
host: "192.168.1.48"
22
port: 50000
33
connectionTimeout: 2
44
readTimeout: 2

‎AT_CSC/ATPTG/docker-compose.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
version: '3.6'
2+
services:
3+
atptg:
4+
image: tiagorib/ptkernel:DM-19890
5+
container_name: atptg
6+
environment:
7+
- OSPL_URI=${OSPL_URI}
8+
- LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
9+
network_mode: "host"
10+
volumes:
11+
- ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}

‎AT_CSC/ATTCS/docker-compose.yaml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
version: '3.6'
2+
3+
services:
4+
5+
ataos:
6+
image: lsstts/ataos:DM-19890
7+
container_name: ataos
8+
environment:
9+
- OSPL_URI=${OSPL_URI}
10+
- LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
11+
network_mode: "host"
12+
volumes:
13+
- ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
14+
15+
entrypoint: ["/home/saluser/.setup.sh"]
16+
17+
atdome-csc:
18+
image: lsstts/at_dome:3.9-0.5
19+
container_name: atdome
20+
environment:
21+
- OSPL_URI=${OSPL_URI}
22+
- LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
23+
network_mode: "host"
24+
volumes:
25+
- ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
26+
27+
entrypoint: ["/home/saluser/.setup.sh"]
28+
29+
atdometrajectory-sim:
30+
image: lsstts/at_dome_trajectory_sim:3.9-0.6a
31+
container_name: atdometrajectory
32+
environment:
33+
- OSPL_URI=${OSPL_URI}
34+
- LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
35+
network_mode: "host"
36+
volumes:
37+
- ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
38+
39+
entrypoint: ["/home/saluser/.setup.sh"]
40+

‎AT_CSC/Electrometer/docker-compose.yaml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
version: "3"
2+
3+
services:
4+
ElectrometerCSC:
5+
image: lsstts/electrometer
6+
environment:
7+
- LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
8+
network_mode: "host"
9+
volumes:
10+
- ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
11+
- ./startCSC.sh:/home/saluser/startCSC.sh
12+
- ./mainSetup.yaml:/home/saluser/repos/ts_electrometer2/bin/settingFiles/mainSetup.yaml
13+
devices:
14+
- /dev/ttyUSB0:/dev/ttyUSB0
15+
- /dev/electrometer:/dev/electrometer
16+
entrypoint: ["/home/saluser/startCSC.sh"]
17+
ElectrometerGUI:
18+
image: lsstts/electrometer
19+
environment:
20+
- LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
21+
- DISPLAY=${DISPLAY}
22+
network_mode: "host"
23+
volumes:
24+
- ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
25+
- ./startGUI.sh:/home/saluser/startGUI.sh
26+
- /tmp/.X11-unix:/tmp/.X11-unix
27+
- ./mainSetup.yaml:/home/saluser/repos/ts_electrometer2/bin/settingFiles/mainSetup.yaml
28+
entrypoint: ["/home/saluser/startGUI.sh"]

‎AT_CSC/Electrometer/mainSetup.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
recommendedSettings:
2+
- "Default1"
3+
- "Default2"
4+
aliases:
5+
Default1:
6+
settingSet: "Test"
7+
settingVersion: 1
8+
Default2:
9+
settingSet: "Test"
10+
settingVersion: 2
11+
salId: 1
12+
filePath: "/home/saluser/ts_electrometer2/electrometerFitsFiles"
13+
simulated: 0
14+
httpHost: "10.0.100.133"
15+
port: 8000
16+

0 commit comments

Comments
 (0)