Skip to content

Commit

Permalink
Update merging_manager.py
Browse files Browse the repository at this point in the history
  • Loading branch information
azerty9971 committed Jan 27, 2025
1 parent 2ac9374 commit 88c61a7
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ class XTMergingManager:
def merge_devices(device1: XTDevice, device2: XTDevice, multi_manager: MultiManager = None):
msg_queue: list[str] = []

if multi_manager:
multi_manager.device_watcher.report_message(device1.id, f"About to merge {device1.source}:{device1}\r\n\r\nand\r\n\r\n{device2.source}:{device2}", device1)
#if multi_manager:
# multi_manager.device_watcher.report_message(device1.id, f"About to merge {device1.source}:{device1}\r\n\r\nand\r\n\r\n{device2.source}:{device2}", device1)
device1_bak = copy.deepcopy(device1)
device2_bak = copy.deepcopy(device2)
#Make both devices compliant
Expand Down Expand Up @@ -55,8 +55,8 @@ def merge_devices(device1: XTDevice, device2: XTDevice, multi_manager: MultiMana
device2.function = device1.function
device2.status = device1.status
device2.local_strategy = device1.local_strategy
if multi_manager:
multi_manager.device_watcher.report_message(device1.id, f"Merged into {device1}", device1)
#if multi_manager:
# multi_manager.device_watcher.report_message(device1.id, f"Merged into {device1}", device1)

def _align_device_properties(device1: XTDevice, device2: XTDevice, msg_queue: list[str] | None = None):
device1.name = XTMergingManager.smart_merge(device1.name, device2.name, msg_queue, "device.name")
Expand Down

0 comments on commit 88c61a7

Please sign in to comment.