File tree 2 files changed +5
-6
lines changed
2 files changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -52,8 +52,7 @@ class epicsShareClass ScalarAlarmSupport :
52
52
/* *
53
53
* @brief Honors scalarAlarm fields.
54
54
*
55
- *
56
- * @return Returns true is any fields were modified; otherwise false.
55
+ * @return true if any fields were modified, otherwise false.
57
56
*/
58
57
virtual bool process ();
59
58
/* *
@@ -77,20 +76,20 @@ class epicsShareClass ScalarAlarmSupport :
77
76
private:
78
77
79
78
ScalarAlarmSupport (PVRecordPtr const & pvRecord);
80
- enum {
79
+ enum AlarmRange {
81
80
range_Lolo = 0 ,
82
81
range_Low,
83
82
range_Normal,
84
83
range_High,
85
84
range_Hihi,
86
85
range_Invalid,
87
86
range_Undefined
88
- } AlarmRange ;
87
+ };
89
88
void setAlarm (
90
89
epics::pvData::PVStructurePtr const & pvAlarm,
91
90
int alarmRange);
92
91
PVRecordPtr pvRecord;
93
- int prevAlarmRange;
92
+ enum AlarmRange prevAlarmRange;
94
93
epics::pvData::PVScalarPtr pvValue;
95
94
epics::pvData::PVStructurePtr pvAlarm;
96
95
epics::pvData::PVStructurePtr pvScalarAlarm;
Original file line number Diff line number Diff line change @@ -110,7 +110,7 @@ bool ScalarAlarmSupport::process()
110
110
double highWarningLimit = pvHighWarningLimit->get ();
111
111
double highAlarmLimit = pvHighAlarmLimit->get ();
112
112
double hysteresis = pvHysteresis->get ();
113
- int alarmRange = range_Normal;
113
+ enum AlarmRange alarmRange = range_Normal;
114
114
if (highAlarmLimit>lowAlarmLimit) {
115
115
if (value>=highAlarmLimit
116
116
||(prevAlarmRange==range_Hihi && value>=highAlarmLimit-hysteresis)) {
You can’t perform that action at this time.
0 commit comments