Skip to content

Commit

Permalink
Black and gitignore
Browse files Browse the repository at this point in the history
  • Loading branch information
jmafoster1 committed Apr 8, 2024
1 parent 2f85ca1 commit ee2be7e
Show file tree
Hide file tree
Showing 38 changed files with 5,194 additions and 4,553 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__pycache__/
56 changes: 38 additions & 18 deletions HMI/HMI.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
from logicblock.logicblock import ALM


class HMI_plant:
def __init__(self):
self.Reset_On = 1
Expand Down Expand Up @@ -56,8 +58,9 @@ def __init__(self):
self.FLUSHING_MIN_SP = 2 # temporarily set to this value
self.RO_HIGH_PUMP_Shutdown = 0
self.SD_FLUSHING_DONE_On = 0
self.RO_SD_FLUSHING =0
self.RO_SD_FLUSHING_MIN=0
self.RO_SD_FLUSHING = 0
self.RO_SD_FLUSHING_MIN = 0


class HMI_mv:
def __init__(self):
Expand All @@ -77,7 +80,9 @@ class HMI_pump:
def __init__(self):
self.Auto = 1
self.Permissive = [1] * 32
self.MSG_Permissive = [0] * 6 # Actually values [1-5] is needed, but for expressiveness, we difine from [0-5]
self.MSG_Permissive = [
0
] * 6 # Actually values [1-5] is needed, but for expressiveness, we difine from [0-5]
self.SD = [0] * 32
self.MSG_Shutdown = [0] * 6
self.Reset = 0
Expand Down Expand Up @@ -122,11 +127,14 @@ def __init__(self, SAHH, SAH, SAL, SALL):
self.AL = 0
self.ALL = 0
self.Pv = 0

def set_alarm(self):
if type(self.Pv) != type('a'):
self.AHH, self.AH, self.AL, self.ALL = ALM(self.Pv, self.SAHH, self.SAH, self.SAL, self.SALL)
if type(self.Pv) != type("a"):
self.AHH, self.AH, self.AL, self.ALL = ALM(
self.Pv, self.SAHH, self.SAH, self.SAL, self.SALL
)
else:
print (self.Pv)
print(self.Pv)


class HMI_FIT:
Expand All @@ -143,9 +151,12 @@ def __init__(self, SAHH, SAH, SAL, SALL):
self.ALL = 0
self.Totaliser = 0
self.Pv = 0

def set_alarm(self):
if type(self.Pv) != type('a'):
self.AHH, self.AH, self.AL, self.ALL = ALM(self.Pv, self.SAHH, self.SAH, self.SAL, self.SALL)
if type(self.Pv) != type("a"):
self.AHH, self.AH, self.AL, self.ALL = ALM(
self.Pv, self.SAHH, self.SAH, self.SAL, self.SALL
)


class HMI_duty2:
Expand All @@ -166,10 +177,14 @@ def __init__(self, SAHH, SAH, SAL, SALL):
self.AH = 0
self.AL = 0
self.ALL = 0
self.Pv=0
self.Pv = 0

def set_alarm(self):
if type(self.Pv) != type('a'):
self.AHH, self.AH, self.AL, self.ALL = ALM(self.Pv, self.SAHH, self.SAH, self.SAL, self.SALL)
if type(self.Pv) != type("a"):
self.AHH, self.AH, self.AL, self.ALL = ALM(
self.Pv, self.SAHH, self.SAH, self.SAL, self.SALL
)


class HMI_PSH:
def __init__(self):
Expand Down Expand Up @@ -213,9 +228,13 @@ def __init__(self, SAHH, SAH, SAL, SALL):
self.AL = 0
self.ALL = 0
self.Pv = 0

def set_alarm(self):
if type(self.Pv) != type('a'):
self.AHH, self.AH, self.AL, self.ALL = ALM(self.Pv, self.SAHH, self.SAH, self.SAL, self.SALL)
if type(self.Pv) != type("a"):
self.AHH, self.AH, self.AL, self.ALL = ALM(
self.Pv, self.SAHH, self.SAH, self.SAL, self.SALL
)


