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

Исправлена прединициализация перед запуском задачи

This commit is contained in:
cfif 2024-12-18 18:15:25 +03:00
parent 6c947a0476
commit 5fa0a934cc
1 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
MainModesArbiter.c
View File

@ -17,6 +17,7 @@
#define LOGGER &env->slog.logger #define LOGGER &env->slog.logger
#ifdef UVEOS_ADD_TELEMATICA #ifdef UVEOS_ADD_TELEMATICA
void TELEMATICA_START(tMma *env) { void TELEMATICA_START(tMma *env) {
env->storage.runtime.EGTS_FLEET_ON = true; env->storage.runtime.EGTS_FLEET_ON = true;
} }
@ -36,6 +37,7 @@ void TELEMATICA_STOP(tMma *env) {
} }
} }
#endif #endif
@ -249,7 +251,7 @@ void Mma_EcallPrepare(tMma *env) {
GsmWithGnss_SelectStandartNetwork(&env->gsmWithGnss.gsmAt, 25); GsmWithGnss_SelectStandartNetwork(&env->gsmWithGnss.gsmAt, 25);
SystemDelayMs(3000); SystemDelayMs(3000);
AtGsm_OperatorSelectionDeregister(&env->gsmWithGnss.gsmAt); AtGsm_OperatorSelectionDeregister(&env->gsmWithGnss.gsmAt);
AtGsmTelitLe910_GnssEcallOnlyMode(&env->gsmWithGnss.gsmAt,0); AtGsmTelitLe910_GnssEcallOnlyMode(&env->gsmWithGnss.gsmAt, 0);
} }
void Mma_EcallManual(tMma *env) { void Mma_EcallManual(tMma *env) {
@ -273,7 +275,7 @@ void Mma_EcallManualKZ(tMma *env) {
Mma_SetMode(env, DEVICE_MODE_UVEOS_CALL_INITIATE); Mma_SetMode(env, DEVICE_MODE_UVEOS_CALL_INITIATE);
Mma_NetworkAndAudioRequireKz(env); Mma_NetworkAndAudioRequireKz(env);
Mma_EcallPrepare(env); Mma_EcallPrepare(env);
GsmWithGnss_NetworkEnableInnaterups(&env->gsmWithGnss, 5,250000); GsmWithGnss_NetworkEnableInnaterups(&env->gsmWithGnss, 5, 250000);
GpioPinEnable(&env->power.pins->main.ecall); GpioPinEnable(&env->power.pins->main.ecall);
env->uveos.currentMsd->msd.MSD_Data.msgId = 1; env->uveos.currentMsd->msd.MSD_Data.msgId = 1;
EraGlonassUveos_ManualEmergencyCall(&env->uveos, true); EraGlonassUveos_ManualEmergencyCall(&env->uveos, true);
@ -324,7 +326,7 @@ void Mma_EcallAutomatic(tMma *env, tUveosEmergencyEvent emergencyEvent) {
Pwm_AudioEnable(&env->power); Pwm_AudioEnable(&env->power);
Mma_SetMode(env, DEVICE_MODE_UVEOS_CALL_INITIATE); Mma_SetMode(env, DEVICE_MODE_UVEOS_CALL_INITIATE);
Mma_EcallPrepare(env); Mma_EcallPrepare(env);
GsmWithGnss_NetworkEnableInnaterups(&env->gsmWithGnss, 5,250000); GsmWithGnss_NetworkEnableInnaterups(&env->gsmWithGnss, 5, 250000);
Mma_NetworkAndAudioRequireKz(env); Mma_NetworkAndAudioRequireKz(env);
GpioPinEnable(&env->power.pins->main.ecall); GpioPinEnable(&env->power.pins->main.ecall);
@ -536,25 +538,23 @@ static _Noreturn void Mma_Thread(tMma *env) {
} else { } else {
LoggerInfoStatic(LOGGER, LOG_SIGN, "Сеть или сим-чип отсутствует"); LoggerInfoStatic(LOGGER, LOG_SIGN, "Сеть или сим-чип отсутствует");
} }
} else {
#ifdef UVEOS_ADD_TELEMATICA
TELEMATICA_START(env);
#endif
} }
/*
Pwm_AudioDisable(&env->power); Pwm_AudioDisable(&env->power);
LoggerTraceStatic(LOGGER, LOG_SIGN, "Звуковой усилитель отключён") LoggerTraceStatic(LOGGER, LOG_SIGN, "Звуковой усилитель отключён")
AtGsm_OperatorSelectionDeregister(&env->gsmWithGnss.gsmAt); AtGsm_OperatorSelectionDeregister(&env->gsmWithGnss.gsmAt);
SystemDelayMs(2000); SystemDelayMs(2000);
AtGsmTelitLe910_GnssEcallOnlyMode(&env->gsmWithGnss.gsmAt,0); AtGsmTelitLe910_GnssEcallOnlyMode(&env->gsmWithGnss.gsmAt, 0);
SystemDelayMs(2000); SystemDelayMs(2000);
GsmWithGnss_SelectStandartNetwork(&env->gsmWithGnss.gsmAt, 25); GsmWithGnss_SelectStandartNetwork(&env->gsmWithGnss.gsmAt, 25);
#ifdef UVEOS_ADD_TELEMATICA
if (noSendMsdCount == 0) {
TELEMATICA_START(env);
}
#endif
// Mma_StartTestThreadStart(env); // Mma_StartTestThreadStart(env);
*/
SystemDelayMs(100);
for (;;) { for (;;) {
@ -662,7 +662,7 @@ static _Noreturn void Mma_Thread(tMma *env) {
LoggerTraceStatic(LOGGER, LOG_SIGN, "Проверяем экстренное событие") LoggerTraceStatic(LOGGER, LOG_SIGN, "Проверяем экстренное событие")
if (UveosEmergencyEvent_GetNext(&env->crashDetect.emergencyEvents, &emergencyEvent, 0)) { if (UveosEmergencyEvent_GetNext(&env->crashDetect.emergencyEvents, &emergencyEvent, 0)) {
if(env->storage.nvm.gost.CRASH_SIGNAL_INTERNAL == 1) { if (env->storage.nvm.gost.CRASH_SIGNAL_INTERNAL == 1) {
LoggerInfoStatic(LOGGER, LOG_SIGN, "Экстренное событие получено"); LoggerInfoStatic(LOGGER, LOG_SIGN, "Экстренное событие получено");
Mma_EcallAutomatic(env, emergencyEvent); Mma_EcallAutomatic(env, emergencyEvent);
} }
@ -680,9 +680,7 @@ static _Noreturn void Mma_Thread(tMma *env) {
TELEMATICA_STOP(env); TELEMATICA_STOP(env);
#endif #endif
Mma_EcallManualKZ(env); Mma_EcallManualKZ(env);
} else } else if (UserInputButtonEventIsBetween(buttonEvent, UI_BUTTON_ADDITIONAL, RAISE, 3000, 10000)) {
if (UserInputButtonEventIsBetween(buttonEvent, UI_BUTTON_ADDITIONAL, RAISE, 3000, 10000)) {
#ifdef UVEOS_ADD_TELEMATICA #ifdef UVEOS_ADD_TELEMATICA
TELEMATICA_STOP(env); TELEMATICA_STOP(env);