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

Правки в обновлении

This commit is contained in:
cfif 2026-09-01 17:09:06 +03:00
parent b7068824a9
commit dde9f47594
7 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
APP/main.c
View File

@ -77,7 +77,8 @@ void FirmwareStopThread() {
Lin5_StopThread(&MAIN_ENV.linTaskSensor5); Lin5_StopThread(&MAIN_ENV.linTaskSensor5);
ADC0_StopThread(&MAIN_ENV.adcTask0); ADC0_StopThread(&MAIN_ENV.adcTask0);
ADC1_StopThread(&MAIN_ENV.adcTask1); ADC1_StopThread(&MAIN_ENV.adcTask1);
LogTransmitter_StopThread(&MAIN_ENV.slog);
CommandLine_StopThread(&MAIN_ENV.cli);
} }
int main(void) { int main(void) {

3
CMakeLists.txt
View File

@ -48,8 +48,7 @@ SET(VECT_TAB_OFFSET "0x00000")
#-- Defines -------------------------------------------------------------------- #-- Defines --------------------------------------------------------------------
#ADD_DEFINITIONS(-DLFS_NO_ASSERT=1)
#ADD_DEFINITIONS(-DLFS_NO_MALLOC=1)
ADD_DEFINITIONS(-DINTERNAL_HW_YEAR=${INTERNAL_HW_YEAR}) ADD_DEFINITIONS(-DINTERNAL_HW_YEAR=${INTERNAL_HW_YEAR})
ADD_DEFINITIONS(-DINTERNAL_HW_MONTH=${INTERNAL_HW_MONTH}) ADD_DEFINITIONS(-DINTERNAL_HW_MONTH=${INTERNAL_HW_MONTH})

4
MODULES/HVAC_M7_CAN_UDS/CanUds.c
View File

@ -655,7 +655,6 @@ static void setDefaultValue(tCanUds *env) {
set_CCU_Mute(env->canSpamTransmitter, false); set_CCU_Mute(env->canSpamTransmitter, false);
set_DBG_CCU_Mute(env->canSpamDebugTransmitter, false); set_DBG_CCU_Mute(env->canSpamDebugTransmitter, false);
set_NoBitsDTC(env->Diagnostic, 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; env->currentSession = com->sub_function;
//setDefaultSecurityAccess(env); //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; statusData.Status_Active_Diagnostic_Session.Active_Diagnostic_Session = env->currentSession;
} }

6
MODULES/HVAC_M7_Command/CommandLines.c
View File

@ -73,4 +73,10 @@ void CommandLine_StartThread(tCommandLine *env) {
if (!env->thread.id) { if (!env->thread.id) {
env->thread.id = osThreadNew((osThreadFunc_t) (CommandLine_Thread), (void *) (env), &env->thread.attr); 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);
}
} }

2
MODULES/HVAC_M7_Command/CommandLines.h
View File

@ -40,4 +40,6 @@ void CommandLine_Init(tCommandLine *env, tLoggerToSerialPort *loggerToSerialPort
tSerialPortIO *cliVirtualPortOut_Io); tSerialPortIO *cliVirtualPortOut_Io);
void CommandLine_StartThread(tCommandLine *env); void CommandLine_StartThread(tCommandLine *env);
void CommandLine_StopThread(tCommandLine *env);
#endif //WATER_BLACKBOX2_G_COMMANDLINES_H #endif //WATER_BLACKBOX2_G_COMMANDLINES_H

1
MODULES/LoggerToSerialPort/Inc/LoggerToSerialPort.h
View File

@ -82,5 +82,6 @@ void LoggerToSerialPort_Init(
void LogTransmitter_StartThread(tLoggerToSerialPort *env); void LogTransmitter_StartThread(tLoggerToSerialPort *env);
void LoggerToSerialPort_Cmd(tLoggerToSerialPort *env, char *msg, uint16_t msgLen); void LoggerToSerialPort_Cmd(tLoggerToSerialPort *env, char *msg, uint16_t msgLen);
void LogTransmitter_StopThread(tLoggerToSerialPort *env);
#endif //UVEOS_ON_NATION_LOGGERTOSERIALPORT_H #endif //UVEOS_ON_NATION_LOGGERTOSERIALPORT_H

6
MODULES/LoggerToSerialPort/Src/LoggerToSerialPort.c
View File

@ -302,4 +302,10 @@ void LogTransmitter_StartThread(tLoggerToSerialPort *env) {
if (!env->thread.id) { if (!env->thread.id) {
env->thread.id = osThreadNew((osThreadFunc_t) (LogTransmitter_Thread), (void *) (env), &env->thread.attr); 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);
}
} }