Skip to content

Commit

Permalink
Readd UnitToRead enum to Electrometer
Browse files Browse the repository at this point in the history
  • Loading branch information
couger01 committed Aug 23, 2024
1 parent 3f2be4b commit 6770377
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion doc/news/interface_changes/DM-45177.electrometer.rst
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Changed how you set and read the mode of the Electrometer from an integer to a string, remove UnittoRead from enums
Changed how you set and read the mode of the Electrometer from an integer to a string
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
<?xml-stylesheet type="text/xsl" href="http://lsst-sal.tuc.noao.edu/schema/SALEventSet.xsl"?>
<SALEventSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://lsst-sal.tuc.noao.edu/schema/SALEventSet.xsd">
<Enumeration>DetailedState_DisabledState,DetailedState_EnabledState,DetailedState_FaultState,DetailedState_OfflineState,DetailedState_StandbyState,DetailedState_NotReadingState,DetailedState_ConfiguringState,DetailedState_ManualReadingState,DetailedState_ReadingBufferState,DetailedState_SetDurationReadingState</Enumeration>
<Enumeration>
UnitToRead_Current,
UnitToRead_Charge
</Enumeration>
<SALEvent>
<Subsystem>Electrometer</Subsystem>
<EFDB_Topic>Electrometer_logevent_detailedState</EFDB_Topic>
Expand Down
7 changes: 6 additions & 1 deletion python/lsst/ts/xml/enums/Electrometer.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__all__ = ["DetailedState"]
__all__ = ["DetailedState", "UnitToRead"]

import enum

Expand All @@ -14,3 +14,8 @@ class DetailedState(enum.IntEnum):
MANUALREADINGSTATE = 8
READINGBUFFERSTATE = 9
SETDURATIONREADINGSTATE = 10


class UnitToRead(enum.IntEnum):
CURRENT = 1
CHARGE = 2

0 comments on commit 6770377

Please sign in to comment.