Skip to content

Ticket8614 mercury ips magnet supply #936

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.

Sign up for GitHub

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

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
Open

Ticket8614 mercury ips magnet supply #936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
0e7401e
Range change time delay
iangillingham-stfc Mar 11, 2025
47eba0e
Merge branch 'master' of https://github.com/ISISComputingGroup/EPICS-…
iangillingham-stfc Mar 13, 2025
9452eaa
IPS: work around limitation of getting legacy status from SCPI protocol
iangillingham-stfc Mar 25, 2025
4ec5b4a
Initial updates to EPICS database for SCPI protocol migration
iangillingham-stfc Mar 27, 2025
c10d6d3
initial state machine commit
LowriJenkins Feb 14, 2025
da2a283
Range change time delay
iangillingham-stfc Mar 11, 2025
cb65419
IPS: work around limitation of getting legacy status from SCPI protocol
iangillingham-stfc Mar 25, 2025
c6f4d56
Initial updates to EPICS database for SCPI protocol migration
iangillingham-stfc Mar 27, 2025
3c282a8
Added new db file for SCPI instead of legacy protocol.
iangillingham-stfc Apr 1, 2025
707fde7
Reverted ips.db to original to continue development of SCPI option in…
iangillingham-stfc Apr 1, 2025
1ed6a4a
Merge branch 'Ticket8614_mercury_IPS_magnet_supply' of https://github…
iangillingham-stfc Apr 1, 2025
af80bed
Reverted ips.db to original to continue development of SCPI option in…
iangillingham-stfc Apr 1, 2025
303555e
Created the ips scpi test framework and further work on the db
iangillingham-stfc Jun 5, 2025
b80d381
st.cmd: Commented out asynTraceMask() calls for diagnostic logging. L…
iangillingham-stfc Jun 10, 2025
e10153f
Commenced adding Level Sensor board support
iangillingham-stfc Jun 26, 2025
6fdd8d0
Added a lot of records for the helium and nitrogen level meters and s…
iangillingham-stfc Jul 3, 2025
5daee32
Merge branch 'master' of https://github.com/ISISComputingGroup/EPICS-…
iangillingham-stfc Jul 3, 2025
9215a31
Added MIN_N2_FREQ and MAX_N2_FREQ macros to dbLoadRecords(db/ips_scpi…
iangillingham-stfc Jul 3, 2025
48022bc
IPS: Added STREAMPROTOCOL macro to config.xml
iangillingham-stfc Jul 22, 2025
2a0cb1c
Added He & N levels records. cleaned up ips_scpi.db. build.mak now in…
iangillingham-stfc Jul 29, 2025
d31cc8f
Added a substitutions file and associated template file to generate t…
iangillingham-stfc Jul 31, 2025
ebfcc85
Removed deprecated record SWEEPMODE:PARAMS:SP
iangillingham-stfc Aug 12, 2025
1bf774b
Added discrete records for system alarms and corresponding macros in …
iangillingham-stfc Aug 12, 2025
7e8a32a
Converted STS:_POLLSYSTEM:ALARMS_SUB to waveform records, as lengthy …
iangillingham-stfc Aug 13, 2025
90ed165
st.cmd: Removed MsgBox call as no longer in debug phase on IOC start up.
iangillingham-stfc Aug 19, 2025
7db187e
State machine cryomagnet.st copied and modified for SCPI mode, where …
iangillingham-stfc Aug 21, 2025
9e4ea1b
Added support for discovered alarm status 'Magnet Safety'
iangillingham-stfc Aug 28, 2025
af4cbca
Merge remote-tracking branch 'origin/master' into Ticket8614_mercury_…
iangillingham-stfc Sep 9, 2025
cfa967c
ips_scpi.db: Removed FIELD and CURRENT trip status records - can not …
iangillingham-stfc Sep 16, 2025
e9294c1
ips_scpi.db: Moved some documentation to the Developer Manual (Oxford…
iangillingham-stfc Sep 16, 2025
6cf11fb
ips_scpi.db and ips.db: Removed misleading comment about magnet heate…
iangillingham-stfc Sep 16, 2025
3035c1e
Added ips_common.db which contains all the EPICS records common to bo…
iangillingham-stfc Sep 17, 2025
41dbae7
Split out duplicated records from SCPI and legacy databases into ips_…
iangillingham-stfc Sep 17, 2025
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
7 changes: 6 additions & 1 deletion IPS/IPS-IOC-01App/Db/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,12 @@ include $(TOP)/configure/CONFIG
#----------------------------------------------------
# Create and install (or just install) into <top>/db
# databases, templates, substitutions like this
DB += ips.db
DB += ips_common.db
DB += ips_legacy.db
DB += ips_scpi.db
DB += ips_scpi_levels.db
DB += scpi_system_alarms.db
DB += scpi_system_alarms_discrete.db

#----------------------------------------------------
# If <anyname>.db template is not named <anyname>*.template add
Expand Down
Loading