Index: HD/Buttons.py =================================================================== diff -u -r082ea4c8b0c6a3c804453308990d0bb98a0a2156 -r0da0106eca868b9144298c60911710b3414a5837 --- HD/Buttons.py (.../Buttons.py) (revision 082ea4c8b0c6a3c804453308990d0bb98a0a2156) +++ HD/Buttons.py (.../Buttons.py) (revision 0da0106eca868b9144298c60911710b3414a5837) @@ -1,8 +1,7 @@ from DialIn.CoreCANProtocol import (DenaliMessage, DenaliChannels) -from .utils import integer2ByteArray -from .HemodialysisDevice import HD +from utils import integer_to_byte_array, RESET class HDButtons: @@ -12,7 +11,7 @@ \brief Hemodialysis Device (HD) Dialin API sub-class for button related commands. """ - # Buttons message IDs + # buttons message IDs MSG_ID_HD_OFF_BUTTON_OVERRIDE = 0x8002 MSG_ID_HD_STOP_BUTTON_OVERRIDE = 0x8003 @@ -22,6 +21,7 @@ \param can_interface: the denali can interface object """ + self.can_interface = can_interface def cmd_off_button_override(self, reset, state): @@ -33,8 +33,8 @@ \returns 1 if successful, zero otherwise """ - rst = integer2ByteArray(reset) - sta = integer2ByteArray(state) + rst = integer_to_byte_array(reset) + sta = integer_to_byte_array(state) payload = rst + sta message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -48,7 +48,7 @@ # If there is content... if received_message is not None: - if reset == HD.RESET: + if reset == RESET: str_res = "reset back to normal" else: str_res = ("pressed" if state != 0 else "released") @@ -70,8 +70,8 @@ \returns 1 if successful, zero otherwise """ - rst = integer2ByteArray(reset) - sta = integer2ByteArray(state) + rst = integer_to_byte_array(reset) + sta = integer_to_byte_array(state) payload = rst + sta message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -85,7 +85,7 @@ # If there is content... if received_message is not None: - if reset == HD.RESET: + if reset == RESET: str_res = "reset back to normal" else: str_res = ("pressed" if state != 0 else "released")