Добавлена калибровка в другие модули

This commit is contained in:
cfif 2026-10-12 09:27:17 +03:00
parent fcdf2dc93d
commit cd8a9baa2e
6 changed files with 120 additions and 6 deletions

View File

@ -1,3 +1,4 @@
#pragma GCC optimize ("O0")
/** Doxygen: File brief /** Doxygen: File brief
****************************************************************************** ******************************************************************************
* @file Rs_Cal_0_SedanL.c * @file Rs_Cal_0_SedanL.c

View File

@ -1,3 +1,4 @@
#pragma GCC optimize ("O0")
/** Doxygen: File brief /** Doxygen: File brief
****************************************************************************** ******************************************************************************
* @file Rs_Cal_1_SedanH.c * @file Rs_Cal_1_SedanH.c
@ -1075,6 +1076,19 @@ SECT_VEH_CAL_1 const tU16 c_ausDbF_Pwm_Bi2_Vent_SedanH[9] = { 105, 120, 120, 90,
SECT_VEH_CAL_1 const tU16 c_usAromaPwm_Min_SedanH = 200; SECT_VEH_CAL_1 const tU16 c_usAromaPwm_Min_SedanH = 200;
SECT_VEH_CAL_1 const tU16 c_usAromaPwm_Max_SedanH = 700; SECT_VEH_CAL_1 const tU16 c_usAromaPwm_Max_SedanH = 700;
/* ------------------------------------------Aroma Limit Pwm: End*/ /* ------------------------------------------Aroma Limit Pwm: End*/
SECT_VEH_CAL_1 const tS16 c_assPID_COMPRESSOR_SedanH[6] = { 60, 1000, 0, 100, 1, 1};
SECT_VEH_CAL_1 const tS16 c_assPID_VALVE_FRONT_UP_SedanH[6] = { 5, 0, 0, 0, 200, -200 };
SECT_VEH_CAL_1 const tS16 c_assPID_VALVE_FRONT_LOW_SedanH[6] = { 95, 22, 5, 0, 200, -200 };
SECT_VEH_CAL_1 const tS16 c_assPID2_VALVE_FRONT_SedanH[6] = { 20, 1, 0, 100, 0, 0};
SECT_VEH_CAL_1 const tS16 c_assPID_VALVE_REAR_SedanH[6] = { 95, 22, 5, 0, 200, -200 };
SECT_VEH_CAL_1 const tS16 c_assPID2_VALVE_REAR_SedanH[6] = { 20, 1, 0, 100, 0, 0};
SECT_VEH_CAL_1 const tS16 c_assPID_VALVE_TG_SedanH[15 ] = {0, 0, 0,7,18,20,30,35,40,45, 50,55, 70, 85, 100};
SECT_VEH_CAL_1 const tS16 c_assPID_VALVE_SPEED_SedanH[6] = { 0, 5, 15, 30, 50, 100};
/* ------------------------------------------PID: End*/
SECT_VEH_CAL_1 const tU08 c_aucFRONT_SIDE_DRS_PERCENT_AF_SedanH[12] = { 100, 70, 30, 100, 70, 30, 100, 70, 30, 100, 70, 30};
SECT_VEH_CAL_1 const tU08 c_aucFRONT_CENT_DRS_PERCENT_AF_SedanH[12] = { 100, 70, 30, 100, 70, 30, 100, 70, 30, 100, 70, 30};
/*********************************************************Cal Table End*/ /*********************************************************Cal Table End*/
/****************************************************************************** /******************************************************************************
@ -2150,6 +2164,21 @@ void Rs_Cal_1_SedanH(void)
g_usAromaPwm_Min = c_usAromaPwm_Min_SedanH; g_usAromaPwm_Min = c_usAromaPwm_Min_SedanH;
g_usAromaPwm_Max = c_usAromaPwm_Max_SedanH; g_usAromaPwm_Max = c_usAromaPwm_Max_SedanH;
/* ------------------------------------------Aroma Limit Pwm: End*/ /* ------------------------------------------Aroma Limit Pwm: End*/
M_MEMCOPY((g_assPID_COMPRESSOR), (c_assPID_COMPRESSOR_SedanH));
M_MEMCOPY((g_assPID_VALVE_FRONT_UP), (c_assPID_VALVE_FRONT_UP_SedanH));
M_MEMCOPY((g_assPID_VALVE_FRONT_LOW), (c_assPID_VALVE_FRONT_LOW_SedanH));
M_MEMCOPY((g_assPID2_VALVE_FRONT), (c_assPID2_VALVE_FRONT_SedanH));
M_MEMCOPY((g_assPID_VALVE_REAR), (c_assPID_VALVE_REAR_SedanH));
M_MEMCOPY((g_assPID2_VALVE_REAR), (c_assPID2_VALVE_REAR_SedanH));
M_MEMCOPY((g_assPID_VALVE_TG), (c_assPID_VALVE_TG_SedanH));
M_MEMCOPY((g_assPID_VALVE_SPEED), (c_assPID_VALVE_SPEED_SedanH));
/* ------------------------------------------PID: End*/
M_MEMCOPY((g_aucFRONT_SIDE_DRS_PERCENT_AF), (c_aucFRONT_SIDE_DRS_PERCENT_AF_SedanH));
M_MEMCOPY((g_aucFRONT_CENT_DRS_PERCENT_AF), (c_aucFRONT_CENT_DRS_PERCENT_AF_SedanH));
/*********************************************************Cal Table End*/ /*********************************************************Cal Table End*/
} }

