Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -r8c39fe1f9affe360ee6a97c5e6243e58a5c27509 -r3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 8c39fe1f9affe360ee6a97c5e6243e58a5c27509) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a) @@ -13,12 +13,10 @@ # @brief This class allows sending to and receiving from the DG device. # ############################################################################ -# TODO: Needs to be restructured and existing TODO items need to be addressed. - -from .protocols.CAN import (DenaliCanMessenger, - DenaliMessage, - DenaliChannels) -from .utils.conversions import integer_to_bytearray, float_to_bytearray +from ..protocols.CAN import (DenaliCanMessenger, + DenaliMessage, + DenaliChannels) +from ..utils.conversions import integer_to_bytearray, float_to_bytearray from time import sleep import unittest Fisheye: Tag 3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a refers to a dead (removed) revision in file `dialin/dg/protocols'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a refers to a dead (removed) revision in file `dialin/dg/utils'. Fisheye: No comparison available. Pass `N' to diff? Index: dialin/hd/alarms.py =================================================================== diff -u -r8c39fe1f9affe360ee6a97c5e6243e58a5c27509 -r3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a --- dialin/hd/alarms.py (.../alarms.py) (revision 8c39fe1f9affe360ee6a97c5e6243e58a5c27509) +++ dialin/hd/alarms.py (.../alarms.py) (revision 3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a) @@ -13,9 +13,9 @@ # @brief # ############################################################################ -from .protocols.CAN import (DenaliMessage, - DenaliChannels) -from .utils.conversions import integer_to_bytearray +from ..protocols.CAN import (DenaliMessage, + DenaliChannels) +from ..utils.conversions import integer_to_bytearray from .constants import RESET import struct Index: dialin/hd/blood_flow.py =================================================================== diff -u -r8c39fe1f9affe360ee6a97c5e6243e58a5c27509 -r3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a --- dialin/hd/blood_flow.py (.../blood_flow.py) (revision 8c39fe1f9affe360ee6a97c5e6243e58a5c27509) +++ dialin/hd/blood_flow.py (.../blood_flow.py) (revision 3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a) @@ -14,9 +14,9 @@ # # ############################################################################ -from .protocols.CAN import (DenaliMessage, - DenaliChannels) -from .utils.conversions import integer_to_bytearray, float_to_bytearray +from ..protocols.CAN import (DenaliMessage, + DenaliChannels) +from ..utils.conversions import integer_to_bytearray, float_to_bytearray from .constants import RESET, NO_RESET import struct Index: dialin/hd/buttons.py =================================================================== diff -u -r8c39fe1f9affe360ee6a97c5e6243e58a5c27509 -r3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a --- dialin/hd/buttons.py (.../buttons.py) (revision 8c39fe1f9affe360ee6a97c5e6243e58a5c27509) +++ dialin/hd/buttons.py (.../buttons.py) (revision 3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a) @@ -1,6 +1,6 @@ -from .protocols.CAN import (DenaliMessage, - DenaliChannels) -from .utils.conversions import integer_to_bytearray +from ..protocols.CAN import (DenaliMessage, + DenaliChannels) +from ..utils.conversions import integer_to_bytearray from .constants import RESET Index: dialin/hd/dialout_flow.py =================================================================== diff -u -r8c39fe1f9affe360ee6a97c5e6243e58a5c27509 -r3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a --- dialin/hd/dialout_flow.py (.../dialout_flow.py) (revision 8c39fe1f9affe360ee6a97c5e6243e58a5c27509) +++ dialin/hd/dialout_flow.py (.../dialout_flow.py) (revision 3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a) @@ -15,8 +15,8 @@ # ############################################################################ from enum import Enum -from .protocols.CAN import (DenaliMessage, - DenaliChannels) +from ..protocols.CAN import (DenaliMessage, + DenaliChannels) import matplotlib.pyplot as plt import sys import numpy as np Index: dialin/hd/dialysate_outlet_flow.py =================================================================== diff -u -r8c39fe1f9affe360ee6a97c5e6243e58a5c27509 -r3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a --- dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision 8c39fe1f9affe360ee6a97c5e6243e58a5c27509) +++ dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision 3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a) @@ -14,9 +14,9 @@ # # ############################################################################ -from .protocols.CAN import (DenaliMessage, - DenaliChannels) -from .utils.conversions import integer_to_bytearray, float_to_bytearray +from ..protocols.CAN import (DenaliMessage, + DenaliChannels) +from ..utils.conversions import integer_to_bytearray, float_to_bytearray from .constants import RESET import struct Index: dialin/hd/hemodialysis_device.py =================================================================== diff -u -r8c39fe1f9affe360ee6a97c5e6243e58a5c27509 -r3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a --- dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision 8c39fe1f9affe360ee6a97c5e6243e58a5c27509) +++ dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision 3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a) @@ -26,10 +26,10 @@ from .treatment import HDTreatment from .basics import HDBasics from .pressure_occlusion import HDPressureOcclusion -from .utils.conversions import integer_to_bytearray -from .protocols.CAN import (DenaliMessage, - DenaliCanMessenger, - DenaliChannels) +from ..utils.conversions import integer_to_bytearray +from ..protocols.CAN import (DenaliMessage, + DenaliCanMessenger, + DenaliChannels) class HD: Fisheye: Tag 3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a refers to a dead (removed) revision in file `dialin/hd/protocols'. Fisheye: No comparison available. Pass `N' to diff? Index: dialin/hd/rtc.py =================================================================== diff -u -r8c39fe1f9affe360ee6a97c5e6243e58a5c27509 -r3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a --- dialin/hd/rtc.py (.../rtc.py) (revision 8c39fe1f9affe360ee6a97c5e6243e58a5c27509) +++ dialin/hd/rtc.py (.../rtc.py) (revision 3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a) @@ -14,9 +14,9 @@ # # ############################################################################ -from .protocols.CAN import (DenaliMessage, - DenaliChannels) -from .utils.conversions import integer_to_bytearray +from ..protocols.CAN import (DenaliMessage, + DenaliChannels) +from ..utils.conversions import integer_to_bytearray import ctypes Index: dialin/hd/treatment.py =================================================================== diff -u -r8c39fe1f9affe360ee6a97c5e6243e58a5c27509 -r3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a --- dialin/hd/treatment.py (.../treatment.py) (revision 8c39fe1f9affe360ee6a97c5e6243e58a5c27509) +++ dialin/hd/treatment.py (.../treatment.py) (revision 3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a) @@ -14,8 +14,8 @@ # # ############################################################################ -from .protocols.CAN import (DenaliMessage, - DenaliChannels) +from ..protocols.CAN import (DenaliMessage, + DenaliChannels) import struct Index: dialin/hd/ui.py =================================================================== diff -u -r8c39fe1f9affe360ee6a97c5e6243e58a5c27509 -r3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a --- dialin/hd/ui.py (.../ui.py) (revision 8c39fe1f9affe360ee6a97c5e6243e58a5c27509) +++ dialin/hd/ui.py (.../ui.py) (revision 3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a) @@ -14,9 +14,9 @@ # # ############################################################################ -from .protocols.CAN import (DenaliMessage, - DenaliChannels) -from .utils.conversions import integer_to_bytearray, float_to_bytearray +from ..protocols.CAN import (DenaliMessage, + DenaliChannels) +from ..utils.conversions import integer_to_bytearray, float_to_bytearray import struct Fisheye: Tag 3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a refers to a dead (removed) revision in file `dialin/hd/utils'. Fisheye: No comparison available. Pass `N' to diff? Index: dialin/hd/watchdog.py =================================================================== diff -u -r8c39fe1f9affe360ee6a97c5e6243e58a5c27509 -r3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a --- dialin/hd/watchdog.py (.../watchdog.py) (revision 8c39fe1f9affe360ee6a97c5e6243e58a5c27509) +++ dialin/hd/watchdog.py (.../watchdog.py) (revision 3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a) @@ -14,9 +14,9 @@ # # ############################################################################ -from .protocols.CAN import (DenaliMessage, - DenaliChannels) -from .utils.conversions import integer_to_bytearray +from ..protocols.CAN import (DenaliMessage, + DenaliChannels) +from ..utils.conversions import integer_to_bytearray from .constants import RESET Index: setup.py =================================================================== diff -u -r8c39fe1f9affe360ee6a97c5e6243e58a5c27509 -r3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a --- setup.py (.../setup.py) (revision 8c39fe1f9affe360ee6a97c5e6243e58a5c27509) +++ setup.py (.../setup.py) (revision 3c6e1e61afe606f16e0e0300f4d93d5e0e8b001a) @@ -1,8 +1,5 @@ import setuptools -# print(setuptools.find_packages()) -# print(setuptools.find_packages(exclude=["test*", "tools", "venv"])) - setuptools.setup( name="dialin", version="0.0.1",