Index: leahi_dialin/ui/td_messaging.py =================================================================== diff -u -rbe143d6c18a7f971d48130adbe458eaf8547da23 -r1805eef13be34b7e55465a88dee3de18a5955008 --- leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision be143d6c18a7f971d48130adbe458eaf8547da23) +++ leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 1805eef13be34b7e55465a88dee3de18a5955008) @@ -214,7 +214,10 @@ self.can_interface.send(message, 0) - def td_ejector(self, H5_state: int, H5_set_speed: float): + def td_ejector(self, H5_state: int, + H5_set_speed: float, + Retract_Opt_sensor: int, + Engage_Opt_sensor: int): """ Broadcasts the current TD Ejector data (Msg ID: 0x4E, 78) Args: @@ -225,10 +228,11 @@ if not self.can_enabled: raise ValueError("CAN Interface is not enabled") + payload = conversions.unsigned_integer_to_bytearray (H5_state ) + payload += conversions.float_to_bytearray (H5_set_speed ) + payload += conversions.unsigned_integer_to_bytearray (Retract_Opt_sensor ) + payload += conversions.unsigned_integer_to_bytearray (Engage_Opt_sensor ) - payload = conversions.unsigned_integer_to_bytearray(H5_state ) - payload += conversions.float_to_bytearray (H5_set_speed) - message = CAN.CanMessage.build_message( channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_EJECTOR_DATA.value, @@ -279,7 +283,16 @@ self.can_interface.send(message, 0) - def td_valves(self, valve_id: int, state: int, pos_name: int, pos_count: int, next_pos: int): + def td_valves(self, valve_id : int, + state : int, + currPosID : int, + currPos : int, + cmdPos : int, + posA : int, + posB : int, + posC : int, + posD : int, + maxHomingPos: int): """ Broadcasts the current TD Valves Data (Msg ID: 0x2B, 43) Args: @@ -297,9 +310,14 @@ payload = conversions.unsigned_integer_to_bytearray(valve_id ) payload += conversions.unsigned_integer_to_bytearray(state ) - payload += conversions.unsigned_integer_to_bytearray(pos_name ) - payload += conversions.short_to_bytearray (pos_count ) - payload += conversions.short_to_bytearray (next_pos ) + payload += conversions.unsigned_integer_to_bytearray(currPosID ) + payload += conversions.short_to_bytearray (currPos ) + payload += conversions.short_to_bytearray (cmdPos ) + payload += conversions.short_to_bytearray (posA ) + payload += conversions.short_to_bytearray (posB ) + payload += conversions.short_to_bytearray (posC ) + payload += conversions.short_to_bytearray (posD ) + payload += conversions.short_to_bytearray (maxHomingPos) message = CAN.CanMessage.build_message( channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, @@ -308,21 +326,22 @@ self.can_interface.send(message, 0) - def td_voltage(self, line_1_2v: float, line_3_3v: float, line_logic_5v: float, - line_sensors_5v: float, line_24v: float, line_regen_24v: float, - fpga_adc_ref: float, res_ref: float, fpga_vcc: float, - fpga_vaux: float, fpga_vpvn: float): + def td_voltage(self, line_1_2v : float, + line_3_3v : float, + line_logic_5v : float, + line_24v_1 : float, + line_24v_2 : float, + fpga_vcc : float, + fpga_vaux : float, + fpga_vpvn : float): """ Broadcasts the current TD voltage data (Msg ID: 0x1D, 29) Args: @param line_1_2v (float): Processor 1.2V @param line_3_3v (float): Logic voltage (3.3V) @param line_logic_5v (float): Logic voltage (5V) - @param line_sensors_5v (float): Sensors voltage (5V) - @param line_24v (float): Actuators voltage (24V) - @param line_regen_24v (float): Actuators regen voltage (24V) - @param fpga_adc_ref (float): FPGA ADC reference voltage (1V) - @param res_ref (float): PBA ADC reference voltage (3V) + @param line_24v_1 (float): Actuators voltage (24V) + @param line_24v_2 (float): Actuators voltage (24V) @param fpga_vcc (float): FPGA input voltage (3V) @param fpga_vaux (float): FPGA aux. voltage (3V) @param fpga_vpvn (float): FPGA pvn voltage (1V) @@ -331,18 +350,16 @@ if not self.can_enabled: raise ValueError("CAN Interface is not enabled") - payload = conversions.float_to_bytearray(line_1_2v ) - payload += conversions.float_to_bytearray(line_3_3v ) - payload += conversions.float_to_bytearray(line_logic_5v ) - payload += conversions.float_to_bytearray(line_sensors_5v ) - payload += conversions.float_to_bytearray(line_24v ) - payload += conversions.float_to_bytearray(line_regen_24v ) - payload += conversions.float_to_bytearray(fpga_adc_ref ) - payload += conversions.float_to_bytearray(res_ref ) - payload += conversions.float_to_bytearray(fpga_vcc ) - payload += conversions.float_to_bytearray(fpga_vaux ) - payload += conversions.float_to_bytearray(fpga_vpvn ) + payload = conversions.float_to_bytearray(line_1_2v ) + payload += conversions.float_to_bytearray(line_3_3v ) + payload += conversions.float_to_bytearray(line_logic_5v ) + payload += conversions.float_to_bytearray(line_24v_1 ) + payload += conversions.float_to_bytearray(line_24v_2 ) + payload += conversions.float_to_bytearray(fpga_vcc ) + payload += conversions.float_to_bytearray(fpga_vaux ) + payload += conversions.float_to_bytearray(fpga_vpvn ) + message = CAN.CanMessage.build_message( channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_VOLTAGES_DATA.value, @@ -592,8 +609,8 @@ payload = conversions.unsigned_integer_to_bytearray (valve ) payload += conversions.unsigned_integer_to_bytearray (timeout ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_WATER_SAMPLE_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -612,8 +629,8 @@ payload += conversions.integer_to_bytearray (vRejectionReason) payload += conversions.float_to_bytearray (vValue ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_WATER_SAMPLE_RESULT_RESPONSE.value, payload=payload) self.can_interface.send(message, 0)