class HMI_UV:
def __init__(self):
Expand Down Expand Up @@ -245,9 +264,13 @@ def __init__(self, SAHH, SAH, SAL, SALL):
self.AL = 0
self.ALL = 0
self.Pv = 0

def set_alarm(self):
if type(self.Pv) != type('a'):
self.AHH, self.AH, self.AL, self.ALL = ALM(self.Pv, self.SAHH, self.SAH, self.SAL, self.SALL)
if type(self.Pv) != type("a"):
self.AHH, self.AH, self.AL, self.ALL = ALM(
self.Pv, self.SAHH, self.SAH, self.SAL, self.SALL
)


class HMI_VSD:
def __init__(self):
Expand All @@ -269,6 +292,3 @@ def __init__(self):
self.Speed = 0
self.Drive_Ready = 0
self.Shutdown = [0] * 32



186 changes: 98 additions & 88 deletions IO.py
Original file line number Diff line number Diff line change
@@ -1,96 +1,106 @@
from io_plc.IO_PLC import *


class P1:
def __init__(self):
# P1
self.LIT101 = IO_AIN_FIT()
self.FIT101 = IO_AIN_FIT()
self.MV101 = IO_MV()
self.P101 = IO_PMP_UV()
self.P102 = IO_PMP_UV()
def __init__(self):
# P1
self.LIT101 = IO_AIN_FIT()
self.FIT101 = IO_AIN_FIT()
self.MV101 = IO_MV()
self.P101 = IO_PMP_UV()
self.P102 = IO_PMP_UV()


class P2:
def __init__(self):
# P2
self.LS201 = IO_SWITCH()
self.LS202 = IO_SWITCH()
self.LSL203 = IO_SWITCH()
self.LSLL203 = IO_SWITCH()
self.MV201 = IO_MV()
self.P201 = IO_PMP_UV()
self.P202 = IO_PMP_UV()
self.P203 = IO_PMP_UV()
self.P204 = IO_PMP_UV()
self.P205 = IO_PMP_UV()
self.P206 = IO_PMP_UV()
self.P207 = IO_PMP_UV()
self.P208 = IO_PMP_UV()
self.FIT201 = IO_AIN_FIT()
self.AIT201 = IO_AIN_FIT()
self.AIT202 = IO_AIN_FIT()
self.AIT203 = IO_AIN_FIT()
def __init__(self):
# P2
self.LS201 = IO_SWITCH()
self.LS202 = IO_SWITCH()
self.LSL203 = IO_SWITCH()
self.LSLL203 = IO_SWITCH()
self.MV201 = IO_MV()
self.P201 = IO_PMP_UV()
self.P202 = IO_PMP_UV()
self.P203 = IO_PMP_UV()
self.P204 = IO_PMP_UV()
self.P205 = IO_PMP_UV()
self.P206 = IO_PMP_UV()
self.P207 = IO_PMP_UV()
self.P208 = IO_PMP_UV()
self.FIT201 = IO_AIN_FIT()
self.AIT201 = IO_AIN_FIT()
self.AIT202 = IO_AIN_FIT()
self.AIT203 = IO_AIN_FIT()


class P3:
def __init__(self):
# P3
self.LIT301 = IO_AIN_FIT()
self.FIT301 = IO_AIN_FIT()
self.P301 = IO_PMP_UV()
self.P302 = IO_PMP_UV()
self.PSH301 = IO_SWITCH()
self.DPSH301= IO_SWITCH()
self.DPIT301= IO_AIN_FIT()
self.MV301 = IO_MV()
self.MV302 = IO_MV()
self.MV303 = IO_MV()
self.MV304 = IO_MV()
def __init__(self):
# P3
self.LIT301 = IO_AIN_FIT()
self.FIT301 = IO_AIN_FIT()
self.P301 = IO_PMP_UV()
self.P302 = IO_PMP_UV()
self.PSH301 = IO_SWITCH()
self.DPSH301 = IO_SWITCH()
self.DPIT301 = IO_AIN_FIT()
self.MV301 = IO_MV()
self.MV302 = IO_MV()
self.MV303 = IO_MV()
self.MV304 = IO_MV()


