Index: HD/DialysateOutletFlow.py =================================================================== diff -u -r0da0106eca868b9144298c60911710b3414a5837 -ref59d2c0f0dc5aadfde4ad50554d5c686dd4c0d1 --- HD/DialysateOutletFlow.py (.../DialysateOutletFlow.py) (revision 0da0106eca868b9144298c60911710b3414a5837) +++ HD/DialysateOutletFlow.py (.../DialysateOutletFlow.py) (revision ef59d2c0f0dc5aadfde4ad50554d5c686dd4c0d1) @@ -16,7 +16,7 @@ ############################################################################ from DialIn.CoreCANProtocol import (DenaliMessage, DenaliChannels) -from utils import integer_to_byte_array, float_to_byte_array, RESET +from utils import integer_to_bytearray, float_to_bytearray, RESET import struct @@ -117,8 +117,8 @@ \returns 1 if successful, zero otherwise """ - rst = integer_to_byte_array(reset) - vol = float_to_byte_array(refVol) + rst = integer_to_bytearray(reset) + vol = float_to_bytearray(refVol) payload = rst + vol message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -155,8 +155,8 @@ \returns 1 if successful, zero otherwise """ - rst = integer_to_byte_array(reset) - vol = float_to_byte_array(measVol) + rst = integer_to_bytearray(reset) + vol = float_to_bytearray(measVol) payload = rst + vol message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -193,8 +193,8 @@ \returns 1 if successful, zero otherwise """ - rst = integer_to_byte_array(reset) - spd = float_to_byte_array(speed) + rst = integer_to_bytearray(reset) + spd = float_to_bytearray(speed) payload = rst + spd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -230,8 +230,8 @@ \returns 1 if successful, zero otherwise """ - rst = integer_to_byte_array(reset) - cur = float_to_byte_array(curr) + rst = integer_to_bytearray(reset) + cur = float_to_bytearray(curr) payload = rst + cur message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -268,8 +268,8 @@ \returns 1 if successful, zero otherwise """ - rst = integer_to_byte_array(reset) - spd = float_to_byte_array(speed) + rst = integer_to_bytearray(reset) + spd = float_to_bytearray(speed) payload = rst + spd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -306,8 +306,8 @@ \returns 1 if successful, zero otherwise """ - rst = integer_to_byte_array(reset) - spd = float_to_byte_array(speed) + rst = integer_to_bytearray(reset) + spd = float_to_bytearray(speed) payload = rst + spd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -343,8 +343,8 @@ \returns 1 if successful, zero otherwise """ - rst = integer_to_byte_array(reset) - mis = integer_to_byte_array(ms) + rst = integer_to_bytearray(reset) + mis = integer_to_bytearray(ms) payload = rst + mis message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -387,9 +387,9 @@ 3 = reservoir 2 backup \n """ - rst = integer_to_byte_array(reset) - spd = float_to_byte_array(weight) - sen = integer_to_byte_array(sensor) + rst = integer_to_bytearray(reset) + spd = float_to_bytearray(weight) + sen = integer_to_bytearray(sensor) payload = rst + spd + sen message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -427,10 +427,10 @@ \returns 0 - no response will come from HD for this message """ - r1pb = float_to_byte_array(r1p) - r1bb = float_to_byte_array(r1b) - r2pb = float_to_byte_array(r2p) - r2bb = float_to_byte_array(r2b) + r1pb = float_to_bytearray(r1p) + r1bb = float_to_bytearray(r1b) + r2pb = float_to_bytearray(r2p) + r2bb = float_to_bytearray(r2b) payload = r1pb + r1bb + r2pb + r2bb message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,