View File

@ -1,3 +1,4 @@
#pragma GCC optimize ("O0")
/** Doxygen: File brief /** Doxygen: File brief
****************************************************************************** ******************************************************************************
* @file Rs_Cal_2_Limo.c * @file Rs_Cal_2_Limo.c
@ -1075,6 +1076,19 @@ SECT_VEH_CAL_2 const tU16 c_ausDbF_Pwm_Bi2_Vent_Limo[9] = { 105, 120, 120, 90, 1
SECT_VEH_CAL_2 const tU16 c_usAromaPwm_Min_Limo = 200; SECT_VEH_CAL_2 const tU16 c_usAromaPwm_Min_Limo = 200;
SECT_VEH_CAL_2 const tU16 c_usAromaPwm_Max_Limo = 700; SECT_VEH_CAL_2 const tU16 c_usAromaPwm_Max_Limo = 700;
/* ------------------------------------------Aroma Limit Pwm: End*/ /* ------------------------------------------Aroma Limit Pwm: End*/
SECT_VEH_CAL_2 const tS16 c_assPID_COMPRESSOR_Limo[6] = { 60, 1000, 0, 100, 1, 1};
SECT_VEH_CAL_2 const tS16 c_assPID_VALVE_FRONT_UP_Limo[6] = { 5, 0, 0, 0, 200, -200 };
SECT_VEH_CAL_2 const tS16 c_assPID_VALVE_FRONT_LOW_Limo[6] = { 95, 22, 5, 0, 200, -200 };
SECT_VEH_CAL_2 const tS16 c_assPID2_VALVE_FRONT_Limo[6] = { 20, 1, 0, 100, 0, 0};
SECT_VEH_CAL_2 const tS16 c_assPID_VALVE_REAR_Limo[6] = { 95, 22, 5, 0, 200, -200 };
SECT_VEH_CAL_2 const tS16 c_assPID2_VALVE_REAR_Limo[6] = { 20, 1, 0, 100, 0, 0};
SECT_VEH_CAL_2 const tS16 c_assPID_VALVE_TG_Limo[15 ] = {0, 0, 0,7,18,20,30,35,40,45, 50,55, 70, 85, 100};
SECT_VEH_CAL_2 const tS16 c_assPID_VALVE_SPEED_Limo[6] = { 0, 5, 15, 30, 50, 100};
/* ------------------------------------------PID: End*/
SECT_VEH_CAL_2 const tU08 c_aucFRONT_SIDE_DRS_PERCENT_AF_Limo[12] = { 100, 70, 30, 100, 70, 30, 100, 70, 30, 100, 70, 30};
SECT_VEH_CAL_2 const tU08 c_aucFRONT_CENT_DRS_PERCENT_AF_Limo[12] = { 100, 70, 30, 100, 70, 30, 100, 70, 30, 100, 70, 30};
/*********************************************************Cal Table End*/ /*********************************************************Cal Table End*/
/****************************************************************************** /******************************************************************************
@ -2150,6 +2164,21 @@ void Rs_Cal_2_Limo(void)
g_usAromaPwm_Min = c_usAromaPwm_Min_Limo; g_usAromaPwm_Min = c_usAromaPwm_Min_Limo;
g_usAromaPwm_Max = c_usAromaPwm_Max_Limo; g_usAromaPwm_Max = c_usAromaPwm_Max_Limo;
/* ------------------------------------------Aroma Limit Pwm: End*/ /* ------------------------------------------Aroma Limit Pwm: End*/
M_MEMCOPY((g_assPID_COMPRESSOR), (c_assPID_COMPRESSOR_Limo));
M_MEMCOPY((g_assPID_VALVE_FRONT_UP), (c_assPID_VALVE_FRONT_UP_Limo));
M_MEMCOPY((g_assPID_VALVE_FRONT_LOW), (c_assPID_VALVE_FRONT_LOW_Limo));
M_MEMCOPY((g_assPID2_VALVE_FRONT), (c_assPID2_VALVE_FRONT_Limo));
M_MEMCOPY((g_assPID_VALVE_REAR), (c_assPID_VALVE_REAR_Limo));
M_MEMCOPY((g_assPID2_VALVE_REAR), (c_assPID2_VALVE_REAR_Limo));
M_MEMCOPY((g_assPID_VALVE_TG), (c_assPID_VALVE_TG_Limo));
M_MEMCOPY((g_assPID_VALVE_SPEED), (c_assPID_VALVE_SPEED_Limo));
/* ------------------------------------------PID: End*/
M_MEMCOPY((g_aucFRONT_SIDE_DRS_PERCENT_AF), (c_aucFRONT_SIDE_DRS_PERCENT_AF_Limo));
M_MEMCOPY((g_aucFRONT_CENT_DRS_PERCENT_AF), (c_aucFRONT_CENT_DRS_PERCENT_AF_Limo));
/*********************************************************Cal Table End*/ /*********************************************************Cal Table End*/
} }

