Index: leahi_dialin/dd/modules/records_get_responses.py =================================================================== diff -u -r088cb4b5e6c8e152496787a25a7cd0df2669efe9 -rb723797c80a2ad6a535f9071dd657ce45259ff40 --- leahi_dialin/dd/modules/records_get_responses.py (.../records_get_responses.py) (revision 088cb4b5e6c8e152496787a25a7cd0df2669efe9) +++ leahi_dialin/dd/modules/records_get_responses.py (.../records_get_responses.py) (revision b723797c80a2ad6a535f9071dd657ce45259ff40) @@ -543,7 +543,10 @@ self.process_into_vars(decoder_list = msg_list, message = message) # Get the Conductivity Sensor Name - sensor_name = dd_enum_repository.DDConductivitySensorNames(sensor_id.value).name + if sensor_id.value < dd_enum_repository.DDConductivitySensorNames.NUM_OF_CONDUCTIVITY_SENSORS.value: + sensor_name = dd_enum_repository.DDConductivitySensorNames(sensor_id.value).name + else: + sensor_name = fp_enum_repository.FPConductivitySensorNames(sensor_id.value - dd_enum_repository.DDConductivitySensorNames.NUM_OF_CONDUCTIVITY_SENSORS.value).name # Saving into the calibration data if acceptance.value: @@ -650,7 +653,7 @@ self.get_institutional_rec_timestamp = timestamp - @publish([MsgIds.MSG_ID_DD_UI_NVM_GET_BICARB_CONC_CAL_RECORD_RESPONSE.name.lower(), "get_usage_info_rec_ack", "get_usage_info_rec_rr", "usage_info_records", "get_usage_info_rec_timestamp"]) + @publish([MsgIds.MSG_ID_DD_UI_NVM_GET_USAGE_INFO_RECORD_RESPONSE.name.lower(), "get_usage_info_rec_ack", "get_usage_info_rec_rr", "usage_info_records", "get_usage_info_rec_timestamp"]) def _handler_usage_info_record_sync(self, message, timestamp = 0.0): """ Handles published DD Usage Information Record data messages. Index: leahi_dialin/dd/modules/records_set_responses.py =================================================================== diff -u -rbe799e12803dba3054ff893b68f8b79a9dde440b -rb723797c80a2ad6a535f9071dd657ce45259ff40 --- leahi_dialin/dd/modules/records_set_responses.py (.../records_set_responses.py) (revision be799e12803dba3054ff893b68f8b79a9dde440b) +++ leahi_dialin/dd/modules/records_set_responses.py (.../records_set_responses.py) (revision b723797c80a2ad6a535f9071dd657ce45259ff40) @@ -620,7 +620,11 @@ self.process_into_vars(decoder_list = msg_list, message = message) # Get the Conductivity Sensor Name - sensor_name = dd_enum_repository.DDConductivitySensorNames(sensor_id.value).name + # Get the Conductivity Sensor Name + if sensor_id.value < dd_enum_repository.DDConductivitySensorNames.NUM_OF_CONDUCTIVITY_SENSORS.value: + sensor_name = dd_enum_repository.DDConductivitySensorNames(sensor_id.value).name + else: + sensor_name = fp_enum_repository.FPConductivitySensorNames(sensor_id.value - dd_enum_repository.DDConductivitySensorNames.NUM_OF_CONDUCTIVITY_SENSORS.value).name # Saving into the calibration data self.set_calibration_rec_ack[f'COND__{sensor_name}'] = acceptance.value