Index: dialin/common/hd_defs.py =================================================================== diff -u -r7fe939e59e034a80456d9f865c6fda428c2ae861 -r9dee83286969ac19c09f6879394494e551663cb5 --- dialin/common/hd_defs.py (.../hd_defs.py) (revision 7fe939e59e034a80456d9f865c6fda428c2ae861) +++ dialin/common/hd_defs.py (.../hd_defs.py) (revision 9dee83286969ac19c09f6879394494e551663cb5) @@ -8,7 +8,7 @@ # @file hd_defs.py # # @author (last) Sean Nash -# @date (last) 02-Feb-2023 +# @date (last) 16-Mar-2023 # @author (original) Peter Lucia # @date (original) 04-Dec-2020 # @@ -330,12 +330,18 @@ HD_EVENT_SERVICE_UPDATE = 9 # HD new service record has been updated HD_EVENT_USAGE_INFO_UPDATE = 10 # HD new usage information has been updated HD_EVENT_SW_CONFIG_UPDATE = 11 # HD new software configuration has been updated - HD_EVENT_RSRVR_1_LOAD_CELL_START_VALUES = 12 # HD reservoir 1 load cells start values - HD_EVENT_RSRVR_1_LOAD_CELL_END_VALUES = 13 # HD reservoir 2 load cells end values - HD_EVENT_RSRVR_2_LOAD_CELL_START_VALUES = 14 # HD reservoir 2 load cells start values - HD_EVENT_RSRVR_2_LOAD_CELL_END_VALUES = 15 # HD reservoir 2 load cells end values - HD_EVENT_SUB_STATE_CHANGE = 16 # HD Op sub-state change event - NUM_OF_EVENT_IDS = 17 # Total number of HD events + HD_EVENT_BUTTON = 12 # HD button pressed/released + HD_EVENT_SAFETY_LINE = 13 # HD safety line pulled/released + HD_EVENT_RSRVR_1_LOAD_CELL_START_VALUES = 14 # HD reservoir 1 load cells start values + HD_EVENT_RSRVR_1_LOAD_CELL_END_VALUES = 15 # HD reservoir 2 load cells end values + HD_EVENT_RSRVR_2_LOAD_CELL_START_VALUES = 16 # HD reservoir 2 load cells start values + HD_EVENT_RSRVR_2_LOAD_CELL_END_VALUES = 17 # HD reservoir 2 load cells end values + HD_EVENT_SUB_STATE_CHANGE = 18 # HD Op sub-state change event + HD_EVENT_SYRINGE_PUMP_STATE = 19 # HD syringe pump state change event + HD_EVENT_OCCLUSION_BASELINE = 20 # HD event occlusion baseline event + HD_EVENT_RSRVR_UF_VOLUME_AND_TIME = 21 # HD ultrafiltration volume and time for a reservoir use + HD_EVENT_RSRVR_UF_RATE = 22 # HD ultrafiltration measured and expected rates + NUM_OF_EVENT_IDS = 23 # Total number of HD events @unique class HDEventDataType(DialinEnum): Index: dialin/common/msg_ids.py =================================================================== diff -u -rdc07ecb63eed240b6d3b47dd96743f93014c564c -r9dee83286969ac19c09f6879394494e551663cb5 --- dialin/common/msg_ids.py (.../msg_ids.py) (revision dc07ecb63eed240b6d3b47dd96743f93014c564c) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision 9dee83286969ac19c09f6879394494e551663cb5) @@ -8,7 +8,7 @@ # @file msg_ids.py # # @author (last) Micahel Garthwaite -# @date (last) 09-Feb-2023 +# @date (last) 07-Mar-2023 # @author (original) Peter Lucia # @date (original) 06-Apr-2021 # Index: dialin/dg/chemical_disinfect.py =================================================================== diff -u -rcadb919bce9140638cae552306f374961833dafc -r9dee83286969ac19c09f6879394494e551663cb5 --- dialin/dg/chemical_disinfect.py (.../chemical_disinfect.py) (revision cadb919bce9140638cae552306f374961833dafc) +++ dialin/dg/chemical_disinfect.py (.../chemical_disinfect.py) (revision 9dee83286969ac19c09f6879394494e551663cb5) @@ -7,8 +7,8 @@ # # @file chemical_disinfect.py # -# @author (last) Dara Navaei -# @date (last) 03-Feb-2023 +# @author (last) Micahel Garthwaite +# @date (last) 07-Mar-2023 # @author (original) Dara Navaei # @date (original) 02-May-2021 # Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -ra2fc3606bea19772cbbb7a41a613b783a10ab652 -r9dee83286969ac19c09f6879394494e551663cb5 --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision a2fc3606bea19772cbbb7a41a613b783a10ab652) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 9dee83286969ac19c09f6879394494e551663cb5) @@ -7,8 +7,8 @@ # # @file dialysate_generator.py # -# @author (last) Dara Navaei -# @date (last) 18-Jan-2023 +# @author (last) Micahel Garthwaite +# @date (last) 07-Mar-2023 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # Index: dialin/dg/drain_pump.py =================================================================== diff -u -rcadb919bce9140638cae552306f374961833dafc -r9dee83286969ac19c09f6879394494e551663cb5 --- dialin/dg/drain_pump.py (.../drain_pump.py) (revision cadb919bce9140638cae552306f374961833dafc) +++ dialin/dg/drain_pump.py (.../drain_pump.py) (revision 9dee83286969ac19c09f6879394494e551663cb5) @@ -7,8 +7,8 @@ # # @file drain_pump.py # -# @author (last) Dara Navaei -# @date (last) 11-Jan-2023 +# @author (last) Micahel Garthwaite +# @date (last) 07-Mar-2023 # @author (original) Sean # @date (original) 14-Apr-2020 # Index: dialin/dg/heat_disinfect.py =================================================================== diff -u -rcadb919bce9140638cae552306f374961833dafc -r9dee83286969ac19c09f6879394494e551663cb5 --- dialin/dg/heat_disinfect.py (.../heat_disinfect.py) (revision cadb919bce9140638cae552306f374961833dafc) +++ dialin/dg/heat_disinfect.py (.../heat_disinfect.py) (revision 9dee83286969ac19c09f6879394494e551663cb5) @@ -7,8 +7,8 @@ # # @file heat_disinfect.py # -# @author (last) Dara Navaei -# @date (last) 14-Feb-2023 +# @author (last) Micahel Garthwaite +# @date (last) 07-Mar-2023 # @author (original) Dara Navaei # @date (original) 27-Feb-2021 # Index: dialin/dg/reservoirs.py =================================================================== diff -u -rcadb919bce9140638cae552306f374961833dafc -r9dee83286969ac19c09f6879394494e551663cb5 --- dialin/dg/reservoirs.py (.../reservoirs.py) (revision cadb919bce9140638cae552306f374961833dafc) +++ dialin/dg/reservoirs.py (.../reservoirs.py) (revision 9dee83286969ac19c09f6879394494e551663cb5) @@ -7,8 +7,8 @@ # # @file reservoirs.py # -# @author (last) Dara Navaei -# @date (last) 03-Nov-2022 +# @author (last) Micahel Garthwaite +# @date (last) 07-Mar-2023 # @author (original) Sean # @date (original) 14-Apr-2020 # Index: dialin/dg/temperatures.py =================================================================== diff -u -rcadb919bce9140638cae552306f374961833dafc -r9dee83286969ac19c09f6879394494e551663cb5 --- dialin/dg/temperatures.py (.../temperatures.py) (revision cadb919bce9140638cae552306f374961833dafc) +++ dialin/dg/temperatures.py (.../temperatures.py) (revision 9dee83286969ac19c09f6879394494e551663cb5) @@ -7,8 +7,8 @@ # # @file temperatures.py # -# @author (last) Dara Navaei -# @date (last) 25-Oct-2022 +# @author (last) Micahel Garthwaite +# @date (last) 07-Mar-2023 # @author (original) Dara Navaei # @date (original) 01-Dec-2021` # Index: dialin/hd/alarms.py =================================================================== diff -u -rcadb919bce9140638cae552306f374961833dafc -r9dee83286969ac19c09f6879394494e551663cb5 --- dialin/hd/alarms.py (.../alarms.py) (revision cadb919bce9140638cae552306f374961833dafc) +++ dialin/hd/alarms.py (.../alarms.py) (revision 9dee83286969ac19c09f6879394494e551663cb5) @@ -8,7 +8,7 @@ # @file alarms.py # # @author (last) Micahel Garthwaite -# @date (last) 07-Feb-2023 +# @date (last) 03-Mar-2023 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # Index: dialin/hd/battery.py =================================================================== diff -u -rcadb919bce9140638cae552306f374961833dafc -r9dee83286969ac19c09f6879394494e551663cb5 --- dialin/hd/battery.py (.../battery.py) (revision cadb919bce9140638cae552306f374961833dafc) +++ dialin/hd/battery.py (.../battery.py) (revision 9dee83286969ac19c09f6879394494e551663cb5) @@ -8,7 +8,7 @@ # @file battery.py # # @author (last) Micahel Garthwaite -# @date (last) 09-Feb-2023 +# @date (last) 10-Mar-2023 # @author (original) Steve Jarpe # @date (original) 27-Sep-2022 # Index: dialin/hd/fans.py =================================================================== diff -u -rcadb919bce9140638cae552306f374961833dafc -r9dee83286969ac19c09f6879394494e551663cb5 --- dialin/hd/fans.py (.../fans.py) (revision cadb919bce9140638cae552306f374961833dafc) +++ dialin/hd/fans.py (.../fans.py) (revision 9dee83286969ac19c09f6879394494e551663cb5) @@ -7,8 +7,8 @@ # # @file fans.py # -# @author (last) Dara Navaei -# @date (last) 27-May-2022 +# @author (last) Micahel Garthwaite +# @date (last) 03-Mar-2023 # @author (original) Dara Navaei # @date (original) 04-Aug-2021 # Index: dialin/hd/hemodialysis_device.py =================================================================== diff -u -ra2fc3606bea19772cbbb7a41a613b783a10ab652 -r9dee83286969ac19c09f6879394494e551663cb5 --- dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision a2fc3606bea19772cbbb7a41a613b783a10ab652) +++ dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision 9dee83286969ac19c09f6879394494e551663cb5) @@ -7,8 +7,8 @@ # # @file hemodialysis_device.py # -# @author (last) Dara Navaei -# @date (last) 18-Jan-2023 +# @author (last) Micahel Garthwaite +# @date (last) 07-Mar-2023 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # Index: dialin/hd/pretreatment.py =================================================================== diff -u -rcadb919bce9140638cae552306f374961833dafc -r9dee83286969ac19c09f6879394494e551663cb5 --- dialin/hd/pretreatment.py (.../pretreatment.py) (revision cadb919bce9140638cae552306f374961833dafc) +++ dialin/hd/pretreatment.py (.../pretreatment.py) (revision 9dee83286969ac19c09f6879394494e551663cb5) @@ -7,8 +7,8 @@ # # @file pretreatment.py # -# @author (last) Dara Navaei -# @date (last) 18-Jun-2022 +# @author (last) Micahel Garthwaite +# @date (last) 03-Mar-2023 # @author (original) Quang Nguyen # @date (original) 02-Mar-2021 # Index: dialin/hd/rtc.py =================================================================== diff -u -rcadb919bce9140638cae552306f374961833dafc -r9dee83286969ac19c09f6879394494e551663cb5 --- dialin/hd/rtc.py (.../rtc.py) (revision cadb919bce9140638cae552306f374961833dafc) +++ dialin/hd/rtc.py (.../rtc.py) (revision 9dee83286969ac19c09f6879394494e551663cb5) @@ -8,7 +8,7 @@ # @file rtc.py # # @author (last) Micahel Garthwaite -# @date (last) 01-Feb-2023 +# @date (last) 03-Mar-2023 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # Index: dialin/hd/treatment.py =================================================================== diff -u -rcadb919bce9140638cae552306f374961833dafc -r9dee83286969ac19c09f6879394494e551663cb5 --- dialin/hd/treatment.py (.../treatment.py) (revision cadb919bce9140638cae552306f374961833dafc) +++ dialin/hd/treatment.py (.../treatment.py) (revision 9dee83286969ac19c09f6879394494e551663cb5) @@ -8,7 +8,7 @@ # @file treatment.py # # @author (last) Micahel Garthwaite -# @date (last) 08-Aug-2022 +# @date (last) 03-Mar-2023 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # Index: dialin/hd/ui_proxy.py =================================================================== diff -u -rcee26db30e61173225355e599e2f99d6ddd13808 -r9dee83286969ac19c09f6879394494e551663cb5 --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision cee26db30e61173225355e599e2f99d6ddd13808) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 9dee83286969ac19c09f6879394494e551663cb5) @@ -7,8 +7,8 @@ # # @file ui_proxy.py # -# @author (last) Dara Navaei -# @date (last) 03-Jan-2023 +# @author (last) Micahel Garthwaite +# @date (last) 07-Mar-2023 # @author (original) Sean # @date (original) 15-Apr-2020 # Index: dialin/ui/dg_simulator.py =================================================================== diff -u -ra2fc3606bea19772cbbb7a41a613b783a10ab652 -r9dee83286969ac19c09f6879394494e551663cb5 --- dialin/ui/dg_simulator.py (.../dg_simulator.py) (revision a2fc3606bea19772cbbb7a41a613b783a10ab652) +++ dialin/ui/dg_simulator.py (.../dg_simulator.py) (revision 9dee83286969ac19c09f6879394494e551663cb5) @@ -7,8 +7,8 @@ # # @file dg_simulator.py # -# @author (last) Behrouz NematiPour -# @date (last) 29-Jun-2022 +# @author (last) Micahel Garthwaite +# @date (last) 08-Mar-2023 # @author (original) Peter Lucia # @date (original) 16-Mar-2021 # Index: dialin/ui/hd_simulator.py =================================================================== diff -u -ra2fc3606bea19772cbbb7a41a613b783a10ab652 -r9dee83286969ac19c09f6879394494e551663cb5 --- dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision a2fc3606bea19772cbbb7a41a613b783a10ab652) +++ dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 9dee83286969ac19c09f6879394494e551663cb5) @@ -7,8 +7,8 @@ # # @file hd_simulator.py # -# @author (last) Behrouz NematiPour -# @date (last) 10-Feb-2023 +# @author (last) Micahel Garthwaite +# @date (last) 08-Mar-2023 # @author (original) Peter Lucia # @date (original) 06-Aug-2020 # Index: tools/Code_Report.csv =================================================================== diff -u -reee9ebb437e3ce48deec6cb537624de11961e1ff -r9dee83286969ac19c09f6879394494e551663cb5 --- tools/Code_Report.csv (.../Code_Report.csv) (revision eee9ebb437e3ce48deec6cb537624de11961e1ff) +++ tools/Code_Report.csv (.../Code_Report.csv) (revision 9dee83286969ac19c09f6879394494e551663cb5) @@ -786,6 +786,7 @@ dg/flow_sensors.py, Variable, dg_flow_sensors_timestamp dg/flow_sensors.py, Variable, measured_raw_ro_flow_LPM dg/flow_sensors.py, Variable, measured_raw_dialysate_flow_LPM +dg/flow_sensors.py, Variable, dg_flow_sensors_timestamp dg/fluid_leak.py, Variable, dg_fluid_leak_timestamp dg/fluid_leak.py, Variable, fluid_leak_state dg/flush.py, Variable, flush_state @@ -1022,7 +1023,6 @@ hd/fans.py, Variable, inlet_1_rpm hd/fans.py, Variable, rpm_alarm_time hd/fans.py, Variable, hd_fans_data_timestamp -hd/fans.py, Variable, remove hd/fluid_leak.py, Variable, fluid_leak_state hd/fluid_leak.py, Variable, hd_fluid_leak_timestamp hd/hd_events.py, Variable, hd_event_timestamp @@ -2041,11 +2041,17 @@ common/hd_defs.py, Enum, HDEventList, HD_EVENT_SERVICE_UPDATE common/hd_defs.py, Enum, HDEventList, HD_EVENT_USAGE_INFO_UPDATE common/hd_defs.py, Enum, HDEventList, HD_EVENT_SW_CONFIG_UPDATE +common/hd_defs.py, Enum, HDEventList, HD_EVENT_BUTTON +common/hd_defs.py, Enum, HDEventList, HD_EVENT_SAFETY_LINE common/hd_defs.py, Enum, HDEventList, HD_EVENT_RSRVR_1_LOAD_CELL_START_VALUES common/hd_defs.py, Enum, HDEventList, HD_EVENT_RSRVR_1_LOAD_CELL_END_VALUES common/hd_defs.py, Enum, HDEventList, HD_EVENT_RSRVR_2_LOAD_CELL_START_VALUES common/hd_defs.py, Enum, HDEventList, HD_EVENT_RSRVR_2_LOAD_CELL_END_VALUES common/hd_defs.py, Enum, HDEventList, HD_EVENT_SUB_STATE_CHANGE +common/hd_defs.py, Enum, HDEventList, HD_EVENT_SYRINGE_PUMP_STATE +common/hd_defs.py, Enum, HDEventList, HD_EVENT_OCCLUSION_BASELINE +common/hd_defs.py, Enum, HDEventList, HD_EVENT_RSRVR_UF_VOLUME_AND_TIME +common/hd_defs.py, Enum, HDEventList, HD_EVENT_RSRVR_UF_RATE common/hd_defs.py, Enum, HDEventList, NUM_OF_EVENT_IDS common/hd_defs.py, Enum, HDEventDataType, HDEventDataType common/hd_defs.py, Enum, HDEventDataType, EVENT_DATA_TYPE_NONE