Добавлены идентификация PHEV BEV, ARMORED и т.д.

This commit is contained in:
cfif 2026-11-18 12:24:47 +03:00
parent 3e7f9d9e71
commit 0bc2ff535c
7 changed files with 293 additions and 116 deletions

View File

@ -353,8 +353,6 @@ static void set_CanSpamReceiver(tCanSpamReceiver *env, uint32_t recid) {
env->getVIN2 = false; env->getVIN2 = false;
} }
return;
} }
countQueue_ccu_candb_rx = osMessageQueueGetSpace(env->ccu_candb_rx_LOCAL_HVAC_UDS_VIN); countQueue_ccu_candb_rx = osMessageQueueGetSpace(env->ccu_candb_rx_LOCAL_HVAC_UDS_VIN);

View File

@ -1709,40 +1709,87 @@ static uint16_t vUDS_check_Programming_Preconditions(tCanUds *env, eUdsRoutineCo
} }
static bool is_powerTrain_valid(uint8_t power_train) {
switch ((PowerTrainCode_t)power_train) {
case PT_V8_CONVENTIONAL:
case PT_V8_PHEV_2EM_AIR:
case PT_L4_PHEV_2EM_AIR:
case PT_L4_HAMM_PHEV_2EM_AIR:
case PT_BEV_2EM_AIR:
case PT_PFCV_2EM_AIR:
case PT_V8_AIR:
case PT_V8_PHEV_3EM_AIR:
case PT_L4_PHEV_3EM_AIR:
case PT_L4_HAMM_PHEV_3EM_AIR:
case PT_BEV_3EM_AIR:
case PT_PFCV_3EM_AIR:
case PT_V8_AIR_REAR_STEER:
return true;
default:
return false;
}
}
static bool is_BodyVariant_valid(uint16_t full_address) {
switch ((VehicleType_t)full_address) {
// Vehicle TYPE = 1
case VEHICLE_SEDAN_NON_ARMORED: // '00' - Седан небронированный
case VEHICLE_CABRIO: // '05' - Кабриолет
case VEHICLE_SEDAN_4X2: // '08' - Седан 4x2 (не используется в Phase1)
case VEHICLE_SEDAN_LONG: // '09' - Седан длинный
case VEHICLE_CABRIO_SHOW: // '0B' - Кабриолет шоу (не используется в Phase1)
// Vehicle TYPE = 2
case VEHICLE_SEDAN_ARMORED: // '01' - Седан бронированный
case VEHICLE_SEDAN_LONG_ARMORED: // '0A' - Седан длинный бронированный
// Vehicle TYPE = 3
case VEHICLE_LIMO_ARMORED_V12: // '03' - Лимузин бронированный V12
case VEHICLE_LIMO_ARMORED_V8: // '04' - Лимузин бронированный V8
case VEHICLE_LIMO_ARMORED_V8_CIVIL: // '0C' - Лимузин бронированный V8 гражданский (не используется)
// Vehicle TYPE = 4
case VEHICLE_SUV_NON_ARMORED: // '12' - Внедорожник небронированный
case VEHICLE_SUV_ARMORED: // '13' - Внедорожник бронированный
// Vehicle TYPE = 5
case VEHICLE_MPV_NON_ARMORED_4SEAT: // '20' - Минивэн небронированный 4-местный
case VEHICLE_MPV_ARMORED_8SEAT: // '21' - Минивэн бронированный 8-местный
case VEHICLE_MPV_NON_ARMORED_9SEAT: // '22' - Минивэн небронированный 9-местный
case VEHICLE_MPV_ARMORED_9SEAT: // '23' - Минивэн бронированный 9-местный
case VEHICLE_MPV_ARMORED_4SEAT: // '27' - Минивэн бронированный 4-местный
case VEHICLE_MPV_ORBITA: // '28' - Минивэн "Орбита"
case VEHICLE_MPV_TABLETKA: // '29' - Минивэн "Таблетка"
return true;
default:
return false;
}
}
/** /**
* Функция проверки корректности адреса. * Функция проверки корректности адреса.
* *
* @param address Проверяемый адрес (например, 0x3030) * @param address Проверяемый адрес (например, 0x3030)
* @return true, если адрес присутствует в таблице, иначе false * @return true, если адрес присутствует в таблице, иначе false
*/ */
static bool is_valid_address(uint16_t full_address) { static bool is_valid_address(uint16_t full_address, uint8_t power_train) {
switch (full_address) {
case 0x3030: if (!is_powerTrain_valid(power_train)) {
case 0x3031: return false;
case 0x3033: }
case 0x3034:
case 0x3035: if (!is_BodyVariant_valid(full_address)) {
case 0x3038: return false;
case 0x3039: }
case 0x3041:
case 0x3042:
case 0x3043:
case 0x3132:
case 0x3133:
case 0x3230:
case 0x3231:
case 0x3232:
case 0x3233:
case 0x3237:
case 0x3238:
case 0x3239:
return true; return true;
default:
return false;
}
return false;
} }
extern volatile bool isUpdateVinDataModel;
static uint16_t vUDS_routine_VIN_learn(tCanUds *env, eUdsRoutineControlType udsRoutineControlType) { static uint16_t vUDS_routine_VIN_learn(tCanUds *env, eUdsRoutineControlType udsRoutineControlType) {
if (udsRoutineControlType != UDS_routine_StartRoutine) { if (udsRoutineControlType != UDS_routine_StartRoutine) {
@ -1755,7 +1802,7 @@ static uint16_t vUDS_routine_VIN_learn(tCanUds *env, eUdsRoutineControlType udsR
uint16_t full_address = ((uint16_t)env->VIN[3] << 8) | (uint16_t)env->VIN[4]; uint16_t full_address = ((uint16_t)env->VIN[3] << 8) | (uint16_t)env->VIN[4];
if (is_valid_address(full_address)) { if (is_valid_address(full_address, env->VIN[5])) {
memcpy(statusData.ecu.Vehicle_Identification, env->VIN, 17); memcpy(statusData.ecu.Vehicle_Identification, env->VIN, 17);
@ -1763,6 +1810,7 @@ static uint16_t vUDS_routine_VIN_learn(tCanUds *env, eUdsRoutineControlType udsR
SaveToStorageFromStatusData(env->deviceStorage, &statusData.ecu); SaveToStorageFromStatusData(env->deviceStorage, &statusData.ecu);
setVehicleTypeFromVinToCalib(env->deviceStorage->dataParam->device.identification.Vehicle_Identification); setVehicleTypeFromVinToCalib(env->deviceStorage->dataParam->device.identification.Vehicle_Identification);
isUpdateVinDataModel = true;
env->dataResponse[4] = UDS_routine_RoutineStartStopSuccess; env->dataResponse[4] = UDS_routine_RoutineStartStopSuccess;

View File

@ -75,3 +75,63 @@ uint8_t setVehicleTypeFromVinToCalib(const char* vin) {
return 0; // Неизвестный тип return 0; // Неизвестный тип
} }
} }
BodyTypeBodyArmored_t getVehicleTypeBodyArmoredFromVin(const char* vin) {
// Преобразуем два байта в 16-битное значение
uint16_t typeCode = ((uint16_t)(uint8_t)vin[3] << 8) | (uint8_t)vin[4];
// Определяем Vehicle TYPE по коду
switch ((VehicleType_t)typeCode) {
case VEHICLE_SEDAN_ARMORED:
case VEHICLE_SEDAN_LONG_ARMORED:
case VEHICLE_LIMO_ARMORED_V12:
case VEHICLE_LIMO_ARMORED_V8:
case VEHICLE_LIMO_ARMORED_V8_CIVIL:
case VEHICLE_SUV_ARMORED:
case VEHICLE_MPV_ARMORED_8SEAT:
case VEHICLE_MPV_ARMORED_9SEAT:
case VEHICLE_MPV_ARMORED_4SEAT:
return VEHICLE_TYPE_ARMORED;
default:
return VEHICLE_TYPE_DEFAULT;
}
}
EngineType_t getEngineTypeFromVin(const char* vin) {
PowerTrainCode_t power_train = (uint8_t)vin[5];
switch ((PowerTrainCode_t)power_train) {
// --- ОБЫЧНЫЕ БЕНЗИНОВЫЕ (без электромоторов) ---
case PT_V8_CONVENTIONAL:
case PT_V8_AIR:
case PT_V8_AIR_REAR_STEER:
return ENGINE_CONVENTIONAL;
// --- ПОДКЛЮЧАЕМЫЕ ГИБРИДЫ (PHEV) ---
case PT_V8_PHEV_2EM_AIR:
case PT_L4_PHEV_2EM_AIR:
case PT_L4_HAMM_PHEV_2EM_AIR:
case PT_V8_PHEV_3EM_AIR:
case PT_L4_PHEV_3EM_AIR:
case PT_L4_HAMM_PHEV_3EM_AIR:
return ENGINE_PHEV;
// --- ЭЛЕКТРОМОБИЛИ (BEV) ---
case PT_BEV_2EM_AIR:
case PT_BEV_3EM_AIR:
return ENGINE_BEV;
// --- ВОДОРОДНЫЕ (PFCV) ---
case PT_PFCV_2EM_AIR:
case PT_PFCV_3EM_AIR:
return ENGINE_PFCV;
// --- НЕИЗВЕСТНЫЙ КОД ---
default:
return ENGINE_DEFAULT;
}
}

View File

@ -46,6 +46,37 @@ typedef enum {
VEHICLE_MPV_TABLETKA = 0x3239, // '29' - Минивэн "Таблетка" VEHICLE_MPV_TABLETKA = 0x3239, // '29' - Минивэн "Таблетка"
} VehicleType_t; } VehicleType_t;
typedef enum {
PT_V8_CONVENTIONAL = '1', /* V8 / Conventional (?) */
PT_V8_PHEV_2EM_AIR = '2', /* V8 (PHEV) + 2 EM / Air */
PT_L4_PHEV_2EM_AIR = '3', /* L4 (PHEV) + 2 EM / Air */
PT_L4_HAMM_PHEV_2EM_AIR = '4', /* L4 HAMM (PHEV) + 2 EM / Air */
PT_BEV_2EM_AIR = '5', /* BEV + 2EM / Air */
PT_PFCV_2EM_AIR = '6', /* PFCV + 2EM / Air */
PT_V8_AIR = 'B', /* V8 / Air */
PT_V8_PHEV_3EM_AIR = 'C', /* V8 (PHEV) + 3 EM / Air */
PT_L4_PHEV_3EM_AIR = 'D', /* L4 (PHEV) + 3 EM / Air */
PT_L4_HAMM_PHEV_3EM_AIR = 'E', /* L4 HAMM (PHEV) + 3 EM / Air */
PT_BEV_3EM_AIR = 'F', /* BEV + 3EM / Air */
PT_PFCV_3EM_AIR = 'G', /* PFCV + 3EM / Air */
PT_V8_AIR_REAR_STEER = 'R' /* V8 / Air + Rear Axle Steering */
} PowerTrainCode_t;
typedef enum {
ENGINE_DEFAULT = 0, // Неизвестный или невалидный код
ENGINE_CONVENTIONAL = 1, // Обычный бензиновый (V8/L4 без электромоторов)
ENGINE_PHEV = 2, // Подключаемый гибрид (V8/L4 + Электромоторы)
ENGINE_BEV = 3, // Чистый электромобиль
ENGINE_PFCV = 4 // Водородный (топливные элементы)
} EngineType_t;
typedef enum {
VEHICLE_TYPE_DEFAULT = 0, // Неизвестный или невалидный код
VEHICLE_TYPE_ARMORED = 1, // Armored
} BodyTypeBodyArmored_t;
uint8_t setVehicleTypeFromVinToCalib(const char* vin); uint8_t setVehicleTypeFromVinToCalib(const char* vin);
BodyTypeBodyArmored_t getVehicleTypeBodyArmoredFromVin(const char* vin);
EngineType_t getEngineTypeFromVin(const char* vin);
#endif //HVAC_M7_VIN_DATA_H #endif //HVAC_M7_VIN_DATA_H

View File

@ -89,7 +89,7 @@ static _Noreturn void Mma_Thread(tMma *env) {
*/ */
InitWakeupModel(&env->ModelTask); InitWakeupModel(&env->ModelTask);
getVehicleTypeArmoredFromVin(&env->ModelTask, env->storage.dataParam->device.identification.Vehicle_Identification); updateVinDataModel(&env->ModelTask, env->storage.dataParam->device.identification.Vehicle_Identification);
LoggerInfoStatic(LOGGER, LOG_TASK_ARB, "Waiting for the adc to run...") LoggerInfoStatic(LOGGER, LOG_TASK_ARB, "Waiting for the adc to run...")
uint32_t countQueue_space = osMessageQueueGetSpace(env->adcTask0.queueCmdBusADCData); uint32_t countQueue_space = osMessageQueueGetSpace(env->adcTask0.queueCmdBusADCData);

View File

@ -12,7 +12,7 @@
#include "lfs.h" #include "lfs.h"
#include "LittleFsInterface.h" #include "LittleFsInterface.h"
#include "StatusError.h" #include "StatusError.h"
#include "VIN_DATA.h"
#define LOG_SIGN "ModelTask" #define LOG_SIGN "ModelTask"
#define LOGGER env->logger #define LOGGER env->logger
@ -611,35 +611,14 @@ void InitWakeupModel(tModelTask *env) {
} }
} }
volatile bool isUpdateVinDataModel = false;
uint8_t getVehicleTypeArmoredFromVin(tModelTask *env, const char* vin) { void updateVinDataModel(tModelTask *env, const char *vin) {
isUpdateVinDataModel = false;
env->isVinArmored = 0; env->VIN_BodyTypeBodyArmored = getVehicleTypeBodyArmoredFromVin(vin);
env->VIN_EngineType = getEngineTypeFromVin(vin);
// Преобразуем два байта в 16-битное значение
uint16_t typeCode = ((uint16_t)(uint8_t)vin[3] << 8) | (uint8_t)vin[4];
// Определяем Vehicle TYPE по коду
switch (typeCode) {
case VEHICLE_SEDAN_ARMORED:
case VEHICLE_SEDAN_LONG_ARMORED:
case VEHICLE_LIMO_ARMORED_V12:
case VEHICLE_LIMO_ARMORED_V8:
case VEHICLE_LIMO_ARMORED_V8_CIVIL:
case VEHICLE_SUV_ARMORED:
case VEHICLE_MPV_ARMORED_8SEAT:
case VEHICLE_MPV_ARMORED_9SEAT:
case VEHICLE_MPV_ARMORED_4SEAT:
env->isVinArmored = 1;
return 1;
default:
return 0; // Неизвестный тип
} }
}
volatile bool isSendingCAN = true; volatile bool isSendingCAN = true;
#define SLEEP_TIME 5000 #define SLEEP_TIME 5000
@ -683,17 +662,23 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) {
if (osMutexAcquire(env->access, 1000) == osOK) { if (osMutexAcquire(env->access, 1000) == osOK) {
if (isUpdateVinDataModel) {
updateVinDataModel(env, env->canUds->deviceStorage->dataParam->device.identification.Vehicle_Identification);
}
//LoggerFormatError(LOGGER, LOG_SIGN, "Step END = %d", SystemGetMs()) //LoggerFormatError(LOGGER, LOG_SIGN, "Step END = %d", SystemGetMs())
rtDW.t_now = SystemGetMs(); rtDW.t_now = SystemGetMs();
//начало--------------------------------------------------ВХОД МОДЕЛИ ADC---------------------------------------------- //начало--------------------------------------------------ВХОД МОДЕЛИ ADC----------------------------------------------
getCmdBusADCData(env->adc0Task, &rtDW.ADC_Data_Model); getCmdBusADCData(env->adc0Task, &rtDW.ADC_Data_Model);
getCmdBusADC2Data(env->adc1Task,(CmdBusADC2Data *) &rtDW.ADC_Data_Model.VN7008AJ_DIAG_FrontLINActuatorPowerDriverAB); getCmdBusADC2Data(env->adc1Task,
(CmdBusADC2Data *) &rtDW.ADC_Data_Model.VN7008AJ_DIAG_FrontLINActuatorPowerDriverAB);
// rtDW.ADC_Data_Model.PBATT_CHECK = 1400; // rtDW.ADC_Data_Model.PBATT_CHECK = 1400;
uint16_t PBATT_CHECK_16 = (uint16_t) (((float)rtDW.ADC_Data_Model.PBATT_CHECK * 33.4375f / 4095.0f) * 10.0f); uint16_t PBATT_CHECK_16 = (uint16_t) (((float) rtDW.ADC_Data_Model.PBATT_CHECK * 33.4375f / 4095.0f) *
10.0f);
uint16_t IGN_CHECK_16 = (uint16_t) (((float) rtDW.ADC_Data_Model.IGN_ANS * 27.75f / 4095.0f) * 10.0f); uint16_t IGN_CHECK_16 = (uint16_t) (((float) rtDW.ADC_Data_Model.IGN_ANS * 27.75f / 4095.0f) * 10.0f);
// if ((PBATT_CHECK_16 >= V_SEND_LOW) && (PBATT_CHECK_16 <= V_SEND_HIGH)) { // if ((PBATT_CHECK_16 >= V_SEND_LOW) && (PBATT_CHECK_16 <= V_SEND_HIGH)) {
@ -707,7 +692,8 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) {
rtDW.ADC_Key_Data_Model.EmergencyAirCleanSwitch = GpioPinGet(&env->gpios->EmergencyAirCleanSwitch); rtDW.ADC_Key_Data_Model.EmergencyAirCleanSwitch = GpioPinGet(&env->gpios->EmergencyAirCleanSwitch);
rtDW.ADC_Key_Data_Model.FireExtinguishSwitch = GpioPinGet(&env->gpios->FireExtinguishSwitch); rtDW.ADC_Key_Data_Model.FireExtinguishSwitch = GpioPinGet(&env->gpios->FireExtinguishSwitch);
memcpy((void *) &rtDW.CCUCAN_tStatus_CCU_Configuration_model, (void *) &statusData.ecu.Status_CCU_Configuration, sizeof(tStatus_CCU_Configuration_Bus)); memcpy((void *) &rtDW.CCUCAN_tStatus_CCU_Configuration_model,
(void *) &statusData.ecu.Status_CCU_Configuration, sizeof(tStatus_CCU_Configuration_Bus));
//начало--------------------------------------------------ВХОД МОДЕЛИ НАСТРОЙКИ---------------------------------------------- //начало--------------------------------------------------ВХОД МОДЕЛИ НАСТРОЙКИ----------------------------------------------
@ -732,7 +718,8 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) {
//конец--------------------------------------------------ВХОД МОДЕЛИ CAN DBG-------------------------------------------- //конец--------------------------------------------------ВХОД МОДЕЛИ CAN DBG--------------------------------------------
//начало--------------------------------------------------ВХОД МОДЕЛИ CAN----------------------------------------------- //начало--------------------------------------------------ВХОД МОДЕЛИ CAN-----------------------------------------------
get_CanSpamReceiver(env->canSpamReceiver, env->GET_HVAC_VIN, &env->CAN_ERROR_MISSING, &env->CAN_TIME_MISSING); get_CanSpamReceiver(env->canSpamReceiver, env->GET_HVAC_VIN, &env->CAN_ERROR_MISSING,
&env->CAN_TIME_MISSING);
// Если был захват в UDS (подмена) // Если был захват в UDS (подмена)
if (model_Status_Set_For_Model_output.EMS == 1) { if (model_Status_Set_For_Model_output.EMS == 1) {
@ -757,9 +744,12 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) {
//начало-------------------------------------------------ВХОД МОДЕЛИ SlEEP---------------------------------------------- //начало-------------------------------------------------ВХОД МОДЕЛИ SlEEP----------------------------------------------
memcpy((void *) &rtDW.CCU_STAT1_WAKEUP_MODEL, (void *) &CCU_STAT1_MODEL_SAVE, sizeof(CmdCAN_CCU_STAT1_WakeUp_Bus)); memcpy((void *) &rtDW.CCU_STAT1_WAKEUP_MODEL, (void *) &CCU_STAT1_MODEL_SAVE,
memcpy((void *) &rtDW.CCU_STAT2_WAKEUP_MODEL, (void *) &CCU_STAT2_MODEL_SAVE, sizeof(CmdCAN_CCU_STAT2_WakeUp_Bus)); sizeof(CmdCAN_CCU_STAT1_WakeUp_Bus));
memcpy((void *) &rtDW.CCU_STAT3_WAKEUP_MODEL, (void *) &CCU_STAT3_MODEL_SAVE, sizeof(CmdCAN_CCU_STAT3_WakeUp_Bus)); memcpy((void *) &rtDW.CCU_STAT2_WAKEUP_MODEL, (void *) &CCU_STAT2_MODEL_SAVE,
sizeof(CmdCAN_CCU_STAT2_WakeUp_Bus));
memcpy((void *) &rtDW.CCU_STAT3_WAKEUP_MODEL, (void *) &CCU_STAT3_MODEL_SAVE,
sizeof(CmdCAN_CCU_STAT3_WakeUp_Bus));
memcpy((void *) &rtDW.CCU_Msg1_WakeUp_model, (void *) &CCU_MSG1_MODEL_SAVE, sizeof(CCU_Msg1_WakeUp_Bus)); memcpy((void *) &rtDW.CCU_Msg1_WakeUp_model, (void *) &CCU_MSG1_MODEL_SAVE, sizeof(CCU_Msg1_WakeUp_Bus));
//конец--------------------------------------------------ВХОД МОДЕЛИ SLEEP---------------------------------------------- //конец--------------------------------------------------ВХОД МОДЕЛИ SLEEP----------------------------------------------
@ -820,19 +810,27 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) {
Lin5_Output_Get_From_Model(env->lin5TaskSensor, env->LIN5_ERROR_MISSING); Lin5_Output_Get_From_Model(env->lin5TaskSensor, env->LIN5_ERROR_MISSING);
if (((rtDW.LIN5_SENSON_ADR_Stat_model.Err_Stat[0] == 1) || (rtDW.LIN5_SENSON_ADR_Stat_model.Err_Stat[1] == 1) || if (((rtDW.LIN5_SENSON_ADR_Stat_model.Err_Stat[0] == 1) ||
(rtDW.LIN5_SENSON_ADR_Stat_model.Err_Stat[2] == 1) || (rtDW.LIN5_SENSON_ADR_Stat_model.Err_Stat[3] == 1)) || (rtDW.LIN5_SENSON_ADR_Stat_model.Err_Stat[1] == 1) ||
((rtDW.LIN5_SENSON_ADR_Stat_model.LinRespErr_Stat[0] == 1) || (rtDW.LIN5_SENSON_ADR_Stat_model.LinRespErr_Stat[1] == 1) || (rtDW.LIN5_SENSON_ADR_Stat_model.Err_Stat[2] == 1) ||
(rtDW.LIN5_SENSON_ADR_Stat_model.LinRespErr_Stat[2] == 1) || (rtDW.LIN5_SENSON_ADR_Stat_model.LinRespErr_Stat[3] == 1))) { (rtDW.LIN5_SENSON_ADR_Stat_model.Err_Stat[3] == 1)) ||
((rtDW.LIN5_SENSON_ADR_Stat_model.LinRespErr_Stat[0] == 1) ||
(rtDW.LIN5_SENSON_ADR_Stat_model.LinRespErr_Stat[1] == 1) ||
(rtDW.LIN5_SENSON_ADR_Stat_model.LinRespErr_Stat[2] == 1) ||
(rtDW.LIN5_SENSON_ADR_Stat_model.LinRespErr_Stat[3] == 1))) {
env->diagnostic->state.d_DTC_DRS_FRONT_ZONE_MALFUNCTION = 1; env->diagnostic->state.d_DTC_DRS_FRONT_ZONE_MALFUNCTION = 1;
} else { } else {
env->diagnostic->state.d_DTC_DRS_FRONT_ZONE_MALFUNCTION = 0; env->diagnostic->state.d_DTC_DRS_FRONT_ZONE_MALFUNCTION = 0;
} }
if (((rtDW.LIN5_SENSON_ADR_Stat_model.Err_Stat[4] == 1) || (rtDW.LIN5_SENSON_ADR_Stat_model.Err_Stat[5] == 1) || if (((rtDW.LIN5_SENSON_ADR_Stat_model.Err_Stat[4] == 1) ||
(rtDW.LIN5_SENSON_ADR_Stat_model.Err_Stat[6] == 1) || (rtDW.LIN5_SENSON_ADR_Stat_model.Err_Stat[7] == 1)) || (rtDW.LIN5_SENSON_ADR_Stat_model.Err_Stat[5] == 1) ||
((rtDW.LIN5_SENSON_ADR_Stat_model.LinRespErr_Stat[4] == 1) || (rtDW.LIN5_SENSON_ADR_Stat_model.LinRespErr_Stat[5] == 1) || (rtDW.LIN5_SENSON_ADR_Stat_model.Err_Stat[6] == 1) ||
(rtDW.LIN5_SENSON_ADR_Stat_model.LinRespErr_Stat[6] == 1) || (rtDW.LIN5_SENSON_ADR_Stat_model.LinRespErr_Stat[7] == 1))) { (rtDW.LIN5_SENSON_ADR_Stat_model.Err_Stat[7] == 1)) ||
((rtDW.LIN5_SENSON_ADR_Stat_model.LinRespErr_Stat[4] == 1) ||
(rtDW.LIN5_SENSON_ADR_Stat_model.LinRespErr_Stat[5] == 1) ||
(rtDW.LIN5_SENSON_ADR_Stat_model.LinRespErr_Stat[6] == 1) ||
(rtDW.LIN5_SENSON_ADR_Stat_model.LinRespErr_Stat[7] == 1))) {
env->diagnostic->state.d_DTC_DRS_REAR_ZONE_MALFUNCTION = 1; env->diagnostic->state.d_DTC_DRS_REAR_ZONE_MALFUNCTION = 1;
} else { } else {
env->diagnostic->state.d_DTC_DRS_REAR_ZONE_MALFUNCTION = 0; env->diagnostic->state.d_DTC_DRS_REAR_ZONE_MALFUNCTION = 0;
@ -946,15 +944,20 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) {
} }
GpioPinSet(&env->gpios->power.BTS5180_2EKA_TwoWayValveAndReservePowerSupply.TwoWayValve_EN,env->TwoWayValve_EN); GpioPinSet(&env->gpios->power.BTS5180_2EKA_TwoWayValveAndReservePowerSupply.TwoWayValve_EN,
env->TwoWayValve_EN);
GpioPinSet(&env->gpios->power.BTS5180_2EKA_TwoWayValveAndReservePowerSupply.TwoWayValve_EN_Diag, true); GpioPinSet(&env->gpios->power.BTS5180_2EKA_TwoWayValveAndReservePowerSupply.TwoWayValve_EN_Diag, true);
GpioPinSet(&env->gpios->power.BTS5180_2EKA_TwoWayValveAndReservePowerSupply.ReservePower_EN,rtY.PowerEnable_Model.ReservePower_EN); GpioPinSet(&env->gpios->power.BTS5180_2EKA_TwoWayValveAndReservePowerSupply.ReservePower_EN,
rtY.PowerEnable_Model.ReservePower_EN);
GpioPinSet(&env->gpios->power.BTS4175SGAXUMA1_ShutOFFValveBatteryChiller.EN_BATTChiller,env->EN_BATTChiller); GpioPinSet(&env->gpios->power.BTS4175SGAXUMA1_ShutOFFValveBatteryChiller.EN_BATTChiller,
env->EN_BATTChiller);
GpioPinSet(&env->gpios->power.BTS5180_2EKA_FrontRearIncarMotor.Incar_Motor_Front_EN,env->Incar_Motor_Front_EN); GpioPinSet(&env->gpios->power.BTS5180_2EKA_FrontRearIncarMotor.Incar_Motor_Front_EN,
env->Incar_Motor_Front_EN);
GpioPinSet(&env->gpios->power.BTS5180_2EKA_FrontRearIncarMotor.Incar_EN_Diag, true); GpioPinSet(&env->gpios->power.BTS5180_2EKA_FrontRearIncarMotor.Incar_EN_Diag, true);
GpioPinSet(&env->gpios->power.BTS5180_2EKA_FrontRearIncarMotor.Incar_Motor_Rear_EN,env->Incar_Motor_Rear_EN); GpioPinSet(&env->gpios->power.BTS5180_2EKA_FrontRearIncarMotor.Incar_Motor_Rear_EN,
env->Incar_Motor_Rear_EN);
GpioPinSet(&env->gpios->power.BTS5180_2EKA_ShutOFFValveFrontRear.ShutOffFront_EN, env->ShutOffFront_EN); GpioPinSet(&env->gpios->power.BTS5180_2EKA_ShutOFFValveFrontRear.ShutOffFront_EN, env->ShutOffFront_EN);
GpioPinSet(&env->gpios->power.BTS5180_2EKA_ShutOFFValveFrontRear.ShutOff_EN_Diag, true); GpioPinSet(&env->gpios->power.BTS5180_2EKA_ShutOFFValveFrontRear.ShutOff_EN_Diag, true);
@ -977,17 +980,22 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) {
// GpioPinSet(&env->gpios->power.BTS4175SGAXUMA1_ReservePowerOutput.EN_ReservePower, rtY.PowerEnable_Model.EN_ReservePower); // GpioPinSet(&env->gpios->power.BTS4175SGAXUMA1_ReservePowerOutput.EN_ReservePower, rtY.PowerEnable_Model.EN_ReservePower);
GpioPinSet(&env->gpios->power.BTS4175SGAXUMA1_PowerReserve.EN_PowerReserve, rtY.PowerEnable_Model.EN_PowerReserve); GpioPinSet(&env->gpios->power.BTS4175SGAXUMA1_PowerReserve.EN_PowerReserve,
rtY.PowerEnable_Model.EN_PowerReserve);
GpioPinSet(&env->gpios->power.VN7008AJ_FrontLINActuatorPowerDriverAB.LIN_ActPower_AB, rtY.PowerEnable_Model.LIN_ActPower_AB); GpioPinSet(&env->gpios->power.VN7008AJ_FrontLINActuatorPowerDriverAB.LIN_ActPower_AB,
rtY.PowerEnable_Model.LIN_ActPower_AB);
GpioPinSet(&env->gpios->power.VN7008AJ_FrontLINActuatorPowerDriverAB.EN_CurrentSensing_AB, true); GpioPinSet(&env->gpios->power.VN7008AJ_FrontLINActuatorPowerDriverAB.EN_CurrentSensing_AB, true);
GpioPinSet(&env->gpios->power.VN7008AJ_RearLINActuatorPowerDriverC.LIN_ActPower_C, rtY.PowerEnable_Model.LIN_ActPower_C); GpioPinSet(&env->gpios->power.VN7008AJ_RearLINActuatorPowerDriverC.LIN_ActPower_C,
rtY.PowerEnable_Model.LIN_ActPower_C);
GpioPinSet(&env->gpios->power.VN7008AJ_RearLINActuatorPowerDriverC.EN_CurrentSensing_C, true); GpioPinSet(&env->gpios->power.VN7008AJ_RearLINActuatorPowerDriverC.EN_CurrentSensing_C, true);
GpioPinSet(&env->gpios->power.BTS5120_2EKA_ShutoffValvePowerTXV.ShutOffTXV1_EN, rtY.PowerEnable_Model.ShutOffTXV1_EN); GpioPinSet(&env->gpios->power.BTS5120_2EKA_ShutoffValvePowerTXV.ShutOffTXV1_EN,
rtY.PowerEnable_Model.ShutOffTXV1_EN);
GpioPinSet(&env->gpios->power.BTS5120_2EKA_ShutoffValvePowerTXV.ShutOffTXV_EN_Diag, true); GpioPinSet(&env->gpios->power.BTS5120_2EKA_ShutoffValvePowerTXV.ShutOffTXV_EN_Diag, true);
GpioPinSet(&env->gpios->power.BTS5120_2EKA_ShutoffValvePowerTXV.ShutOffTXV2_EN, rtY.PowerEnable_Model.ShutOffTXV2_EN); GpioPinSet(&env->gpios->power.BTS5120_2EKA_ShutoffValvePowerTXV.ShutOffTXV2_EN,
rtY.PowerEnable_Model.ShutOffTXV2_EN);
//конец--------------------------------------------------ВЫХОД МОДЕЛИ ДЛЯ GPIO------------------------------------------ //конец--------------------------------------------------ВЫХОД МОДЕЛИ ДЛЯ GPIO------------------------------------------
@ -1015,15 +1023,19 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) {
env->pwms->pwmFrontIo.setActivePercent(env->pwms->pwmFrontIo.env, Pwm_Front); env->pwms->pwmFrontIo.setActivePercent(env->pwms->pwmFrontIo.env, Pwm_Front);
env->pwms->pwmRearIo.setActivePercent(env->pwms->pwmRearIo.env, Pwm_Rear); env->pwms->pwmRearIo.setActivePercent(env->pwms->pwmRearIo.env, Pwm_Rear);
env->pwms->pwmFrontReservedIo.setActivePercent(env->pwms->pwmFrontReservedIo.env, rtY.PWM_Get_out.pwmPercentFrontReserved); env->pwms->pwmFrontReservedIo.setActivePercent(env->pwms->pwmFrontReservedIo.env,
env->pwms->pwmRearReservedIo.setActivePercent(env->pwms->pwmRearReservedIo.env, rtY.PWM_Get_out.pwmPercentRearReserved); rtY.PWM_Get_out.pwmPercentFrontReserved);
env->pwms->pwmRearReservedIo.setActivePercent(env->pwms->pwmRearReservedIo.env,
rtY.PWM_Get_out.pwmPercentRearReserved);
} else { } else {
env->pwms->pwmFrontIo.setActivePercent(env->pwms->pwmFrontIo.env, rtY.PWM_Get_out.pwmPercentFront); env->pwms->pwmFrontIo.setActivePercent(env->pwms->pwmFrontIo.env, rtY.PWM_Get_out.pwmPercentFront);
env->pwms->pwmRearIo.setActivePercent(env->pwms->pwmRearIo.env, rtY.PWM_Get_out.pwmPercentRear); env->pwms->pwmRearIo.setActivePercent(env->pwms->pwmRearIo.env, rtY.PWM_Get_out.pwmPercentRear);
env->pwms->pwmFrontReservedIo.setActivePercent(env->pwms->pwmFrontReservedIo.env, rtY.PWM_Get_out.pwmPercentFrontReserved); env->pwms->pwmFrontReservedIo.setActivePercent(env->pwms->pwmFrontReservedIo.env,
env->pwms->pwmRearReservedIo.setActivePercent(env->pwms->pwmRearReservedIo.env,rtY.PWM_Get_out.pwmPercentRearReserved); rtY.PWM_Get_out.pwmPercentFrontReserved);
env->pwms->pwmRearReservedIo.setActivePercent(env->pwms->pwmRearReservedIo.env,
rtY.PWM_Get_out.pwmPercentRearReserved);
} }
//конец--------------------------------------------------ВЫХОД МОДЕЛИ ДЛЯ PWM------------------------------------------- //конец--------------------------------------------------ВЫХОД МОДЕЛИ ДЛЯ PWM-------------------------------------------
@ -1043,6 +1055,7 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) {
//==============================================DTC=============================================================================================== //==============================================DTC===============================================================================================
//==============================================DTC=============================================================================================== //==============================================DTC===============================================================================================
//==============================================DTC=============================================================================================== //==============================================DTC===============================================================================================
if (env->is_Global_Soft_T15) { if (env->is_Global_Soft_T15) {
memcpy(env->dtc_state_error, rtY.dtc_state_error_model, sizeof(env->dtc_state_error)); memcpy(env->dtc_state_error, rtY.dtc_state_error_model, sizeof(env->dtc_state_error));
@ -1083,7 +1096,8 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) {
memcpy(&env->ccu_candb_tx.CCU_Stat1, &rtY.CCU_Stat1_model, sizeof(env->ccu_candb_tx.CCU_Stat1)); memcpy(&env->ccu_candb_tx.CCU_Stat1, &rtY.CCU_Stat1_model, sizeof(env->ccu_candb_tx.CCU_Stat1));
memcpy(&env->ccu_candb_tx.CCU_Stat2, &rtY.CCU_Stat2_model, sizeof(env->ccu_candb_tx.CCU_Stat2)); memcpy(&env->ccu_candb_tx.CCU_Stat2, &rtY.CCU_Stat2_model, sizeof(env->ccu_candb_tx.CCU_Stat2));
memcpy(&env->ccu_candb_tx.CCU_Stat3, &rtY.CCU_Stat3_model, sizeof(env->ccu_candb_tx.CCU_Stat3)); memcpy(&env->ccu_candb_tx.CCU_Stat3, &rtY.CCU_Stat3_model, sizeof(env->ccu_candb_tx.CCU_Stat3));
memcpy(&env->ccu_candb_tx.CCU_HVC_Req_Msg, &rtY.CCUCAN_HVC_REQ_MSG_MODEL, sizeof(env->ccu_candb_tx.CCU_HVC_Req_Msg)); memcpy(&env->ccu_candb_tx.CCU_HVC_Req_Msg, &rtY.CCUCAN_HVC_REQ_MSG_MODEL,
sizeof(env->ccu_candb_tx.CCU_HVC_Req_Msg));
memcpy(&env->ccu_candb_tx.CCU_Msg3, &rtY.CCU_Msg3_model, sizeof(env->ccu_candb_tx.CCU_Msg3)); memcpy(&env->ccu_candb_tx.CCU_Msg3, &rtY.CCU_Msg3_model, sizeof(env->ccu_candb_tx.CCU_Msg3));
memcpy(&env->ccu_candb_tx.CCU_Msg1, &rtY.CCU_Msg1_model, sizeof(env->ccu_candb_tx.CCU_Msg1)); memcpy(&env->ccu_candb_tx.CCU_Msg1, &rtY.CCU_Msg1_model, sizeof(env->ccu_candb_tx.CCU_Msg1));
@ -1137,43 +1151,67 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) {
memcpy(&env->ccu_candb_dbg_tx.dbg_Act0, &rtY.dbgCAN_dbg_Act0_model, sizeof(env->ccu_candb_dbg_tx.dbg_Act0)); memcpy(&env->ccu_candb_dbg_tx.dbg_Act0, &rtY.dbgCAN_dbg_Act0_model, sizeof(env->ccu_candb_dbg_tx.dbg_Act0));
memcpy(&env->ccu_candb_dbg_tx.dbg_Act1, &rtY.dbgCAN_dbg_Act1_model, sizeof(env->ccu_candb_dbg_tx.dbg_Act1)); memcpy(&env->ccu_candb_dbg_tx.dbg_Act1, &rtY.dbgCAN_dbg_Act1_model, sizeof(env->ccu_candb_dbg_tx.dbg_Act1));
memcpy(&env->ccu_candb_dbg_tx.dbg_Act2, &rtY.dbgCAN_dbg_Act2_model, sizeof(env->ccu_candb_dbg_tx.dbg_Act2)); memcpy(&env->ccu_candb_dbg_tx.dbg_Act2, &rtY.dbgCAN_dbg_Act2_model, sizeof(env->ccu_candb_dbg_tx.dbg_Act2));
memcpy(&env->ccu_candb_dbg_tx.dbg_Sen_Duct, &rtY.dbgCAN_dbg_Sen_Duct_model,sizeof(env->ccu_candb_dbg_tx.dbg_Sen_Duct)); memcpy(&env->ccu_candb_dbg_tx.dbg_Sen_Duct, &rtY.dbgCAN_dbg_Sen_Duct_model,
memcpy(&env->ccu_candb_dbg_tx.dbg_Sen_Eva, &rtY.dbgCAN_dbg_Sen_Eva_model,sizeof(env->ccu_candb_dbg_tx.dbg_Sen_Eva)); sizeof(env->ccu_candb_dbg_tx.dbg_Sen_Duct));
memcpy(&env->ccu_candb_dbg_tx.dbg_Logic_Blower, &rtY.dbgCAN_dbg_Logic_Blower_model, sizeof(env->ccu_candb_dbg_tx.dbg_Logic_Blower)); memcpy(&env->ccu_candb_dbg_tx.dbg_Sen_Eva, &rtY.dbgCAN_dbg_Sen_Eva_model,
sizeof(env->ccu_candb_dbg_tx.dbg_Sen_Eva));
memcpy(&env->ccu_candb_dbg_tx.dbg_Logic_Blower, &rtY.dbgCAN_dbg_Logic_Blower_model,
sizeof(env->ccu_candb_dbg_tx.dbg_Logic_Blower));
// Подмена дебажного сообщения для UDS // Подмена дебажного сообщения для UDS
if (model_Status_Set_For_Model_output.Pwm == 1) { if (model_Status_Set_For_Model_output.Pwm == 1) {
env->ccu_candb_dbg_tx.dbg_Logic_Blower.Logic_Blower_Pwm_Front = model_Status_Pwm_For_Model_output.Pwm_Front / 10; env->ccu_candb_dbg_tx.dbg_Logic_Blower.Logic_Blower_Pwm_Front =
env->ccu_candb_dbg_tx.dbg_Logic_Blower.Logic_Blower_Pwm_Rear = model_Status_Pwm_For_Model_output.Pwm_Rear / 10; model_Status_Pwm_For_Model_output.Pwm_Front / 10;
env->ccu_candb_dbg_tx.dbg_Logic_Blower.Logic_Blower_Pwm_Rear =
model_Status_Pwm_For_Model_output.Pwm_Rear / 10;
} }
model_Status_Pwm_For_Model_input.Pwm_Front = env->ccu_candb_dbg_tx.dbg_Logic_Blower.Logic_Blower_Pwm_Front * 10; model_Status_Pwm_For_Model_input.Pwm_Front =
model_Status_Pwm_For_Model_input.Pwm_Rear = env->ccu_candb_dbg_tx.dbg_Logic_Blower.Logic_Blower_Pwm_Rear * 10; env->ccu_candb_dbg_tx.dbg_Logic_Blower.Logic_Blower_Pwm_Front * 10;
model_Status_Pwm_For_Model_input.Pwm_Rear =
env->ccu_candb_dbg_tx.dbg_Logic_Blower.Logic_Blower_Pwm_Rear * 10;
memcpy(&env->ccu_candb_dbg_tx.dbg_Sen_Amb, &rtY.dbgCAN_dbg_Sen_Amb_model, sizeof(env->ccu_candb_dbg_tx.dbg_Sen_Amb)); memcpy(&env->ccu_candb_dbg_tx.dbg_Sen_Amb, &rtY.dbgCAN_dbg_Sen_Amb_model,
memcpy(&env->ccu_candb_dbg_tx.dbg_Sen_Incar, &rtY.dbgCAN_dbg_Sen_Incar_model, sizeof(env->ccu_candb_dbg_tx.dbg_Sen_Incar)); sizeof(env->ccu_candb_dbg_tx.dbg_Sen_Amb));
memcpy(&env->ccu_candb_dbg_tx.dbg_Sen_0, &rtY.dbgCAN_dbg_Sen_0_model, sizeof(env->ccu_candb_dbg_tx.dbg_Sen_0)); memcpy(&env->ccu_candb_dbg_tx.dbg_Sen_Incar, &rtY.dbgCAN_dbg_Sen_Incar_model,
memcpy(&env->ccu_candb_dbg_tx.dbg_Logic_Ac, &rtY.dbg_Logic_Ac_model, sizeof(env->ccu_candb_dbg_tx.dbg_Logic_Ac)); sizeof(env->ccu_candb_dbg_tx.dbg_Sen_Incar));
memcpy(&env->ccu_candb_dbg_tx.dbg_CCU_IO, &rtY.dbgCAN_CCU_IO_model, sizeof(env->ccu_candb_dbg_tx.dbg_CCU_IO)); memcpy(&env->ccu_candb_dbg_tx.dbg_Sen_0, &rtY.dbgCAN_dbg_Sen_0_model,
memcpy(&env->ccu_candb_dbg_tx.dbg_Logic_Rec, &rtY.dbgCAN_Logic_Rec_model, sizeof(env->ccu_candb_dbg_tx.dbg_Logic_Rec)); sizeof(env->ccu_candb_dbg_tx.dbg_Sen_0));
memcpy(&env->ccu_candb_dbg_tx.dbg_Logic_State, &rtY.dbgCAN_Logic_State_model, sizeof(env->ccu_candb_dbg_tx.dbg_Logic_State)); memcpy(&env->ccu_candb_dbg_tx.dbg_Logic_Ac, &rtY.dbg_Logic_Ac_model,
memcpy(&env->ccu_candb_dbg_tx.dbg_Auto_AF, &rtY.dbgCAN_Auto_AF_model, sizeof(env->ccu_candb_dbg_tx.dbg_Auto_AF)); sizeof(env->ccu_candb_dbg_tx.dbg_Logic_Ac));
memcpy(&env->ccu_candb_dbg_tx.dbg_Auto_Duct, &rtY.dbgCAN_Auto_Duct_model, sizeof(env->ccu_candb_dbg_tx.dbg_Auto_Duct)); memcpy(&env->ccu_candb_dbg_tx.dbg_CCU_IO, &rtY.dbgCAN_CCU_IO_model,
memcpy(&env->ccu_candb_dbg_tx.dbg_Logic_Valve, &rtY.dbg_Logic_Valve_model, sizeof(env->ccu_candb_dbg_tx.dbg_Logic_Valve)); sizeof(env->ccu_candb_dbg_tx.dbg_CCU_IO));
memcpy(&env->ccu_candb_dbg_tx.dbg_Logic_Rec, &rtY.dbgCAN_Logic_Rec_model,
sizeof(env->ccu_candb_dbg_tx.dbg_Logic_Rec));
memcpy(&env->ccu_candb_dbg_tx.dbg_Logic_State, &rtY.dbgCAN_Logic_State_model,
sizeof(env->ccu_candb_dbg_tx.dbg_Logic_State));
memcpy(&env->ccu_candb_dbg_tx.dbg_Auto_AF, &rtY.dbgCAN_Auto_AF_model,
sizeof(env->ccu_candb_dbg_tx.dbg_Auto_AF));
memcpy(&env->ccu_candb_dbg_tx.dbg_Auto_Duct, &rtY.dbgCAN_Auto_Duct_model,
sizeof(env->ccu_candb_dbg_tx.dbg_Auto_Duct));
memcpy(&env->ccu_candb_dbg_tx.dbg_Logic_Valve, &rtY.dbg_Logic_Valve_model,
sizeof(env->ccu_candb_dbg_tx.dbg_Logic_Valve));
memcpy(&env->ccu_candb_dbg_tx.dbg_Drs, &rtY.dbg_Drs_t_model, sizeof(env->ccu_candb_dbg_tx.dbg_Drs)); memcpy(&env->ccu_candb_dbg_tx.dbg_Drs, &rtY.dbg_Drs_t_model, sizeof(env->ccu_candb_dbg_tx.dbg_Drs));
memcpy(&env->ccu_candb_dbg_tx.dbg_LIN_AirQS_Stat, &rtY.dbg_LIN_AirQS_Stat_t_model, sizeof(env->ccu_candb_dbg_tx.dbg_Logic_Valve)); memcpy(&env->ccu_candb_dbg_tx.dbg_LIN_AirQS_Stat, &rtY.dbg_LIN_AirQS_Stat_t_model,
sizeof(env->ccu_candb_dbg_tx.dbg_Logic_Valve));
memcpy(&env->ccu_candb_dbg_tx.dbg_LIN_Ionizer_Stat, &rtY.dbg_LIN_Ionizer_Stat_t_model, sizeof(env->ccu_candb_dbg_tx.dbg_LIN_Ionizer_Stat)); memcpy(&env->ccu_candb_dbg_tx.dbg_LIN_Ionizer_Stat, &rtY.dbg_LIN_Ionizer_Stat_t_model,
memcpy(&env->ccu_candb_dbg_tx.dbg_LIN_Aroma_Stat, &rtY.dbg_LIN_Aroma_Stat_t_model, sizeof(env->ccu_candb_dbg_tx.dbg_LIN_Aroma_Stat)); sizeof(env->ccu_candb_dbg_tx.dbg_LIN_Ionizer_Stat));
memcpy(&env->ccu_candb_dbg_tx.dbg_LIN_Aroma_Stat, &rtY.dbg_LIN_Aroma_Stat_t_model,
sizeof(env->ccu_candb_dbg_tx.dbg_LIN_Aroma_Stat));
memcpy(&env->ccu_candb_dbg_tx.dbg_Sen_Demist, &rtY.dbg_Sen_Demist_model_out, sizeof(env->ccu_candb_dbg_tx.dbg_Sen_Demist)); memcpy(&env->ccu_candb_dbg_tx.dbg_Sen_Demist, &rtY.dbg_Sen_Demist_model_out,
memcpy(&env->ccu_candb_dbg_tx.dbg_PID_tune, &rtY.dbg_PID_valve_model_out, sizeof(env->ccu_candb_dbg_tx.dbg_PID_tune)); sizeof(env->ccu_candb_dbg_tx.dbg_Sen_Demist));
memcpy(&env->ccu_candb_dbg_tx.dbg_PID_tune, &rtY.dbg_PID_valve_model_out,
sizeof(env->ccu_candb_dbg_tx.dbg_PID_tune));
memcpy(&env->ccu_candb_dbg_tx.dbg_Act_calibration, &rtY.dbg_Act_calibration_model_out, sizeof(env->ccu_candb_dbg_tx.dbg_Act_calibration)); memcpy(&env->ccu_candb_dbg_tx.dbg_Act_calibration, &rtY.dbg_Act_calibration_model_out,
memcpy(&env->ccu_candb_dbg_tx.dbg_Act_calibration_error, &rtY.dbg_Act_calibration_error_model_out, sizeof(env->ccu_candb_dbg_tx.dbg_Act_calibration_error)); sizeof(env->ccu_candb_dbg_tx.dbg_Act_calibration));
memcpy(&env->ccu_candb_dbg_tx.dbg_Act_calibration_error, &rtY.dbg_Act_calibration_error_model_out,
sizeof(env->ccu_candb_dbg_tx.dbg_Act_calibration_error));
//конец--------------------------------------------------ВЫХОД МОДЕЛИ ДЛЯ CAN------------------------------------------- //конец--------------------------------------------------ВЫХОД МОДЕЛИ ДЛЯ CAN-------------------------------------------

View File

@ -20,6 +20,7 @@
#include "DiagnosticTask.h" #include "DiagnosticTask.h"
#include "LinSensorTasks.h" #include "LinSensorTasks.h"
#include "CanUds.h" #include "CanUds.h"
#include "VIN_DATA.h"
typedef struct { typedef struct {
@ -37,7 +38,8 @@ typedef struct {
ccu_candb_tx_t ccu_candb_tx; ccu_candb_tx_t ccu_candb_tx;
ccu_candb_dbg_tx_t ccu_candb_dbg_tx; ccu_candb_dbg_tx_t ccu_candb_dbg_tx;
uint8_t isVinArmored; BodyTypeBodyArmored_t VIN_BodyTypeBodyArmored;
EngineType_t VIN_EngineType;
osMutexId_t access; osMutexId_t access;
@ -127,6 +129,6 @@ void ModelTask_StopThread(tModelTask *env);
void InitWakeupModel(tModelTask *env); void InitWakeupModel(tModelTask *env);
uint8_t getVehicleTypeArmoredFromVin(tModelTask *env, const char* vin); void updateVinDataModel(tModelTask *env, const char* vin);
#endif //HVAC_M7_MODEL_TASK_H #endif //HVAC_M7_MODEL_TASK_H