Обновление
This commit is contained in:
parent
503fb648f2
commit
28f2cf12da
|
|
@ -50,7 +50,7 @@ void LoadDataInFromModel(tMma *env) {
|
|||
env->rtDW.controllerDataIncarInput.InIncarFL = env->adcTask0.ADC_Data.Sensor_Ambient_Temp;
|
||||
|
||||
osMutexRelease(env->adcTask0.access);
|
||||
LoggerFormatInfo(LOGGER, LOG_TASK_ARB, "Temp1 = %d", temp1)
|
||||
//LoggerFormatInfo(LOGGER, LOG_TASK_ARB, "Temp1 = %d", temp1)
|
||||
}
|
||||
|
||||
if (osMutexAcquire(env->adcTask1.access, 1000) == osOK) {
|
||||
|
|
@ -87,15 +87,12 @@ void LoadDataInFromModel(tMma *env) {
|
|||
|
||||
static _Noreturn void Mma_Thread(tMma *env) {
|
||||
|
||||
// Инициализация периферийных интерфейсов
|
||||
InitPeripheralInterfaces();
|
||||
|
||||
// Запуск устройства
|
||||
Mma_InitStage(env);
|
||||
|
||||
can_rx_message_type frame_data;
|
||||
// can_rx_message_type frame_data;
|
||||
|
||||
uint32_t step = 0;
|
||||
// uint32_t step = 0;
|
||||
|
||||
|
||||
if (RGM_SRS_WAKEUP_MASK == (RGM->SRS & RGM_SRS_WAKEUP_MASK)) {
|
||||
|
|
@ -106,7 +103,7 @@ static _Noreturn void Mma_Thread(tMma *env) {
|
|||
|
||||
LoadDataInFromModel(env);
|
||||
|
||||
ModelTask_StartThread(&env->ModelTask);
|
||||
// ModelTask_StartThread(&env->ModelTask);
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -27,18 +27,31 @@ void Mma_InitComIntLog(tMma *env) {
|
|||
|
||||
}
|
||||
|
||||
const DMA_InitType dmaInitCfg =
|
||||
{
|
||||
.eArbitrationAlgorithm = DMA_ARBITRATION_ALGORITHM_FIXED_PRIORITY,
|
||||
.bHaltOnError = false
|
||||
};
|
||||
|
||||
static void Mma_InitSubSystems(tMma *env) {
|
||||
DMA_Init(DMA_INSTANCE_0, &dmaInitCfg);
|
||||
|
||||
// Настройка таймера реального времени
|
||||
Rtcs_Init();
|
||||
time_t set_timestamp = 1768553105;
|
||||
RtcSet(&env->rtcs->rtcI0, &set_timestamp);
|
||||
|
||||
SerialPorts_Init();
|
||||
|
||||
Mma_InitComIntLog(env);
|
||||
env->flash->nf_storage_param.logger = &env->slog.logger;
|
||||
env->flash->nf_storage_calib.logger = &env->slog.logger;
|
||||
|
||||
LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "Initialization of subsystems")
|
||||
|
||||
// Инициализация периферийных интерфейсов
|
||||
InitPeripheralInterfaces(&env->slog.logger);
|
||||
|
||||
bool result = DeviceStorage_Init(&env->storage, false, &env->flash->interface_calib, &env->flash->interface_param,
|
||||
&env->slog.logger);
|
||||
|
||||
|
|
|
|||
|
|
@ -4,22 +4,12 @@
|
|||
|
||||
#include "PeripheralInterfaces.h"
|
||||
|
||||
const DMA_InitType dmaInitCfg =
|
||||
{
|
||||
.eArbitrationAlgorithm = DMA_ARBITRATION_ALGORITHM_FIXED_PRIORITY,
|
||||
.bHaltOnError = false
|
||||
};
|
||||
|
||||
void InitPeripheralInterfaces() {
|
||||
void InitPeripheralInterfaces(tLoggerInterface *logger) {
|
||||
// Gpios_Init();
|
||||
|
||||
DMA_Init(DMA_INSTANCE_0, &dmaInitCfg);
|
||||
CanPorts_Init(logger);
|
||||
Adcs_Init(logger);
|
||||
Pwms_Init(logger);
|
||||
StorageOnFlash_Init(logger);
|
||||
|
||||
SerialPorts_Init();
|
||||
CanPorts_Init();
|
||||
|
||||
Adcs_Init();
|
||||
Rtcs_Init();
|
||||
StorageOnFlash_Init();
|
||||
Pwms_Init();
|
||||
}
|
||||
|
|
@ -13,6 +13,6 @@
|
|||
#include "Pwms.h"
|
||||
#include "StorageOnFlash.h"
|
||||
|
||||
void InitPeripheralInterfaces();
|
||||
void InitPeripheralInterfaces(tLoggerInterface *logger);
|
||||
|
||||
#endif //WATER_BOX_BSD_PERIPHERALINTERFACES_H
|
||||
|
|
|
|||
Loading…
Reference in New Issue