Index: leahi_dialin/ui/td_messaging.py =================================================================== diff -u -rb4d3a3f424d8038c4970c3c904ebc0c546ea6de8 -r09f9ad071f896bcd683045f55f067a2a7c901b7c --- leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision b4d3a3f424d8038c4970c3c904ebc0c546ea6de8) +++ leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 09f9ad071f896bcd683045f55f067a2a7c901b7c) @@ -508,14 +508,14 @@ def td_isolated_uf( self, duration : int , - volume_goal : int , + set_volume : int , volume_delivered : int , rate : int ): """ Broadcasts the current TD Ultrafiltration data (Msg ID: 0x3E, 62) Args: @param duration (int) : isolated UF duration (min) - @param volume_goal (int) : isolated UF volume goal (mL) + @param set_volume (int) : isolated UF set volume (mL) @param volume_delivered (int) : isolated UF volume delivered (mL) @param rate (int) : isolated UF rate (mL/Hr) @return: None @@ -524,7 +524,7 @@ raise ValueError("CAN Interface is not enabled") payload = conversions.unsigned_integer_to_bytearray(duration ) - payload += conversions.unsigned_integer_to_bytearray(volume_goal ) + payload += conversions.unsigned_integer_to_bytearray(set_volume ) payload += conversions.unsigned_integer_to_bytearray(volume_delivered ) payload += conversions.unsigned_integer_to_bytearray(rate ) @@ -1218,22 +1218,22 @@ payload=payload) self.can_interface.send(message, 0) - def td_duration_validate_response(self, vRejectionReason: int, vDuration: int, vUFVolumeGoal: float, vUFRate: float): + def td_duration_validate_response(self, vRejectionReason: int, vDuration: int, vUFVolume: float, vUFRate: float): """ the duration validate response message method(Msg ID: 0x84, 132) Args: - @param vRejectionReason (int) : response rejection reason, - if rejection reason is 0, then accepted (0) will be sent, - otherwise rejected (1) - @param vDuration (int) : treatment duration (min) - @param vUFVolumeGoal (float) : UF volume goal (mL) - @param vUFRate (float) : UF rate (L/hr) + @param vRejectionReason (int) : response rejection reason, + if rejection reason is 0, then accepted (0) will be sent, + otherwise rejected (1) + @param vDuration (int) : treatment duration (min) + @param vUFVolume (float) : UF volume goal (mL) + @param vUFRate (float) : UF rate (L/hr) @return: None """ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0 ) payload += conversions.integer_to_bytearray(vRejectionReason ) payload += conversions.integer_to_bytearray(vDuration ) - payload += conversions.float_to_bytearray(vUFVolumeGoal ) + payload += conversions.float_to_bytearray(vUFVolume ) payload += conversions.float_to_bytearray(vUFRate ) message = CAN.DenaliMessage.build_message( @@ -1287,19 +1287,19 @@ self.can_interface.send(message, 0) - def td_isolated_uf_duration_change_response(self, vRejectionReason: int, vVolumeGoalMax: int): + def td_isolated_uf_duration_change_response(self, vRejectionReason: int, vVolumeMax: int): """ the isolated uf duration change response message (msg id: 0x9C, 156) args: @param vRejectionReason (int) : response rejection reason, if rejection reason is 0, then accepted (0) will be sent, otherwise rejected (1) - @param vVolmeGoalMax (int) : volume goal maximum (mL) + @param vVolmeMax (int) : volume goal maximum (mL) @return: none """ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0 ) payload += conversions.integer_to_bytearray(vRejectionReason ) - payload += conversions.integer_to_bytearray(vVolumeGoalMax ) + payload += conversions.integer_to_bytearray(vVolumeMax ) message = CAN.DenaliMessage.build_message( channel_id=CAN.DenaliChannels.td_to_ui_ch_id, @@ -1308,21 +1308,21 @@ self.can_interface.send(message, 0) - def td_isolated_uf_volume_goal_change_response(self, vRejectionReason: int, vVolumeGoal: int, vDuration: int, vRate: int): + def td_isolated_uf_volume_change_response(self, vRejectionReason: int, vVolume: int, vDuration: int, vRate: int): """ the isolated uf volume goal change response message (msg id: 0x9E, 158) args: @param vRejectionReason (int) : response rejection reason, if rejection reason is 0, then accepted (0) will be sent, otherwise rejected (1) - @param vVolmeGoal (int) : volume goal (mL) + @param vVolme (int) : volume (mL) @param vDuration (int) : duration (min) @param vRate (int) : rate (mL/Hr) @return: none """ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0 ) payload += conversions.integer_to_bytearray(vRejectionReason ) - payload += conversions.integer_to_bytearray(vVolumeGoal ) + payload += conversions.integer_to_bytearray(vVolume ) payload += conversions.integer_to_bytearray(vDuration ) payload += conversions.integer_to_bytearray(vRate )