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

Обновление платы на V2

This commit is contained in:
cfif 2026-05-25 12:46:59 +03:00
parent f43d9b52c7
commit 7c8a9c887b
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MainModesArbiter.c
View File

@ -71,18 +71,6 @@ static _Noreturn void Mma_Thread(tMma *env) {
// Запуск устройства // Запуск устройства
Mma_InitStage(env); Mma_InitStage(env);
if (RGM_SRS_WAKEUP_MASK == (RGM->SRS & RGM_SRS_WAKEUP_MASK)) {
LoggerInfoStatic(LOGGER, LOG_TASK_ARB, "Wake up from standby")
}
// if (RGM_SRS_WAKEUP_MASK == (RGM->SRS & RGM_SRS_WAKEUP_MASK)) {
// asm("nop");
// } else {
// SystemDelayMs(1000);
// SMC_SetSystemMode(SMC_MODE_STANBY_3);
// }
env->pwms->pwmFrontIo.run(env->pwms->pwmFrontIo.env); env->pwms->pwmFrontIo.run(env->pwms->pwmFrontIo.env);
ModelTask_StartThread(&env->ModelTask); ModelTask_StartThread(&env->ModelTask);

2
MainModesArbiter.h
View File

@ -76,8 +76,6 @@ typedef struct {
tAdc0Task adcTask0; tAdc0Task adcTask0;
tAdc1Task adcTask1; tAdc1Task adcTask1;
tStandBy standBy;
tModelTask ModelTask; tModelTask ModelTask;
tDiagnostic Diagnostic; tDiagnostic Diagnostic;

12
MainModesArbiter_InitStage.c
View File

@ -35,6 +35,7 @@ const DMA_InitType dmaInitCfg =
}; };
static void Mma_InitSubSystems(tMma *env) { static void Mma_InitSubSystems(tMma *env) {
DMA_Init(DMA_INSTANCE_0, &dmaInitCfg); DMA_Init(DMA_INSTANCE_0, &dmaInitCfg);
// Настройка таймера реального времени // Настройка таймера реального времени
@ -48,6 +49,16 @@ static void Mma_InitSubSystems(tMma *env) {
env->flash->nf_storage_param.logger = &env->slog.logger; env->flash->nf_storage_param.logger = &env->slog.logger;
env->flash->nf_storage_calib.logger = &env->slog.logger; env->flash->nf_storage_calib.logger = &env->slog.logger;
if (RGM_SRS_WAKEUP_MASK == (RGM->SRS & RGM_SRS_WAKEUP_MASK)) {
LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "Wake up from standby")
tGpioPin Ign_Wakeup = vInitGpioPinPull(GPIO_E, PORT_PIN_16, GPIO_IN, GPIO_PIN_NOREVERSE, GPIO_HIGH, GPIO_PUSH_PULL,
PORT_PULL_UP);
}
LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "Initialization of subsystems") LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "Initialization of subsystems")
// Инициализация периферийных интерфейсов // Инициализация периферийных интерфейсов
@ -211,7 +222,6 @@ static void Mma_InitSubSystems(tMma *env) {
CanSerialPortCanUds_Start(&env->canUds); CanSerialPortCanUds_Start(&env->canUds);
StandBy_Init(&env->standBy);
LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "End of subsystem initialization") LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "End of subsystem initialization")