View File

@ -1,3 +1,4 @@
#pragma GCC optimize ("O0")
/** Doxygen: File brief /** Doxygen: File brief
****************************************************************************** ******************************************************************************
* @file Rs_Cal_3_Suv.c * @file Rs_Cal_3_Suv.c
@ -1075,6 +1076,19 @@ SECT_VEH_CAL_3 const tU16 c_ausDbF_Pwm_Bi2_Vent_Suv[9] = { 105, 120, 120, 90, 12
SECT_VEH_CAL_3 const tU16 c_usAromaPwm_Min_Suv = 200; SECT_VEH_CAL_3 const tU16 c_usAromaPwm_Min_Suv = 200;
SECT_VEH_CAL_3 const tU16 c_usAromaPwm_Max_Suv = 700; SECT_VEH_CAL_3 const tU16 c_usAromaPwm_Max_Suv = 700;
/* ------------------------------------------Aroma Limit Pwm: End*/ /* ------------------------------------------Aroma Limit Pwm: End*/
SECT_VEH_CAL_3 const tS16 c_assPID_COMPRESSOR_Suv[6] = { 60, 1000, 0, 100, 1, 1};
SECT_VEH_CAL_3 const tS16 c_assPID_VALVE_FRONT_UP_Suv[6] = { 5, 0, 0, 0, 200, -200 };
SECT_VEH_CAL_3 const tS16 c_assPID_VALVE_FRONT_LOW_Suv[6] = { 95, 22, 5, 0, 200, -200 };
SECT_VEH_CAL_3 const tS16 c_assPID2_VALVE_FRONT_Suv[6] = { 20, 1, 0, 100, 0, 0};
SECT_VEH_CAL_3 const tS16 c_assPID_VALVE_REAR_Suv[6] = { 95, 22, 5, 0, 200, -200 };
SECT_VEH_CAL_3 const tS16 c_assPID2_VALVE_REAR_Suv[6] = { 20, 1, 0, 100, 0, 0};
SECT_VEH_CAL_3 const tS16 c_assPID_VALVE_TG_Suv[15 ] = {0, 0, 0,7,18,20,30,35,40,45, 50,55, 70, 85, 100};
SECT_VEH_CAL_3 const tS16 c_assPID_VALVE_SPEED_Suv[6] = { 0, 5, 15, 30, 50, 100};
/* ------------------------------------------PID: End*/
SECT_VEH_CAL_3 const tU08 c_aucFRONT_SIDE_DRS_PERCENT_AF_Suv[12] = { 100, 70, 30, 100, 70, 30, 100, 70, 30, 100, 70, 30};
SECT_VEH_CAL_3 const tU08 c_aucFRONT_CENT_DRS_PERCENT_AF_Suv[12] = { 100, 70, 30, 100, 70, 30, 100, 70, 30, 100, 70, 30};
/*********************************************************Cal Table End*/ /*********************************************************Cal Table End*/
/****************************************************************************** /******************************************************************************
@ -2150,6 +2164,21 @@ void Rs_Cal_3_Suv(void)
g_usAromaPwm_Min = c_usAromaPwm_Min_Suv; g_usAromaPwm_Min = c_usAromaPwm_Min_Suv;
g_usAromaPwm_Max = c_usAromaPwm_Max_Suv; g_usAromaPwm_Max = c_usAromaPwm_Max_Suv;
/* ------------------------------------------Aroma Limit Pwm: End*/ /* ------------------------------------------Aroma Limit Pwm: End*/
M_MEMCOPY((g_assPID_COMPRESSOR), (c_assPID_COMPRESSOR_Suv));
M_MEMCOPY((g_assPID_VALVE_FRONT_UP), (c_assPID_VALVE_FRONT_UP_Suv));
M_MEMCOPY((g_assPID_VALVE_FRONT_LOW), (c_assPID_VALVE_FRONT_LOW_Suv));
M_MEMCOPY((g_assPID2_VALVE_FRONT), (c_assPID2_VALVE_FRONT_Suv));
M_MEMCOPY((g_assPID_VALVE_REAR), (c_assPID_VALVE_REAR_Suv));
M_MEMCOPY((g_assPID2_VALVE_REAR), (c_assPID2_VALVE_REAR_Suv));
M_MEMCOPY((g_assPID_VALVE_TG), (c_assPID_VALVE_TG_Suv));
M_MEMCOPY((g_assPID_VALVE_SPEED), (c_assPID_VALVE_SPEED_Suv));
/* ------------------------------------------PID: End*/
M_MEMCOPY((g_aucFRONT_SIDE_DRS_PERCENT_AF), (c_aucFRONT_SIDE_DRS_PERCENT_AF_Suv));
M_MEMCOPY((g_aucFRONT_CENT_DRS_PERCENT_AF), (c_aucFRONT_CENT_DRS_PERCENT_AF_Suv));
/*********************************************************Cal Table End*/ /*********************************************************Cal Table End*/
} }

