Innovenergy
/
Innovenergy_trunk
2
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

solve repetitive alarms issue

This commit is contained in:
Yinyin Liu 2024-08-07 15:46:50 +02:00
parent 8736df40b0
commit 48004f43e2
2 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
firmware/Cerbo_Release/CerboReleaseFiles/dbus-fzsonick-48tl/dbus-fzsonick-48tl.py
View File

@ -704,26 +704,24 @@ def update_state_from_dictionaries(current_warnings, current_alarms, node_number
changed_alarms = current_alarms changed_alarms = current_alarms
is_first_update = False is_first_update = False
else: else:
changed_alarms={} changed_alarms = {}
changed_warnings={} changed_warnings = {}
# calculate the diff in warnings and alarms
prev_alarm_value_list=list(previous_alarms.values())
alarm_keys=list(previous_alarms.keys())
for i, alarm in enumerate(current_alarms.values()): for key in current_alarms:
if alarm!=prev_alarm_value_list[i]: current_value = current_alarms[key]
changed_alarms[alarm_keys[i]]=True prev_value = previous_alarms.get(key, False) # Use False if the key doesn't exist
if current_value != prev_value:
changed_alarms[key] = True
else: else:
changed_alarms[alarm_keys[i]]=False changed_alarms[key] = False
prev_warning_value_list=list(previous_warnings.values()) for key in current_warnings:
warning_keys=list(previous_warnings.keys()) current_value = current_warnings[key]
prev_value = previous_warnings.get(key, False)
for i, warning in enumerate(current_warnings.values()): if current_value != prev_value:
if warning!=prev_warning_value_list[i]: changed_warnings[key] = True
changed_warnings[warning_keys[i]]=True
else: else:
changed_warnings[warning_keys[i]]=False changed_warnings[key] = False
status_message = { status_message = {
"InstallationId": INSTALLATION_ID, "InstallationId": INSTALLATION_ID,

30
firmware/Venus_Release/VenusReleaseFiles/dbus-fzsonick-48tl/dbus-fzsonick-48tl.py
View File

@ -151,7 +151,7 @@ prev_status = 0
def update_state_from_dictionaries(current_warnings, current_alarms, node_numbers): def update_state_from_dictionaries(current_warnings, current_alarms, node_numbers):
global previous_warnings, previous_alarms, INSTALLATION_ID, PRODUCT_ID, is_first_update, channel, prev_status global previous_warnings, previous_alarms, INSTALLATION_ID, PRODUCT_ID, is_first_update, channel, prev_status
if is_first_update: if is_first_update:
changed_warnings = current_warnings changed_warnings = current_warnings
changed_alarms = current_alarms changed_alarms = current_alarms
@ -159,25 +159,23 @@ def update_state_from_dictionaries(current_warnings, current_alarms, node_number
else: else:
changed_alarms = {} changed_alarms = {}
changed_warnings = {} changed_warnings = {}
# calculate the diff in warnings and alarms
prev_alarm_value_list = list(previous_alarms.values())
alarm_keys = list(previous_alarms.keys())
for i, alarm in enumerate(current_alarms.values()): for key in current_alarms:
if alarm != prev_alarm_value_list[i]: current_value = current_alarms[key]
changed_alarms[alarm_keys[i]] = True prev_value = previous_alarms.get(key, False) # Use False if the key doesn't exist
if current_value != prev_value:
changed_alarms[key] = True
else: else:
changed_alarms[alarm_keys[i]] = False changed_alarms[key] = False
prev_warning_value_list=list(previous_warnings.values()) for key in current_warnings:
warning_keys=list(previous_warnings.keys()) current_value = current_warnings[key]
prev_value = previous_warnings.get(key, False)
for i, warning in enumerate(current_warnings.values()): if current_value != prev_value:
if warning!=prev_warning_value_list[i]: changed_warnings[key] = True
changed_warnings[warning_keys[i]]=True
else: else:
changed_warnings[warning_keys[i]]=False changed_warnings[key] = False
status_message = { status_message = {
"InstallationId": INSTALLATION_ID, "InstallationId": INSTALLATION_ID,
"Product": PRODUCT_ID, "Product": PRODUCT_ID,