Index: leahi_dialin/ui/dd_messaging.py =================================================================== diff -u -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df -r84e4345fc09b9796d6430c49f11cc2b0a1e33522 --- leahi_dialin/ui/dd_messaging.py (.../dd_messaging.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) +++ leahi_dialin/ui/dd_messaging.py (.../dd_messaging.py) (revision 84e4345fc09b9796d6430c49f11cc2b0a1e33522) @@ -60,45 +60,33 @@ self.can_interface.send(message, 0) def dd_gen_dialysate(self, - gen_dialysate_exec : int , - dd_in_progress : int , - D6_floater_level_1 : int , - D63_bicarb_level : int , - D46_spent_level : int , - D9_hyd_negative_press : float , - D18_hyd_positive_press : float , - D51_spend_pressure : float , - is_dial_good : int ): + gen_dialysate_exec : int , + dd_in_progress : int , + is_dial_good : int , + currentQd : float ): + """ Broadcasts DD generate dialysate data (Msg ID: 0x2F, 47) Args: @param gen_dialysate_exec (int ): Generate dialysate execution state @param dd_in_progress (int ): Dialysate Delivery in Progress Bool - @param D6_floater_level_1 (int ): Floater level (low, medium and high) - @param D63_bicarb_level (int ): BiCarb Chamber level - @param D46_spent_level (int ): Spent dialysate chamber level - @param D9_hyd_negative_press (float): Hydraulics chamber negative pressure - @param D18_hyd_positive_press (float): Hydraulics chamber positive pressure - @param D51_spend_pressure (float): Spent Dialysate positive pressure @param is_dial_good (int ): Ready to deliver dialysate or not + @param currentQd (float): Current dialysate flow rate (ml/min) + @return: None """ payload = conversions.unsigned_integer_to_bytearray(gen_dialysate_exec ) payload += conversions.unsigned_integer_to_bytearray(dd_in_progress ) - payload += conversions.unsigned_integer_to_bytearray(D6_floater_level_1 ) - payload += conversions.unsigned_integer_to_bytearray(D63_bicarb_level ) - payload += conversions.unsigned_integer_to_bytearray(D46_spent_level ) - payload += conversions.float_to_bytearray (D9_hyd_negative_press ) - payload += conversions.float_to_bytearray (D18_hyd_positive_press ) - payload += conversions.float_to_bytearray (D51_spend_pressure ) payload += conversions.unsigned_integer_to_bytearray(is_dial_good ) + payload += conversions.float_to_bytearray (currentQd ) message = CAN.DenaliMessage.build_message( channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_GEN_DIALYSATE_MODE_DATA.value, payload=payload) self.can_interface.send(message, 0) + def dd_versions(self, major: int, minor: int, micro: int, build: int, fpga_id: int, fpga_major: int, fpga_minor: int, fpga_lab: int,