NAVIGATOR_UVEOS_NATION_TELIT
/
UveosOnNation_VEGA_MainModesArbiter
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix

This commit is contained in:
cfif 2024-12-09 13:40:18 +03:00
parent 46818030bb
commit 786633e012
3 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
MainModesArbiter.c
View File

@ -375,8 +375,6 @@ static _Noreturn void Mma_Thread(tMma *env) {
//Запуск устройства //Запуск устройства
Mma_InitStage(env); Mma_InitStage(env);
GsmWithGnss_StartRMCThread2(&env->gsmWithGnss.gsmAt);
EgtsProcessing_Init( EgtsProcessing_Init(
&env->egtsProcessing, &env->egtsProcessing,
&env->storage, &env->storage,
@ -388,7 +386,7 @@ static _Noreturn void Mma_Thread(tMma *env) {
EgtsProcessing_Start(&env->egtsProcessing); EgtsProcessing_Start(&env->egtsProcessing);
size_t size = xPortGetMinimumEverFreeHeapSize(); volatile size_t size = xPortGetMinimumEverFreeHeapSize();
uint32_t sizeStorage = sizeof(tDeviceDataNonVolatile); uint32_t sizeStorage = sizeof(tDeviceDataNonVolatile);
LoggerStrFormatInfo(LOGGER, LOG_SIGN, "Свободно %u байт в куче. Размер хранилища %u", size, sizeStorage); LoggerStrFormatInfo(LOGGER, LOG_SIGN, "Свободно %u байт в куче. Размер хранилища %u", size, sizeStorage);
@ -450,12 +448,35 @@ static _Noreturn void Mma_Thread(tMma *env) {
Pwm_AudioDisable(&env->power); Pwm_AudioDisable(&env->power);
LoggerTraceStatic(LOGGER, LOG_SIGN, "Звуковой усилитель отключён") LoggerTraceStatic(LOGGER, LOG_SIGN, "Звуковой усилитель отключён")
SystemDelayMs(2000);
// Mma_StartTestThreadStart(env); // Mma_StartTestThreadStart(env);
for (;;) { for (;;) {
Mma_ColorBip(env); Mma_ColorBip(env);
Mma_gnssUpdate(env, &indicationState);
// if (env->storage.runtime.EGTS_FLEET_ON == false) {
if (osMutexAcquire(env->gsmWithGnss.gsmAt.access, 1000) == osOK) {
Mma_gnssUpdate(env, &indicationState);
osMutexRelease(env->gsmWithGnss.gsmAt.access);
} else {
LoggerTraceStatic(LOGGER, LOG_SIGN, "Ошибка доступа (1)")
}
} else {
if (osMutexAcquire(env->gsmWithGnss.gsmAt.access, 1000) == osOK) {
AtGsm_Gsnss_GetNMEA_Pack(&env->gsmWithGnss, 400);
osMutexRelease(env->gsmWithGnss.gsmAt.access);
SystemDelayMs(1000);
} else {
LoggerTraceStatic(LOGGER, LOG_SIGN, "Ошибка доступа (2)")
}
}
/* /*

3
MainModesArbiter.h
View File

@ -74,7 +74,8 @@ typedef struct {
struct { struct {
osThreadId_t id; osThreadId_t id;
uint32_t stack[4048]; //4048 6072 // ++++++CFIF
uint32_t stack[2500]; //4048 6072
StaticTask_t controlBlock; StaticTask_t controlBlock;
osThreadAttr_t attr; osThreadAttr_t attr;
} thread; } thread;

5
MainModesArbiter_InitStage.c
View File

@ -303,12 +303,12 @@ static void Mma_RunSubThreads(tMma *env) {
VarsTabDumpObserver_StartThread(&env->storage.dumpObserver); VarsTabDumpObserver_StartThread(&env->storage.dumpObserver);
Accel_StartThread(&env->accel); Accel_StartThread(&env->accel);
CrashDetection_StartThread(&env->crashDetect); // CrashDetection_StartThread(&env->crashDetect);
/* /*
Cli_StartThread(&env->cli); Cli_StartThread(&env->cli);
Cli_StartThread(&env->cliVrt); Cli_StartThread(&env->cliVrt);
*/ */
UserInput_StartThread(&env->userInput); // UserInput_StartThread(&env->userInput);
ComInt_StartThread(&env->comInt); ComInt_StartThread(&env->comInt);
@ -382,6 +382,7 @@ static void Mma_InitAndRunIndication(tMma *env) {
void Mma_ColorBip(tMma *env) { void Mma_ColorBip(tMma *env) {
if (!GpioPinGet(&env->power.pins->main.ignition)) { if (!GpioPinGet(&env->power.pins->main.ignition)) {
env->flIgn = false; env->flIgn = false;
} else if ((GpioPinGet(&env->power.pins->main.ignition)) && (env->flIgn == false)) { } else if ((GpioPinGet(&env->power.pins->main.ignition)) && (env->flIgn == false)) {