Обновление
This commit is contained in:
cfif
parent
10ac079551
commit
1d4d1f2ded
135
AdcTasks.c
135
AdcTasks.c
|
|
@ -5,13 +5,16 @@
|
|||
#include "CmsisRtosThreadUtils.h"
|
||||
#include <SystemDelayInterface.h>
|
||||
#include "memory.h"
|
||||
#include "HVAC_model.h"
|
||||
|
||||
void Adc_0_Init(tAdcTask *env,
|
||||
osMutexId_t modelTaskAccess,
|
||||
tAdcIO *adcIO,
|
||||
tGpios *gpios
|
||||
) {
|
||||
|
||||
env->adcIO = adcIO;
|
||||
env->modelTaskAccess = modelTaskAccess;
|
||||
env->access = osMutexNew(NULL);
|
||||
|
||||
env->gpios = gpios;
|
||||
|
|
@ -31,35 +34,53 @@ static _Noreturn void Adc0_Thread(tAdcTask *env) {
|
|||
|
||||
env->ADC_ChannelCount = env->adcIO->get(env->adcIO->env, &ADC_Pointer_Data, 5000);
|
||||
|
||||
if (osMutexAcquire(env->access, 5000) == osOK) {
|
||||
uint32_t *pData = (uint32_t *) ADC_Pointer_Data;
|
||||
|
||||
uint32_t *pData = (uint32_t *) ADC_Pointer_Data;
|
||||
uint32_t count = osMessageQueueGetSpace(env->queueRandom);
|
||||
|
||||
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];
|
||||
if (count) {
|
||||
|
||||
env->ADC0_Data.Pressure_DIAG = pData[23];
|
||||
env->ADC0_Data.Reserve_Sensor_Duct_Temp_2 = pData[28];
|
||||
uint32_t seed = 0;
|
||||
|
||||
for (uint8_t i = 0; i < 28; ++i) {
|
||||
seed = seed | ((pData[i] & 1) << i);
|
||||
}
|
||||
|
||||
for (uint8_t i = 0; i < 4; ++i) {
|
||||
seed = seed | (((pData[i] >> 1) & 1) << (i + 28));
|
||||
}
|
||||
|
||||
osStatus_t status = osMessageQueuePut(env->queueRandom, &seed, 0, 0U);
|
||||
}
|
||||
|
||||
|
||||
if (osMutexAcquire(env->modelTaskAccess, 5000) == osOK) {
|
||||
|
||||
rtDW.ADC_Data_Model.Sensor_Ambient_Temp = pData[0];
|
||||
rtDW.ADC_Data_Model.IGN_ANS = pData[1];
|
||||
rtDW.ADC_Data_Model.Sensor_AC_Pressure = pData[2];
|
||||
rtDW.ADC_Data_Model.Sensor_Incar_Temp_FL = pData[3];
|
||||
rtDW.ADC_Data_Model.Sensor_Incar_Temp_RL = pData[4];
|
||||
rtDW.ADC_Data_Model.Sensor_Rear_Evap_Temp = pData[5];
|
||||
rtDW.ADC_Data_Model.Sensor_Evap_Temp = pData[6];
|
||||
rtDW.ADC_Data_Model.Sensor_Rear_Duct1 = pData[7];
|
||||
rtDW.ADC_Data_Model.Sensor_Rear_Duct2 = pData[8];
|
||||
rtDW.ADC_Data_Model.Sensor_Front_Duct1 = pData[9];
|
||||
rtDW.ADC_Data_Model.Sensor_Front_Duct2 = pData[10];
|
||||
rtDW.ADC_Data_Model.Sensor_Front_Duct3 = pData[11];
|
||||
rtDW.ADC_Data_Model.Sensor_Front_Duct4 = pData[12];
|
||||
rtDW.ADC_Data_Model.Sensor_Rear_Duct3 = pData[13];
|
||||
rtDW.ADC_Data_Model.Sensor_Rear_Duct4 = pData[14];
|
||||
rtDW.ADC_Data_Model.Sensor_Incar_Temp_FR = pData[15];
|
||||
rtDW.ADC_Data_Model.Sensor_Incar_Temp_RR = pData[16];
|
||||
rtDW.ADC_Data_Model.Sensor_Rear_Duct5 = pData[17];
|
||||
rtDW.ADC_Data_Model.Sensor_Rear_Duct6 = pData[18];
|
||||
rtDW.ADC_Data_Model.Reserve_Sensor_Duct_Temp_1 = pData[19];
|
||||
rtDW.ADC_Data_Model.Sensor_Front_Duct5 = pData[20];
|
||||
rtDW.ADC_Data_Model.Sensor_Front_Duct6 = pData[21];
|
||||
|
||||
rtDW.ADC_Data_Model.Pressure_DIAG = pData[23];
|
||||
rtDW.ADC_Data_Model.Reserve_Sensor_Duct_Temp_2 = pData[28];
|
||||
|
||||
if (env->ADC0_BTS5120_2EKA_Channel == 0) {
|
||||
env->ADC0_BTS5120_2EKA_Channel = 1;
|
||||
|
|
@ -71,11 +92,11 @@ static _Noreturn void Adc0_Thread(tAdcTask *env) {
|
|||
GpioPinSet(&env->gpios->power.BTS5180_2EKA_2xChannelPTCPower.PtcRelayDriver_SEL_Diag, true);
|
||||
|
||||
|
||||
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]; //
|
||||
rtDW.ADC_Data_Model.BTS5120_2EKA_ShutoffValvePowerTXV1 = pData[22]; //
|
||||
rtDW.ADC_Data_Model.BTS5180_2EKA_ShutOFFValveFront = pData[24]; //
|
||||
rtDW.ADC_Data_Model.BTS5180_2EKA_TwoWayValve = pData[25]; //
|
||||
rtDW.ADC_Data_Model.BTS5180_2EKA_FrontIncarMotor = pData[26]; //
|
||||
rtDW.ADC_Data_Model.BTS5180_2EKA_ChannelPTCPower1 = pData[27]; //
|
||||
} else {
|
||||
env->ADC0_BTS5120_2EKA_Channel = 0;
|
||||
|
||||
|
|
@ -86,37 +107,16 @@ 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->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]; //
|
||||
rtDW.ADC_Data_Model.BTS5120_2EKA_ShutoffValvePowerTXV2 = pData[22]; //
|
||||
rtDW.ADC_Data_Model.BTS5180_2EKA_ShutOFFValveRear = pData[24]; //
|
||||
rtDW.ADC_Data_Model.BTS5180_2EKA_ReservePowerSupply = pData[25]; //
|
||||
rtDW.ADC_Data_Model.BTS5180_2EKA_RearIncarMotor = pData[26]; //
|
||||
rtDW.ADC_Data_Model.BTS5180_2EKA_ChannelPTCPower2 = pData[27]; //
|
||||
|
||||
env->ADC_isUpdate = true;
|
||||
}
|
||||
|
||||
|
||||
uint32_t count = osMessageQueueGetSpace(env->queueRandom);
|
||||
|
||||
if (count) {
|
||||
|
||||
uint32_t seed = 0;
|
||||
|
||||
for (uint8_t i = 0; i < 28; ++i) {
|
||||
seed = seed | ((pData[i] & 1) << i);
|
||||
}
|
||||
|
||||
for (uint8_t i = 0; i < 4; ++i) {
|
||||
seed = seed | (((pData[i] >> 1) & 1) << (i + 28));
|
||||
}
|
||||
|
||||
osStatus_t status = osMessageQueuePut(env->queueRandom, &seed, 0, 0U);
|
||||
}
|
||||
|
||||
|
||||
//memcpy(env->ADC_Data, (uint8_t *)ADC_Pointer_Data, env->ADC_ChannelCount << 2);
|
||||
|
||||
osMutexRelease(env->access);
|
||||
osMutexRelease(env->modelTaskAccess);
|
||||
}
|
||||
|
||||
SystemDelayMs(500);
|
||||
|
|
@ -145,10 +145,12 @@ void Adc_0_StartThread(tAdcTask *env) {
|
|||
|
||||
|
||||
void Adc_1_Init(tAdcTask *env,
|
||||
osMutexId_t modelTaskAccess,
|
||||
tAdcIO *adcIO,
|
||||
tGpios *gpios) {
|
||||
|
||||
env->adcIO = adcIO;
|
||||
env->modelTaskAccess = modelTaskAccess;
|
||||
env->access = osMutexNew(NULL);
|
||||
env->gpios = gpios;
|
||||
|
||||
|
|
@ -165,20 +167,17 @@ static _Noreturn void Adc1_Thread(tAdcTask *env) {
|
|||
|
||||
env->ADC_ChannelCount = env->adcIO->get(env->adcIO->env, &ADC_Pointer_Data, 5000);
|
||||
|
||||
if (osMutexAcquire(env->access, 5000) == osOK) {
|
||||
if (osMutexAcquire(env->modelTaskAccess, 5000) == osOK) {
|
||||
|
||||
//memcpy(env->ADC_Data, (uint8_t *)ADC_Pointer_Data, env->ADC_ChannelCount << 2);
|
||||
uint32_t *pData = (uint32_t *) ADC_Pointer_Data;
|
||||
|
||||
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];
|
||||
rtDW.ADC_Data_Model.VN7008AJ_DIAG_FrontLINActuatorPowerDriverAB = pData[0];
|
||||
rtDW.ADC_Data_Model.VN7008AJ_DIAG_RearLINActuatorPowerDriverC = pData[1];
|
||||
rtDW.ADC_Data_Model.PBATT_CHECK = pData[2];
|
||||
rtDW.ADC_Data_Model.VN7008AJ_FrontLINActuatorPowerDriverAB = pData[3];
|
||||
rtDW.ADC_Data_Model.VN7008AJ_RearLINActuatorPowerDriverC = pData[4];
|
||||
|
||||
env->ADC_isUpdate = true;
|
||||
|
||||
osMutexRelease(env->access);
|
||||
osMutexRelease(env->modelTaskAccess);
|
||||
}
|
||||
|
||||
SystemDelayMs(500);
|
||||
|
|
|
|||
|
|
@ -71,18 +71,19 @@ typedef struct {
|
|||
tADC0_data ADC0_Data;
|
||||
tADC1_data ADC1_Data;
|
||||
|
||||
osMutexId_t modelTaskAccess;
|
||||
|
||||
uint8_t ADC_ChannelCount;
|
||||
|
||||
tGpios *gpios;
|
||||
|
||||
uint8_t ADC0_BTS5120_2EKA_Channel;
|
||||
bool ADC_isUpdate;
|
||||
|
||||
osMessageQueueId_t queueRandom;
|
||||
|
||||
struct {
|
||||
osThreadId_t id;
|
||||
uint32_t stack[256];
|
||||
uint32_t stack[384];
|
||||
StaticTask_t controlBlock;
|
||||
osThreadAttr_t attr;
|
||||
} thread;
|
||||
|
|
@ -92,12 +93,14 @@ typedef struct {
|
|||
uint32_t getRandom32(tAdcTask *env);
|
||||
|
||||
void Adc_0_Init(tAdcTask *env,
|
||||
osMutexId_t modelTaskAccess,
|
||||
tAdcIO *adcIO,
|
||||
tGpios *gpios);
|
||||
|
||||
void Adc_0_StartThread(tAdcTask *env);
|
||||
|
||||
void Adc_1_Init(tAdcTask *env,
|
||||
osMutexId_t modelTaskAccess,
|
||||
tAdcIO *adcIO,
|
||||
tGpios *gpios);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue