Обновление
This commit is contained in:
parent
731c0d4f3f
commit
74cc0e0ada
|
|
@ -19,6 +19,7 @@
|
||||||
#include "CommandLines.h"
|
#include "CommandLines.h"
|
||||||
#include "DeviceStorage.h"
|
#include "DeviceStorage.h"
|
||||||
#include "SerialPortCan.h"
|
#include "SerialPortCan.h"
|
||||||
|
#include "CanSerialPortFrameXCP.h"
|
||||||
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
|
@ -41,6 +42,8 @@ typedef struct {
|
||||||
|
|
||||||
tIndication Indication;
|
tIndication Indication;
|
||||||
|
|
||||||
|
tCanSerialPortFrameXCP CanSerialPortFrameXCP;
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
osThreadId_t id;
|
osThreadId_t id;
|
||||||
uint32_t stack[2048 * 1];
|
uint32_t stack[2048 * 1];
|
||||||
|
|
|
||||||
|
|
@ -36,15 +36,14 @@ static void Mma_InitSubSystems(tMma *env) {
|
||||||
Mma_InitComIntLog(env);
|
Mma_InitComIntLog(env);
|
||||||
LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "Инициализация подсистем")
|
LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "Инициализация подсистем")
|
||||||
|
|
||||||
bool result = DeviceStorage_Init(&env->storage, &env->flash->interface_calib, &env->flash->interface_param);
|
bool result = DeviceStorage_Init(&env->storage, &env->flash->interface_calib, &env->flash->interface_param, &env->slog.logger);
|
||||||
|
|
||||||
Indication_Init(&env->Indication, HVAC_DEV_MODE_STARTUP);
|
Indication_Init(&env->Indication, HVAC_DEV_MODE_STARTUP);
|
||||||
|
|
||||||
tSerialPortIO *thisCanComPortIO = &env->serialPorts->serialPortCanIO;
|
|
||||||
|
|
||||||
ComInt_Init(
|
ComInt_Init(
|
||||||
&env->comInt,
|
&env->comInt,
|
||||||
thisCanComPortIO,
|
&env->serialPorts->serialPortCanIO,
|
||||||
&env->storage.publicVariablesTable,
|
&env->storage.publicVariablesTable,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
|
|
@ -57,6 +56,14 @@ static void Mma_InitSubSystems(tMma *env) {
|
||||||
CommandLine_Init(&env->cli, &env->serialPorts->cliVirtualInIo);
|
CommandLine_Init(&env->cli, &env->serialPorts->cliVirtualInIo);
|
||||||
CommandLine_StartThread(&env->cli);
|
CommandLine_StartThread(&env->cli);
|
||||||
|
|
||||||
|
CanSerialPortFrameXcpInit(
|
||||||
|
&env->CanSerialPortFrameXCP,
|
||||||
|
&env->canPorts->Can0_IO,
|
||||||
|
&env->slog
|
||||||
|
);
|
||||||
|
|
||||||
|
CanSerialPortFrameTp_Start(&env->CanSerialPortFrameXCP);
|
||||||
|
|
||||||
LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "Конец инициализации подсистем")
|
LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "Конец инициализации подсистем")
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue