Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dream logic #9

Merged
merged 31 commits into from
Sep 9, 2024
Merged
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
e080df5
Adding ECAT communication with TMO PLC
janezg-SLAC Jan 18, 2024
aac6940
Adding ECAT communication with TMO PLC
janezg-SLAC Jan 18, 2024
ba796a7
Re-organizing file structure, Serial_COM task priority change and cyc…
janezg-SLAC Jan 18, 2024
83278a4
DREAM logic roughly complete
janezg-SLAC Jan 19, 2024
50905a1
adding EL3052 for FWM, adding ROUGH2-PTM-01 to PRG_COM
janezg-SLAC Jan 22, 2024
e3579b8
Adding back CAT1:GHC
janezg-SLAC Jan 25, 2024
dd9a916
Adding more logic. Moving Output ch for ROUGH2-PTM-02 to new EL2794 m…
janezg-SLAC Jan 30, 2024
a33c872
Replacing vacuum plc with BSD PLC
janezg-SLAC May 1, 2024
e334341
Re-organizing global variable, adding Flow meter reading, adding Coil…
janezg-SLAC May 2, 2024
470d916
Building IOC
May 2, 2024
c35f597
Adding Routes, Changing limit for Coil PS coolant flow min value
janezg-SLAC May 2, 2024
99d8157
Adding PV for FWM, other minor changes
janezg-SLAC May 3, 2024
0c71d4c
Building IOC
May 3, 2024
2b2848a
Renaming PV for Coil FWM and renaming variables
janezg-SLAC May 3, 2024
7eeba10
building IOC
May 3, 2024
f67b6e4
Updating serial library, updating serial interface for the TD400
janezg-SLAC May 24, 2024
4cb1846
Updating ads-ioc to R0.6.2
May 28, 2024
2da8dca
Adding HV interlock and updating interlocks for roughing valves
janezg-SLAC Aug 16, 2024
9490f81
Updating Flow meter function, moving beckhoff terminal EL3052 to DRL-03
janezg-SLAC Aug 22, 2024
02fe75a
re-building IOC
Aug 22, 2024
0376083
Updating interlock logic for CAT1-VRC-1
janezg-SLAC Aug 27, 2024
9966e3d
Updating Interlock logic
janezg-SLAC Aug 29, 2024
2d8890d
Re-building IOC
Aug 29, 2024
023842d
Updating interlocks for venting valves
janezg-SLAC Aug 30, 2024
2ac9c99
Updating bits value for ADC for the rough GPIs
janezg-SLAC Sep 3, 2024
9340263
Updating interlock logic
janezg-SLAC Sep 5, 2024
f6a7cb0
Re-building IOC
Sep 5, 2024
597a602
Using i_xClsLS or i_xOpnLS to indentify if valve is Closed/Open
janezg-SLAC Sep 5, 2024
2f37df5
Using i_xClsLS or i_xOpnLS to indentify if valve is Closed/Open
janezg-SLAC Sep 5, 2024
22cc3c0
DP1-VRC-01/02 pins swap
janezg-SLAC Sep 6, 2024
d752237
Updating Valves interlock logic after code review
janezg-SLAC Sep 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lcls-plc-dream-vac/iocBoot/ioc-lcls-plc-dream-vac/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
IOC_TOP=/reg/g/pcds/epics/ioc/common/ads-ioc/R0.6.1
IOC_TOP=/reg/g/pcds/epics/ioc/common/ads-ioc/R0.6.2
IOC_INSTANCE_PATH := $(shell pwd)

# Set PRODUCTION_IOC to 1 to move from a testing to a production IOC:
Expand Down
2 changes: 1 addition & 1 deletion lcls-plc-dream-vac/iocBoot/ioc-lcls-plc-dream-vac/envPaths
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
epicsEnvSet("IOC","${IOC=ioc-lcls-plc-dream-vac}")
epicsEnvSet("TOP","/cds/group/pcds/epics/ioc/common/ads-ioc/R0.6.1")
epicsEnvSet("TOP","/reg/g/pcds/epics/ioc/common/ads-ioc/R0.6.2")
epicsEnvSet("EPICS_SITE_TOP","/reg/g/pcds/epics/")
epicsEnvSet("EPICS_MODULES","/reg/g/pcds/epics//R7.0.2-2.0/modules")
epicsEnvSet("AUTOSAVE","/reg/g/pcds/epics//R7.0.2-2.0/modules/autosave/R5.8-2.1.0")
Expand Down
Loading