Index: dialin/common/ui_defs.py =================================================================== diff -u -racd09d02879e8add4cf7f694f5db8e423a76c341 -rbc8b953306fc4a8a2bc97b6949081e8fbf9190e8 --- dialin/common/ui_defs.py (.../ui_defs.py) (revision acd09d02879e8add4cf7f694f5db8e423a76c341) +++ dialin/common/ui_defs.py (.../ui_defs.py) (revision bc8b953306fc4a8a2bc97b6949081e8fbf9190e8) @@ -94,9 +94,8 @@ SALINE_BOLUS_STATE_MAX_DELIVERED = 3 # Maximum saline bolus volume reached # UF states - UF_START_STATE = 0 # Start state of the ultrafiltration state machine - UF_PAUSED_STATE = 1 # Paused state of the ultrafiltration state machine - UF_RUNNING_STATE = 2 # Running state of the ultrafiltration state machine + UF_PAUSED_STATE = 0 # Paused state of the ultrafiltration state machine + UF_RUNNING_STATE = 1 # Running state of the ultrafiltration state machine UF_OFF_STATE = 3 # Completed/off state of the ultrafiltration state machine UF_COMPLETED_STATE = 4 # Completed state of ultrafiltration state machine Index: dialin/ui/dg_simulator.py =================================================================== diff -u -r4dfa4d2eae8484e5079aa4ca7eff93ffe0c0abf0 -rbc8b953306fc4a8a2bc97b6949081e8fbf9190e8 --- dialin/ui/dg_simulator.py (.../dg_simulator.py) (revision 4dfa4d2eae8484e5079aa4ca7eff93ffe0c0abf0) +++ dialin/ui/dg_simulator.py (.../dg_simulator.py) (revision bc8b953306fc4a8a2bc97b6949081e8fbf9190e8) @@ -148,7 +148,8 @@ self.can_interface.send(message, 0) def cmd_set_dg_pressures_data(self, ro_inlet_pressure: float, ro_outlet_pressure: float, - drain_inlet_pressure: float, drain_outlet_pressure: float) -> None: + drain_inlet_pressure: float, drain_outlet_pressure: float, + barometric_pressure : float) -> None: """ the DG Pressures Data message setter/sender method @@ -167,6 +168,7 @@ payload += float_to_bytearray(ro_outlet_pressure) payload += float_to_bytearray(drain_inlet_pressure) payload += float_to_bytearray(drain_outlet_pressure) + payload += float_to_bytearray(barometric_pressure) message = DenaliMessage.build_message(channel_id=DenaliChannels.dg_sync_broadcast_ch_id, message_id=MsgIds.MSG_ID_DG_PRESSURES_DATA.value, @@ -260,7 +262,11 @@ self.can_interface.send(message, 0) - def cmd_set_dg_heaters_data(self, main_primary_dc: int, small_primary_dc: int, trimmer_dc: int) -> None: + def cmd_set_dg_heaters_data(self, main_primary_dc: int, small_primary_dc: int, trimmer_dc: int, + primary_target_temp : float, trimmer_target_temp : float, + primary_heater_state: float, trimmer_heater_state: float, + primary_efficiency : float, primary_calc_target_temp:float, + trimmer_calc_current_temp: float, trimmer_use_last_dc:float) -> None: """ the DG Heaters Data message setter/sender method | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | #1:(U32) | #2:(U32) | #3:(U32) | @@ -276,13 +282,21 @@ payload = integer_to_bytearray(main_primary_dc) payload += integer_to_bytearray(small_primary_dc) payload += integer_to_bytearray(trimmer_dc) + payload += integer_to_bytearray(primary_target_temp) + payload += integer_to_bytearray(trimmer_target_temp) + payload += integer_to_bytearray(primary_heater_state) + payload += integer_to_bytearray(trimmer_heater_state) + payload += integer_to_bytearray(primary_efficiency) + payload += integer_to_bytearray(primary_calc_target_temp) + payload += integer_to_bytearray(trimmer_calc_current_temp) + payload += integer_to_bytearray(trimmer_use_last_dc) message = DenaliMessage.build_message(channel_id=DenaliChannels.dg_sync_broadcast_ch_id, message_id=MsgIds.MSG_ID_DG_HEATERS_DATA.value, payload=payload) self.can_interface.send(message, 0) - + def cmd_set_dg_load_cell_readings_data(self, reservoir1_primary: float, reservoir1_backup: float, reservoir2_primary: float, reservoir2_backup: float) -> None: """ @@ -651,7 +665,10 @@ def cmd_send_dg_conductivity_data(self, ro_rejection_ratio: float, cpi_conductivity: float, cpo_conductivity: float, cd1_conductivity: float, - cd2_conductivity: float) -> None: + cd2_conductivity: float, CPi_raw : float, CPo_raw:float, + CD1_raw: float, CD2_raw:float, CPi_sensor_status:int, + CPo_sensor_status : int, CD1_sensor_status:int, + CD2_sensor_status: int) -> None: """ A simulated DG broadcast message of conductivity data. @param ro_rejection_ratio: (float) RO Pump rejection ratio @@ -666,6 +683,14 @@ payload += float_to_bytearray(cpo_conductivity) payload += float_to_bytearray(cd1_conductivity) payload += float_to_bytearray(cd2_conductivity) + payload += float_to_bytearray(CPi_raw) + payload += float_to_bytearray(CPo_raw) + payload += float_to_bytearray(CD1_raw) + payload += float_to_bytearray(CD2_raw) + payload += integer_to_bytearray(CPi_sensor_status) + payload += integer_to_bytearray(CPo_sensor_status) + payload += integer_to_bytearray(CD1_sensor_status) + payload += integer_to_bytearray(CD2_sensor_status) message = DenaliMessage.build_message(channel_id=DenaliChannels.dg_sync_broadcast_ch_id, message_id=MsgIds.MSG_ID_DG_CONDUCTIVITY_DATA.value, Index: dialin/ui/hd_simulator.py =================================================================== diff -u -r2abf398a7fffa390c46f8d41403de44575ffd97e -rbc8b953306fc4a8a2bc97b6949081e8fbf9190e8 --- dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 2abf398a7fffa390c46f8d41403de44575ffd97e) +++ dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision bc8b953306fc4a8a2bc97b6949081e8fbf9190e8) @@ -229,7 +229,7 @@ self.logger.error("Not all rejections are enums.") return False - payload = bytearray() + payload = integer_to_bytearray(0) for rejection in rejections: payload += integer_to_bytearray(rejection.value) @@ -2009,6 +2009,38 @@ self.can_interface.send(message, 0) + def cmd_send_confirm_post_tx_next(self, accepted: int, reason: int): + """ + the HD response to the request from UI to continue after a post treatment review + @param accepted: boolean accepted or rejected + @param reason: the rejection reason + @return: None + """ + payload = integer_to_bytearray(accepted) + payload += integer_to_bytearray(reason) + + message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id, + message_id=MsgIds.MSG_ID_HD_POST_TX_NEXT_CMD_RESPONSE.value, + payload=payload) + + self.can_interface.send(message, 0) + + def cmd_send_heparin_response(self, syringePumpVolumeDelivered: float, syringePumpVolumeRequired: float): + """ + the HD response to the request from UI to continue after a post treatment review + @param accepted: boolean accepted or rejected + @param reason: the rejection reason + @return: None + """ + payload = float_to_bytearray(syringePumpVolumeDelivered) + payload += float_to_bytearray(syringePumpVolumeRequired) + + message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id, + message_id=MsgIds.MSG_ID_HD_HEPARIN_DATA.value, + payload=payload) + + self.can_interface.send(message, 0) + # ------------------------------------------------ GENERAL MESSAGES ------------------------------------------------ def cmd_send_hd_general_response(self, message_id: int, accepted: int, reason: int,