Index: leahi_dialin/ui/dd_messaging.py =================================================================== diff -u -r7412ecaf908e316c199518fe7f97256dc46b133b -r78916ee80bc08bb8203851a1c1b2fd6709ddc9f7 --- leahi_dialin/ui/dd_messaging.py (.../dd_messaging.py) (revision 7412ecaf908e316c199518fe7f97256dc46b133b) +++ leahi_dialin/ui/dd_messaging.py (.../dd_messaging.py) (revision 78916ee80bc08bb8203851a1c1b2fd6709ddc9f7) @@ -771,8 +771,8 @@ accept : int , rejectionReason : int , index : int , - gainRejection : float , - offsetRejection : float , + gainRejection : int , + offsetRejection : int , calibrationTimeRejection : int ): """ @@ -841,8 +841,8 @@ accept : int , rejectionReason : int , index : int , - gainRejection : float , - offsetRejection : float , + gainRejection : int , + offsetRejection : int , calibrationTimeRejection : int ): """ @@ -911,8 +911,8 @@ accept : int , rejectionReason : int , index : int , - gainRejection : float , - offsetRejection : float , + gainRejection : int , + offsetRejection : int , calibrationTimeRejection : int ): """ @@ -973,7 +973,7 @@ def dd_set_calibration_D12Pump_sensor_record(self, accept : int , rejectionReason : int , - TargetPumpSpeedRejection : float , + TargetPumpSpeedRejection : int , calibrationTimeRejection : int ): """ Broadcasts DD calibration_pressure_sensor_record @@ -995,4 +995,229 @@ message_id=msg_ids.MsgIds.MSG_ID_DD_UI_NVM_SET_D12_PUMP_CAL_RECORD_RESPONSE.value, payload=payload) - self.can_interface.send(message, 0) \ No newline at end of file + self.can_interface.send(message, 0) + + + def dd_get_calibration_D48Pump_sensor_record(self, + accept : int , + rejectionReason : int , + gain : float , + offset : float , + calibrationTime : int ): + + """ + Broadcasts DD calibration_pressure_sensor_record + Args: + @param accept (int ): accept + @param rejectionReason (int ): Rejection Reason + @param index (int ):index + @param gain (float): calibration gain + @param offset (float): calibration offset + @param calibrationTime (int ): calibration time epoch + + @return: None + """ + payload = conversions.integer_to_bytearray(accept ) + payload += conversions.integer_to_bytearray(rejectionReason ) + payload += conversions.float_to_bytearray (gain ) + payload += conversions.float_to_bytearray (offset ) + payload += conversions.integer_to_bytearray(calibrationTime ) + + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, + message_id=msg_ids.MsgIds.MSG_ID_DD_UI_NVM_GET_D48_PUMP_CAL_RECORD_RESPONSE.value, + payload=payload) + + self.can_interface.send(message, 0) + + + def dd_set_calibration_D48_sensor_record(self, + accept : int , + rejectionReason : int , + gainRejection : int , + offsetRejection : int , + calibrationTimeRejection : int ): + + """ + Broadcasts DD calibration_pressure_sensor_record + Args: + @param accept (int ): accept + @param rejectionReason (int ): Rejection Reason + @param index (int ):index + @param gain (float): calibration gain + @param offset (float): calibration offset + @param calibrationTime (int ): calibration time epoch + + @return: None + """ + payload = conversions.integer_to_bytearray(accept ) + payload += conversions.integer_to_bytearray(rejectionReason ) + payload += conversions.integer_to_bytearray(gainRejection ) + payload += conversions.integer_to_bytearray(offsetRejection ) + payload += conversions.integer_to_bytearray(calibrationTimeRejection ) + + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, + message_id=msg_ids.MsgIds.MSG_ID_DD_UI_NVM_SET_D48_PUMP_CAL_RECORD_RESPONSE.value, + payload=payload) + + self.can_interface.send(message, 0) + + + def dd_get_calibration_acid_conc_record(self, + accept : int , + rejectionReason : int , + index : int , + mix : float , + start : float , + perCM : float , + Temp : float , + calibrationTime : int ): + + """ + Broadcasts DD calibration_pressure_sensor_record + Args: + @param accept (int ): accept + @param rejectionReason (int ): Rejection Reason + @param index (int ):index + @param gain (float): calibration gain + @param offset (float): calibration offset + @param calibrationTime (int ): calibration time epoch + + @return: None + """ + payload = conversions.integer_to_bytearray(accept ) + payload += conversions.integer_to_bytearray(rejectionReason ) + payload += conversions.integer_to_bytearray(index ) + payload += conversions.float_to_bytearray (mix ) + payload += conversions.float_to_bytearray (start ) + payload += conversions.float_to_bytearray (perCM ) + payload += conversions.float_to_bytearray (Temp ) + payload += conversions.integer_to_bytearray(calibrationTime ) + + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, + message_id=msg_ids.MsgIds.MSG_ID_DD_UI_NVM_GET_ACID_CONC_CAL_RECORD_RESPONSE.value, + payload=payload) + + self.can_interface.send(message, 0) + + + def dd_set_calibration_acid_conc_record(self, + accept : int , + rejectionReason : int , + index : int , + mix : int , + start : int , + perCM : int , + Temp : int , + calibrationTimeRejection : int ): + + """ + Broadcasts DD calibration_pressure_sensor_record + Args: + @param accept (int ): accept + @param rejectionReason (int ): Rejection Reason + @param index (int ):index + @param gain (float): calibration gain + @param offset (float): calibration offset + @param calibrationTime (int ): calibration time epoch + + @return: None + """ + payload = conversions.integer_to_bytearray(accept ) + payload += conversions.integer_to_bytearray(rejectionReason ) + payload += conversions.integer_to_bytearray(index ) + payload += conversions.integer_to_bytearray(mix ) + payload += conversions.integer_to_bytearray(start ) + payload += conversions.integer_to_bytearray(perCM ) + payload += conversions.integer_to_bytearray(Temp ) + payload += conversions.integer_to_bytearray(calibrationTimeRejection ) + + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, + message_id=msg_ids.MsgIds.MSG_ID_DD_UI_NVM_SET_ACID_CONC_CAL_RECORD_RESPONSE.value, + payload=payload) + + self.can_interface.send(message, 0) + + + def dd_get_calibration_bicarb_conc_record(self, + accept : int , + rejectionReason : int , + index : int , + mix : float , + start : float , + perCM : float , + Temp : float , + calibrationTime : int ): + + """ + Broadcasts DD calibration_pressure_sensor_record + Args: + @param accept (int ): accept + @param rejectionReason (int ): Rejection Reason + @param index (int ):index + @param gain (float): calibration gain + @param offset (float): calibration offset + @param calibrationTime (int ): calibration time epoch + + @return: None + """ + payload = conversions.integer_to_bytearray(accept ) + payload += conversions.integer_to_bytearray(rejectionReason ) + payload += conversions.integer_to_bytearray(index ) + payload += conversions.float_to_bytearray (mix ) + payload += conversions.float_to_bytearray (start ) + payload += conversions.float_to_bytearray (perCM ) + payload += conversions.float_to_bytearray (Temp ) + payload += conversions.integer_to_bytearray(calibrationTime ) + print("dd_get_calibration_bicarb_conc_record") + + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, + message_id=msg_ids.MsgIds.MSG_ID_DD_UI_NVM_GET_BICARB_CONC_CAL_RECORD_RESPONSE.value, + payload=payload) + + self.can_interface.send(message, 0) + + + def dd_set_calibration_bicarb_conc_record(self, + accept : int , + rejectionReason : int , + index : int , + mix : int , + start : int , + perCM : int , + Temp : int , + calibrationTimeRejection : int ): + + """ + Broadcasts DD calibration_pressure_sensor_record + Args: + @param accept (int ): accept + @param rejectionReason (int ): Rejection Reason + @param index (int ):index + @param gain (float): calibration gain + @param offset (float): calibration offset + @param calibrationTime (int ): calibration time epoch + + @return: None + """ + payload = conversions.integer_to_bytearray(accept ) + payload += conversions.integer_to_bytearray(rejectionReason ) + payload += conversions.integer_to_bytearray(index ) + payload += conversions.integer_to_bytearray(mix ) + payload += conversions.integer_to_bytearray(start ) + payload += conversions.integer_to_bytearray(perCM ) + payload += conversions.integer_to_bytearray(Temp ) + payload += conversions.integer_to_bytearray(calibrationTimeRejection ) + + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, + message_id=msg_ids.MsgIds.MSG_ID_DD_UI_NVM_SET_BICARB_CONC_CAL_RECORD_RESPONSE.value, + payload=payload) + + self.can_interface.send(message, 0) + +