From 8e89210038f3a235e0782a4b39da74319d58f234 Mon Sep 17 00:00:00 2001 From: cfif Date: Tue, 16 Dec 2025 11:12:00 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MainModesArbiter.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/MainModesArbiter.c b/MainModesArbiter.c index f4682f2..75cd4ba 100644 --- a/MainModesArbiter.c +++ b/MainModesArbiter.c @@ -23,7 +23,9 @@ void Mma_Init( env->thread.id = 0; } -#include "ADC_Temp_KST45-14-2.h" +#include "ADC_Temp_Table.h" + +#include "math.h" const char LOG_TASK_ARB[] = "Arb"; @@ -35,18 +37,27 @@ static _Noreturn void Mma_Thread(tMma *env) { can_rx_message_type frame_data; uint32_t step = 0; - int16_t temp = 0; + int16_t temp1 = 0; + int16_t temp2 = 0; for (;;) { SystemDelayMs(1000); if (osMutexAcquire(env->adcTask1.access, 1000) == osOK) { - temp = get_temperature_fast_KST45(env->adcTask1.ADC_Data[0]); + temp1 = get_temperature_fast(env->adcTask1.ADC_Data[0], fast_lookup_Incar, 512); osMutexRelease(env->adcTask1.access); + LoggerFormatInfo(&env->slog.logger, LOG_TASK_ARB, "Temp1 = %d", temp1) } - LoggerFormatInfo(&env->slog.logger, LOG_TASK_ARB, "Temp = %d", temp) + + if (osMutexAcquire(env->adcTask1.access, 1000) == osOK) { + temp2 = get_temperature_fast(env->adcTask1.ADC_Data[0], fast_lookup_KST45, 512); + osMutexRelease(env->adcTask1.access); + LoggerFormatInfo(&env->slog.logger, LOG_TASK_ARB, "Temp2 = %d", temp2) + } + + // ADC_Start(ADC_INSTANCE_0);