Обновление

This commit is contained in:
cfif 2026-04-22 12:18:45 +03:00
parent a911e96c72
commit 01e0f9c2cf
3 changed files with 329 additions and 332 deletions

File diff suppressed because it is too large Load Diff

View File

@ -3,9 +3,9 @@
*
* Code generated for Simulink model 'HVAC_model'.
*
* Model version : 1.824
* Model version : 1.827
* Simulink Coder version : 24.1 (R2024a) 19-Nov-2023
* C/C++ source code generated on : Tue Apr 21 17:06:10 2026
* C/C++ source code generated on : Wed Apr 22 11:56:10 2026
*
* Target selection: ert.tlc
* Embedded hardware selection: ARM Compatible->ARM Cortex-M
@ -80,10 +80,10 @@ typedef struct {
/* Block signals (default storage) */
typedef struct {
uint8_t Merge_b; /* '<S7>/Merge' */
int8_t Merge_l; /* '<S380>/Merge' */
int8_t Merge_h; /* '<S380>/Merge' */
int8_t Merge_c; /* '<S453>/Merge' */
int8_t Merge_h; /* '<S452>/Merge' */
int8_t Merge_h1; /* '<S385>/Merge' */
int8_t Merge_ho; /* '<S452>/Merge' */
int8_t Merge_hu; /* '<S385>/Merge' */
} B;
/* Block states (default storage) for system '<Root>' */
@ -144,8 +144,8 @@ typedef struct {
uint32_t t_start_delay_private_DSTATE_pd;/* '<S497>/t_start_delay_private ' */
uint32_t t_now; /* '<Root>/Data Store Memory5' */
uint32_t t_start; /* '<S418>/MATLAB Function' */
int16_t MinPositionCh0_private[9]; /* '<S380>/Data Store Memory12' */
int16_t MaxPositionCh0_private[9]; /* '<S380>/Data Store Memory13' */
int16_t MinPositionCh1_private[9]; /* '<S380>/Data Store Memory12' */
int16_t MaxPositionCh1_private[9]; /* '<S380>/Data Store Memory13' */
uint16_t POS_private[9]; /* '<S380>/Data Store Memory3' */
uint16_t Blower_FL; /* '<Root>/Data Store Memory27' */
uint16_t Blower_RR; /* '<Root>/Data Store Memory32' */
@ -338,10 +338,10 @@ extern const ConstP rtConstP;
* states and exports their symbols.
*
*/
extern ActuatorCmdBusInput Actuator_Ch1_Status_Model;/* '<Root>/Data Store Memory62' */
extern ActuatorCmdBusInput Actuator_Ch2_Status_Model;/* '<Root>/Data Store Memory63' */
extern ActuatorCmdBusInput Actuator_Ch0_Status_Model;/* '<Root>/Data Store Memory61' */
extern ActuatorCmdBus Actuator_Ch0_Command_Model;/* '<S380>/Data Store Memory15' */
extern ActuatorCmdBusInput Actuator_Ch2_Status_Model;/* '<Root>/Data Store Memory63' */
extern ActuatorCmdBusInput Actuator_Ch1_Status_Model;/* '<Root>/Data Store Memory62' */
extern ActuatorCmdBus Actuator_Ch1_Command_Model;/* '<S380>/Data Store Memory15' */
extern CmdBusStatus Status_Sensor_Model;/* '<S2>/Data Store Memory' */
extern CmdBusError CCU_Errors_Model; /* '<Root>/Data Store Memory3' */
extern CmdBusPWMGet PWM_Get; /* '<S5>/Data Store Memory1' */
@ -793,10 +793,6 @@ extern RT_MODEL *const rtM;
* Block '<S419>/Display' : Unused code path elimination
* Block '<S387>/Display' : Unused code path elimination
* Block '<S387>/Display3' : Unused code path elimination
* Block '<S435>/Constant1' : Unused code path elimination
* Block '<S435>/Constant14' : Unused code path elimination
* Block '<S438>/Constant1' : Unused code path elimination
* Block '<S438>/Constant14' : Unused code path elimination
* Block '<S390>/Display' : Unused code path elimination
* Block '<S6>/Display' : Unused code path elimination
* Block '<S6>/Display1' : Unused code path elimination
@ -1324,73 +1320,73 @@ extern RT_MODEL *const rtM;
* '<S377>' : 'HVAC_model/ACP/Subsystem1/Write IncarFR'
* '<S378>' : 'HVAC_model/ACP/Subsystem1/Write IncarRR'
* '<S379>' : 'HVAC_model/CAN/Subsystem'
* '<S380>' : 'HVAC_model/LIN/CHANEL0'
* '<S381>' : 'HVAC_model/LIN/CHANEL0/Actuator_Ch0_Command_Model'
* '<S382>' : 'HVAC_model/LIN/CHANEL0/COM = 0'
* '<S383>' : 'HVAC_model/LIN/CHANEL0/Check Stall Max'
* '<S384>' : 'HVAC_model/LIN/CHANEL0/Check Stall Min'
* '<S385>' : 'HVAC_model/LIN/CHANEL0/Homing'
* '<S386>' : 'HVAC_model/LIN/CHANEL0/Initial CPOS Max'
* '<S387>' : 'HVAC_model/LIN/CHANEL0/Initial CPOS Min'
* '<S388>' : 'HVAC_model/LIN/CHANEL0/Move to position Max'
* '<S389>' : 'HVAC_model/LIN/CHANEL0/Move to position Min'
* '<S390>' : 'HVAC_model/LIN/CHANEL0/Normal Mode'
* '<S391>' : 'HVAC_model/LIN/CHANEL0/Stop Mode'
* '<S392>' : 'HVAC_model/LIN/CHANEL0/COM = 0/Compare To Constant'
* '<S393>' : 'HVAC_model/LIN/CHANEL0/Check Stall Max/If Action Subsystem2'
* '<S394>' : 'HVAC_model/LIN/CHANEL0/Check Stall Max/If Action Subsystem3'
* '<S395>' : 'HVAC_model/LIN/CHANEL0/Check Stall Max/If Action Subsystem2/Write'
* '<S396>' : 'HVAC_model/LIN/CHANEL0/Check Stall Min/If Action Subsystem2'
* '<S397>' : 'HVAC_model/LIN/CHANEL0/Check Stall Min/If Action Subsystem3'
* '<S398>' : 'HVAC_model/LIN/CHANEL0/Check Stall Min/If Action Subsystem2/Write'
* '<S399>' : 'HVAC_model/LIN/CHANEL0/Homing/Count step actuator'
* '<S400>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem'
* '<S401>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem1'
* '<S402>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem2'
* '<S403>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem3'
* '<S404>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem4'
* '<S405>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem/Compare To Constant'
* '<S406>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem/Compare To Constant1'
* '<S407>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem/MAX POSITION'
* '<S408>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem/Subsystem'
* '<S409>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem1/CAN ERROR'
* '<S410>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem1/Compare To Constant'
* '<S411>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem1/MAX POSITION'
* '<S412>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem1/Subsystem'
* '<S413>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem1/UDS ERROR'
* '<S414>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem1/CAN ERROR/Write ERROR'
* '<S415>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem2/Compare To Constant3'
* '<S416>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem2/Compare To Constant4'
* '<S417>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem2/MAX POSITION'
* '<S418>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem3/If Action Subsystem'
* '<S419>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem3/If Action Subsystem1'
* '<S420>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem3/MAX POSITION'
* '<S421>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem3/If Action Subsystem/If Action Subsystem'
* '<S422>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem3/If Action Subsystem/If Action Subsystem1'
* '<S423>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem3/If Action Subsystem/MATLAB Function'
* '<S424>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem3/If Action Subsystem/MAX POSITION'
* '<S425>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem3/If Action Subsystem1/CAN ERROR'
* '<S426>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem3/If Action Subsystem1/UDS ERROR'
* '<S427>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem3/If Action Subsystem1/CAN ERROR/Write ERROR'
* '<S428>' : 'HVAC_model/LIN/CHANEL0/Homing/Switch Case Action Subsystem4/MAX POSITION'
* '<S429>' : 'HVAC_model/LIN/CHANEL0/Initial CPOS Max/If Action Subsystem2'
* '<S430>' : 'HVAC_model/LIN/CHANEL0/Initial CPOS Max/If Action Subsystem3'
* '<S431>' : 'HVAC_model/LIN/CHANEL0/Initial CPOS Max/If Action Subsystem2/Write'
* '<S432>' : 'HVAC_model/LIN/CHANEL0/Initial CPOS Min/If Action Subsystem'
* '<S433>' : 'HVAC_model/LIN/CHANEL0/Initial CPOS Min/If Action Subsystem3'
* '<S434>' : 'HVAC_model/LIN/CHANEL0/Initial CPOS Min/If Action Subsystem/Write'
* '<S435>' : 'HVAC_model/LIN/CHANEL0/Move to position Max/If Action Subsystem2'
* '<S436>' : 'HVAC_model/LIN/CHANEL0/Move to position Max/If Action Subsystem3'
* '<S437>' : 'HVAC_model/LIN/CHANEL0/Move to position Max/If Action Subsystem2/Write'
* '<S438>' : 'HVAC_model/LIN/CHANEL0/Move to position Min/If Action Subsystem2'
* '<S439>' : 'HVAC_model/LIN/CHANEL0/Move to position Min/If Action Subsystem3'
* '<S440>' : 'HVAC_model/LIN/CHANEL0/Move to position Min/If Action Subsystem2/Write'
* '<S441>' : 'HVAC_model/LIN/CHANEL0/Normal Mode/If Action Subsystem2'
* '<S442>' : 'HVAC_model/LIN/CHANEL0/Normal Mode/If Action Subsystem3'
* '<S443>' : 'HVAC_model/LIN/CHANEL0/Normal Mode/If Action Subsystem2/Write'
* '<S444>' : 'HVAC_model/LIN/CHANEL0/Stop Mode/If Action Subsystem2'
* '<S445>' : 'HVAC_model/LIN/CHANEL0/Stop Mode/If Action Subsystem3'
* '<S446>' : 'HVAC_model/LIN/CHANEL0/Stop Mode/If Action Subsystem2/Write'
* '<S380>' : 'HVAC_model/LIN/CHANEL1'
* '<S381>' : 'HVAC_model/LIN/CHANEL1/Actuator_Ch1_Command_Model'
* '<S382>' : 'HVAC_model/LIN/CHANEL1/COM = 0'
* '<S383>' : 'HVAC_model/LIN/CHANEL1/Check Stall Max'
* '<S384>' : 'HVAC_model/LIN/CHANEL1/Check Stall Min'
* '<S385>' : 'HVAC_model/LIN/CHANEL1/Homing'
* '<S386>' : 'HVAC_model/LIN/CHANEL1/Initial CPOS Max'
* '<S387>' : 'HVAC_model/LIN/CHANEL1/Initial CPOS Min'
* '<S388>' : 'HVAC_model/LIN/CHANEL1/Move to position Max'
* '<S389>' : 'HVAC_model/LIN/CHANEL1/Move to position Min'
* '<S390>' : 'HVAC_model/LIN/CHANEL1/Normal Mode'
* '<S391>' : 'HVAC_model/LIN/CHANEL1/Stop Mode'
* '<S392>' : 'HVAC_model/LIN/CHANEL1/COM = 0/Compare To Constant'
* '<S393>' : 'HVAC_model/LIN/CHANEL1/Check Stall Max/If Action Subsystem2'
* '<S394>' : 'HVAC_model/LIN/CHANEL1/Check Stall Max/If Action Subsystem3'
* '<S395>' : 'HVAC_model/LIN/CHANEL1/Check Stall Max/If Action Subsystem2/Write'
* '<S396>' : 'HVAC_model/LIN/CHANEL1/Check Stall Min/If Action Subsystem2'
* '<S397>' : 'HVAC_model/LIN/CHANEL1/Check Stall Min/If Action Subsystem3'
* '<S398>' : 'HVAC_model/LIN/CHANEL1/Check Stall Min/If Action Subsystem2/Write'
* '<S399>' : 'HVAC_model/LIN/CHANEL1/Homing/Count step actuator'
* '<S400>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem'
* '<S401>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem1'
* '<S402>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem2'
* '<S403>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem3'
* '<S404>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem4'
* '<S405>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem/Compare To Constant'
* '<S406>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem/Compare To Constant1'
* '<S407>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem/MAX POSITION'
* '<S408>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem/Subsystem'
* '<S409>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem1/CAN ERROR'
* '<S410>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem1/Compare To Constant'
* '<S411>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem1/MAX POSITION'
* '<S412>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem1/Subsystem'
* '<S413>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem1/UDS ERROR'
* '<S414>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem1/CAN ERROR/Write ERROR'
* '<S415>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem2/Compare To Constant3'
* '<S416>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem2/Compare To Constant4'
* '<S417>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem2/MAX POSITION'
* '<S418>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem3/If Action Subsystem'
* '<S419>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem3/If Action Subsystem1'
* '<S420>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem3/MAX POSITION'
* '<S421>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem3/If Action Subsystem/If Action Subsystem'
* '<S422>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem3/If Action Subsystem/If Action Subsystem1'
* '<S423>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem3/If Action Subsystem/MATLAB Function'
* '<S424>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem3/If Action Subsystem/MAX POSITION'
* '<S425>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem3/If Action Subsystem1/CAN ERROR'
* '<S426>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem3/If Action Subsystem1/UDS ERROR'
* '<S427>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem3/If Action Subsystem1/CAN ERROR/Write ERROR'
* '<S428>' : 'HVAC_model/LIN/CHANEL1/Homing/Switch Case Action Subsystem4/MAX POSITION'
* '<S429>' : 'HVAC_model/LIN/CHANEL1/Initial CPOS Max/If Action Subsystem2'
* '<S430>' : 'HVAC_model/LIN/CHANEL1/Initial CPOS Max/If Action Subsystem3'
* '<S431>' : 'HVAC_model/LIN/CHANEL1/Initial CPOS Max/If Action Subsystem2/Write'
* '<S432>' : 'HVAC_model/LIN/CHANEL1/Initial CPOS Min/If Action Subsystem'
* '<S433>' : 'HVAC_model/LIN/CHANEL1/Initial CPOS Min/If Action Subsystem3'
* '<S434>' : 'HVAC_model/LIN/CHANEL1/Initial CPOS Min/If Action Subsystem/Write'
* '<S435>' : 'HVAC_model/LIN/CHANEL1/Move to position Max/If Action Subsystem2'
* '<S436>' : 'HVAC_model/LIN/CHANEL1/Move to position Max/If Action Subsystem3'
* '<S437>' : 'HVAC_model/LIN/CHANEL1/Move to position Max/If Action Subsystem2/Write'
* '<S438>' : 'HVAC_model/LIN/CHANEL1/Move to position Min/If Action Subsystem2'
* '<S439>' : 'HVAC_model/LIN/CHANEL1/Move to position Min/If Action Subsystem3'
* '<S440>' : 'HVAC_model/LIN/CHANEL1/Move to position Min/If Action Subsystem2/Write'
* '<S441>' : 'HVAC_model/LIN/CHANEL1/Normal Mode/If Action Subsystem2'
* '<S442>' : 'HVAC_model/LIN/CHANEL1/Normal Mode/If Action Subsystem3'
* '<S443>' : 'HVAC_model/LIN/CHANEL1/Normal Mode/If Action Subsystem2/Write'
* '<S444>' : 'HVAC_model/LIN/CHANEL1/Stop Mode/If Action Subsystem2'
* '<S445>' : 'HVAC_model/LIN/CHANEL1/Stop Mode/If Action Subsystem3'
* '<S446>' : 'HVAC_model/LIN/CHANEL1/Stop Mode/If Action Subsystem2/Write'
* '<S447>' : 'HVAC_model/PWN/Write'
* '<S448>' : 'HVAC_model/PWN/Write1'
* '<S449>' : 'HVAC_model/PWN/Write2'

View File

@ -32,13 +32,9 @@ void ModelTask_Init(
static bool setActuatorBusy(tModelTask *env) {
/*
if (env->triggerCommand1 == false){
// int result = memcmp(&env->triggerActuatorCmdBus_1, &Actuator_Ch0_Command_Model, sizeof(ActuatorCmdBus));
// if (result == 0) {
// return false;
// }
for (uint8_t i = 0; i < env->linTaskActuator1->LIN_ISSR_ALL; ++i) {
if (Actuator_Ch0_Command_Model.COM[i] != 0) {
@ -55,8 +51,8 @@ static bool setActuatorBusy(tModelTask *env) {
}
}
}
*/
/*
if (env->triggerCommand2 == false) {
for (uint8_t i = 0; i < env->linTaskActuator2->LIN_ISSR_ALL; ++i) {
@ -76,7 +72,7 @@ static bool setActuatorBusy(tModelTask *env) {
}
}
/*
if (env->triggerCommand3 == false) {
for (uint8_t i = 0; i < env->linTaskActuator3->LIN_ISSR_ALL; ++i) {