diff --git a/StatusData.c b/StatusData.c index 3687db1..f77b2e7 100644 --- a/StatusData.c +++ b/StatusData.c @@ -7,7 +7,7 @@ tStatusData statusData; -const eUds_ReadDataByIdentifier_22_com uds_ReadDataByIdentifier_22_com[256] = { +const eUds_ReadDataByIdentifier_22_com uds_ReadDataByIdentifier_22_com_CF[256] = { {&statusData.Status_CCU_Configuration, sizeof(statusData.Status_CCU_Configuration), "0xCF00 : Status_CCU_Configuration"}, {&statusData.Status_Sensor, sizeof(statusData.Status_Sensor), "0xCF01 : Status_Sensor"}, {&statusData.Status_Actuator_DoorsActuator_FB, sizeof(statusData.Status_Actuator_DoorsActuator_FB), "0xCF02 : Status_Actuator_DoorsActuator_FB"}, @@ -263,5 +263,264 @@ const eUds_ReadDataByIdentifier_22_com uds_ReadDataByIdentifier_22_com[256] = { {NULL, 0, ""}, {NULL, 0, ""}, {&statusData.Status_Activated_Cal_Num, sizeof(statusData.Status_Activated_Cal_Num), "0xCFFE : Status_Activated_Cal_Num"}, - {NULL, 0, ""} + {&statusData.Internal_SW_Version, sizeof(statusData.Internal_SW_Version), "Internal_SW_Version"} +}; + +const eUds_ReadDataByIdentifier_22_com uds_ReadDataByIdentifier_22_com_F1[256] = { + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {statusData.Software_classification_identification, sizeof(statusData.Software_classification_identification), "0xF151 : Software classification identification"}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {&statusData.Tester_Fingerprint, sizeof(statusData.Tester_Fingerprint), "0xF15A : Tester_Fingerprint"}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {&statusData.Boot_SW_Fingerprint, sizeof(statusData.Boot_SW_Fingerprint), "0xF183 : Boot SW Fingerprint"}, + {&statusData.Application_SW_Fingerprint, sizeof(statusData.Application_SW_Fingerprint), "0xF184 : Application SW Fingerprint"}, + {NULL, 0, ""}, + {&statusData.Status_Active_Diagnostic_Session, sizeof(statusData.Status_Active_Diagnostic_Session), "0xF186 : Active Diagnostic Session"}, + {NULL, 0, "0xF187 : Spare Part Number"}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {statusData.Serial_Number, sizeof(statusData.Serial_Number), "0xF18C : Serial Number"}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {statusData.Vehicle_Identification, sizeof(statusData.Vehicle_Identification), "0xF190 : Vehicle Identification"}, + {statusData.ECU_hardware_number_NAMI, sizeof(statusData.ECU_hardware_number_NAMI), "0xF191 : ECU hardware number (NAMI)"}, + {statusData.ECU_hardware_number_ECU_supplier, sizeof(statusData.ECU_hardware_number_ECU_supplier), "0xF192 : ECU hardware number (ECU supplier)"}, + {NULL, 0, ""}, + {statusData.ECU_software_number_ECU_supplier, sizeof(statusData.ECU_software_number_ECU_supplier), "0xF194 : ECU software number (ECU supplier)"}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {statusData.ECU_boot_software_identification_ECU_supplier, sizeof(statusData.ECU_boot_software_identification_ECU_supplier), "0xF1F4 : ECU boot software identification (ECU supplier)"}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""}, + {NULL, 0, ""} }; \ No newline at end of file diff --git a/StatusData.h b/StatusData.h index 5dc9a7c..e9130bf 100644 --- a/StatusData.h +++ b/StatusData.h @@ -7,6 +7,7 @@ #include "stdint.h" #include "stddef.h" +#include "DataNonVolatile.h" typedef enum { AROMA_NOT_PRESENT = 0, @@ -232,6 +233,21 @@ typedef struct { tStatus_Duct_Select Status_Duct_Select; + + tInternal_SW_Version Internal_SW_Version; + char Software_classification_identification[15]; + tFingerprint Tester_Fingerprint; + tFingerprint Boot_SW_Fingerprint; + tFingerprint Application_SW_Fingerprint; + char Spare_Part_Number[27]; + char Serial_Number[26]; + char Vehicle_Identification[17]; + char ECU_hardware_number_NAMI[13]; + char ECU_hardware_number_ECU_supplier[2]; + char ECU_software_number_ECU_supplier[2]; + char ECU_boot_software_identification_ECU_supplier[2]; + + } tStatusData; typedef struct { @@ -240,7 +256,7 @@ typedef struct { char *desc; } eUds_ReadDataByIdentifier_22_com; -extern const eUds_ReadDataByIdentifier_22_com uds_ReadDataByIdentifier_22_com[256]; - +extern const eUds_ReadDataByIdentifier_22_com uds_ReadDataByIdentifier_22_com_CF[256]; +extern const eUds_ReadDataByIdentifier_22_com uds_ReadDataByIdentifier_22_com_F1[256]; #endif //HVAC_M7_STATUSDATA_H