Skip to content

Commit 3e5167f

Browse files
committed
CtrlQueue.Push: Fix typo; CtrlQueue validated using the new electricdss-tst/Test/CtrlQueueTest.py
Also adds missing enum type in ActionCodes enum.
1 parent 6ea4552 commit 3e5167f

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

dss/dss_capi_gr/ICtrlQueue.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def NumActions(self):
3939
'''(read-only) Number of Actions on the current actionlist (that have been popped off the control queue by CheckControlActions)'''
4040
return self._lib.CtrlQueue_Get_NumActions()
4141

42-
def Push(self, Hour, Second, ActionCode, DeviceHandle):
42+
def Push(self, Hour, Seconds, ActionCode, DeviceHandle):
4343
'''Push a control action onto the DSS control queue by time, action code, and device handle (user defined). Returns Control Queue handle.'''
4444
return self.CheckForError(self._lib.CtrlQueue_Push(Hour, Seconds, ActionCode, DeviceHandle))
4545

dss/dss_capi_ir/ICtrlQueue.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def NumActions(self):
3939
'''(read-only) Number of Actions on the current actionlist (that have been popped off the control queue by CheckControlActions)'''
4040
return self._lib.CtrlQueue_Get_NumActions()
4141

42-
def Push(self, Hour, Second, ActionCode, DeviceHandle):
42+
def Push(self, Hour, Seconds, ActionCode, DeviceHandle):
4343
'''Push a control action onto the DSS control queue by time, action code, and device handle (user defined). Returns Control Queue handle.'''
4444
return self.CheckForError(self._lib.CtrlQueue_Push(Hour, Seconds, ActionCode, DeviceHandle))
4545

dss/enums.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class CapControlModes(IntEnum):
8989
Time = 3 # Time control, ON and OFF settings are seconds from midnight
9090
PF = 4 # ON and OFF settings are power factor, negative for leading
9191

92-
class ActionCodes:
92+
class ActionCodes(IntEnum):
9393
none = 0 # No action
9494
Open = 1 # Open a switch
9595
Close = 2 # Close a switch

0 commit comments

Comments
 (0)