Index: dialin/common/msg_ids.py =================================================================== diff -u -r149514544ca06ad78778933c3db3bd147b60915b -r09cbb74248e9fb44ea81b9a2131d81e96e4a9d8d --- dialin/common/msg_ids.py (.../msg_ids.py) (revision 149514544ca06ad78778933c3db3bd147b60915b) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision 09cbb74248e9fb44ea81b9a2131d81e96e4a9d8d) @@ -7,8 +7,8 @@ # # @file msg_ids.py # -# @author (last) Quang Nguyen -# @date (last) 30-Aug-2021 +# @author (last) Dara Navaei +# @date (last) 10-Nov-2021 # @author (original) Peter Lucia # @date (original) 06-Apr-2021 # Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -r962dd8ebc689cd4a61ec614ed2d4f3b2e96a58ed -r09cbb74248e9fb44ea81b9a2131d81e96e4a9d8d --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 962dd8ebc689cd4a61ec614ed2d4f3b2e96a58ed) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 09cbb74248e9fb44ea81b9a2131d81e96e4a9d8d) @@ -7,8 +7,8 @@ # # @file dialysate_generator.py # -# @author (last) Quang Nguyen -# @date (last) 30-Aug-2021 +# @author (last) Dara Navaei +# @date (last) 29-Oct-2021 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # Index: dialin/dg/events.py =================================================================== diff -u -rb93526f20c12f7a3d5d887becb95bd372bcb26ab -r09cbb74248e9fb44ea81b9a2131d81e96e4a9d8d --- dialin/dg/events.py (.../events.py) (revision b93526f20c12f7a3d5d887becb95bd372bcb26ab) +++ dialin/dg/events.py (.../events.py) (revision 09cbb74248e9fb44ea81b9a2131d81e96e4a9d8d) @@ -1,3 +1,18 @@ +########################################################################### +# +# Copyright (c) 2019-2021 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 events.py +# +# @author (last) Dara Navaei +# @date (last) 01-Nov-2021 +# @author (original) Dara Navaei +# @date (original) 12-Oct-2021 +# +############################################################################ import struct from logging import Logger Index: dialin/dg/ro_pump.py =================================================================== diff -u -r5b791b3c7d1d2498dbe52c4573225a56afffe2fb -r09cbb74248e9fb44ea81b9a2131d81e96e4a9d8d --- dialin/dg/ro_pump.py (.../ro_pump.py) (revision 5b791b3c7d1d2498dbe52c4573225a56afffe2fb) +++ dialin/dg/ro_pump.py (.../ro_pump.py) (revision 09cbb74248e9fb44ea81b9a2131d81e96e4a9d8d) @@ -7,8 +7,8 @@ # # @file ro_pump.py # -# @author (last) Quang Nguyen -# @date (last) 05-Aug-2021 +# @author (last) Dara Navaei +# @date (last) 10-Nov-2021 # @author (original) Sean # @date (original) 14-Apr-2020 # @@ -61,6 +61,7 @@ self.pwm_duty_cycle_pct = 0.0 self.ro_pump_state = 0.0 self.target_flow_lpm = 0.0 + self.feedback_duty_cycle_pct = 0.0 def get_target_pressure(self): """ @@ -94,7 +95,8 @@ """ return self.ro_pump_state - @publish(["target_pressure_psi", "measured_flow_rate_lpm", "pwm_duty_cycle_pct", "ro_pump_state"]) + @publish(["target_pressure_psi", "measured_flow_rate_lpm", "pwm_duty_cycle_pct", "ro_pump_state", + "feedback_duty_cycle_pct"]) def _handler_ro_pump_sync(self, message): """ Handles published ro pump data messages. RO pump data are captured @@ -114,12 +116,15 @@ message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] tgt_flow = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] + feedback_dc = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] self.target_pressure_psi = tgt_pres self.measured_flow_rate_lpm = flow self.pwm_duty_cycle_pct = pwm self.ro_pump_state = ROPumpStates(ro_state).name if ROPumpStates.has_value(ro_state) else 'State Unknown' self.target_flow_lpm = tgt_flow + self.feedback_duty_cycle_pct = feedback_dc def cmd_ro_pump_duty_cycle_pct(self, duty: float) -> int: """ Index: dialin/hd/hemodialysis_device.py =================================================================== diff -u -r19ed99efea69f85cf5ea175a39555dfaa8e493e0 -r09cbb74248e9fb44ea81b9a2131d81e96e4a9d8d --- dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision 19ed99efea69f85cf5ea175a39555dfaa8e493e0) +++ dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision 09cbb74248e9fb44ea81b9a2131d81e96e4a9d8d) @@ -7,8 +7,8 @@ # # @file hemodialysis_device.py # -# @author (last) Quang Nguyen -# @date (last) 30-Aug-2021 +# @author (last) Dara Navaei +# @date (last) 14-Oct-2021 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # Index: dialin/hd/rtc.py =================================================================== diff -u -re6bbe766a98c5e0d4e8e3cd57efa5b5895bb4672 -r09cbb74248e9fb44ea81b9a2131d81e96e4a9d8d --- dialin/hd/rtc.py (.../rtc.py) (revision e6bbe766a98c5e0d4e8e3cd57efa5b5895bb4672) +++ dialin/hd/rtc.py (.../rtc.py) (revision 09cbb74248e9fb44ea81b9a2131d81e96e4a9d8d) @@ -7,8 +7,8 @@ # # @file rtc.py # -# @author (last) Quang Nguyen -# @date (last) 11-Aug-2021 +# @author (last) Dara Navaei +# @date (last) 11-Nov-2021 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # @@ -70,7 +70,7 @@ """ Stops the HD RTC clock - @return: None + @return: 1 if Successful, False otherwise """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, Index: tests/dg_heat_and_chemical_disinfect_test.py =================================================================== diff -u -rcbe423dbeb2e62446251f8e1de73f0eebdaf94ca -r09cbb74248e9fb44ea81b9a2131d81e96e4a9d8d --- tests/dg_heat_and_chemical_disinfect_test.py (.../dg_heat_and_chemical_disinfect_test.py) (revision cbe423dbeb2e62446251f8e1de73f0eebdaf94ca) +++ tests/dg_heat_and_chemical_disinfect_test.py (.../dg_heat_and_chemical_disinfect_test.py) (revision 09cbb74248e9fb44ea81b9a2131d81e96e4a9d8d) @@ -8,7 +8,7 @@ # @file dg_heat_and_chemical_disinfect_test.py # # @author (last) Dara Navaei -# @date (last) 30-Jun-2021 +# @date (last) 04-Nov-2021 # @author (original) Dara Navaei # @date (original) 02-May-2021 # Index: tests/test_flush.py =================================================================== diff -u -re6bbe766a98c5e0d4e8e3cd57efa5b5895bb4672 -r09cbb74248e9fb44ea81b9a2131d81e96e4a9d8d --- tests/test_flush.py (.../test_flush.py) (revision e6bbe766a98c5e0d4e8e3cd57efa5b5895bb4672) +++ tests/test_flush.py (.../test_flush.py) (revision 09cbb74248e9fb44ea81b9a2131d81e96e4a9d8d) @@ -8,7 +8,7 @@ # @file test_flush.py # # @author (last) Dara Navaei -# @date (last) 28-Jun-2021 +# @date (last) 10-Nov-2021 # @author (original) Dara Navaei # @date (original) 16-Apr-2021 # @@ -24,13 +24,19 @@ def get_flush_mode_info(): + """ info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Drain_vol, {:5.3f}, Top_alarm, {}, Op, {}, ' 'Sub, {}, History, {}, ' .format(dg.flush.flush_state, dg.flush.overall_elapsed_time, dg.flush.state_elapsed_time, dg.flush.flush_drain_line_volume_l, hd.alarms.alarm_top, dg.events.get_dg_events(1, 0), dg.events.get_dg_nth_event(2), dg.events.get_dg_events(2, 70))) + """ + info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Drain_vol, {:5.3f}, Top_alarm, {}, ' + .format(dg.flush.flush_state, dg.flush.overall_elapsed_time, dg.flush.state_elapsed_time, + dg.flush.flush_drain_line_volume_l, hd.alarms.alarm_top)) + def get_concentrate_pumps_info(): info = ('Bicarb_tgt_speed, {:5.3f}, Bicarb_speed, {:5.3f}, Acid_tgt_speed, {:5.3f}, Acid_speed, {:5.3f}, ' @@ -84,10 +90,10 @@ def get_ro_info(): - info = ('RO, {}, PPi, {:5.3f}, PPo, {:5.3f}, PWM, {:5.3f}, Flow, {:5.3f}, ' + info = ('RO, {}, PPi, {:5.3f}, PPo, {:5.3f}, PWM, {:5.3f}, Flow, {:5.3f}, Feedback_PWM, {:5.3f},' .format(dg.ro_pump.ro_pump_state, dg.pressures.ro_pump_inlet_pressure, dg.pressures.ro_pump_outlet_pressure, dg.ro_pump.pwm_duty_cycle_pct, - dg.ro_pump.measured_flow_rate_lpm)) + dg.ro_pump.measured_flow_rate_lpm, dg.ro_pump.feedback_duty_cycle_pct)) return info