Index: HD/UI.py =================================================================== diff -u -rc652777ecb913a96a3bd61ca0bb0c062091f45e3 -ref59d2c0f0dc5aadfde4ad50554d5c686dd4c0d1 --- HD/UI.py (.../UI.py) (revision c652777ecb913a96a3bd61ca0bb0c062091f45e3) +++ HD/UI.py (.../UI.py) (revision ef59d2c0f0dc5aadfde4ad50554d5c686dd4c0d1) @@ -16,7 +16,7 @@ ############################################################################ from DialIn.CoreCANProtocol import (DenaliMessage, DenaliChannels) -from utils import integer_to_byte_array, float_to_byte_array +from utils import integer_to_bytearray, float_to_bytearray import struct @@ -303,7 +303,7 @@ \returns none """ - payload = integer_to_byte_array(cmd) + payload = integer_to_bytearray(cmd) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, message_id=self.MSG_ID_HD_UF_PAUSE_RESUME_REQUEST, payload=payload) @@ -330,7 +330,7 @@ # reset response to this command so we can tell when response is received self.UFChangeResponse = None # build command message - volume = float_to_byte_array(vol * self.LITER_TO_ML_CONVERSION_FACTOR) + volume = float_to_bytearray(vol * self.LITER_TO_ML_CONVERSION_FACTOR) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, message_id=self.MSG_ID_UF_SETTINGS_CHANGE_REQUEST_BY_USER, payload=volume) @@ -355,8 +355,8 @@ self.UFChangeResponse = None # build command message - volume = float_to_byte_array(vol * self.LITER_TO_ML_CONVERSION_FACTOR) - adjust = integer_to_byte_array(adj) + volume = float_to_bytearray(vol * self.LITER_TO_ML_CONVERSION_FACTOR) + adjust = integer_to_bytearray(adj) payload = volume + adjust message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, message_id=self.MSG_ID_UF_SETTINGS_CHANGE_REQUEST_BY_USER, @@ -380,10 +380,10 @@ \returns none """ - resp = integer_to_byte_array(response) - volume = float_to_byte_array(vol * self.LITER_TO_ML_CONVERSION_FACTOR) - min = integer_to_byte_array(tm) - ufRate = float_to_byte_array(rate) + resp = integer_to_bytearray(response) + volume = float_to_bytearray(vol * self.LITER_TO_ML_CONVERSION_FACTOR) + min = integer_to_bytearray(tm) + ufRate = float_to_bytearray(rate) payload = resp + volume + min + ufRate message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, message_id=self.MSG_ID_UF_SETTINGS_CHANGE_CONFIRMED_BY_USER, @@ -404,7 +404,7 @@ \returns none """ - payload = integer_to_byte_array(timeMin) + payload = integer_to_bytearray(timeMin) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, message_id=self.MSG_ID_TREATMENT_DURATION_SETTING_CHANGE_REQUEST, payload=payload) @@ -426,8 +426,8 @@ \returns none """ - bld = integer_to_byte_array(bloodFlow) - dial = integer_to_byte_array(dialFlow) + bld = integer_to_bytearray(bloodFlow) + dial = integer_to_bytearray(dialFlow) payload = bld + dial message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, message_id=self.MSG_ID_BLOOD_DIALYSATE_FLOW_SETTING_CHANGE_REQUEST_BY_USER,