From dde9f4759407986927ae77dc7baa623787144c62 Mon Sep 17 00:00:00 2001 From: cfif Date: Tue, 1 Sep 2026 17:09:06 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=B2?= =?UTF-8?q?=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APP/main.c | 3 ++- CMakeLists.txt | 3 +-- MODULES/HVAC_M7_CAN_UDS/CanUds.c | 4 ++-- MODULES/HVAC_M7_Command/CommandLines.c | 6 ++++++ MODULES/HVAC_M7_Command/CommandLines.h | 2 ++ MODULES/LoggerToSerialPort/Inc/LoggerToSerialPort.h | 1 + MODULES/LoggerToSerialPort/Src/LoggerToSerialPort.c | 6 ++++++ 7 files changed, 20 insertions(+), 5 deletions(-) diff --git a/APP/main.c b/APP/main.c index fe6784a..abbe00b 100644 --- a/APP/main.c +++ b/APP/main.c @@ -77,7 +77,8 @@ void FirmwareStopThread() { Lin5_StopThread(&MAIN_ENV.linTaskSensor5); ADC0_StopThread(&MAIN_ENV.adcTask0); ADC1_StopThread(&MAIN_ENV.adcTask1); - + LogTransmitter_StopThread(&MAIN_ENV.slog); + CommandLine_StopThread(&MAIN_ENV.cli); } int main(void) { diff --git a/CMakeLists.txt b/CMakeLists.txt index d7db0a6..06e0223 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,8 +48,7 @@ SET(VECT_TAB_OFFSET "0x00000") #-- Defines -------------------------------------------------------------------- - -#ADD_DEFINITIONS(-DLFS_NO_MALLOC=1) +#ADD_DEFINITIONS(-DLFS_NO_ASSERT=1) ADD_DEFINITIONS(-DINTERNAL_HW_YEAR=${INTERNAL_HW_YEAR}) ADD_DEFINITIONS(-DINTERNAL_HW_MONTH=${INTERNAL_HW_MONTH}) diff --git a/MODULES/HVAC_M7_CAN_UDS/CanUds.c b/MODULES/HVAC_M7_CAN_UDS/CanUds.c index 4f991da..2e2f1fa 100644 --- a/MODULES/HVAC_M7_CAN_UDS/CanUds.c +++ b/MODULES/HVAC_M7_CAN_UDS/CanUds.c @@ -655,7 +655,6 @@ static void setDefaultValue(tCanUds *env) { set_CCU_Mute(env->canSpamTransmitter, false); set_DBG_CCU_Mute(env->canSpamDebugTransmitter, false); set_NoBitsDTC(env->Diagnostic, false); - memset(&env->Status_Set_For_Model_output, 0, sizeof(tStatus_Set_For_Model)); } @@ -934,7 +933,8 @@ static uint16_t DiagnosticSessionControl_10(tCanUds *env) { env->currentSession = com->sub_function; //setDefaultSecurityAccess(env); - setDefaultValue(env); + //setDefaultValue(env); + memset(&env->Status_Set_For_Model_output, 0, sizeof(tStatus_Set_For_Model)); statusData.Status_Active_Diagnostic_Session.Active_Diagnostic_Session = env->currentSession; } diff --git a/MODULES/HVAC_M7_Command/CommandLines.c b/MODULES/HVAC_M7_Command/CommandLines.c index 5b7a80e..bb18c61 100644 --- a/MODULES/HVAC_M7_Command/CommandLines.c +++ b/MODULES/HVAC_M7_Command/CommandLines.c @@ -73,4 +73,10 @@ void CommandLine_StartThread(tCommandLine *env) { if (!env->thread.id) { env->thread.id = osThreadNew((osThreadFunc_t) (CommandLine_Thread), (void *) (env), &env->thread.attr); } +} + +void CommandLine_StopThread(tCommandLine *env) { + if (env->thread.id) { + osThreadSuspend(env->thread.id); + } } \ No newline at end of file diff --git a/MODULES/HVAC_M7_Command/CommandLines.h b/MODULES/HVAC_M7_Command/CommandLines.h index 4321dc4..be98113 100644 --- a/MODULES/HVAC_M7_Command/CommandLines.h +++ b/MODULES/HVAC_M7_Command/CommandLines.h @@ -40,4 +40,6 @@ void CommandLine_Init(tCommandLine *env, tLoggerToSerialPort *loggerToSerialPort tSerialPortIO *cliVirtualPortOut_Io); void CommandLine_StartThread(tCommandLine *env); +void CommandLine_StopThread(tCommandLine *env); + #endif //WATER_BLACKBOX2_G_COMMANDLINES_H diff --git a/MODULES/LoggerToSerialPort/Inc/LoggerToSerialPort.h b/MODULES/LoggerToSerialPort/Inc/LoggerToSerialPort.h index c0f80e4..1b564f7 100644 --- a/MODULES/LoggerToSerialPort/Inc/LoggerToSerialPort.h +++ b/MODULES/LoggerToSerialPort/Inc/LoggerToSerialPort.h @@ -82,5 +82,6 @@ void LoggerToSerialPort_Init( void LogTransmitter_StartThread(tLoggerToSerialPort *env); void LoggerToSerialPort_Cmd(tLoggerToSerialPort *env, char *msg, uint16_t msgLen); +void LogTransmitter_StopThread(tLoggerToSerialPort *env); #endif //UVEOS_ON_NATION_LOGGERTOSERIALPORT_H diff --git a/MODULES/LoggerToSerialPort/Src/LoggerToSerialPort.c b/MODULES/LoggerToSerialPort/Src/LoggerToSerialPort.c index f61eaea..c2736c3 100644 --- a/MODULES/LoggerToSerialPort/Src/LoggerToSerialPort.c +++ b/MODULES/LoggerToSerialPort/Src/LoggerToSerialPort.c @@ -302,4 +302,10 @@ void LogTransmitter_StartThread(tLoggerToSerialPort *env) { if (!env->thread.id) { env->thread.id = osThreadNew((osThreadFunc_t) (LogTransmitter_Thread), (void *) (env), &env->thread.attr); } +} + +void LogTransmitter_StopThread(tLoggerToSerialPort *env) { + if (env->thread.id) { + osThreadSuspend(env->thread.id); + } } \ No newline at end of file