Skip to content
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 Mar 12, 2025
1dcb2ed
Further SCPI migration
iangillingham-stfc Mar 27, 2025
5d73d90
Corrections to SCPI protocol on connection to real instrument
iangillingham-stfc May 1, 2025
6f9d113
Tests IOCS config changed to specify use of SCPI protocol
iangillingham-stfc May 1, 2025
8fa489d
Further corrections to SCPI protocol on connection to real instrument
iangillingham-stfc May 6, 2025
c9a7adf
Added voltage_limit to device_scpi.py
iangillingham-stfc May 6, 2025
cc0799d
Added system_test files after moving out of generic support/DeviceEmu…
iangillingham-stfc May 6, 2025
4922bc5
.gitignore: added __pycache__ and .idea directories
iangillingham-stfc May 6, 2025
2438716
tests/ips.py reverted to original as scpi tests are now in ips_scpi.py
iangillingham-stfc May 7, 2025
94ffca5
refactor: Split tests into common and specific to legacy and SCPI
iangillingham-stfc May 7, 2025
f82db58
Added ips_scpi.py for specific SCPI protocol tests
iangillingham-stfc May 8, 2025
255777c
Added to and made changes with lewis emulator and tests. Originally p…
iangillingham-stfc Jun 5, 2025
cde4713
SCPI protocol: Some 'out' commands had associated 'in' to read back t…
iangillingham-stfc Jun 10, 2025
19bd866
stream_interface_scpi.py: Removed some no longer needed diagnostic lo…
iangillingham-stfc Jun 10, 2025
13d36a9
ips_common.py tests: Removed some no longer needed diagnostic logging…
iangillingham-stfc Jun 10, 2025
d339f2c
ips_scpi.py tests: Commented out the ioc_launcher_class attribute for…
iangillingham-stfc Jun 10, 2025
5955855
Deleted modes_scpi.py
iangillingham-stfc Jun 10, 2025
03ae20e
Added StreamDevice protocol functions for SCPI getSysAlarms, readSysA…
iangillingham-stfc Jun 25, 2025
6cab1e4
Added lewis emulator device support for the level meter board and mag…
iangillingham-stfc Jun 25, 2025
9cea6da
Added lewis emulator support for reading system alarms (STAT:SYS:ALRM)
iangillingham-stfc Jun 25, 2025
c5f2035
Added lewis emulator support for temperature board status and level m…
iangillingham-stfc Jun 25, 2025
744a5da
Added tests for magnet temperature sensor board and level meter board…
iangillingham-stfc Jun 25, 2025
1e52a2a
Commenced adding Level Sensor board support
iangillingham-stfc Jun 26, 2025
d73ecfb
Added loads of stuff to the SCPI protocol file.
iangillingham-stfc Jul 3, 2025
21b908d
Added loads of device attributes to the lewis device.py file.
iangillingham-stfc Jul 3, 2025
f699099
Added LevelMeterHeliumReadRate Enum class to encapsulate He level rea…
iangillingham-stfc Jul 3, 2025
f3c247b
Added tests for helium and nitrogen levels attributes.
iangillingham-stfc Jul 3, 2025
d4b0ea0
Added lewis emulation features for helium and nitrogen levels attribu…
iangillingham-stfc Jul 3, 2025
3c96b6b
Removed commented out code.
iangillingham-stfc Jul 9, 2025
4e3f028
Ruff formatted: Added type annotations and general formatting.
iangillingham-stfc Jul 9, 2025
7829d0b
Ruff formatted: Added type annotations and general formatting.
iangillingham-stfc Jul 9, 2025
035241a
Fixed a couple of long lines.
iangillingham-stfc Jul 9, 2025
24867b7
aSub record framework added to handle system error processing.
iangillingham-stfc Jul 29, 2025
78a5432
Added pressure and levels daughter board support
iangillingham-stfc Aug 7, 2025
923e6d3
Modified src/Makefile to build for both the test IOC and support modu…
iangillingham-stfc Aug 7, 2025
b3cbf3b
device.py: Added Temperature and pressure values along with system al…
iangillingham-stfc Aug 7, 2025
d6c6b7e
OxInstIPS_SCPI.protocol: SYS:ALRM now read in one string then passed …
iangillingham-stfc Aug 7, 2025
707e698
modes.py: Pressure board class added and case corrected for some alar…
iangillingham-stfc Aug 7, 2025
735cc37
RELEASE cosmetic mods
iangillingham-stfc Aug 7, 2025
b17feea
alarms.c: aSub function starting to receive alarm data and preliminar…
iangillingham-stfc Aug 7, 2025
5a3ed7d
Switch alarms code from C to C++ and renamed to alarms.cpp
iangillingham-stfc Aug 12, 2025
3da1d99
alarms.c renamed to alarms.cpp
iangillingham-stfc Aug 12, 2025
fff7596
Refactor: Used C++ STL to remove complexity of arrays of pointers to …
iangillingham-stfc Aug 13, 2025
db24ffb
Refactor: Augmented code documentation. Corrected the order of some m…
iangillingham-stfc Aug 13, 2025
4d2eb07
fix: Corrected system alarm messages source for pressure board.
iangillingham-stfc Aug 13, 2025
b5c9447
Added tests for system alarm handling and removed He/N filling status…
iangillingham-stfc Aug 19, 2025
9f8475a
Type checking sorted for pyright.
iangillingham-stfc Aug 21, 2025
b3bc2fa
Corrected for ruff checks.
iangillingham-stfc Aug 21, 2025
29d6c15
Added support for discovered alarm status 'Magnet Safety'
iangillingham-stfc Aug 28, 2025
1784122
alarms.cpp: Removed diagnostic log messages and additional documentat…
iangillingham-stfc Aug 28, 2025
3485c96
Ruff formatted (again)
iangillingham-stfc Sep 16, 2025
f7e4543
OxinstIPS_SCPI.protocol: Removed no longer relevant commentary regard…
iangillingham-stfc Sep 16, 2025
ca1b808
alarms.cpp: PR review changes
iangillingham-stfc Sep 16, 2025
fe3233b
Removed commented out code from interfaces/__init__.py
iangillingham-stfc Sep 16, 2025
6f6869c
stream_interface_scpi.py: Removed redundent code in set_activity()
iangillingham-stfc Sep 16, 2025
9132e72
stream_interface_scpi.py: Removed redundent function get_trip_current()
iangillingham-stfc Sep 16, 2025
3db02a3
stream_interface_scpi.py: Removed commentded out code in get_pressure()
iangillingham-stfc Sep 16, 2025
14a174a
More Ruff formatting that somehow got missed
iangillingham-stfc Sep 16, 2025
c48246c
ips.py: Commented out ioc_launcher_class: ProcServLauncher to improve…
iangillingham-stfc Sep 17, 2025
a5c5b76
Remove unused parameters
Tom-Willemsen Oct 15, 2025
3590a5e
Fix run_tests.bat & remove commented-out code
Tom-Willemsen Oct 15, 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
14 changes: 3 additions & 11 deletions OxInstIPSApp/src/alarms.cpp
Copy link
Contributor Author

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.

Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,11 @@
* where the bit patterns will be established according to active alarms.
*
* INPA - Input string containing the alarm message.
* INPB - Board identifier form the magnet temperature controller (e.g. "MB1.T1")
* INPC - Board identifier form the 10T magnet temperature controller (e.g. "DB8.T1")
* INPD - Board identifier form the Levels controller (e.g. "DB1.L1")
* INPE - Board identifier form the pressure controller (e.g. "DB5.P1")
*
* OUTA - Output field for the magnet temperature alarm status (mbbidirect).
* OUTA - Output field for the magnet 10T temperature alarm status (mbbidirect).
* OUTA - Output field for the levels alarm status (mbbidirect).
* OUTA - Output field for the pressure alarm status (mbbidirect).
* OUTB - Output field for the magnet 10T temperature alarm status (mbbidirect).
* OUTC - Output field for the levels alarm status (mbbidirect).
* OUTD - Output field for the pressure alarm status (mbbidirect).
*
* Incoming alarm messages are expected to be in the format:
* "STAT:SYS:ALRM:DB8.T1<9>Open Circuit;MB1.T1<9>Open Circuit;"
Expand Down Expand Up @@ -141,10 +137,6 @@ static long handle_system_alarm_status(aSubRecord *prec)

if (
prec->fta != menuFtypeCHAR
|| prec->ftb != menuFtypeSTRING
|| prec->ftc != menuFtypeSTRING
|| prec->ftd != menuFtypeSTRING
|| prec->fte != menuFtypeSTRING
|| prec->ftva != menuFtypeLONG
|| prec->ftvb != menuFtypeLONG
|| prec->ftvc != menuFtypeLONG
Expand Down