Index: HD_DialOutFlow.py =================================================================== diff -u -re0254e59354475c1e7c95ac4c0ff033a33d98fd7 -rf1a95e42324e7f6da895039e4863db6af49bf0d2 --- HD_DialOutFlow.py (.../HD_DialOutFlow.py) (revision e0254e59354475c1e7c95ac4c0ff033a33d98fd7) +++ HD_DialOutFlow.py (.../HD_DialOutFlow.py) (revision f1a95e42324e7f6da895039e4863db6af49bf0d2) @@ -15,7 +15,7 @@ PAUSE = 2 -class HD_DialOut: +class HDDialOut: """ Encapsulates command for testing dialout flow module. """ @@ -34,14 +34,14 @@ def __init__(self, can_interface): """ - Constructor for the HD_Dialout class + Constructor for the HDDialOut class \param can_interface: reference to DenaliMessenger """ self.__can_interface = can_interface - self.__can_interface.registerReceivingPublicationFunction(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, - message_id=self.MSG_ID_DIALYSATE_UF_DATA, - function=self.receiveDialysateUFDataHandler) + self.__can_interface.register_receiving_publication_function(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, + message_id=self.MSG_ID_DIALYSATE_UF_DATA, + function=self.receiveDialysateUFDataHandler) ## DialOutBroadcast a dictionary storing latest broadcast values of the following keys: # state, target_volume, measured_volume, pwm, motor_current, motor_speed. self.DialOutBroadcast = {'target_volume': 0, @@ -70,15 +70,15 @@ if new_state in self.DIALOUT_STATES: payload = [new_state.value] - msg = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_SET_DIALOUT_FLOW_STATE, - payload=payload) + msg = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_SET_DIALOUT_FLOW_STATE, + payload=payload) received_msg = self.__can_interface.send(msg) else: print("Argument to setUFState method are incorrect", file=sys.stderr) if received_msg is not None: - return_value = True if DenaliMessage.getPayload(received_msg)[0] == 1 else False + return_value = True if DenaliMessage.get_payload(received_msg)[0] == 1 else False return return_value @@ -100,16 +100,16 @@ payload += list(rx_time_min.to_bytes(2, byteorder=DenaliMessage.BYTE_ORDER, signed=False)) payload += list(rx_flow_rate.to_bytes(2, byteorder=DenaliMessage.BYTE_ORDER, signed=False)) - msg = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_SET_DIALOUT_FLOW_RX, - payload=payload) + msg = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=self.MSG_ID_SET_DIALOUT_FLOW_RX, + payload=payload) received_msg = self.__can_interface.send(msg) print(received_msg) else: print("Arguments to setUFRx are incorrect", file=sys.stderr) if received_msg is not None: - return_value = True if DenaliMessage.getPayload(received_msg)[0] == 1 else False + return_value = True if DenaliMessage.get_payload(received_msg)[0] == 1 else False return return_value @@ -120,7 +120,7 @@ \return: None """ - payload = DenaliMessage.getPayload(message) + payload = DenaliMessage.get_payload(message) state_num = int.from_bytes(bytearray(payload[0:2]), byteorder=DenaliMessage.BYTE_ORDER, signed=True) self.DialOutBroadcast['state'] = DialOutStates(state_num).name