Index: leahi_dialin/dd/modules/dialysate_pump.py =================================================================== diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -r9dd43942f571c0f63e69e191b5b33b566a07c641 --- leahi_dialin/dd/modules/dialysate_pump.py (.../dialysate_pump.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) +++ leahi_dialin/dd/modules/dialysate_pump.py (.../dialysate_pump.py) (revision 9dd43942f571c0f63e69e191b5b33b566a07c641) @@ -58,25 +58,25 @@ dd_enum_repository.DDDialysatePumpAttributes.TARGET_RPM.name: 0.0, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_SPEED.name: 0.0, dd_enum_repository.DDDialysatePumpAttributes.CURRENT_SPEED.name: 0.0, - dd_enum_repository.DDDialysatePumpAttributes.STATE.name: 0.0, + dd_enum_repository.DDDialysatePumpAttributes.STATE.name: 0, dd_enum_repository.DDDialysatePumpAttributes.TARGET_PRESSURE.name: 0.0, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_PRESSURE.name: 0.0, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_CURRENT.name: 0.0, - dd_enum_repository.DDDialysatePumpAttributes.CONTROL.name: 0.0, - dd_enum_repository.DDDialysatePumpAttributes.DIRECTION_ERROR_COUNT.name: 0.0, - dd_enum_repository.DDDialysatePumpAttributes.MEASURED_DIRECTION.name: 0.0 + dd_enum_repository.DDDialysatePumpAttributes.CONTROL.name: 0, + dd_enum_repository.DDDialysatePumpAttributes.DIRECTION_ERROR_COUNT.name: 0, + dd_enum_repository.DDDialysatePumpAttributes.MEASURED_DIRECTION.name: 0 }, dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name: { dd_enum_repository.DDDialysatePumpAttributes.TARGET_RPM.name: 0.0, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_SPEED.name: 0.0, dd_enum_repository.DDDialysatePumpAttributes.CURRENT_SPEED.name: 0.0, - dd_enum_repository.DDDialysatePumpAttributes.STATE.name: 0.0, + dd_enum_repository.DDDialysatePumpAttributes.STATE.name: 0, dd_enum_repository.DDDialysatePumpAttributes.TARGET_PRESSURE.name: 0.0, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_PRESSURE.name: 0.0, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_CURRENT.name: 0.0, - dd_enum_repository.DDDialysatePumpAttributes.CONTROL.name: 0.0, - dd_enum_repository.DDDialysatePumpAttributes.DIRECTION_ERROR_COUNT.name: 0.0, - dd_enum_repository.DDDialysatePumpAttributes.MEASURED_DIRECTION.name: 0.0 + dd_enum_repository.DDDialysatePumpAttributes.CONTROL.name: 0, + dd_enum_repository.DDDialysatePumpAttributes.DIRECTION_ERROR_COUNT.name: 0, + dd_enum_repository.DDDialysatePumpAttributes.MEASURED_DIRECTION.name: 0 } } Index: leahi_dialin/dd/proxies/td_proxy.py =================================================================== diff -u -reb0906658a56741e5e0a092359143acda54538f5 -r9dd43942f571c0f63e69e191b5b33b566a07c641 --- leahi_dialin/dd/proxies/td_proxy.py (.../td_proxy.py) (revision eb0906658a56741e5e0a092359143acda54538f5) +++ leahi_dialin/dd/proxies/td_proxy.py (.../td_proxy.py) (revision 9dd43942f571c0f63e69e191b5b33b566a07c641) @@ -115,14 +115,18 @@ def cmd_td_send_dd_start_pre_gen_request(self, start: bool = 0, dialysate_rate: float = 0.0, dialysate_temp: float = 0.0, - acid_conv_factor: float = 0.0, bicarb_conv_factor: float = 0.0, sodium: int = 0, bicarb_volume: int = 0): + acid_conv_factor: float = 0.0, bicarb_conv_factor: float = 0.0, sodium: int = 0, bicarb_volume: int = 0, substitution_rate: float=0.0): """ - Constructs and sends a TD start pre gen dialysate request to the DD. - :param start: start and stop boolean - :param dialysate_rate: dialysate rate in ml/min - :param dialysate_temp: dialysate temp in c - :param acid_type: acid type - :param bicarb_type: bicarb type + Constructs and sends a TD start pre gen dialysate request to the DD. + + :param start: (Boolean) start and stop boolean + :param dialysate_rate: (Float) dialysate rate in ml/min + :param dialysate_temp: (Float) dialysate temp in c + :param acid_conv_factor: (Float) acid conversion factor + :param bicarb_conv_factor: (Float) bicarb conversion factor + :param sodium: (Integer) bicarb conversion factor + :param bicarb_volume: (Integer) bicarb volume + :param substitution_rate: (Float) substitution rate :return: """ stt = integer_to_bytearray(start) @@ -132,7 +136,8 @@ bic = float_to_bytearray(bicarb_conv_factor) sod = integer_to_bytearray(sodium) bvl = integer_to_bytearray(bicarb_volume) - payload = stt + dial + temp + acd + bic + sod + bvl + sub = float_to_bytearray(substitution_rate) + payload = stt + dial + temp + acd + bic + sod + bvl + sub cmd_generic_override(payload = payload, reset = None,