View File

@ -1,3 +1,4 @@
#pragma GCC optimize ("O0")
/** Doxygen: File brief /** Doxygen: File brief
****************************************************************************** ******************************************************************************
* @file Rs_Cal_4_Mpv.c * @file Rs_Cal_4_Mpv.c
@ -1075,6 +1076,19 @@ SECT_VEH_CAL_4 const tU16 c_ausDbF_Pwm_Bi2_Vent_Mpv[9] = { 105, 120, 120, 90, 12
SECT_VEH_CAL_4 const tU16 c_usAromaPwm_Min_Mpv = 200; SECT_VEH_CAL_4 const tU16 c_usAromaPwm_Min_Mpv = 200;
SECT_VEH_CAL_4 const tU16 c_usAromaPwm_Max_Mpv = 700; SECT_VEH_CAL_4 const tU16 c_usAromaPwm_Max_Mpv = 700;
/* ------------------------------------------Aroma Limit Pwm: End*/ /* ------------------------------------------Aroma Limit Pwm: End*/
SECT_VEH_CAL_4 const tS16 c_assPID_COMPRESSOR_Mpv[6] = { 60, 1000, 0, 100, 1, 1};
SECT_VEH_CAL_4 const tS16 c_assPID_VALVE_FRONT_UP_Mpv[6] = { 5, 0, 0, 0, 200, -200 };
SECT_VEH_CAL_4 const tS16 c_assPID_VALVE_FRONT_LOW_Mpv[6] = { 95, 22, 5, 0, 200, -200 };
SECT_VEH_CAL_4 const tS16 c_assPID2_VALVE_FRONT_Mpv[6] = { 20, 1, 0, 100, 0, 0};
SECT_VEH_CAL_4 const tS16 c_assPID_VALVE_REAR_Mpv[6] = { 95, 22, 5, 0, 200, -200 };
SECT_VEH_CAL_4 const tS16 c_assPID2_VALVE_REAR_Mpv[6] = { 20, 1, 0, 100, 0, 0};
SECT_VEH_CAL_4 const tS16 c_assPID_VALVE_TG_Mpv[15 ] = {0, 0, 0,7,18,20,30,35,40,45, 50,55, 70, 85, 100};
SECT_VEH_CAL_4 const tS16 c_assPID_VALVE_SPEED_Mpv[6] = { 0, 5, 15, 30, 50, 100};
/* ------------------------------------------PID: End*/
SECT_VEH_CAL_4 const tU08 c_aucFRONT_SIDE_DRS_PERCENT_AF_Mpv[12] = { 100, 70, 30, 100, 70, 30, 100, 70, 30, 100, 70, 30};
SECT_VEH_CAL_4 const tU08 c_aucFRONT_CENT_DRS_PERCENT_AF_Mpv[12] = { 100, 70, 30, 100, 70, 30, 100, 70, 30, 100, 70, 30};
/*********************************************************Cal Table End*/ /*********************************************************Cal Table End*/
/****************************************************************************** /******************************************************************************
@ -2150,6 +2164,21 @@ void Rs_Cal_4_Mpv(void)
g_usAromaPwm_Min = c_usAromaPwm_Min_Mpv; g_usAromaPwm_Min = c_usAromaPwm_Min_Mpv;
g_usAromaPwm_Max = c_usAromaPwm_Max_Mpv; g_usAromaPwm_Max = c_usAromaPwm_Max_Mpv;
/* ------------------------------------------Aroma Limit Pwm: End*/ /* ------------------------------------------Aroma Limit Pwm: End*/
M_MEMCOPY((g_assPID_COMPRESSOR), (c_assPID_COMPRESSOR_Mpv));
M_MEMCOPY((g_assPID_VALVE_FRONT_UP), (c_assPID_VALVE_FRONT_UP_Mpv));
M_MEMCOPY((g_assPID_VALVE_FRONT_LOW), (c_assPID_VALVE_FRONT_LOW_Mpv));
M_MEMCOPY((g_assPID2_VALVE_FRONT), (c_assPID2_VALVE_FRONT_Mpv));
M_MEMCOPY((g_assPID_VALVE_REAR), (c_assPID_VALVE_REAR_Mpv));
M_MEMCOPY((g_assPID2_VALVE_REAR), (c_assPID2_VALVE_REAR_Mpv));
M_MEMCOPY((g_assPID_VALVE_TG), (c_assPID_VALVE_TG_Mpv));
M_MEMCOPY((g_assPID_VALVE_SPEED), (c_assPID_VALVE_SPEED_Mpv));
/* ------------------------------------------PID: End*/
M_MEMCOPY((g_aucFRONT_SIDE_DRS_PERCENT_AF), (c_aucFRONT_SIDE_DRS_PERCENT_AF_Mpv));
M_MEMCOPY((g_aucFRONT_CENT_DRS_PERCENT_AF), (c_aucFRONT_CENT_DRS_PERCENT_AF_Mpv));
/*********************************************************Cal Table End*/ /*********************************************************Cal Table End*/
} }