class P4:
def __init__(self):
# P4
self.LS401 = IO_SWITCH()
self.LIT401 = IO_AIN_FIT()
self.UV401 = IO_PMP_UV()
self.P401 = IO_PMP_UV()
self.P402 = IO_PMP_UV()
self.P403 = IO_PMP_UV()
self.P404 = IO_PMP_UV()
self.AIT401 = IO_AIN_FIT()
self.AIT402 = IO_AIN_FIT()
self.FIT401 = IO_AIN_FIT()
def __init__(self):
# P4
self.LS401 = IO_SWITCH()
self.LIT401 = IO_AIN_FIT()
self.UV401 = IO_PMP_UV()
self.P401 = IO_PMP_UV()
self.P402 = IO_PMP_UV()
self.P403 = IO_PMP_UV()
self.P404 = IO_PMP_UV()
self.AIT401 = IO_AIN_FIT()
self.AIT402 = IO_AIN_FIT()
self.FIT401 = IO_AIN_FIT()


class P5:
def __init__(self):
# P5
self.AIT501 = IO_AIN_FIT()
self.AIT502 = IO_AIN_FIT()
self.AIT503 = IO_AIN_FIT()
self.AIT504 = IO_AIN_FIT()
self.PIT501 = IO_AIN_FIT()
self.PIT502 = IO_AIN_FIT()
self.PIT503 = IO_AIN_FIT()
self.FIT501 = IO_AIN_FIT()
self.FIT502 = IO_AIN_FIT()
self.FIT503 = IO_AIN_FIT()
self.FIT504 = IO_AIN_FIT()
self.MV501 = IO_MV()
self.MV502 = IO_MV()
self.MV503 = IO_MV()
self.MV504 = IO_MV()
#for Pressure Pump, we have VSD IO(normal) and VSD_In and VSD_Out, in total 3 I/O
self.P501 = VSD()
self.P502 = VSD()
self.P501_VSD_In = VSD_In()
self.P502_VSD_In = VSD_In()
self.P501_VSD_Out = VSD_Out()
self.P502_VSD_Out = VSD_Out()
class P6:
def __init__(self):
# P6
self.LSL601 = IO_SWITCH()
self.LSL602 = IO_SWITCH()
self.LSL603 = IO_SWITCH()
self.LSH601 = IO_SWITCH()
self.LSH602 = IO_SWITCH()
self.LSH603 = IO_SWITCH()
self.P601 = IO_PMP_UV()
self.P602 = IO_PMP_UV()
self.P603 = IO_PMP_UV()
self.FIT601 = IO_AIN_FIT()
def __init__(self):
# P5
self.AIT501 = IO_AIN_FIT()
self.AIT502 = IO_AIN_FIT()
self.AIT503 = IO_AIN_FIT()
self.AIT504 = IO_AIN_FIT()
self.PIT501 = IO_AIN_FIT()
self.PIT502 = IO_AIN_FIT()
self.PIT503 = IO_AIN_FIT()
self.FIT501 = IO_AIN_FIT()
self.FIT502 = IO_AIN_FIT()
self.FIT503 = IO_AIN_FIT()
self.FIT504 = IO_AIN_FIT()
self.MV501 = IO_MV()
self.MV502 = IO_MV()
self.MV503 = IO_MV()
self.MV504 = IO_MV()
# for Pressure Pump, we have VSD IO(normal) and VSD_In and VSD_Out, in total 3 I/O
self.P501 = VSD()
self.P502 = VSD()
self.P501_VSD_In = VSD_In()
self.P502_VSD_In = VSD_In()
self.P501_VSD_Out = VSD_Out()
self.P502_VSD_Out = VSD_Out()


class P6:
def __init__(self):
# P6
self.LSL601 = IO_SWITCH()
self.LSL602 = IO_SWITCH()
self.LSL603 = IO_SWITCH()
self.LSH601 = IO_SWITCH()
self.LSH602 = IO_SWITCH()
self.LSH603 = IO_SWITCH()
self.P601 = IO_PMP_UV()
self.P602 = IO_PMP_UV()
self.P603 = IO_PMP_UV()
self.FIT601 = IO_AIN_FIT()
Loading

0 comments on commit ee2be7e

Please sign in to comment.