Index: leahi_dialin/dd/modules/pre_gen_dialysate.py =================================================================== diff -u -r84343d0460bb04169cf6fedb023b5eaf332bfc65 -r9301b6eaa48b8c912538c472f611a7cc790b97d3 --- leahi_dialin/dd/modules/pre_gen_dialysate.py (.../pre_gen_dialysate.py) (revision 84343d0460bb04169cf6fedb023b5eaf332bfc65) +++ leahi_dialin/dd/modules/pre_gen_dialysate.py (.../pre_gen_dialysate.py) (revision 9301b6eaa48b8c912538c472f611a7cc790b97d3) @@ -55,6 +55,13 @@ self.execution_state = 0 self.pre_gen_state_timestamp = 0 + self.pre_gen_request_timestamp = 0 + self.pre_gen_start = 0 + self.pre_gen_dial_rate = 0.0 + self.pre_gen_dial_temp = 0.0 + self.pre_gen_acid = 0 + self.pre_gen_bicarb = 0 + def _handler_pre_gen_state_sync(self, message, timestamp=0.0): """ Handles published pre gen dialysate data messages. @@ -68,6 +75,28 @@ self.pre_gen_state_timestamp = timestamp + + def _handler_pre_gen_request_sync(self, message, timestamp=0.0): + """ + Handles published pre gen dialysate request messages. + + @param message: published pre gen dialysate request message + @return: None + """ + + self.pre_gen_start = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] + self.pre_gen_dial_rate = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] + self.pre_gen_dial_temp = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] + self.pre_gen_acid = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] + self.pre_gen_bicarb = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] + + self.pre_gen_request_timestamp = timestamp + def cmd_pre_gen_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the broadcast time interval override for pre gen dialysate data.