Index: README.md =================================================================== diff -u -rc6596d42d995bed3789849bd85c83da5a3837fac -r322377decd72091859c355c84705276e89cd140e --- README.md (.../README.md) (revision c6596d42d995bed3789849bd85c83da5a3837fac) +++ README.md (.../README.md) (revision 322377decd72091859c355c84705276e89cd140e) @@ -1,3 +1,21 @@ + + ![Diality](images/logo.jpg) # Dialin Index: dialin/hd/alarms.py =================================================================== diff -u -r128445d89a7a0379b1cd99e2097943741e608e5c -r322377decd72091859c355c84705276e89cd140e --- dialin/hd/alarms.py (.../alarms.py) (revision 128445d89a7a0379b1cd99e2097943741e608e5c) +++ dialin/hd/alarms.py (.../alarms.py) (revision 322377decd72091859c355c84705276e89cd140e) @@ -154,7 +154,6 @@ for attr in dir(self): if not callable(getattr(self, attr)) and attr.startswith("ALARM_ID"): self.ids[attr] = getattr(self, attr) - # self.ids = sorted(self.ids, key=lambda x: x[1]) self.ids = OrderedDict(sorted(self.ids.items(), key=lambda key: key[1])) def get_alarm_states(self): Index: dialin/hd/hemodialysis_device.py =================================================================== diff -u -r5e834984727c1798784d95ae17f686cb8d72fdca -r322377decd72091859c355c84705276e89cd140e --- dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision 5e834984727c1798784d95ae17f686cb8d72fdca) +++ dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision 322377decd72091859c355c84705276e89cd140e) @@ -174,5 +174,3 @@ else: print("Timeout!!!!") return False - - Index: dialin/hd/pressure_occlusion.py =================================================================== diff -u -rae1e423f7cf68432e1e3daf01b50a162de4563e4 -r322377decd72091859c355c84705276e89cd140e --- dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision ae1e423f7cf68432e1e3daf01b50a162de4563e4) +++ dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision 322377decd72091859c355c84705276e89cd140e) @@ -24,7 +24,7 @@ class HDPressureOcclusion(_AbstractSubSystem): """ - Hemodialysis Device (HD) Dialin API sub-class for pressure related commands. + Hemodialysis Delivery (HD) Dialin API sub-class for pressure related commands. """ # Pressure/Occlusion message IDs @@ -108,7 +108,6 @@ """ return self.dialysate_outlet_pump_occlusion - @_publish([ "arterial_pressure", "venous_pressure", Index: dialin/hd/rtc.py =================================================================== diff -u -r044087c3a2f8b762452ebd58eaeb27db968b31a2 -r322377decd72091859c355c84705276e89cd140e --- dialin/hd/rtc.py (.../rtc.py) (revision 044087c3a2f8b762452ebd58eaeb27db968b31a2) +++ dialin/hd/rtc.py (.../rtc.py) (revision 322377decd72091859c355c84705276e89cd140e) @@ -21,7 +21,7 @@ class HDRTC: """ - Hemodialysis Device (HD) Dialin API sub-class for rtc commands. + Hemodialysis Delivery (HD) Dialin API sub-class for rtc commands. """ MSG_ID_SET_RTC_DATE_TIME = 0x801D Index: dialin/hd/treatment.py =================================================================== diff -u -r044087c3a2f8b762452ebd58eaeb27db968b31a2 -r322377decd72091859c355c84705276e89cd140e --- dialin/hd/treatment.py (.../treatment.py) (revision 044087c3a2f8b762452ebd58eaeb27db968b31a2) +++ dialin/hd/treatment.py (.../treatment.py) (revision 322377decd72091859c355c84705276e89cd140e) @@ -20,10 +20,7 @@ class HDTreatment: """ - \class HD_Treatment - - \brief Hemodialysis Device (HD) Dialin API sub-class for treatment related commands. - + Hemodialysis Delivery (HD) Dialin API sub-class for treatment related commands. """ # treatment message IDs Index: dialin/hd/ui_proxy.py =================================================================== diff -u -r044087c3a2f8b762452ebd58eaeb27db968b31a2 -r322377decd72091859c355c84705276e89cd140e --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 044087c3a2f8b762452ebd58eaeb27db968b31a2) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 322377decd72091859c355c84705276e89cd140e) @@ -22,7 +22,7 @@ class HDUIProxy: """ - Hemodialysis Device (HD) Dialin API sub-class for ui commands. + Hemodialysis Delivery (HD) Dialin API sub-class for ui commands. """ # ui message IDs Index: dialin/hd/watchdog.py =================================================================== diff -u -r044087c3a2f8b762452ebd58eaeb27db968b31a2 -r322377decd72091859c355c84705276e89cd140e --- dialin/hd/watchdog.py (.../watchdog.py) (revision 044087c3a2f8b762452ebd58eaeb27db968b31a2) +++ dialin/hd/watchdog.py (.../watchdog.py) (revision 322377decd72091859c355c84705276e89cd140e) @@ -22,7 +22,7 @@ class HDWatchdog: """ - Hemodialysis Device (HD) Dialin API sub-class for watchdog related commands. + Hemodialysis Delivery (HD) Dialin API sub-class for watchdog related commands. """ # watchdog message IDs Index: dialin/utils/base.py =================================================================== diff -u -rb612ddd4cabc1078e2bc2e6d28385210df80a874 -r322377decd72091859c355c84705276e89cd140e --- dialin/utils/base.py (.../base.py) (revision b612ddd4cabc1078e2bc2e6d28385210df80a874) +++ dialin/utils/base.py (.../base.py) (revision 322377decd72091859c355c84705276e89cd140e) @@ -1,3 +1,19 @@ +########################################################################### +# +# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# +# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN +# WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. +# +# @file base.py +# +# @date 20-July-2020 +# @author P. Lucia +# +# @brief Contains base classes for Dialin API sub systems and observers +# +# +############################################################################ from abc import ABC, abstractmethod from datetime import datetime @@ -91,6 +107,3 @@ """ pass - - - Index: docs/source/conf.py =================================================================== diff -u -rc6c42e21248dd7f4bf391b75541aaaae14a1ab42 -r322377decd72091859c355c84705276e89cd140e --- docs/source/conf.py (.../conf.py) (revision c6c42e21248dd7f4bf391b75541aaaae14a1ab42) +++ docs/source/conf.py (.../conf.py) (revision 322377decd72091859c355c84705276e89cd140e) @@ -1,6 +1,22 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- +########################################################################### # +# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# +# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN +# WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. +# +# @file base.py +# +# @date 20-July-2020 +# @author P. Lucia +# +# @brief Dialin documentation build configuration file +# +# +############################################################################ +# # Dialin documentation build configuration file, created by # sphinx-quickstart on Fri May 29 15:33:59 2020. # @@ -50,7 +66,7 @@ # General information about the project. project = 'Dialin' -copyright = '2020, Diality Inc.' +copyright = '2020, Diality Inc' author = 'Peter Lucia' # The version info for the project you're documenting, acts as replacement for @@ -167,6 +183,3 @@ author, 'Dialin', 'One line description of project.', 'Miscellaneous'), ] - - - Index: docs/source/index.rst =================================================================== diff -u -r84a2eda208d7b18754a8fc101fdb8fd6ab8f4150 -r322377decd72091859c355c84705276e89cd140e --- docs/source/index.rst (.../index.rst) (revision 84a2eda208d7b18754a8fc101fdb8fd6ab8f4150) +++ docs/source/index.rst (.../index.rst) (revision 322377decd72091859c355c84705276e89cd140e) @@ -1,3 +1,20 @@ +.. ........................................................................... +.. +.. Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +.. +.. THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN +.. WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. +.. +.. @file index.rst +.. +.. @date 20-July-2020 +.. @author P. Lucia +.. +.. @brief Dialin documentation master file +.. +.. +.. ........................................................................... + .. Dialin documentation master file, created by sphinx-quickstart on Fri May 29 15:33:59 2020. You can adapt this file completely to your liking, but it should at least Index: setup.py =================================================================== diff -u -rc6c42e21248dd7f4bf391b75541aaaae14a1ab42 -r322377decd72091859c355c84705276e89cd140e --- setup.py (.../setup.py) (revision c6c42e21248dd7f4bf391b75541aaaae14a1ab42) +++ setup.py (.../setup.py) (revision 322377decd72091859c355c84705276e89cd140e) @@ -41,5 +41,4 @@ "six", "wrapt" ] - ) Index: tests/test_demo.py =================================================================== diff -u -rae1e423f7cf68432e1e3daf01b50a162de4563e4 -r322377decd72091859c355c84705276e89cd140e --- tests/test_demo.py (.../test_demo.py) (revision ae1e423f7cf68432e1e3daf01b50a162de4563e4) +++ tests/test_demo.py (.../test_demo.py) (revision 322377decd72091859c355c84705276e89cd140e) @@ -63,6 +63,7 @@ # simulate off button pressed hd.buttons.cmd_off_button_override(BUTTON_PRESSED, NO_RESET) + def test_hd_blood_flow(ml_per_min=110): """ Sets the HD blood flow rate (mL / min)