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

Исправления в модулях навигации

This commit is contained in:
cfif 2024-12-18 18:02:35 +03:00
parent d251242b27
commit 6e01b95a61
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
EgtsOutputCommands.c
View File

@ -81,13 +81,16 @@ uint16_t vEgtsPackModuleData(uint8_t *out, tEgtsIdentityModuleDataArgs *args, ui
ADD_TO_RESULT(args->deviceStorage->nvm.device.serialNumber.value.data, args->deviceStorage->nvm.device.serialNumber.value.length); ADD_TO_RESULT(args->deviceStorage->nvm.device.serialNumber.value.data, args->deviceStorage->nvm.device.serialNumber.value.length);
ADD_TO_RESULT(Delimiter, 1); ADD_TO_RESULT(Delimiter, 1);
ADD_TO_RESULT(TAG_VIN, sizeof(TAG_VIN) - 1); ADD_TO_RESULT(TAG_VIN, sizeof(TAG_VIN) - 1);
ADD_TO_RESULT(args->deviceStorage->nvm.gost.VIN.data, args->deviceStorage->nvm.gost.VIN.length); ADD_TO_RESULT("XTT316300S1013581", sizeof("XTT316300S1013581") - 1);
//ADD_TO_RESULT(args->deviceStorage->nvm.gost.VIN.data, args->deviceStorage->nvm.gost.VIN.length);
ADD_TO_RESULT(Delimiter, 1); ADD_TO_RESULT(Delimiter, 1);
ADD_TO_RESULT(TAG_ICCID, sizeof(TAG_ICCID) - 1); ADD_TO_RESULT(TAG_ICCID, sizeof(TAG_ICCID) - 1);
ADD_TO_RESULT(args->deviceStorage->nvm.device.ccid.data, args->deviceStorage->nvm.device.ccid.length); ADD_TO_RESULT("8970120036530350309", sizeof("8970120036530350309") - 1);
//ADD_TO_RESULT(args->deviceStorage->nvm.device.ccid.data, args->deviceStorage->nvm.device.ccid.length);
ADD_TO_RESULT(Delimiter, 1); ADD_TO_RESULT(Delimiter, 1);
ADD_TO_RESULT(TAG_EICCID, sizeof(TAG_EICCID) - 1); ADD_TO_RESULT(TAG_EICCID, sizeof(TAG_EICCID) - 1);
ADD_TO_RESULT(args->deviceStorage->nvm.device.ccid.data, args->deviceStorage->nvm.device.ccid.length); ADD_TO_RESULT("89701012656625450608", sizeof("89701012656625450608") - 1);
//ADD_TO_RESULT(args->deviceStorage->nvm.device.ccid.data, args->deviceStorage->nvm.device.ccid.length);
ADD_TO_RESULT(Delimiter, 1); ADD_TO_RESULT(Delimiter, 1);
*/ */
ADD_TO_RESULT(Delimiter, 1); ADD_TO_RESULT(Delimiter, 1);
@ -390,7 +393,7 @@ bool EgtsProcessing_SendSensors(tEgtsProcessing *env, bool isStorage) {
LoggerFormatInfo(LOGGER, LOG_SIGN, "Отправка пакета (id: %u) теледанных (%u байт):", LoggerFormatInfo(LOGGER, LOG_SIGN, "Отправка пакета (id: %u) теледанных (%u байт):",
env->egtsTeledataAdditionalData.idPacked, PackLength) env->egtsTeledataAdditionalData.idPacked, PackLength)
// sendLogHex(env, egtsRaw, PackLength); sendLogHex(env, egtsRaw, PackLength);
bool result = EgtsProcessingSend(env, egtsRaw, PackLength, EGTS_WAIT_1, bool result = EgtsProcessingSend(env, egtsRaw, PackLength, EGTS_WAIT_1,
&env->egtsTeledataAdditionalData.isReceivedResponse, NULL); &env->egtsTeledataAdditionalData.isReceivedResponse, NULL);

13
EgtsProcessing.c
View File

@ -392,7 +392,7 @@ bool NetworkRequire(tEgtsProcessing *env) {
for (uint8_t i = 0; i < 3; ++i) { for (uint8_t i = 0; i < 3; ++i) {
if (osMutexAcquire(env->gsm->gsmAt.access, 2000) == osOK) { if (osMutexAcquire(env->gsm->gsmAt.access, 2000) == osOK) {
AtGsm_OperatorSelectionAutomatic(&env->gsm->gsmAt); AtGsm_SetRegistrationAutomatic(&env->gsm->gsmAt);
osMutexRelease(env->gsm->gsmAt.access); osMutexRelease(env->gsm->gsmAt.access);
} }
@ -542,16 +542,17 @@ _Noreturn void EgtsProcessing_TransmitterTaskMain(tEgtsProcessing *env) {
Gsm_SetProfileINTERNET(env); Gsm_SetProfileINTERNET(env);
Gsm_ActivatePdp(env);
Gsm_ActivateApn(env); Gsm_ActivateApn(env);
Gsm_ActivatePdp(env); Gsm_ActivatePdp(env);
} }
if (env->deviceTeledataStorageData->telematica.telematicaIsActive) { // if (env->deviceTeledataStorageData->telematica.telematicaIsActive) {
env->isEnableTelematicaSendPoints = true; env->isEnableTelematicaSendPoints = true;
} else { // } else {
env->isEnableTelematicaSendPoints = env->deviceTeledataStorageData->telematica.EGTS_SERVER_ENABLE_TELEMATICA; // env->isEnableTelematicaSendPoints = env->deviceTeledataStorageData->telematica.EGTS_SERVER_ENABLE_TELEMATICA;
} // }
} else { } else {
@ -627,7 +628,7 @@ _Noreturn void EgtsProcessing_TransmitterTaskMain(tEgtsProcessing *env) {
env->fl_firstStartTimeUpdateEBU = true; env->fl_firstStartTimeUpdateEBU = true;
} }
addTeledataQueueEvent(env, EVENT_TCP_CONNECTION_START); // addTeledataQueueEvent(env, EVENT_TCP_CONNECTION_START);
break; break;
} }

2
EgtsProcessing.h
View File

@ -355,7 +355,7 @@ typedef struct {
// uint8_t wb[1024 * 10]; // uint8_t wb[1024 * 10];
char hexString[512]; char hexString[1024];
tLocationPointInDegDouble *bleLoc; tLocationPointInDegDouble *bleLoc;
tGsmWithGnss *gsm; tGsmWithGnss *gsm;

2
EgtsTeledataPoint.c
View File

@ -443,7 +443,7 @@ _Noreturn void EgtsProcessing_EventTaskTeledata(tEgtsProcessing *env) {
env->egtsPointEnv.beginAngle = 0; env->egtsPointEnv.beginAngle = 0;
env->egtsPointEnv.beginDist = 0; env->egtsPointEnv.beginDist = 0;
uint32_t timeTimestamp; uint32_t timeTimestamp = 0;
eEgtsTsStatus egtsTsStatus = TS_STATUS_UNKNOWN; eEgtsTsStatus egtsTsStatus = TS_STATUS_UNKNOWN;