Обновление

This commit is contained in:
cfif 2026-02-09 14:34:23 +03:00
parent 495c536874
commit d031882170
2 changed files with 62 additions and 23 deletions

View File

@ -7,11 +7,14 @@
#include "memory.h"
void Adc_0_Init(tAdcTask *env,
tAdcIO *adcIO) {
tAdcIO *adcIO,
tGpios *gpios) {
env->adcIO = adcIO;
env->access = osMutexNew(NULL);
env->gpios = gpios;
InitThreadAtrStatic(&env->thread.attr, "Adc0", env->thread.controlBlock, env->thread.stack,
osPriorityNormal);
}
@ -52,25 +55,41 @@ static _Noreturn void Adc0_Thread(tAdcTask *env) {
env->ADC_Data.Sensor_Front_Duct5 = pData[20];
env->ADC_Data.Sensor_Front_Duct6 = pData[21];
env->ADC_Data.BTS5120_2EKA_ShutoffValvePowerTXV1 = pData[22]; //
env->ADC_Data.BTS5120_2EKA_ShutoffValvePowerTXV2 = pData[22]; //
env->ADC_Data.Pressure_DIAG = pData[23];
env->ADC_Data.BTS5180_2EKA_ShutOFFValveFront = pData[24]; //
env->ADC_Data.BTS5180_2EKA_ShutOFFValveRear = pData[24]; //
env->ADC_Data.BTS5180_2EKA_TwoWayValve = pData[25]; //
env->ADC_Data.BTS5180_2EKA_ReservePowerSupply = pData[25]; //
env->ADC_Data.BTS5180_2EKA_FrontIncarMotor = pData[26]; //
env->ADC_Data.BTS5180_2EKA_RearIncarMotor = pData[26]; //
env->ADC_Data.BTS5180_2EKA_ChannelPTCPower1 = pData[27]; //
env->ADC_Data.BTS5180_2EKA_ChannelPTCPower2 = pData[27]; //
env->ADC_Data.Reserve_Sensor_Duct_Temp_2 = pData[28];
if (env->ADC0_BTS5120_2EKA_Channel == 0) {
env->ADC0_BTS5120_2EKA_Channel = 1;
/*
GpioPinSet(&env->gpios->power.BTS5120_2EKA_ShutoffValvePowerTXV.ShutSelTXV_SEL_Diag, true);
GpioPinSet(&env->gpios->power.BTS5180_2EKA_ShutOFFValveFrontRear.ShutSel_SEL_Diag, true);
GpioPinSet(&env->gpios->power.BTS5180_2EKA_TwoWayValveAndReservePowerSupply.TwoWayValve_SEL_Diag, true);
GpioPinSet(&env->gpios->power.BTS5180_2EKA_FrontRearIncarMotor.Incar_SEL_Diag, true);
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]; //
} else {
env->ADC0_BTS5120_2EKA_Channel = 0;
/*
GpioPinSet(&env->gpios->power.BTS5120_2EKA_ShutoffValvePowerTXV.ShutSelTXV_SEL_Diag, false);
GpioPinSet(&env->gpios->power.BTS5180_2EKA_ShutOFFValveFrontRear.ShutSel_SEL_Diag, false);
GpioPinSet(&env->gpios->power.BTS5180_2EKA_TwoWayValveAndReservePowerSupply.TwoWayValve_SEL_Diag, false);
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->ADC_isUpdate = true;
}
//memcpy(env->ADC_Data, (uint8_t *)ADC_Pointer_Data, env->ADC_ChannelCount << 2);
@ -78,7 +97,7 @@ static _Noreturn void Adc0_Thread(tAdcTask *env) {
osMutexRelease(env->access);
}
SystemDelayMs(100);
SystemDelayMs(10);
}
}
@ -90,10 +109,12 @@ void Adc_0_StartThread(tAdcTask *env) {
void Adc_1_Init(tAdcTask *env,
tAdcIO *adcIO) {
tAdcIO *adcIO,
tGpios *gpios) {
env->adcIO = adcIO;
env->access = osMutexNew(NULL);
env->gpios = gpios;
InitThreadAtrStatic(&env->thread.attr, "Adc1", env->thread.controlBlock, env->thread.stack,
osPriorityNormal);
@ -111,11 +132,20 @@ static _Noreturn void Adc1_Thread(tAdcTask *env) {
if (osMutexAcquire(env->access, 1000) == osOK) {
//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->ADC_isUpdate = true;
osMutexRelease(env->access);
}
SystemDelayMs(100);
SystemDelayMs(10);
}
}

View File

@ -6,7 +6,9 @@
#define HVAC_M7_ADCTASKS_H
#include "AdcIO.h"
#include "stdbool.h"
#include <cmsis_os.h>
#include "Gpios.h"
typedef struct {
uint16_t Sensor_Ambient_Temp;
@ -65,6 +67,11 @@ typedef struct {
tADC_data ADC_Data;
uint8_t ADC_ChannelCount;
tGpios *gpios;
uint8_t ADC0_BTS5120_2EKA_Channel;
bool ADC_isUpdate;
struct {
osThreadId_t id;
uint32_t stack[512];
@ -75,12 +82,14 @@ typedef struct {
} tAdcTask;
void Adc_0_Init(tAdcTask *env,
tAdcIO *adcIO);
tAdcIO *adcIO,
tGpios *gpios);
void Adc_0_StartThread(tAdcTask *env);
void Adc_1_Init(tAdcTask *env,
tAdcIO *adcIO);
tAdcIO *adcIO,
tGpios *gpios);
void Adc_1_StartThread(tAdcTask *env);