Index: dialin/dg/usage_info_record.py =================================================================== diff -u -r821d2c94ccc6542a7733a9453e59b751bfd0ef75 -r508a67baf93b8b5c5c550e4aaf18535038076c41 --- dialin/dg/usage_info_record.py (.../usage_info_record.py) (revision 821d2c94ccc6542a7733a9453e59b751bfd0ef75) +++ dialin/dg/usage_info_record.py (.../usage_info_record.py) (revision 508a67baf93b8b5c5c550e4aaf18535038076c41) @@ -22,7 +22,7 @@ from ..common.msg_defs import MsgIds, MsgFieldPositions from ..protocols.CAN import DenaliMessage, DenaliChannels from ..utils.base import AbstractSubSystem, publish -from ..utils.nv_ops_utils import NVOpsUtils, NVUtilsObserver, NVRecords +from ..utils.nv_ops_utils import NVOpsUtils, NVUtilsObserver, NVRecordsDG from ..utils.conversions import integer_to_bytearray @@ -108,7 +108,7 @@ # so the payload length is the same when it is received in the firmware. reset_byte_array = integer_to_bytearray(0) crc_value = integer_to_bytearray(crc) - dg_record = integer_to_bytearray(NVRecords.NVDATAMGMT_USAGE_INFO_RECORD.value) + dg_record = integer_to_bytearray(NVRecordsDG.NVDATAMGMT_USAGE_INFO_RECORD.value) payload = reset_byte_array + crc_value + dg_record message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, Index: dialin/hd/usage_info_record.py =================================================================== diff -u -r821d2c94ccc6542a7733a9453e59b751bfd0ef75 -r508a67baf93b8b5c5c550e4aaf18535038076c41 --- dialin/hd/usage_info_record.py (.../usage_info_record.py) (revision 821d2c94ccc6542a7733a9453e59b751bfd0ef75) +++ dialin/hd/usage_info_record.py (.../usage_info_record.py) (revision 508a67baf93b8b5c5c550e4aaf18535038076c41) @@ -23,7 +23,7 @@ from ..common.msg_defs import MsgIds, MsgFieldPositions from ..protocols.CAN import DenaliMessage, DenaliChannels from ..utils.base import AbstractSubSystem, publish -from ..utils.nv_ops_utils import NVOpsUtils, NVUtilsObserver, NVRecords +from ..utils.nv_ops_utils import NVOpsUtils, NVUtilsObserver, NVRecordsHD from ..utils.conversions import integer_to_bytearray @@ -108,7 +108,7 @@ # so the payload length is the same when it is received in the firmware. reset_byte_array = integer_to_bytearray(0) crc_value = integer_to_bytearray(crc) - hd_record = integer_to_bytearray(NVRecords.NVDATAMGMT_USAGE_INFO_RECORD.value) + hd_record = integer_to_bytearray(NVRecordsHD.NVDATAMGMT_USAGE_INFO_RECORD.value) payload = reset_byte_array + crc_value + hd_record message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, Index: dialin/utils/nv_ops_utils.py =================================================================== diff -u -r4c548ce86d1f006c4c54303e151a136bb4bf9497 -r508a67baf93b8b5c5c550e4aaf18535038076c41 --- dialin/utils/nv_ops_utils.py (.../nv_ops_utils.py) (revision 4c548ce86d1f006c4c54303e151a136bb4bf9497) +++ dialin/utils/nv_ops_utils.py (.../nv_ops_utils.py) (revision 508a67baf93b8b5c5c550e4aaf18535038076c41) @@ -25,7 +25,7 @@ @unique -class NVRecords(DialinEnum): +class NVRecordsDG(DialinEnum): NVDATAMGMT_CALIBRATION_RECORD = 0 NVDATAMGMT_SYSTEM_RECORD = 1 NVDATAMGMT_SERVICE_RECORD = 2 @@ -35,6 +35,15 @@ NVDATAMGMT_USAGE_INFO_RECORD = 6 NUM_OF_NVDATMGMT_RECORDS_JOBS = 7 +class NVRecordsHD(DialinEnum): + NVDATAMGMT_CALIBRATION_RECORD = 0 + NVDATAMGMT_SYSTEM_RECORD = 1 + NVDATAMGMT_SERVICE_RECORD = 2 + NVDATAMGMT_SW_CONFIG_RECORD = 3 + NVDATAMGMT_USAGE_INFO_RECORD = 4 + NUM_OF_NVDATMGMT_RECORDS_JOBS = 5 + + class NVUtilsObserver(AbstractObserver): """