Index: leahi_dialin/common/__init__.py =================================================================== diff -u -rbe6aa30cfb37a47935f3c114ecece9ee75809909 -r78a66378ef0f284406cfcf12085a2c23e224ac05 --- leahi_dialin/common/__init__.py (.../__init__.py) (revision be6aa30cfb37a47935f3c114ecece9ee75809909) +++ leahi_dialin/common/__init__.py (.../__init__.py) (revision 78a66378ef0f284406cfcf12085a2c23e224ac05) @@ -8,7 +8,7 @@ sw_key = "SW" config = {} ok: bool = False -module_name = os.path.basename(os.path.dirname(__file__)) +module_name = os.path.basename(os.getcwd()) try: with open(file_name, 'r') as file: config = json.load(file); ok = config[sw_key] @@ -17,7 +17,7 @@ except Exception as e : print(f"Error ({module_name}): An unexpected error occurred: {e}" ) if ok: - print(f"{sw_key} is set to bypass the auto imports in '{module_name}' module.") + print(f"{sw_key} is set to bypass the auto imports.") else: from .alarm_defs import * from .alarm_priorities import * Index: leahi_dialin/dd/__init__.py =================================================================== diff -u -rbe6aa30cfb37a47935f3c114ecece9ee75809909 -r78a66378ef0f284406cfcf12085a2c23e224ac05 --- leahi_dialin/dd/__init__.py (.../__init__.py) (revision be6aa30cfb37a47935f3c114ecece9ee75809909) +++ leahi_dialin/dd/__init__.py (.../__init__.py) (revision 78a66378ef0f284406cfcf12085a2c23e224ac05) @@ -1,22 +1 @@ -import os -import json - -# mandatory import -# none - -file_name = "config.json" -sw_key = "SW" -config = {} -ok: bool = False -module_name = os.path.basename(os.path.dirname(__file__)) - -try: - with open(file_name, 'r') as file: config = json.load(file); ok = config[sw_key] -except FileNotFoundError: print(f"Error ({module_name}): The file '{file_name}' was not found." ) -except KeyError : print(f"Error ({module_name}): The key '{sw_key}' was not found." ) -except Exception as e : print(f"Error ({module_name}): An unexpected error occurred: {e}" ) - -if ok: - print(f"{sw_key} is set to bypass the auto imports in '{module_name}' module.") -else: - from .dialysate_delivery import DD \ No newline at end of file +from .dialysate_delivery import DD \ No newline at end of file Index: leahi_dialin/protocols/CAN.py =================================================================== diff -u -r2ef54f5cc7ef9ce2cf49c528a6205f77933d8a77 -r78a66378ef0f284406cfcf12085a2c23e224ac05 --- leahi_dialin/protocols/CAN.py (.../CAN.py) (revision 2ef54f5cc7ef9ce2cf49c528a6205f77933d8a77) +++ leahi_dialin/protocols/CAN.py (.../CAN.py) (revision 78a66378ef0f284406cfcf12085a2c23e224ac05) @@ -286,9 +286,9 @@ DenaliChannels.td_to_dd_ch_id: DenaliChannels.dialin_to_td_ch_id, DenaliChannels.dd_to_td_ch_id: DenaliChannels.dialin_to_dd_ch_id, DenaliChannels.td_to_ui_ch_id: DenaliChannels.dialin_to_td_ch_id, - DenaliChannels.td_sync_broadcast_ch_id: DenaliChannels.dialin_to_td_ch_id, - DenaliChannels.dd_sync_broadcast_ch_id: DenaliChannels.dialin_to_dd_ch_id, - DenaliChannels.ro_sync_broadcast_ch_id: DenaliChannels.dialin_to_ro_ch_id, + DenaliChannels.td_sync_broadcast_ch_id: None, + # DenaliChannels.dd_to_ui_ch_id: DenaliChannels.dialin_to_dd_ch_id, + DenaliChannels.dd_sync_broadcast_ch_id: None, DenaliChannels.ui_to_td_ch_id: DenaliChannels.dialin_to_ui_ch_id, DenaliChannels.ui_sync_broadcast_ch_id: DenaliChannels.dialin_to_ui_ch_id, DenaliChannels.td_to_dialin_ch_id: DenaliChannels.dialin_to_td_ch_id, @@ -698,7 +698,6 @@ """ if channel_id in { DenaliChannels.ui_to_td_ch_id, - # DenaliChannels.ui_to_dd_ch_id, DenaliChannels.ui_to_dialin_ch_id, DenaliChannels.ui_sync_broadcast_ch_id, DenaliChannels.ui_alarm_broadcast_ch_id Index: leahi_dialin/protocols/__init__.py =================================================================== diff -u -rbe6aa30cfb37a47935f3c114ecece9ee75809909 -r78a66378ef0f284406cfcf12085a2c23e224ac05 --- leahi_dialin/protocols/__init__.py (.../__init__.py) (revision be6aa30cfb37a47935f3c114ecece9ee75809909) +++ leahi_dialin/protocols/__init__.py (.../__init__.py) (revision 78a66378ef0f284406cfcf12085a2c23e224ac05) @@ -5,7 +5,7 @@ sw_key = "SW" config = {} ok: bool = False -module_name = os.path.basename(os.path.dirname(__file__)) +module_name = os.path.basename(os.getcwd()) try: with open(file_name, 'r') as file: config = json.load(file); ok = config[sw_key] @@ -14,7 +14,7 @@ except Exception as e : print(f"Error ({module_name}): An unexpected error occurred: {e}" ) if ok: - print(f"{sw_key} is set to bypass the auto imports in '{module_name}' module.") + print(f"{sw_key} is set to bypass the auto imports.") else: from .CAN import DenaliCanMessenger from .CAN import DenaliChannels Fisheye: Tag 78a66378ef0f284406cfcf12085a2c23e224ac05 refers to a dead (removed) revision in file `leahi_dialin/ro/__init__.py'. Fisheye: No comparison available. Pass `N' to diff? Index: leahi_dialin/td/__init__.py =================================================================== diff -u -rbe6aa30cfb37a47935f3c114ecece9ee75809909 -r78a66378ef0f284406cfcf12085a2c23e224ac05 --- leahi_dialin/td/__init__.py (.../__init__.py) (revision be6aa30cfb37a47935f3c114ecece9ee75809909) +++ leahi_dialin/td/__init__.py (.../__init__.py) (revision 78a66378ef0f284406cfcf12085a2c23e224ac05) @@ -1,22 +1 @@ -import os -import json - -# mandatory import -# none - -file_name = "config.json" -sw_key = "SW" -config = {} -ok: bool = False -module_name = os.path.basename(os.path.dirname(__file__)) - -try: - with open(file_name, 'r') as file: config = json.load(file); ok = config[sw_key] -except FileNotFoundError: print(f"Error ({module_name}): The file '{file_name}' was not found." ) -except KeyError : print(f"Error ({module_name}): The key '{sw_key}' was not found." ) -except Exception as e : print(f"Error ({module_name}): An unexpected error occurred: {e}" ) - -if ok: - print(f"{sw_key} is set to bypass the auto imports in '{module_name}' module.") -else: - from .treatment_delivery import TD \ No newline at end of file +from .treatment_delivery import TD \ No newline at end of file Index: leahi_dialin/ui/td_messaging.py =================================================================== diff -u -rbe6aa30cfb37a47935f3c114ecece9ee75809909 -r78a66378ef0f284406cfcf12085a2c23e224ac05 --- leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision be6aa30cfb37a47935f3c114ecece9ee75809909) +++ leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 78a66378ef0f284406cfcf12085a2c23e224ac05) @@ -1,9 +1,9 @@ #!/bin/python3 -from leahi_dialin.ui.utils import singleton_threadsafe -from leahi_dialin.utils import conversions -from leahi_dialin.protocols import CAN -from leahi_dialin.common import msg_ids +from dialin.ui.utils import singleton_threadsafe +from dialin.utils import conversions +from dialin.protocols import CAN +from dialin.common import msg_ids @singleton_threadsafe Index: leahi_dialin/utils/__init__.py =================================================================== diff -u -rbe6aa30cfb37a47935f3c114ecece9ee75809909 -r78a66378ef0f284406cfcf12085a2c23e224ac05 --- leahi_dialin/utils/__init__.py (.../__init__.py) (revision be6aa30cfb37a47935f3c114ecece9ee75809909) +++ leahi_dialin/utils/__init__.py (.../__init__.py) (revision 78a66378ef0f284406cfcf12085a2c23e224ac05) @@ -9,7 +9,7 @@ sw_key = "SW" config = {} ok: bool = False -module_name = os.path.basename(os.path.dirname(__file__)) +module_name = os.path.basename(os.getcwd()) try: with open(file_name, 'r') as file: config = json.load(file); ok = config[sw_key] @@ -18,7 +18,7 @@ except Exception as e : print(f"Error ({module_name}): An unexpected error occurred: {e}" ) if ok: - print(f"{sw_key} is set to bypass the auto imports in '{module_name}' module.") + print(f"{sw_key} is set to bypass the auto imports.") else: from .conversions import * from .data_logger import DataLogger