View File

@ -704,12 +704,9 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) {
//начало-------------------------------------------------ВХОД МОДЕЛИ SlEEP---------------------------------------------- //начало-------------------------------------------------ВХОД МОДЕЛИ SlEEP----------------------------------------------
memcpy((void *) &rtDW.CCU_STAT1_WAKEUP_MODEL, (void *) &CCU_STAT1_MODEL_SAVE, memcpy((void *) &rtDW.CCU_STAT1_WAKEUP_MODEL, (void *) &CCU_STAT1_MODEL_SAVE, sizeof(CmdCAN_CCU_STAT1_WakeUp_Bus));
sizeof(CmdCAN_CCU_STAT1_WakeUp_Bus)); memcpy((void *) &rtDW.CCU_STAT2_WAKEUP_MODEL, (void *) &CCU_STAT2_MODEL_SAVE, sizeof(CmdCAN_CCU_STAT2_WakeUp_Bus));
memcpy((void *) &rtDW.CCU_STAT2_WAKEUP_MODEL, (void *) &CCU_STAT2_MODEL_SAVE, memcpy((void *) &rtDW.CCU_STAT3_WAKEUP_MODEL, (void *) &CCU_STAT3_MODEL_SAVE, sizeof(CmdCAN_CCU_STAT3_WakeUp_Bus));
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----------------------------------------------