Index: leahi_dialin/ui/dd_messaging.py =================================================================== diff -u -r71ac3afa8dddb9ce74c9de0a508e76467f1dcc3a -r5a50ff3c3ba355fffc616bfc85eb7b312b58b702 --- leahi_dialin/ui/dd_messaging.py (.../dd_messaging.py) (revision 71ac3afa8dddb9ce74c9de0a508e76467f1dcc3a) +++ leahi_dialin/ui/dd_messaging.py (.../dd_messaging.py) (revision 5a50ff3c3ba355fffc616bfc85eb7b312b58b702) @@ -59,37 +59,37 @@ self.can_interface.send(message, 0) def dd_gen_dialysate(self, - GenDExec : int , - isDDInPrg : int , - FltLevel1 : int , - BiCarbLvl : int , - SpentLvl : int , - HydNegPres : float , - HydPosPres : float , - SpentPress : float , - IsDialGood : int ): + gen_dialysate_exec : int , + dd_in_progress : int , + D6_level : int , + D63_level : int , + D46_level : int , + D9_pressure : float , + D18_pressure : float , + D51_pressure : float , + is_dial_good : int ): """ Broadcasts DD generate dialysate data - @param GenDExec (int ): Generate dialysate execution state - @param isDDInPrg (int ): Dialysate Delivery in Progress Bool - @param FltLevel1 (int ): Floater level (low, medium and high) - @param BiCarbLvl (int ): BiCarb Chamber level - @param SpentLvl (int ): Spent dialysate chamber level - @param HydNegPres (float): Hydraulics chamber negative pressure - @param HydPosPres (float): Hydraulics chamber positive pressure - @param SpentPress (float): Spent Dialysate positive pressure - @param IsDialGood (int ): Ready to deliver dialysate or not + @param gen_dialysate_exec (int ): Generate dialysate execution state + @param dd_in_progress (int ): Dialysate Delivery in Progress Bool + @param D6_level (int ): Floater level (low, medium and high) + @param D63_level (int ): BiCarb Chamber level + @param D46_level (int ): Spent dialysate chamber level + @param D9_pressure (float): Hydraulics chamber negative pressure + @param D18_pressure (float): Hydraulics chamber positive pressure + @param D51_pressure (float): Spent Dialysate positive pressure + @param is_dial_good (int ): Ready to deliver dialysate or not @return: None """ - payload = conversions.unsigned_integer_to_bytearray(GenDExec ) - payload += conversions.unsigned_integer_to_bytearray(isDDInPrg ) - payload += conversions.unsigned_integer_to_bytearray(FltLevel1 ) - payload += conversions.unsigned_integer_to_bytearray(BiCarbLvl ) - payload += conversions.unsigned_integer_to_bytearray(SpentLvl ) - payload += conversions.float_to_bytearray (HydNegPres ) - payload += conversions.float_to_bytearray (HydPosPres ) - payload += conversions.float_to_bytearray (SpentPress ) - payload += conversions.unsigned_integer_to_bytearray(IsDialGood ) + 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_level ) + payload += conversions.unsigned_integer_to_bytearray(D63_level ) + payload += conversions.unsigned_integer_to_bytearray(D46_level ) + payload += conversions.float_to_bytearray (D9_pressure ) + payload += conversions.float_to_bytearray (D18_pressure ) + payload += conversions.float_to_bytearray (D51_pressure ) + payload += conversions.unsigned_integer_to_bytearray(is_dial_good ) message = CAN.DenaliMessage.build_message( channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id,