Обновление

This commit is contained in:
cfif 2026-02-09 15:55:06 +03:00
parent d031882170
commit 953e2d065e
2 changed files with 52 additions and 41 deletions

View File

@ -32,31 +32,31 @@ static _Noreturn void Adc0_Thread(tAdcTask *env) {
uint32_t *pData = (uint32_t *) ADC_Pointer_Data;
env->ADC_Data.Sensor_Ambient_Temp = pData[0];
env->ADC_Data.IGN_ANS = pData[1];
env->ADC_Data.Sensor_AC_Pressure = pData[2];
env->ADC_Data.Sensor_Incar_Temp_FL = pData[3];
env->ADC_Data.Sensor_Incar_Temp_RL = pData[4];
env->ADC_Data.Sensor_Rear_Evap_Temp = pData[5];
env->ADC_Data.Sensor_Evap_Temp = pData[6];
env->ADC_Data.Sensor_Rear_Duct1 = pData[7];
env->ADC_Data.Sensor_Rear_Duct2 = pData[8];
env->ADC_Data.Sensor_Front_Duct1 = pData[9];
env->ADC_Data.Sensor_Front_Duct2 = pData[10];
env->ADC_Data.Sensor_Front_Duct3 = pData[11];
env->ADC_Data.Sensor_Front_Duct4 = pData[12];
env->ADC_Data.Sensor_Rear_Duct3 = pData[13];
env->ADC_Data.Sensor_Rear_Duct4 = pData[14];
env->ADC_Data.Sensor_Incar_Temp_FR = pData[15];
env->ADC_Data.Sensor_Incar_Temp_RR = pData[16];
env->ADC_Data.Sensor_Rear_Duct5 = pData[17];
env->ADC_Data.Sensor_Rear_Duct6 = pData[18];
env->ADC_Data.Reserve_Sensor_Duct_Temp_1 = pData[19];
env->ADC_Data.Sensor_Front_Duct5 = pData[20];
env->ADC_Data.Sensor_Front_Duct6 = pData[21];
env->ADC0_Data.Sensor_Ambient_Temp = pData[0];
env->ADC0_Data.IGN_ANS = pData[1];
env->ADC0_Data.Sensor_AC_Pressure = pData[2];
env->ADC0_Data.Sensor_Incar_Temp_FL = pData[3];
env->ADC0_Data.Sensor_Incar_Temp_RL = pData[4];
env->ADC0_Data.Sensor_Rear_Evap_Temp = pData[5];
env->ADC0_Data.Sensor_Evap_Temp = pData[6];
env->ADC0_Data.Sensor_Rear_Duct1 = pData[7];
env->ADC0_Data.Sensor_Rear_Duct2 = pData[8];
env->ADC0_Data.Sensor_Front_Duct1 = pData[9];
env->ADC0_Data.Sensor_Front_Duct2 = pData[10];
env->ADC0_Data.Sensor_Front_Duct3 = pData[11];
env->ADC0_Data.Sensor_Front_Duct4 = pData[12];
env->ADC0_Data.Sensor_Rear_Duct3 = pData[13];
env->ADC0_Data.Sensor_Rear_Duct4 = pData[14];
env->ADC0_Data.Sensor_Incar_Temp_FR = pData[15];
env->ADC0_Data.Sensor_Incar_Temp_RR = pData[16];
env->ADC0_Data.Sensor_Rear_Duct5 = pData[17];
env->ADC0_Data.Sensor_Rear_Duct6 = pData[18];
env->ADC0_Data.Reserve_Sensor_Duct_Temp_1 = pData[19];
env->ADC0_Data.Sensor_Front_Duct5 = pData[20];
env->ADC0_Data.Sensor_Front_Duct6 = pData[21];
env->ADC_Data.Pressure_DIAG = pData[23];
env->ADC_Data.Reserve_Sensor_Duct_Temp_2 = pData[28];
env->ADC0_Data.Pressure_DIAG = pData[23];
env->ADC0_Data.Reserve_Sensor_Duct_Temp_2 = pData[28];
if (env->ADC0_BTS5120_2EKA_Channel == 0) {
env->ADC0_BTS5120_2EKA_Channel = 1;
@ -68,11 +68,11 @@ static _Noreturn void Adc0_Thread(tAdcTask *env) {
GpioPinSet(&env->gpios->power.BTS5180_2EKA_2xChannelPTCPower.PtcRelayDriver_SEL_Diag, true);
*/
env->ADC_Data.BTS5120_2EKA_ShutoffValvePowerTXV1 = pData[22]; //
env->ADC_Data.BTS5180_2EKA_ShutOFFValveFront = pData[24]; //
env->ADC_Data.BTS5180_2EKA_TwoWayValve = pData[25]; //
env->ADC_Data.BTS5180_2EKA_FrontIncarMotor = pData[26]; //
env->ADC_Data.BTS5180_2EKA_ChannelPTCPower1 = pData[27]; //
env->ADC0_Data.BTS5120_2EKA_ShutoffValvePowerTXV1 = pData[22]; //
env->ADC0_Data.BTS5180_2EKA_ShutOFFValveFront = pData[24]; //
env->ADC0_Data.BTS5180_2EKA_TwoWayValve = pData[25]; //
env->ADC0_Data.BTS5180_2EKA_FrontIncarMotor = pData[26]; //
env->ADC0_Data.BTS5180_2EKA_ChannelPTCPower1 = pData[27]; //
} else {
env->ADC0_BTS5120_2EKA_Channel = 0;
/*
@ -82,11 +82,11 @@ static _Noreturn void Adc0_Thread(tAdcTask *env) {
GpioPinSet(&env->gpios->power.BTS5180_2EKA_FrontRearIncarMotor.Incar_SEL_Diag, false);
GpioPinSet(&env->gpios->power.BTS5180_2EKA_2xChannelPTCPower.PtcRelayDriver_SEL_Diag, false);
*/
env->ADC_Data.BTS5120_2EKA_ShutoffValvePowerTXV2 = pData[22]; //
env->ADC_Data.BTS5180_2EKA_ShutOFFValveRear = pData[24]; //
env->ADC_Data.BTS5180_2EKA_ReservePowerSupply = pData[25]; //
env->ADC_Data.BTS5180_2EKA_RearIncarMotor = pData[26]; //
env->ADC_Data.BTS5180_2EKA_ChannelPTCPower2 = pData[27]; //
env->ADC0_Data.BTS5120_2EKA_ShutoffValvePowerTXV2 = pData[22]; //
env->ADC0_Data.BTS5180_2EKA_ShutOFFValveRear = pData[24]; //
env->ADC0_Data.BTS5180_2EKA_ReservePowerSupply = pData[25]; //
env->ADC0_Data.BTS5180_2EKA_RearIncarMotor = pData[26]; //
env->ADC0_Data.BTS5180_2EKA_ChannelPTCPower2 = pData[27]; //
env->ADC_isUpdate = true;
}
@ -134,11 +134,11 @@ static _Noreturn void Adc1_Thread(tAdcTask *env) {
//memcpy(env->ADC_Data, (uint8_t *)ADC_Pointer_Data, env->ADC_ChannelCount << 2);
uint32_t *pData = (uint32_t *) ADC_Pointer_Data;
env->ADC_Data.VN7008AJ_DIAG_FrontLINActuatorPowerDriverAB = pData[0];
env->ADC_Data.VN7008AJ_DIAG_RearLINActuatorPowerDriverC = pData[1];
env->ADC_Data.PBATT_CHECK = pData[2];
env->ADC_Data.VN7008AJ_FrontLINActuatorPowerDriverAB = pData[3];
env->ADC_Data.VN7008AJ_RearLINActuatorPowerDriverC = pData[4];
env->ADC1_Data.VN7008AJ_DIAG_FrontLINActuatorPowerDriverAB = pData[0];
env->ADC1_Data.VN7008AJ_DIAG_RearLINActuatorPowerDriverC = pData[1];
env->ADC1_Data.PBATT_CHECK = pData[2];
env->ADC1_Data.VN7008AJ_FrontLINActuatorPowerDriverAB = pData[3];
env->ADC1_Data.VN7008AJ_RearLINActuatorPowerDriverC = pData[4];
env->ADC_isUpdate = true;

View File

@ -57,14 +57,25 @@ typedef struct {
uint16_t PBATT_CHECK;
uint16_t VN7008AJ_FrontLINActuatorPowerDriverAB;
uint16_t VN7008AJ_RearLINActuatorPowerDriverC;
} tADC_data;
} tADC0_data;
typedef struct {
uint16_t VN7008AJ_DIAG_FrontLINActuatorPowerDriverAB;
uint16_t VN7008AJ_DIAG_RearLINActuatorPowerDriverC;
uint16_t PBATT_CHECK;
uint16_t VN7008AJ_FrontLINActuatorPowerDriverAB;
uint16_t VN7008AJ_RearLINActuatorPowerDriverC;
} tADC1_data;
typedef struct {
tAdcIO *adcIO;
osMutexId_t access;
tADC_data ADC_Data;
tADC0_data ADC0_Data;
tADC1_data ADC1_Data;
uint8_t ADC_ChannelCount;
tGpios *gpios;