equal
deleted
inserted
replaced
13 |
13 |
14 Alarms = [] |
14 Alarms = [] |
15 |
15 |
16 def TriggerAlarm(changed_var_name): |
16 def TriggerAlarm(changed_var_name): |
17 global Alarms |
17 global Alarms |
18 if(getattr(PLCGlobals, changed_var_name)): |
18 Alarms.append((time.time(), PLCGlobals.AlarmText, PLCGlobals.AlarmStatus)) |
19 Alarms.append((time.time(), PLCGlobals.AlarmText, PLCGlobals.AlarmStatus)) |
19 PLCGlobals.AlarmNotify = random.randint(0, 4294967296) |
20 PLCGlobals.AlarmNotify = random.randint(0, 4294967296) |
|
21 |
20 |
22 class AlarmJsonResource(Resource): |
21 class AlarmJsonResource(Resource): |
23 def render_GET(self, request): |
22 def render_GET(self, request): |
24 return '' |
23 return '' |
25 |
24 |