Index: DG/DialysateGenerator.py =================================================================== diff -u -r0da0106eca868b9144298c60911710b3414a5837 -ref59d2c0f0dc5aadfde4ad50554d5c686dd4c0d1 --- DG/DialysateGenerator.py (.../DialysateGenerator.py) (revision 0da0106eca868b9144298c60911710b3414a5837) +++ DG/DialysateGenerator.py (.../DialysateGenerator.py) (revision ef59d2c0f0dc5aadfde4ad50554d5c686dd4c0d1) @@ -101,8 +101,8 @@ TODO: This is built based on HD but needs more infrastructure made for DG before being operational """ - rst = self.outer_instance.integer_to_byte_array(reset) - cur = self.outer_instance.float_to_byte_array(adc_raw) + rst = self.outer_instance.integer_to_bytearray(reset) + cur = self.outer_instance.float_to_bytearray(adc_raw) payload = rst + cur message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -141,8 +141,8 @@ TODO: This is built based on HD but needs more infrastructure made for DG before being operational """ - rst = self.outer_instance.integer_to_byte_array(reset) - cur = self.outer_instance.float_to_byte_array(adc_raw) + rst = self.outer_instance.integer_to_bytearray(reset) + cur = self.outer_instance.float_to_bytearray(adc_raw) payload = rst + cur message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -181,8 +181,8 @@ TODO: This is built based on HD but needs more infrastructure made for DG before being operational """ - rst = self.outer_instance.integer_to_byte_array(reset) - cur = self.outer_instance.float_to_byte_array(adc_raw) + rst = self.outer_instance.integer_to_bytearray(reset) + cur = self.outer_instance.float_to_bytearray(adc_raw) payload = rst + cur message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -221,8 +221,8 @@ TODO: This is built based on HD but needs more infrastructure made for DG before being operational """ - rst = self.outer_instance.integer_to_byte_array(reset) - cur = self.outer_instance.float_to_byte_array(adc_raw) + rst = self.outer_instance.integer_to_bytearray(reset) + cur = self.outer_instance.float_to_bytearray(adc_raw) payload = rst + cur message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, Index: HD/Alarms.py =================================================================== diff -u -r0da0106eca868b9144298c60911710b3414a5837 -ref59d2c0f0dc5aadfde4ad50554d5c686dd4c0d1 --- HD/Alarms.py (.../Alarms.py) (revision 0da0106eca868b9144298c60911710b3414a5837) +++ HD/Alarms.py (.../Alarms.py) (revision ef59d2c0f0dc5aadfde4ad50554d5c686dd4c0d1) @@ -1,7 +1,7 @@ from DialIn.CoreCANProtocol import (DenaliMessage, DenaliChannels) import struct -from utils import integer_to_byte_array, RESET +from utils import integer_to_bytearray, RESET class HDAlarms: @@ -135,9 +135,9 @@ \returns 1 if successful, zero otherwise """ - rst = integer_to_byte_array(reset) - sta = integer_to_byte_array(state) - alm = integer_to_byte_array(alarm) + rst = integer_to_bytearray(reset) + sta = integer_to_bytearray(state) + alm = integer_to_bytearray(alarm) payload = rst + sta + alm message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -174,9 +174,9 @@ \returns 1 if successful, zero otherwise """ - rst = integer_to_byte_array(reset) - ms = integer_to_byte_array(time_ms) - alm = integer_to_byte_array(alarm) + rst = integer_to_bytearray(reset) + ms = integer_to_bytearray(time_ms) + alm = integer_to_bytearray(alarm) payload = rst + ms + alm message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -220,8 +220,8 @@ 5 = low \n 6 = manual """ - rst = integer_to_byte_array(reset) - pat = integer_to_byte_array(pattern) + rst = integer_to_bytearray(reset) + pat = integer_to_bytearray(pattern) payload = rst + pat message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, Index: HD/BloodFlow.py =================================================================== diff -u -r0da0106eca868b9144298c60911710b3414a5837 -ref59d2c0f0dc5aadfde4ad50554d5c686dd4c0d1 --- HD/BloodFlow.py (.../BloodFlow.py) (revision 0da0106eca868b9144298c60911710b3414a5837) +++ HD/BloodFlow.py (.../BloodFlow.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 @@ -121,8 +121,8 @@ \returns 1 if successful, zero otherwise """ - rst = integer_to_byte_array(reset) - flo = integer_to_byte_array(flow) + rst = integer_to_bytearray(reset) + flo = integer_to_bytearray(flow) payload = rst + flo message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -159,8 +159,8 @@ \returns 1 if successful, zero otherwise """ - rst = integer_to_byte_array(reset) - flo = float_to_byte_array(flow) + rst = integer_to_bytearray(reset) + flo = float_to_bytearray(flow) payload = rst + flo message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -197,8 +197,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, @@ -234,8 +234,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, @@ -272,8 +272,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, @@ -310,8 +310,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, @@ -347,8 +347,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, Index: HD/Buttons.py =================================================================== diff -u -r0da0106eca868b9144298c60911710b3414a5837 -ref59d2c0f0dc5aadfde4ad50554d5c686dd4c0d1 --- HD/Buttons.py (.../Buttons.py) (revision 0da0106eca868b9144298c60911710b3414a5837) +++ HD/Buttons.py (.../Buttons.py) (revision ef59d2c0f0dc5aadfde4ad50554d5c686dd4c0d1) @@ -1,7 +1,7 @@ from DialIn.CoreCANProtocol import (DenaliMessage, DenaliChannels) -from utils import integer_to_byte_array, RESET +from utils import integer_to_bytearray, RESET class HDButtons: @@ -33,8 +33,8 @@ \returns 1 if successful, zero otherwise """ - rst = integer_to_byte_array(reset) - sta = integer_to_byte_array(state) + rst = integer_to_bytearray(reset) + sta = integer_to_bytearray(state) payload = rst + sta message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -70,8 +70,8 @@ \returns 1 if successful, zero otherwise """ - rst = integer_to_byte_array(reset) - sta = integer_to_byte_array(state) + rst = integer_to_bytearray(reset) + sta = integer_to_bytearray(state) payload = rst + sta message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, Index: HD/DialysateInletFlow.py =================================================================== diff -u -r0da0106eca868b9144298c60911710b3414a5837 -ref59d2c0f0dc5aadfde4ad50554d5c686dd4c0d1 --- HD/DialysateInletFlow.py (.../DialysateInletFlow.py) (revision 0da0106eca868b9144298c60911710b3414a5837) +++ HD/DialysateInletFlow.py (.../DialysateInletFlow.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, NO_RESET +from utils import integer_to_bytearray, float_to_bytearray, RESET, NO_RESET import struct @@ -116,8 +116,8 @@ \returns 1 if successful, zero otherwise """ - rst = integer_to_byte_array(reset) - flo = integer_to_byte_array(flow) + rst = integer_to_bytearray(reset) + flo = integer_to_bytearray(flow) payload = rst + flo message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -154,8 +154,8 @@ \returns 1 if successful, zero otherwise """ - rst = integer_to_byte_array(reset) - flo = float_to_byte_array(flow) + rst = integer_to_bytearray(reset) + flo = float_to_bytearray(flow) payload = rst + flo message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -192,8 +192,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, @@ -229,8 +229,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, @@ -267,8 +267,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, @@ -305,8 +305,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, @@ -342,8 +342,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, 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, Index: HD/HemodialysisDevice.py =================================================================== diff -u -rc652777ecb913a96a3bd61ca0bb0c062091f45e3 -ref59d2c0f0dc5aadfde4ad50554d5c686dd4c0d1 --- HD/HemodialysisDevice.py (.../HemodialysisDevice.py) (revision c652777ecb913a96a3bd61ca0bb0c062091f45e3) +++ HD/HemodialysisDevice.py (.../HemodialysisDevice.py) (revision ef59d2c0f0dc5aadfde4ad50554d5c686dd4c0d1) @@ -27,7 +27,7 @@ from Treatment import HDTreatment from Basics import HDBasics from PressureOcclusion import HDPressureOcclusion -from utils import integer_to_byte_array, RESET, NO_RESET +from utils import integer_to_bytearray, RESET, NO_RESET from DialIn.CoreCANProtocol import (DenaliMessage, DenaliChannels) @@ -67,12 +67,12 @@ Sends a test can message \param seq: the starting integer of the sequence """ - zero = integer_to_byte_array(0) - seq1 = integer_to_byte_array(seq) - seq2 = integer_to_byte_array(seq + 1) - seq3 = integer_to_byte_array(seq + 2) - seq4 = integer_to_byte_array(seq + 3) - seq5 = integer_to_byte_array(seq + 4) + zero = integer_to_bytearray(0) + seq1 = integer_to_bytearray(seq) + seq2 = integer_to_bytearray(seq + 1) + seq3 = integer_to_bytearray(seq + 2) + seq4 = integer_to_bytearray(seq + 3) + seq5 = integer_to_bytearray(seq + 4) payload = seq1 + zero + seq2 + zero + seq3 + zero + seq4 + zero + seq5 Index: HD/PressureOcclusion.py =================================================================== diff -u -r0da0106eca868b9144298c60911710b3414a5837 -ref59d2c0f0dc5aadfde4ad50554d5c686dd4c0d1 --- HD/PressureOcclusion.py (.../PressureOcclusion.py) (revision 0da0106eca868b9144298c60911710b3414a5837) +++ HD/PressureOcclusion.py (.../PressureOcclusion.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 @@ -105,8 +105,8 @@ \returns 1 if successful, zero otherwise """ - rst = integer_to_byte_array(reset) - prs = float_to_byte_array(pres) + rst = integer_to_bytearray(reset) + prs = float_to_bytearray(pres) payload = rst + prs message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -142,8 +142,8 @@ \returns 1 if successful, zero otherwise """ - rst = integer_to_byte_array(reset) - prs = float_to_byte_array(pres) + rst = integer_to_bytearray(reset) + prs = float_to_bytearray(pres) payload = rst + prs message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -178,8 +178,8 @@ \returns 1 if successful, zero otherwise """ - rst = integer_to_byte_array(reset) - occ = float_to_byte_array(occl) + rst = integer_to_bytearray(reset) + occ = float_to_bytearray(occl) payload = rst + occ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -215,8 +215,8 @@ \returns 1 if successful, zero otherwise """ - rst = integer_to_byte_array(reset) - occ = float_to_byte_array(occl) + rst = integer_to_bytearray(reset) + occ = float_to_bytearray(occl) payload = rst + occ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -252,8 +252,8 @@ \returns 1 if successful, zero otherwise """ - rst = integer_to_byte_array(reset) - occ = float_to_byte_array(occl) + rst = integer_to_bytearray(reset) + occ = float_to_bytearray(occl) payload = rst + occ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -288,8 +288,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, Index: HD/RTC.py =================================================================== diff -u -r0da0106eca868b9144298c60911710b3414a5837 -ref59d2c0f0dc5aadfde4ad50554d5c686dd4c0d1 --- HD/RTC.py (.../RTC.py) (revision 0da0106eca868b9144298c60911710b3414a5837) +++ HD/RTC.py (.../RTC.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 ctypes @@ -73,7 +73,7 @@ hour = bytes([hours]) day = bytes([days]) month = bytes([months]) - year = integer_to_byte_array(years) + year = integer_to_bytearray(years) payload = sec + min + hour + day + month + year message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, 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, Index: HD/Watchdog.py =================================================================== diff -u -r0da0106eca868b9144298c60911710b3414a5837 -ref59d2c0f0dc5aadfde4ad50554d5c686dd4c0d1 --- HD/Watchdog.py (.../Watchdog.py) (revision 0da0106eca868b9144298c60911710b3414a5837) +++ HD/Watchdog.py (.../Watchdog.py) (revision ef59d2c0f0dc5aadfde4ad50554d5c686dd4c0d1) @@ -16,7 +16,7 @@ ############################################################################ from DialIn.CoreCANProtocol import (DenaliMessage, DenaliChannels) -from utils import integer_to_byte_array, RESET +from utils import integer_to_bytearray, RESET class HDWatchdog: @@ -50,9 +50,9 @@ \returns 1 if successful, zero otherwise """ - rst = integer_to_byte_array(reset) - sta = integer_to_byte_array(state) - tsk = integer_to_byte_array(task) + rst = integer_to_bytearray(reset) + sta = integer_to_bytearray(state) + tsk = integer_to_bytearray(task) payload = rst + sta + tsk message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, Index: HD/utils.py =================================================================== diff -u -r0da0106eca868b9144298c60911710b3414a5837 -ref59d2c0f0dc5aadfde4ad50554d5c686dd4c0d1 --- HD/utils.py (.../utils.py) (revision 0da0106eca868b9144298c60911710b3414a5837) +++ HD/utils.py (.../utils.py) (revision ef59d2c0f0dc5aadfde4ad50554d5c686dd4c0d1) @@ -5,7 +5,7 @@ RESET = 1 -def integer_to_byte_array(val): +def integer_to_bytearray(val): """ Converts an integer value into a byte array (little endian) @@ -18,7 +18,7 @@ return b -def float_to_byte_array(val): +def float_to_bytearray(val): """ Converts a float value into a byte array (little endian)