Index: dialin/dg/calibration_record.py =================================================================== diff -u -r2050200f1b9130d4df0e9ea43827ec4f29984c3d -rdebc4bb5ce819c56b511a7565ef7e97efbf5c1a2 --- dialin/dg/calibration_record.py (.../calibration_record.py) (revision 2050200f1b9130d4df0e9ea43827ec4f29984c3d) +++ dialin/dg/calibration_record.py (.../calibration_record.py) (revision debc4bb5ce819c56b511a7565ef7e97efbf5c1a2) @@ -79,7 +79,7 @@ self._current_message = 0 self._total_messages = 0 self._is_getting_cal_in_progress = False - self.cal_data = 0 + self._cal_data = 0 self._raw_cal_record = [] self._utilities = NVOpsUtils(logger=self.logger) # DG Calibration_record main record @@ -182,7 +182,7 @@ end_of_data_index = self._RECORD_START_INDEX + self._RECORD_SPECS_BYTES + length # Get the calibration_record data only - self.cal_data = message['message'][self._RECORD_START_INDEX:end_of_data_index] + self._cal_data = message['message'][self._RECORD_START_INDEX:end_of_data_index] # Continue getting calibration_record records until the all the calibration_record messages are received. # Concatenate the calibration_record records to each other. Index: dialin/dg/scheduled_runs_record.py =================================================================== diff -u -r3a70bfb451b74106348c064c34f19934aadd9119 -rdebc4bb5ce819c56b511a7565ef7e97efbf5c1a2 --- dialin/dg/scheduled_runs_record.py (.../scheduled_runs_record.py) (revision 3a70bfb451b74106348c064c34f19934aadd9119) +++ dialin/dg/scheduled_runs_record.py (.../scheduled_runs_record.py) (revision debc4bb5ce819c56b511a7565ef7e97efbf5c1a2) @@ -72,13 +72,13 @@ self.can_interface = can_interface self.logger = logger - self.current_message = 0 - self.total_messages = 0 - self.received_msg_length = 0 + self._current_message = 0 + self._total_messages = 0 + self._received_msg_length = 0 self._is_getting_runs_in_progress = False self._write_fw_data_to_excel = True - self.cal_data = 0 - self.raw_scheduled_runs_record = [] + self._cal_data = 0 + self._raw_scheduled_runs_record = [] self._utilities = NVOpsUtils(logger=self.logger) # DG scheduled runs main record as an ordered dictionary @@ -113,7 +113,7 @@ if self._is_getting_runs_in_progress is not True: self._is_getting_runs_in_progress = True # Clear the list for the next call - self.raw_scheduled_runs_record.clear() + self._raw_scheduled_runs_record.clear() message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, message_id=MsgIds.MSG_ID_DG_GET_SCHEDULED_RUNS_RECORD.value) @@ -149,24 +149,24 @@ length = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.current_message = curr - self.total_messages = total - self.received_msg_length = length + self._current_message = curr + self._total_messages = total + self._received_msg_length = length # The end of scheduled runs record payload is from the start index + 12 bytes for the current message + total # messages + the length of scheduled runs record. The rest is the CAN messaging CRC and is not # needed. end_of_data_index = self.SCHEDULED_RUNS_RECORD_START_INDEX + self.SCHEDULED_RECORD_SPECS_BYTES + \ - self.received_msg_length + self._received_msg_length # Get the scheduled runs data only - self.cal_data = message['message'][self.SCHEDULED_RUNS_RECORD_START_INDEX:end_of_data_index] + self._cal_data = message['message'][self.SCHEDULED_RUNS_RECORD_START_INDEX:end_of_data_index] # Continue getting calibration_record records until the all the messages are received. Concatenate the # calibration_record records to each other - if self.current_message <= self.total_messages: - self.raw_scheduled_runs_record += (message['message'][self.SCHEDULED_RUNS_RECORD_START_INDEX + - self.SCHEDULED_RECORD_SPECS_BYTES:end_of_data_index]) - if self.current_message == self.total_messages: + if self._current_message <= self._total_messages: + self._raw_scheduled_runs_record += (message['message'][self.SCHEDULED_RUNS_RECORD_START_INDEX + + self.SCHEDULED_RECORD_SPECS_BYTES:end_of_data_index]) + if self._current_message == self._total_messages: # Done receiving the messages self._is_getting_runs_in_progress = False # If all the messages have been received, call another function to process the raw data @@ -190,7 +190,7 @@ """ raw_payload_temp_start_index = 0 # Convert the concatenated raw data into a byte array since the struct library requires byte arrays. - self.raw_scheduled_runs_record = bytearray(self.raw_scheduled_runs_record) + self._raw_scheduled_runs_record = bytearray(self._raw_scheduled_runs_record) # Loop through the keys for the main calibration_record dictionary # DG_Calibration : {pressure_sensors : { ppi : { gain: ['