HVAC_M7
/
HVAC_M7_DebugTesting
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Обновление

This commit is contained in:
cfif 2026-02-09 14:34:23 +03:00
parent 36422707df
commit e9b95902dc
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
MainModesArbiter.c
View File

@ -42,18 +42,28 @@ void Mma_Init(
void LoadDataInFromModel(tMma *env) { void LoadDataInFromModel(tMma *env) {
int16_t temp1 = 0; int16_t temp1 = 0;
int16_t temp2 = 0; float temp2 = 0;
if (osMutexAcquire(env->adcTask0.access, 1000) == osOK) { if (osMutexAcquire(env->adcTask0.access, 1000) == osOK) {
temp1 = get_temperature_fast(env->adcTask0.ADC_Data.Sensor_Ambient_Temp, fast_lookup_Incar, 512); temp1 = get_temperature_fast(env->adcTask0.ADC_Data.Sensor_Ambient_Temp);
temp2 = get_temperature_from_adc(env->adcTask0.ADC_Data.Sensor_Ambient_Temp, ALG_STEINHART);
if (env->adcTask0.ADC_isUpdate) {
env->adcTask0.ADC_isUpdate = false;
env->rtDW.controllerDataIncarInput.InIncarFL = env->adcTask0.ADC_Data.Sensor_Ambient_Temp; env->rtDW.controllerDataIncarInput.InIncarFL = env->adcTask0.ADC_Data.Sensor_Ambient_Temp;
}
osMutexRelease(env->adcTask0.access); osMutexRelease(env->adcTask0.access);
LoggerFormatInfo(LOGGER, LOG_TASK_ARB, "Temp1 = %d", temp1)
LoggerFormatInfo(LOGGER, LOG_TASK_ARB, "Temp1 = %d; Temp2 = %d;", temp1, (int16_t)(temp2 * 10.0f))
} }
if (osMutexAcquire(env->adcTask1.access, 1000) == osOK) { if (osMutexAcquire(env->adcTask1.access, 1000) == osOK) {
if (env->adcTask1.ADC_isUpdate) {
env->adcTask1.ADC_isUpdate = false;
}
//temp2 = get_temperature_fast(env->adcTask1.ADC_Data[0], fast_lookup_KST45, 512); //temp2 = get_temperature_fast(env->adcTask1.ADC_Data[0], fast_lookup_KST45, 512);
//env->rtDW.controllerDataIncarInput.InIncarFR = env->adcTask1.ADC_Data[0]; //env->rtDW.controllerDataIncarInput.InIncarFR = env->adcTask1.ADC_Data[0];
@ -90,6 +100,7 @@ static _Noreturn void Mma_Thread(tMma *env) {
// Запуск устройства // Запуск устройства
Mma_InitStage(env); Mma_InitStage(env);
init_fast_lookup_table(ALG_STEINHART);
// can_rx_message_type frame_data; // can_rx_message_type frame_data;
// uint32_t step = 0; // uint32_t step = 0;

4
MainModesArbiter_InitStage.c
View File

@ -101,10 +101,10 @@ static void Mma_InitSubSystems(tMma *env) {
Lin_0_Init(&env->linTaskActuator0, linData, &env->linPorts->lin1_Io, &env->slog.logger); Lin_0_Init(&env->linTaskActuator0, linData, &env->linPorts->lin1_Io, &env->slog.logger);
Lin0_StartThread(&env->linTaskActuator0); Lin0_StartThread(&env->linTaskActuator0);
Adc_0_Init(&env->adcTask0, &env->adcs->adc_0_IO); Adc_0_Init(&env->adcTask0, &env->adcs->adc_0_IO, env->gpios);
Adc_0_StartThread(&env->adcTask0); Adc_0_StartThread(&env->adcTask0);
Adc_1_Init(&env->adcTask1, &env->adcs->adc_1_IO); Adc_1_Init(&env->adcTask1, &env->adcs->adc_1_IO, env->gpios);
Adc_1_StartThread(&env->adcTask1); Adc_1_StartThread(&env->adcTask1);
StandBy_Init(&env->standBy); StandBy_Init(&env->standBy);