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

Ticket2397 emma fermi chopper #195

Merged
merged 35 commits into from
Dec 19, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
c14edc8
Initial (bare) ioc
Tom-Willemsen Nov 1, 2017
fe519eb
Setting up
Tom-Willemsen Nov 1, 2017
b1c5821
Set up crate template file
Tom-Willemsen Nov 1, 2017
e29991c
Setup IOC to talk to (trivial) emulator
Tom-Willemsen Nov 1, 2017
6bc8220
Add (very) basic nominal frequency records
Tom-Willemsen Nov 2, 2017
a1c20c0
Records for phas and freq
Tom-Willemsen Nov 3, 2017
e0540c5
Push values into correct records as opposed to scanning.
Tom-Willemsen Nov 3, 2017
82b13c1
Add record for interlock status
Tom-Willemsen Nov 3, 2017
704e511
Refactor
Tom-Willemsen Nov 6, 2017
d8e9591
Make interlocks interesting and archived
Tom-Willemsen Nov 6, 2017
92488df
Chopper status records
Tom-Willemsen Nov 6, 2017
c24d130
Start/stop chopper
Tom-Willemsen Nov 6, 2017
9251d28
Rename interlock PVs
Tom-Willemsen Nov 6, 2017
9b3f8d4
Phase units conversion in DB
Tom-Willemsen Nov 7, 2017
fef9387
Add rotator angle DB records
Tom-Willemsen Nov 7, 2017
ea3ce24
Gate width records
Tom-Willemsen Nov 7, 2017
2657667
Correct EGUs
Tom-Willemsen Nov 7, 2017
665914b
Records for setting rotator angle
Tom-Willemsen Nov 8, 2017
40a2095
Recsim
Tom-Willemsen Nov 10, 2017
09338e4
IOC finishing touches (EGU, PREC, interest, archive)
Tom-Willemsen Nov 10, 2017
af3a24c
Remove debug
Tom-Willemsen Nov 10, 2017
47f542c
Add config.xml
Tom-Willemsen Nov 13, 2017
654ee93
Fixes against real hardware
Tom-Willemsen Nov 15, 2017
32b9385
Update st-common for new parameters
Tom-Willemsen Nov 15, 2017
6c4baf5
Make both tests and real device work. Add addressing.
Tom-Willemsen Nov 16, 2017
5558b76
Add macros to config
Tom-Willemsen Nov 16, 2017
7daa574
Autosave setpoints as per labview
Tom-Willemsen Nov 16, 2017
ca20a59
Add chopper to makefile
John-Holt-Tessella Nov 20, 2017
e1ac759
Add config.xml to second IOC
John-Holt-Tessella Nov 20, 2017
3ff3389
Review comments
Tom-Willemsen Nov 23, 2017
ec695a8
Add alarms, change EGUs
Tom-Willemsen Nov 23, 2017
8d54ed8
Add alarm info
Tom-Willemsen Nov 23, 2017
ab1198c
Rename GATE to PHAS_ERR
Tom-Willemsen Nov 23, 2017
afdbddb
Add alarms logic
Tom-Willemsen Nov 27, 2017
02bb485
merge with master
John-Holt-Tessella Dec 19, 2017
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 Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ IOCDIRS = AG33220A AG3631A AG53220A CCD100 CONEXAGP CONTROLSVCS CRYVALVE DELFTAR
IOCDIRS += HAMEG8123 HIFIMAG HLG HVCAEN INHIBITR INSTETC INSTRON ISISDAE JULABO KHLY2400 KEPCO LINKAM95 LINMOT LKSH218 LKSH336
IOCDIRS += MCLEN MERCURY_ITC MK2CHOPR MK3CHOPR NANODAC NEOCERA PDR2000 PIMOT PSCTRL
IOCDIRS += RUNCTRL SCIMAG3D SDTEST SKFCHOPPER SMC100 SPINFLIPPER306015 STPS350 STSR400 TDK_LAMBDA_GENESYS TEKAFG3XXX TEKDMM40X0 TEKMSO4104B TEST TPG26x TPG300 TTIEX355P BKHOFF
IOCDIRS += ROTSC AMINT2L SPRLG FERMCHOP SAMPOS RKNPS CYBAMAN EGXCOLIM IEG
IOCDIRS += ROTSC AMINT2L SPRLG FERMCHOP SAMPOS RKNPS CYBAMAN EGXCOLIM IEG SKFMB350
IOCDIRS += GEMORC

## check on missing directories
Expand Down
31 changes: 31 additions & 0 deletions SKFMB350/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Makefile at top of application tree
TOP = .
include $(TOP)/configure/CONFIG

# Directories to build, any order
DIRS += configure
DIRS += $(wildcard *Sup)
DIRS += $(wildcard *App)
DIRS += $(wildcard *Top)
DIRS += $(wildcard iocBoot)

# The build order is controlled by these dependency rules:

# All dirs except configure depend on configure
$(foreach dir, $(filter-out configure, $(DIRS)), \
$(eval $(dir)_DEPEND_DIRS += configure))

# Any *App dirs depend on all *Sup dirs
$(foreach dir, $(filter %App, $(DIRS)), \
$(eval $(dir)_DEPEND_DIRS += $(filter %Sup, $(DIRS))))

# Any *Top dirs depend on all *Sup and *App dirs
$(foreach dir, $(filter %Top, $(DIRS)), \
$(eval $(dir)_DEPEND_DIRS += $(filter %Sup %App, $(DIRS))))

# iocBoot depends on all *App dirs
iocBoot_DEPEND_DIRS += $(filter %App,$(DIRS))

# Add any additional dependency rules here:

include $(TOP)/configure/RULES_TOP
25 changes: 25 additions & 0 deletions SKFMB350/SKFMB350-IOC-01App/Db/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
TOP=../..
include $(TOP)/configure/CONFIG
#----------------------------------------
# ADD MACRO DEFINITIONS AFTER THIS LINE

#----------------------------------------------------
# Optimization of db files using dbst (DEFAULT: NO)
#DB_OPT = YES

#----------------------------------------------------
# Create and install (or just install) into <top>/db
# databases, templates, substitutions like this
DB += chopper.db
DB += simdis.db
DB += interlocks.db
DB += status.db

#----------------------------------------------------
# If <anyname>.db template is not named <anyname>*.template add
# <anyname>_template = <templatename>

include $(TOP)/configure/RULES
#----------------------------------------
# ADD RULES AFTER THIS LINE

Loading