-
Notifications
You must be signed in to change notification settings - Fork 0
Ticket8614 mercury ips magnet supply #9
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
61 commits
Select commit
Hold shift + click to select a range
467a854
Initial dev changes to OxInstIPS_SCPI.protocol
iangillingham-stfc 1dcb2ed
Further SCPI migration
iangillingham-stfc 5d73d90
Corrections to SCPI protocol on connection to real instrument
iangillingham-stfc 6f9d113
Tests IOCS config changed to specify use of SCPI protocol
iangillingham-stfc 8fa489d
Further corrections to SCPI protocol on connection to real instrument
iangillingham-stfc c9a7adf
Added voltage_limit to device_scpi.py
iangillingham-stfc cc0799d
Added system_test files after moving out of generic support/DeviceEmu…
iangillingham-stfc 4922bc5
.gitignore: added __pycache__ and .idea directories
iangillingham-stfc 2438716
tests/ips.py reverted to original as scpi tests are now in ips_scpi.py
iangillingham-stfc 94ffca5
refactor: Split tests into common and specific to legacy and SCPI
iangillingham-stfc f82db58
Added ips_scpi.py for specific SCPI protocol tests
iangillingham-stfc 255777c
Added to and made changes with lewis emulator and tests. Originally p…
iangillingham-stfc cde4713
SCPI protocol: Some 'out' commands had associated 'in' to read back t…
iangillingham-stfc 19bd866
stream_interface_scpi.py: Removed some no longer needed diagnostic lo…
iangillingham-stfc 13d36a9
ips_common.py tests: Removed some no longer needed diagnostic logging…
iangillingham-stfc d339f2c
ips_scpi.py tests: Commented out the ioc_launcher_class attribute for…
iangillingham-stfc 5955855
Deleted modes_scpi.py
iangillingham-stfc 03ae20e
Added StreamDevice protocol functions for SCPI getSysAlarms, readSysA…
iangillingham-stfc 6cab1e4
Added lewis emulator device support for the level meter board and mag…
iangillingham-stfc 9cea6da
Added lewis emulator support for reading system alarms (STAT:SYS:ALRM)
iangillingham-stfc c5f2035
Added lewis emulator support for temperature board status and level m…
iangillingham-stfc 744a5da
Added tests for magnet temperature sensor board and level meter board…
iangillingham-stfc 1e52a2a
Commenced adding Level Sensor board support
iangillingham-stfc d73ecfb
Added loads of stuff to the SCPI protocol file.
iangillingham-stfc 21b908d
Added loads of device attributes to the lewis device.py file.
iangillingham-stfc f699099
Added LevelMeterHeliumReadRate Enum class to encapsulate He level rea…
iangillingham-stfc f3c247b
Added tests for helium and nitrogen levels attributes.
iangillingham-stfc d4b0ea0
Added lewis emulation features for helium and nitrogen levels attribu…
iangillingham-stfc 3c96b6b
Removed commented out code.
iangillingham-stfc 4e3f028
Ruff formatted: Added type annotations and general formatting.
iangillingham-stfc 7829d0b
Ruff formatted: Added type annotations and general formatting.
iangillingham-stfc 035241a
Fixed a couple of long lines.
iangillingham-stfc 24867b7
aSub record framework added to handle system error processing.
iangillingham-stfc 78a5432
Added pressure and levels daughter board support
iangillingham-stfc 923e6d3
Modified src/Makefile to build for both the test IOC and support modu…
iangillingham-stfc b3cbf3b
device.py: Added Temperature and pressure values along with system al…
iangillingham-stfc d6c6b7e
OxInstIPS_SCPI.protocol: SYS:ALRM now read in one string then passed …
iangillingham-stfc 707e698
modes.py: Pressure board class added and case corrected for some alar…
iangillingham-stfc 735cc37
RELEASE cosmetic mods
iangillingham-stfc b17feea
alarms.c: aSub function starting to receive alarm data and preliminar…
iangillingham-stfc 5a3ed7d
Switch alarms code from C to C++ and renamed to alarms.cpp
iangillingham-stfc 3da1d99
alarms.c renamed to alarms.cpp
iangillingham-stfc fff7596
Refactor: Used C++ STL to remove complexity of arrays of pointers to …
iangillingham-stfc db24ffb
Refactor: Augmented code documentation. Corrected the order of some m…
iangillingham-stfc 4d2eb07
fix: Corrected system alarm messages source for pressure board.
iangillingham-stfc b5c9447
Added tests for system alarm handling and removed He/N filling status…
iangillingham-stfc 9f8475a
Type checking sorted for pyright.
iangillingham-stfc b3bc2fa
Corrected for ruff checks.
iangillingham-stfc 29d6c15
Added support for discovered alarm status 'Magnet Safety'
iangillingham-stfc 1784122
alarms.cpp: Removed diagnostic log messages and additional documentat…
iangillingham-stfc 3485c96
Ruff formatted (again)
iangillingham-stfc f7e4543
OxinstIPS_SCPI.protocol: Removed no longer relevant commentary regard…
iangillingham-stfc ca1b808
alarms.cpp: PR review changes
iangillingham-stfc fe3233b
Removed commented out code from interfaces/__init__.py
iangillingham-stfc 6f6869c
stream_interface_scpi.py: Removed redundent code in set_activity()
iangillingham-stfc 9132e72
stream_interface_scpi.py: Removed redundent function get_trip_current()
iangillingham-stfc 3db02a3
stream_interface_scpi.py: Removed commentded out code in get_pressure()
iangillingham-stfc 14a174a
More Ruff formatting that somehow got missed
iangillingham-stfc c48246c
ips.py: Commented out ioc_launcher_class: ProcServLauncher to improve…
iangillingham-stfc a5c5b76
Remove unused parameters
Tom-Willemsen 3590a5e
Fix run_tests.bat & remove commented-out code
Tom-Willemsen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed - no point leaving misleading stuff in there that isn't used.