Index: build.sh =================================================================== diff -u -r028952270169971af5075574ba7b7b4ba241acd3 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- build.sh (.../build.sh) (revision 028952270169971af5075574ba7b7b4ba241acd3) +++ build.sh (.../build.sh) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,18 @@ #!/bin/bash ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 build.sh +# @file build.sh # -# @date 29-Apr-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 29-Apr-2020 +# @author (original) Peter Lucia +# @date (original) 02-Apr-2020 # -# @brief Packages Dialin into a standalone .whl file -# ############################################################################ python3 setup.py bdist_wheel Index: dialin/dg/__init__.py =================================================================== diff -u -r2c4ed521ba67ea1d459de760ff5a20505602ce96 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/dg/__init__.py (.../__init__.py) (revision 2c4ed521ba67ea1d459de760ff5a20505602ce96) +++ dialin/dg/__init__.py (.../__init__.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,16 +1,16 @@ ########################################################################### # -# Copyright (c) 2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 __init__.py +# @file __init__.py # -# @date 20-July-2020 -# @author Peter Lucia +# @author (last) Peter Lucia +# @date (last) 20-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 02-Apr-2020 # -# @brief Init script for the DG module -# ############################################################################ from ..utils.base import _AbstractSubSystem, _publish Index: dialin/dg/constants.py =================================================================== diff -u -r9d9105c7dc3379c2e14996522291b23a19e7ba46 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/dg/constants.py (.../constants.py) (revision 9d9105c7dc3379c2e14996522291b23a19e7ba46) +++ dialin/dg/constants.py (.../constants.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 constants.py +# @file constants.py # -# @date 1-Apr-2020 -# @author P. Lucia +# @author (last) Sean +# @date (last) 14-Apr-2020 +# @author (original) Sean +# @date (original) 14-Apr-2020 # -# @brief -# -# ############################################################################ RESET = 1 Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -r919980c660e89393848ffc6af4ef25c8309a05dd -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 919980c660e89393848ffc6af4ef25c8309a05dd) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,17 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 DialysateGenerator.py +# @file dialysate_generator.py # -# @date 31-Mar-2019 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 20-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 02-Apr-2020 # -# @brief This class allows sending to and receiving from the DG device. -# ############################################################################ import struct from .drain_pump import DGDrainPump Index: dialin/dg/drain_pump.py =================================================================== diff -u -r1647ec71451f356dc8c61528781a5eff30859604 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/dg/drain_pump.py (.../drain_pump.py) (revision 1647ec71451f356dc8c61528781a5eff30859604) +++ dialin/dg/drain_pump.py (.../drain_pump.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 drain_pump.py +# @file drain_pump.py # -# @date 14-Apr-2020 -# @author S. Nash +# @author (last) Peter Lucia +# @date (last) 17-Jul-2020 +# @author (original) Sean +# @date (original) 14-Apr-2020 # -# @brief -# -# ############################################################################ import struct from ..utils.conversions import integer_to_bytearray Index: dialin/dg/hd_proxy.py =================================================================== diff -u -rca7f6eff65d988c19ccce8cde5efd1ef537e2095 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/dg/hd_proxy.py (.../hd_proxy.py) (revision ca7f6eff65d988c19ccce8cde5efd1ef537e2095) +++ dialin/dg/hd_proxy.py (.../hd_proxy.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 hd_proxy.py +# @file hd_proxy.py # -# @date 14-Apr-2020 -# @author S. Nash +# @author (last) Peter Lucia +# @date (last) 29-Jun-2020 +# @author (original) Sean +# @date (original) 15-Apr-2020 # -# @brief -# -# ############################################################################ from ..utils.conversions import integer_to_bytearray from ..protocols.CAN import (DenaliMessage, Index: dialin/dg/heaters.py =================================================================== diff -u -r414ee5c06661993d4e847b7a61067c1718340cbf -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/dg/heaters.py (.../heaters.py) (revision 414ee5c06661993d4e847b7a61067c1718340cbf) +++ dialin/dg/heaters.py (.../heaters.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 heaters.py +# @file heaters.py # -# @date 28-May-2020 -# @author dnavaei +# @author (last) Dara Navaei +# @date (last) 07-Jul-2020 +# @author (original) Dara Navaei +# @date (original) 29-May-2020 # -# @brief -# -# ############################################################################ import struct Index: dialin/dg/load_cells.py =================================================================== diff -u -rae1e423f7cf68432e1e3daf01b50a162de4563e4 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/dg/load_cells.py (.../load_cells.py) (revision ae1e423f7cf68432e1e3daf01b50a162de4563e4) +++ dialin/dg/load_cells.py (.../load_cells.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 load_cells.py +# @file load_cells.py # -# @date 14-Apr-2020 -# @author S. Nash +# @author (last) Peter Lucia +# @date (last) 22-Jun-2020 +# @author (original) Sean +# @date (original) 14-Apr-2020 # -# @brief -# -# ############################################################################ import struct from ..utils.conversions import integer_to_bytearray, float_to_bytearray Index: dialin/dg/pressures.py =================================================================== diff -u -rca7f6eff65d988c19ccce8cde5efd1ef537e2095 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/dg/pressures.py (.../pressures.py) (revision ca7f6eff65d988c19ccce8cde5efd1ef537e2095) +++ dialin/dg/pressures.py (.../pressures.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 pressures.py +# @file pressures.py # -# @date 14-Apr-2020 -# @author S. Nash +# @author (last) Peter Lucia +# @date (last) 29-Jun-2020 +# @author (original) Sean +# @date (original) 14-Apr-2020 # -# @brief -# -# ############################################################################ import struct from ..utils.conversions import integer_to_bytearray, float_to_bytearray Index: dialin/dg/reservoirs.py =================================================================== diff -u -rca7f6eff65d988c19ccce8cde5efd1ef537e2095 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/dg/reservoirs.py (.../reservoirs.py) (revision ca7f6eff65d988c19ccce8cde5efd1ef537e2095) +++ dialin/dg/reservoirs.py (.../reservoirs.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 reservoirs.py +# @file reservoirs.py # -# @date 14-Apr-2020 -# @author S. Nash +# @author (last) Peter Lucia +# @date (last) 29-Jun-2020 +# @author (original) Sean +# @date (original) 14-Apr-2020 # -# @brief -# -# ############################################################################ import struct from ..protocols.CAN import (DenaliMessage, Index: dialin/dg/ro_pump.py =================================================================== diff -u -r5d58d1eeb80237a7cafbb31bc800cb29e19615e0 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/dg/ro_pump.py (.../ro_pump.py) (revision 5d58d1eeb80237a7cafbb31bc800cb29e19615e0) +++ dialin/dg/ro_pump.py (.../ro_pump.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 ro_pump.py +# @file ro_pump.py # -# @date 14-Apr-2020 -# @author S. Nash +# @author (last) Dara Navaei +# @date (last) 01-Jul-2020 +# @author (original) Sean +# @date (original) 14-Apr-2020 # -# @brief -# -# ############################################################################ import struct from ..utils.conversions import integer_to_bytearray, float_to_bytearray Index: dialin/dg/temperature_sensors.py =================================================================== diff -u -r414ee5c06661993d4e847b7a61067c1718340cbf -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/dg/temperature_sensors.py (.../temperature_sensors.py) (revision 414ee5c06661993d4e847b7a61067c1718340cbf) +++ dialin/dg/temperature_sensors.py (.../temperature_sensors.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 temperature_sensors.py +# @file temperature_sensors.py # -# @date 28-May-2020 -# @author dnavaei +# @author (last) Dara Navaei +# @date (last) 07-Jul-2020 +# @author (original) Dara Navaei +# @date (original) 02-Jun-2020 # -# @brief -# -# ############################################################################ import struct from ..utils.conversions import integer_to_bytearray Index: dialin/dg/valves.py =================================================================== diff -u -r2c4ed521ba67ea1d459de760ff5a20505602ce96 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/dg/valves.py (.../valves.py) (revision 2c4ed521ba67ea1d459de760ff5a20505602ce96) +++ dialin/dg/valves.py (.../valves.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 valves.py +# @file valves.py # -# @date 6-May-2020 -# @author P. Montazemi +# @author (last) Peter Lucia +# @date (last) 20-Jul-2020 +# @author (original) Peman Montazemi +# @date (original) 19-May-2020 # -# @brief -# -# ############################################################################ import struct Index: dialin/hd/alarms.py =================================================================== diff -u -r17e48d8bf1a8960537d0615f7118bb8532e1015c -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/hd/alarms.py (.../alarms.py) (revision 17e48d8bf1a8960537d0615f7118bb8532e1015c) +++ dialin/hd/alarms.py (.../alarms.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,17 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 alarms.py +# @file alarms.py # -# @date 2-Apr-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 20-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 02-Apr-2020 # -# @brief -# ############################################################################ from ..protocols.CAN import (DenaliMessage, DenaliChannels) Index: dialin/hd/blood_flow.py =================================================================== diff -u -rae1e423f7cf68432e1e3daf01b50a162de4563e4 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/hd/blood_flow.py (.../blood_flow.py) (revision ae1e423f7cf68432e1e3daf01b50a162de4563e4) +++ dialin/hd/blood_flow.py (.../blood_flow.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 bloodflow.py +# @file blood_flow.py # -# @date 31-Mar-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 22-Jun-2020 +# @author (original) Peter Lucia +# @date (original) 02-Apr-2020 # -# @brief -# -# ############################################################################ from ..protocols.CAN import (DenaliMessage, DenaliChannels) Index: dialin/hd/buttons.py =================================================================== diff -u -rca7f6eff65d988c19ccce8cde5efd1ef537e2095 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/hd/buttons.py (.../buttons.py) (revision ca7f6eff65d988c19ccce8cde5efd1ef537e2095) +++ dialin/hd/buttons.py (.../buttons.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,17 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 CAN.py +# @file buttons.py # -# @date 29-Apr-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 29-Jun-2020 +# @author (original) Peter Lucia +# @date (original) 02-Apr-2020 # -# @brief Support for button related commands -# ############################################################################ from ..protocols.CAN import (DenaliMessage, DenaliChannels) Index: dialin/hd/constants.py =================================================================== diff -u -r05353eded4d42bb6db53eb398486254af20f7cf0 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/hd/constants.py (.../constants.py) (revision 05353eded4d42bb6db53eb398486254af20f7cf0) +++ dialin/hd/constants.py (.../constants.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 constants.py +# @file constants.py # -# @date 1-Apr-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 15-May-2020 +# @author (original) Peter Lucia +# @date (original) 02-Apr-2020 # -# @brief -# -# ############################################################################ RESET = 1 Index: dialin/hd/dialysate_inlet_flow.py =================================================================== diff -u -rae1e423f7cf68432e1e3daf01b50a162de4563e4 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/hd/dialysate_inlet_flow.py (.../dialysate_inlet_flow.py) (revision ae1e423f7cf68432e1e3daf01b50a162de4563e4) +++ dialin/hd/dialysate_inlet_flow.py (.../dialysate_inlet_flow.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 dialysate_inlet_flow.py +# @file dialysate_inlet_flow.py # -# @date 31-Mar-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 22-Jun-2020 +# @author (original) Peter Lucia +# @date (original) 02-Apr-2020 # -# @brief -# -# ############################################################################ import struct from ..protocols.CAN import (DenaliMessage, Index: dialin/hd/dialysate_outlet_flow.py =================================================================== diff -u -rae1e423f7cf68432e1e3daf01b50a162de4563e4 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision ae1e423f7cf68432e1e3daf01b50a162de4563e4) +++ dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 dialysate_outlet_flow.py +# @file dialysate_outlet_flow.py # -# @date 31-Mar-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 22-Jun-2020 +# @author (original) Peter Lucia +# @date (original) 02-Apr-2020 # -# @brief -# -# ############################################################################ import struct from ..protocols.CAN import (DenaliMessage, Index: dialin/hd/hemodialysis_device.py =================================================================== diff -u -r17e48d8bf1a8960537d0615f7118bb8532e1015c -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision 17e48d8bf1a8960537d0615f7118bb8532e1015c) +++ dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 hemodialysis_device.py +# @file hemodialysis_device.py # -# @date 31-Mar-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 20-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 02-Apr-2020 # -# @brief This class provides the basic interface to communicate with -# the HD board. -# ############################################################################ import struct from .alarms import HDAlarms Index: dialin/hd/pressure_occlusion.py =================================================================== diff -u -r17e48d8bf1a8960537d0615f7118bb8532e1015c -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision 17e48d8bf1a8960537d0615f7118bb8532e1015c) +++ dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 pressure_occlusion.py +# @file pressure_occlusion.py # -# @date 31-Mar-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 20-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 02-Apr-2020 # -# @brief -# -# ############################################################################ import struct from ..protocols.CAN import (DenaliMessage, Index: dialin/hd/rtc.py =================================================================== diff -u -r17e48d8bf1a8960537d0615f7118bb8532e1015c -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/hd/rtc.py (.../rtc.py) (revision 17e48d8bf1a8960537d0615f7118bb8532e1015c) +++ dialin/hd/rtc.py (.../rtc.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 rtc.py +# @file rtc.py # -# @date 31-Mar-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 20-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 02-Apr-2020 # -# @brief -# -# ############################################################################ import ctypes from ..protocols.CAN import (DenaliMessage, Index: dialin/hd/treatment.py =================================================================== diff -u -r17e48d8bf1a8960537d0615f7118bb8532e1015c -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/hd/treatment.py (.../treatment.py) (revision 17e48d8bf1a8960537d0615f7118bb8532e1015c) +++ dialin/hd/treatment.py (.../treatment.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 treatment.py +# @file treatment.py # -# @date 31-Mar-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 20-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 02-Apr-2020 # -# @brief -# -# ############################################################################ import struct from ..protocols.CAN import (DenaliMessage, Index: dialin/hd/ui_proxy.py =================================================================== diff -u -r17e48d8bf1a8960537d0615f7118bb8532e1015c -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 17e48d8bf1a8960537d0615f7118bb8532e1015c) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 ui.py +# @file ui_proxy.py # -# @date 31-Mar-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 20-Jul-2020 +# @author (original) Sean +# @date (original) 15-Apr-2020 # -# @brief -# -# ############################################################################ from ..protocols.CAN import (DenaliMessage, DenaliChannels) Index: dialin/hd/watchdog.py =================================================================== diff -u -r17e48d8bf1a8960537d0615f7118bb8532e1015c -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/hd/watchdog.py (.../watchdog.py) (revision 17e48d8bf1a8960537d0615f7118bb8532e1015c) +++ dialin/hd/watchdog.py (.../watchdog.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 watchdog.py +# @file watchdog.py # -# @date 31-Mar-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 20-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 02-Apr-2020 # -# @brief -# -# ############################################################################ from ..protocols.CAN import (DenaliMessage, DenaliChannels) Index: dialin/protocols/CAN.py =================================================================== diff -u -r02e6bbf85f0699488317daa135d2530bc5b19507 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/protocols/CAN.py (.../CAN.py) (revision 02e6bbf85f0699488317daa135d2530bc5b19507) +++ dialin/protocols/CAN.py (.../CAN.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,17 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 CAN.py +# @file CAN.py # -# @date 31-Mar-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 02-Jun-2020 +# @author (original) Peter Lucia +# @date (original) 02-Apr-2020 # -# @brief Classes in this file facilitate sending and receiving of Denali Messages over CAN -# ############################################################################ import threading Index: dialin/squish/__init__.py =================================================================== diff -u -r2c4ed521ba67ea1d459de760ff5a20505602ce96 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/squish/__init__.py (.../__init__.py) (revision 2c4ed521ba67ea1d459de760ff5a20505602ce96) +++ dialin/squish/__init__.py (.../__init__.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,15 +1 @@ -########################################################################### -# -# Copyright (c) 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 hemodialysis_device.py -# -# @date 20-July-2020 -# @author Peter Lucia -# -# @brief Initialization for the squish module -# -############################################################################ Index: dialin/squish/crc.py =================================================================== diff -u -re6e9d40940a3ce8b012b13be4fe65fea5b0a5168 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/squish/crc.py (.../crc.py) (revision e6e9d40940a3ce8b012b13be4fe65fea5b0a5168) +++ dialin/squish/crc.py (.../crc.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,5 +1,19 @@ # -*- 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 crc.py +# +# @author (last) Peter Lucia +# @date (last) 09-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 09-Jul-2020 +# +############################################################################ ## # Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. # copyright Index: dialin/squish/denaliMessages.py =================================================================== diff -u -re7bfc1b61892db0518f21a1bfde98e0400e83ab3 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/squish/denaliMessages.py (.../denaliMessages.py) (revision e7bfc1b61892db0518f21a1bfde98e0400e83ab3) +++ dialin/squish/denaliMessages.py (.../denaliMessages.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,5 +1,19 @@ # -*- 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 denaliMessages.py +# +# @author (last) Peter Lucia +# @date (last) 09-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 09-Jul-2020 +# +############################################################################ ## # Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. # copyright Index: dialin/squish/globals.py =================================================================== diff -u -r11074441e3cf2a05a9b8c55c6a7c9c21bc5fb5a3 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/squish/globals.py (.../globals.py) (revision 11074441e3cf2a05a9b8c55c6a7c9c21bc5fb5a3) +++ dialin/squish/globals.py (.../globals.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,5 +1,19 @@ # -*- 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 globals.py +# +# @author (last) Peter Lucia +# @date (last) 09-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 09-Jul-2020 +# +############################################################################ ## # Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. # copyright Index: dialin/squish/messageBuilder.py =================================================================== diff -u -re6e9d40940a3ce8b012b13be4fe65fea5b0a5168 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/squish/messageBuilder.py (.../messageBuilder.py) (revision e6e9d40940a3ce8b012b13be4fe65fea5b0a5168) +++ dialin/squish/messageBuilder.py (.../messageBuilder.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,5 +1,19 @@ # -*- 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 messageBuilder.py +# +# @author (last) Peter Lucia +# @date (last) 09-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 09-Jul-2020 +# +############################################################################ ## # Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. # copyright Index: dialin/squish/unittests.py =================================================================== diff -u -re4012447d2ee003bed854060ab9cc09cc55f3629 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/squish/unittests.py (.../unittests.py) (revision e4012447d2ee003bed854060ab9cc09cc55f3629) +++ dialin/squish/unittests.py (.../unittests.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,5 +1,19 @@ # -*- 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 unittests.py +# +# @author (last) Peter Lucia +# @date (last) 10-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 09-Jul-2020 +# +############################################################################ ## # Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. # copyright Index: dialin/squish/utils.py =================================================================== diff -u -re6e9d40940a3ce8b012b13be4fe65fea5b0a5168 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/squish/utils.py (.../utils.py) (revision e6e9d40940a3ce8b012b13be4fe65fea5b0a5168) +++ dialin/squish/utils.py (.../utils.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,5 +1,19 @@ # -*- 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 utils.py +# +# @author (last) Peter Lucia +# @date (last) 09-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 09-Jul-2020 +# +############################################################################ ## # Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. # copyright Index: dialin/utils/base.py =================================================================== diff -u -r17e48d8bf1a8960537d0615f7118bb8532e1015c -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/utils/base.py (.../base.py) (revision 17e48d8bf1a8960537d0615f7118bb8532e1015c) +++ dialin/utils/base.py (.../base.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 +# @file base.py # -# @date 20-July-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 20-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 22-Jun-2020 # -# @brief Contains base classes for Dialin API sub systems and observers -# -# ############################################################################ from abc import ABC, abstractmethod from datetime import datetime Index: dialin/utils/conversions.py =================================================================== diff -u -rc6596d42d995bed3789849bd85c83da5a3837fac -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/utils/conversions.py (.../conversions.py) (revision c6596d42d995bed3789849bd85c83da5a3837fac) +++ dialin/utils/conversions.py (.../conversions.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,3 +1,18 @@ +########################################################################### +# +# 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 conversions.py +# +# @author (last) Peter Lucia +# @date (last) 29-May-2020 +# @author (original) Peter Lucia +# @date (original) 02-Apr-2020 +# +############################################################################ import struct from binascii import unhexlify Index: dialin/utils/fw.py =================================================================== diff -u -r5e834984727c1798784d95ae17f686cb8d72fdca -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/utils/fw.py (.../fw.py) (revision 5e834984727c1798784d95ae17f686cb8d72fdca) +++ dialin/utils/fw.py (.../fw.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,17 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 alarms.py +# @file fw.py # -# @date 04-Jun-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 22-Jun-2020 +# @author (original) Peter Lucia +# @date (original) 22-Jun-2020 # -# @brief Firmware source file paths to be parsed by Dialin -# ############################################################################ import os current_file_dir = os.path.abspath(os.path.join(os.path.dirname(__file__))) Index: dialin/version.py =================================================================== diff -u -r9be13298c8bf224a229dc71a3be120f95247f67c -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- dialin/version.py (.../version.py) (revision 9be13298c8bf224a229dc71a3be120f95247f67c) +++ dialin/version.py (.../version.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,17 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 version.py +# @file version.py # -# @date 16-Jun-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 20-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 18-Jun-2020 # -# @brief This file contains the Dialin API version -# ############################################################################ import subprocess Index: docs/source/conf.py =================================================================== diff -u -r322377decd72091859c355c84705276e89cd140e -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- docs/source/conf.py (.../conf.py) (revision 322377decd72091859c355c84705276e89cd140e) +++ docs/source/conf.py (.../conf.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -2,32 +2,19 @@ # -*- coding: utf-8 -*- ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 +# @file conf.py # -# @date 20-July-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 20-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 29-May-2020 # -# @brief Dialin documentation build configuration file -# -# ############################################################################ -# -# Dialin documentation build configuration file, created by -# sphinx-quickstart on Fri May 29 15:33:59 2020. -# -# This file is execfile()d with the current directory set to its -# containing dir. -# -# Note that not all possible configuration values are present in this -# autogenerated file. -# -# All configuration values have a default; values that are commented out -# serve to show the default. # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the Index: setup.py =================================================================== diff -u -r322377decd72091859c355c84705276e89cd140e -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- setup.py (.../setup.py) (revision 322377decd72091859c355c84705276e89cd140e) +++ setup.py (.../setup.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,17 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 setup.py +# @file setup.py # -# @date 29-Apr-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 20-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 02-Apr-2020 # -# @brief Contains the setup parameters for package deployment -# ############################################################################ import setuptools from version import VERSION Index: tests/can_xmit_test.py =================================================================== diff -u -r715d2353ee713f9ebdd49246e5bd34a1971be77e -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- tests/can_xmit_test.py (.../can_xmit_test.py) (revision 715d2353ee713f9ebdd49246e5bd34a1971be77e) +++ tests/can_xmit_test.py (.../can_xmit_test.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,17 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved. +# 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. +# 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 HD_TestScript.py +# @file can_xmit_test.py # -# @date 19-Nov-2019 -# @author S. Nash +# @author (last) Sean Nash +# @date (last) 21-May-2020 +# @author (original) Sean Nash +# @date (original) 20-May-2020 # -# @brief This is an example test script for the HD. -# ############################################################################ import sys Index: tests/dg_heaters_test.py =================================================================== diff -u -r414ee5c06661993d4e847b7a61067c1718340cbf -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- tests/dg_heaters_test.py (.../dg_heaters_test.py) (revision 414ee5c06661993d4e847b7a61067c1718340cbf) +++ tests/dg_heaters_test.py (.../dg_heaters_test.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 HemodialysisDevice.py +# @file dg_heaters_test.py # -# @date 31-Mar-2020 -# @author P. Lucia +# @author (last) Dara Navaei +# @date (last) 07-Jul-2020 +# @author (original) Dara Navaei +# @date (original) 29-May-2020 # -# @brief This class provides the basic interface to communicate with -# the HD board. -# ############################################################################ import sys sys.path.append("..") Index: tests/dg_test_script.py =================================================================== diff -u -r028952270169971af5075574ba7b7b4ba241acd3 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- tests/dg_test_script.py (.../dg_test_script.py) (revision 028952270169971af5075574ba7b7b4ba241acd3) +++ tests/dg_test_script.py (.../dg_test_script.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,17 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved. +# 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. +# 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 hd_tests_script.py +# @file dg_test_script.py # -# @date 7-Apr-2019 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 29-Apr-2020 +# @author (original) Peter Lucia +# @date (original) 02-Apr-2020 # -# @brief This is an example test script for the HD. -# ############################################################################ import sys sys.path.append("..") Index: tests/dg_valves_test.py =================================================================== diff -u -re7bfc1b61892db0518f21a1bfde98e0400e83ab3 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- tests/dg_valves_test.py (.../dg_valves_test.py) (revision e7bfc1b61892db0518f21a1bfde98e0400e83ab3) +++ tests/dg_valves_test.py (.../dg_valves_test.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 dg_valves_test.py +# @file dg_valves_test.py # -# @date 20-May-2020 -# @author P. Montazemi +# @author (last) Peter Lucia +# @date (last) 09-Jul-2020 +# @author (original) Peman Montazemi +# @date (original) 20-May-2020 # -# @brief This development test script exercises the DG valves states in \n -# single and batch modes -# ############################################################################ import sys Index: tests/dg_valves_test_observer.py =================================================================== diff -u -rebf15ffdee47f73599ee101d775e23339b9ce29e -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- tests/dg_valves_test_observer.py (.../dg_valves_test_observer.py) (revision ebf15ffdee47f73599ee101d775e23339b9ce29e) +++ tests/dg_valves_test_observer.py (.../dg_valves_test_observer.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,17 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 dg_valves_test1.py +# @file dg_valves_test_observer.py # -# @date 01-June-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 24-Jun-2020 +# @author (original) Peter Lucia +# @date (original) 24-Jun-2020 # -# @brief This development test script shows how to use the AbstractObserver class -# ############################################################################ import sys Index: tests/hd_test_script.py =================================================================== diff -u -r4cb37e8ec3d57576aea76c8aae84130d3adb3ab1 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- tests/hd_test_script.py (.../hd_test_script.py) (revision 4cb37e8ec3d57576aea76c8aae84130d3adb3ab1) +++ tests/hd_test_script.py (.../hd_test_script.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,17 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved. +# 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. +# 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 hd_tests_script.py +# @file hd_test_script.py # -# @date 7-Apr-2019 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 07-Apr-2020 +# @author (original) Peter Lucia +# @date (original) 02-Apr-2020 # -# @brief This is an example test script for the HD. -# ############################################################################ import sys sys.path.append("..") Index: tests/test_alarms.py =================================================================== diff -u -r5e834984727c1798784d95ae17f686cb8d72fdca -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- tests/test_alarms.py (.../test_alarms.py) (revision 5e834984727c1798784d95ae17f686cb8d72fdca) +++ tests/test_alarms.py (.../test_alarms.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,17 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved. +# 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. +# 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 test_demo.py +# @file test_alarms.py # -# @date 15-May-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 22-Jun-2020 +# @author (original) Peter Lucia +# @date (original) 05-Jun-2020 # -# @brief This is a demo script to exercise the HD and DG. -# ############################################################################ import sys sys.path.append("..") Index: tests/test_can_protocol.py =================================================================== diff -u -r10ed41d4e0580b54aa859c9ddde83183ff4f51e4 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- tests/test_can_protocol.py (.../test_can_protocol.py) (revision 10ed41d4e0580b54aa859c9ddde83183ff4f51e4) +++ tests/test_can_protocol.py (.../test_can_protocol.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,3 +1,18 @@ +########################################################################### +# +# 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 test_can_protocol.py +# +# @author (last) Peter Lucia +# @date (last) 18-May-2020 +# @author (original) Peter Lucia +# @date (original) 18-May-2020 +# +############################################################################ import sys sys.path.append("..") import argparse Index: tests/test_demo.py =================================================================== diff -u -r322377decd72091859c355c84705276e89cd140e -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- tests/test_demo.py (.../test_demo.py) (revision 322377decd72091859c355c84705276e89cd140e) +++ tests/test_demo.py (.../test_demo.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,17 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved. +# 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. +# 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 test_demo.py +# @file test_demo.py # -# @date 15-May-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 20-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 15-May-2020 # -# @brief This is a demo script to exercise the HD and DG. -# ############################################################################ import sys sys.path.append("..") Index: tests/test_gen_requirements.py =================================================================== diff -u -r878d608b5b6e1974f14e3da2956ac8063e30bf14 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- tests/test_gen_requirements.py (.../test_gen_requirements.py) (revision 878d608b5b6e1974f14e3da2956ac8063e30bf14) +++ tests/test_gen_requirements.py (.../test_gen_requirements.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,17 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved. +# 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. +# 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 test_demo.py +# @file test_gen_requirements.py # -# @date 15-May-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 09-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 09-Jul-2020 # -# @brief This is a demo script to exercise the HD and DG. -# ############################################################################ import sys sys.path.append("..") Index: tests/test_imports.py =================================================================== diff -u -r2c4ed521ba67ea1d459de760ff5a20505602ce96 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- tests/test_imports.py (.../test_imports.py) (revision 2c4ed521ba67ea1d459de760ff5a20505602ce96) +++ tests/test_imports.py (.../test_imports.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,17 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 test_imports.py +# @file test_imports.py # -# @date 29-Apr-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 20-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 07-Apr-2020 # -# @brief Tests imports of all available modules -# ############################################################################ import unittest import sys Index: tests/uf_test.py =================================================================== diff -u -r02e6bbf85f0699488317daa135d2530bc5b19507 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- tests/uf_test.py (.../uf_test.py) (revision 02e6bbf85f0699488317daa135d2530bc5b19507) +++ tests/uf_test.py (.../uf_test.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,17 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved. +# 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. +# 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 HD_UFTest.py +# @file uf_test.py # -# @date 28-Jan-2020 -# @author S. Nash +# @author (last) Peter Lucia +# @date (last) 02-Jun-2020 +# @author (original) Sean Nash +# @date (original) 20-May-2020 # -# @brief This script simulates 300 grams of load cell increase over 15 minutes (20 mL/min). -# ############################################################################ import sys Index: tests/unit_tests.py =================================================================== diff -u -rd66e924d16e5b5f62570f57a483acd3f10c50dcc -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- tests/unit_tests.py (.../unit_tests.py) (revision d66e924d16e5b5f62570f57a483acd3f10c50dcc) +++ tests/unit_tests.py (.../unit_tests.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,17 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 test_imports.py +# @file unit_tests.py # -# @date 29-Apr-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 13-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 13-Jul-2020 # -# @brief Tests imports of all available modules -# ############################################################################ import unittest import sys Index: tools/build_readme_pdf.sh =================================================================== diff -u -r61479ce1965fdcf793913f5e58af92e56c3aea67 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- tools/build_readme_pdf.sh (.../build_readme_pdf.sh) (revision 61479ce1965fdcf793913f5e58af92e56c3aea67) +++ tools/build_readme_pdf.sh (.../build_readme_pdf.sh) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,4 +1,19 @@ #!/bin/bash +########################################################################### +# +# 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 build_readme_pdf.sh +# +# @author (last) Peter Lucia +# @date (last) 22-May-2020 +# @author (original) Peter Lucia +# @date (original) 22-May-2020 +# +############################################################################ cd ../ pandoc README.md -o README.pdf \ No newline at end of file Index: tools/document.sh =================================================================== diff -u -rc6596d42d995bed3789849bd85c83da5a3837fac -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- tools/document.sh (.../document.sh) (revision c6596d42d995bed3789849bd85c83da5a3837fac) +++ tools/document.sh (.../document.sh) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,20 +1,19 @@ #!/bin/bash ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 document.sh +# @file document.sh # -# @date 29-Apr-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 29-May-2020 +# @author (original) Peter Lucia +# @date (original) 01-Apr-2020 # -# @brief Generates doxygen documentation -# ############################################################################ -# Assumes you have already run the following setup: CURR_DIR=$(pwd) if [[ "$@" == "*--setup*" ]]; then Index: tools/install_to_venv.sh =================================================================== diff -u -r2c4ed521ba67ea1d459de760ff5a20505602ce96 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- tools/install_to_venv.sh (.../install_to_venv.sh) (revision 2c4ed521ba67ea1d459de760ff5a20505602ce96) +++ tools/install_to_venv.sh (.../install_to_venv.sh) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,19 +1,18 @@ #!/bin/bash ########################################################################### # -# Copyright (c) 2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 install_to_venv.sh +# @file install_to_venv.sh # -# @date 20-July-2020 -# @author Peter Lucia +# @author (last) Peter Lucia +# @date (last) 20-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 09-Jul-2020 # -# @brief This script builds dialin then installs it to the provided virtual -# environment -# ############################################################################ cd ../ Index: tools/setup_canbus.sh =================================================================== diff -u -r61479ce1965fdcf793913f5e58af92e56c3aea67 -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- tools/setup_canbus.sh (.../setup_canbus.sh) (revision 61479ce1965fdcf793913f5e58af92e56c3aea67) +++ tools/setup_canbus.sh (.../setup_canbus.sh) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,18 @@ #!/bin/bash ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 setup_canbus.sh +# @file setup_canbus.sh # -# @date 29-Apr-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 22-May-2020 +# @author (original) Peter Lucia +# @date (original) 01-Apr-2020 # -# @brief Initializes the canbus interface -# ############################################################################ sudo ifconfig can0 down Index: tools/setup_environment.sh =================================================================== diff -u -r83f6658e1a607c9c8d126d82ff9420c3c4e4919f -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- tools/setup_environment.sh (.../setup_environment.sh) (revision 83f6658e1a607c9c8d126d82ff9420c3c4e4919f) +++ tools/setup_environment.sh (.../setup_environment.sh) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,18 @@ #!/bin/bash ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 setup_environment.sh +# @file setup_environment.sh # -# @date 29-Apr-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 09-Jul-2020 +# @author (original) Peter Lucia +# @date (original) 01-Apr-2020 # -# @brief Configurations the virtual environment -# ############################################################################ cd ../ Index: tools/setup_virtual_can.sh =================================================================== diff -u -ra08757ab36f7555f49526e28b7d2eb799e64769d -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- tools/setup_virtual_can.sh (.../setup_virtual_can.sh) (revision a08757ab36f7555f49526e28b7d2eb799e64769d) +++ tools/setup_virtual_can.sh (.../setup_virtual_can.sh) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1,18 +1,18 @@ #!/bin/bash ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# 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. +# 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 setup_virtual_can.sh +# @file setup_virtual_can.sh # -# @date 29-Apr-2020 -# @author P. Lucia +# @author (last) Peter Lucia +# @date (last) 29-Apr-2020 +# @author (original) Peter Lucia +# @date (original) 01-Apr-2020 # -# @brief Initializes the virtual can interfaces -# ############################################################################ sudo ifconfig vcan0 down sudo ifconfig vcan1 down Index: version.py =================================================================== diff -u -r5818c70699fbe02a31d136f440baee0d9f2cb39d -r4bdb012848d1b59be5edc31d677b77b9d95f6190 --- version.py (.../version.py) (revision 5818c70699fbe02a31d136f440baee0d9f2cb39d) +++ version.py (.../version.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) @@ -1 +1,42 @@ -dialin/version.py \ No newline at end of file +########################################################################### +# +# 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 version.py +# +# @author (last) Peter Lucia +# @date (last) 18-Jun-2020 +# @author (original) Peter Lucia +# @date (original) 16-Jun-2020 +# +############################################################################ +import subprocess + + +def get_branch(): + """ + Gets the current branch name in the current git repository + + @return: The current branch name + """ + + return subprocess.check_output("git rev-parse --abbrev-ref HEAD", shell=True).decode("utf-8").strip() + + +def get_last_commit(): + """ + Gets the latest commit in the current git repository + + @return: (str) the latest commit in the current git repository + """ + return subprocess.check_output("git rev-parse --short=7 HEAD", shell=True).decode("utf-8").strip() + + +VERSION = "0.5.0-{0}-{1}".format(get_branch(), get_last_commit()) + + +if __name__ == '__main__': + print(VERSION)