Index: leahi_dialin/ui/td_messaging.py =================================================================== diff -u -rf65f97e9468c616927f4b6b29c2524e5997bedaa -r1de45e3e0c294d35982514d1c52e2bad87d0a4b2 --- leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision f65f97e9468c616927f4b6b29c2524e5997bedaa) +++ leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 1de45e3e0c294d35982514d1c52e2bad87d0a4b2) @@ -159,16 +159,16 @@ def td_ejector(self, H5_state: int, H5_set_speed: float): """ Broadcasts the current TD operation mode - @param H5_state : ejector state - @param H5_set_speed : ejector set speed + @param H5_state (int ) : ejector state + @param H5_set_speed (float): ejector set speed @return: None """ if not self.can_enabled: raise ValueError("CAN Interface is not enabled") - payload = conversions.integer_to_bytearray(H5_state ) - payload += conversions.float_to_bytearray (H5_set_speed) + payload = conversions.unsigned_integer_to_bytearray(H5_state ) + payload += conversions.float_to_bytearray (H5_set_speed) message = CAN.DenaliMessage.build_message( channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, @@ -180,14 +180,14 @@ def td_switches(self, H9_door: int): """ Broadcasts the current TD switch Data - @param H9_door : door status + @param H9_door (int): door status @return: None """ if not self.can_enabled: raise ValueError("CAN Interface is not enabled") - payload = conversions.integer_to_bytearray(H9_door ) + payload = conversions.unsigned_integer_to_bytearray(H9_door ) message = CAN.DenaliMessage.build_message( channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, @@ -199,17 +199,17 @@ def td_battery(self, capacity: int, ac_power: int): """ Broadcasts the current TD Battery Data - @param capacity : battery capacity - @param ac_power : a/c power status + @param capacity (int): battery capacity + @param ac_power (int): a/c power status @return: None """ # TODO: replace with proper payload and message ID once message is defined if not self.can_enabled: raise ValueError("CAN Interface is not enabled") - payload = conversions.integer_to_bytearray(capacity) - payload += conversions.integer_to_bytearray(ac_power) + payload = conversions.unsigned_integer_to_bytearray(capacity) + payload += conversions.unsigned_integer_to_bytearray(ac_power) message = CAN.DenaliMessage.build_message( channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, @@ -221,11 +221,11 @@ def td_valves(self, valve_id: int, state: int, pos_name: int, pos_count: int, next_pos: int): """ Broadcasts the current TD Battery Data - @param valve_id : Valve ID - @param state : Valve State - @param pos_name : Position Name - @param pos_count : Position Count - @param next_pos : Next Position + @param valve_id (int): Valve ID + @param state (int): Valve State + @param pos_name (int): Position Name + @param pos_count (int): Position Count + @param next_pos (int): Next Position @return: None """ @@ -246,30 +246,29 @@ self.can_interface.send(message, 0) - def td_voltages(self, line_1_2v: float, line_3_3v: float, line_logic_5v: float, + 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): """ Broadcasts the current TD voltage data - @param line_1_2v : 1.2V line - @param line_3_3v : 3.3V line - @param line_logic_5v : Logic voltage (5V) - @param line_sensors_5v : Sensors voltage (5V) - @param line_24v : Actuators voltage (24V) - @param line_regen_24v : Actuators regen voltage (24V) - @param fpga_adc_ref : FPGA ADC reference voltage (1V) - @param res_ref : PBA ADC reference voltage (3V) - @param fpga_vcc : FPGA Vcc (3V) - @param fpga_vaux : FPGA Vaux (3V) - @param fpga_vpvn : FPGA Vpvn (1V) + @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 fpga_vcc (float): FPGA input voltage (3V) + @param fpga_vaux (float): FPGA aux. voltage (3V) + @param fpga_vpvn (float): FPGA pvn voltage (1V) @return: None """ 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 ) @@ -431,13 +430,13 @@ self.can_interface.send(message, 0) def td_treatment_set_points(self, - blood_flow : float , - dialysate_flow : float , + blood_flow : int , + dialysate_flow : int , dialysate_temp : float ): """ Broadcasts the current TD vpressures data - @param blood_flow (float) : Target Blood Flow - @param dialysate_flow (float) : Target Dialysate Flow + @param blood_flow (int ) : Target Blood Flow + @param dialysate_flow (int ) : Target Dialysate Flow @param dialysate_temp (float) : Target Dialysate Temperature @return: None """