diff --git a/EgtsOutputCommands.c b/EgtsOutputCommands.c index 759faae..c49a3c6 100644 --- a/EgtsOutputCommands.c +++ b/EgtsOutputCommands.c @@ -77,17 +77,20 @@ uint16_t vEgtsPackModuleData(uint8_t *out, tEgtsIdentityModuleDataArgs *args, ui ADD_TO_RESULT(SWV, 2); ADD_TO_RESULT(MD, 1); ADD_TO_RESULT(ST, 1); - /* +/* 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(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(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(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); @@ -390,7 +393,7 @@ bool EgtsProcessing_SendSensors(tEgtsProcessing *env, bool isStorage) { LoggerFormatInfo(LOGGER, LOG_SIGN, "Отправка пакета (id: %u) теледанных (%u байт):", env->egtsTeledataAdditionalData.idPacked, PackLength) -// sendLogHex(env, egtsRaw, PackLength); + sendLogHex(env, egtsRaw, PackLength); bool result = EgtsProcessingSend(env, egtsRaw, PackLength, EGTS_WAIT_1, &env->egtsTeledataAdditionalData.isReceivedResponse, NULL); diff --git a/EgtsProcessing.c b/EgtsProcessing.c index ed29b98..b005231 100644 --- a/EgtsProcessing.c +++ b/EgtsProcessing.c @@ -392,7 +392,7 @@ bool NetworkRequire(tEgtsProcessing *env) { for (uint8_t i = 0; i < 3; ++i) { if (osMutexAcquire(env->gsm->gsmAt.access, 2000) == osOK) { - AtGsm_OperatorSelectionAutomatic(&env->gsm->gsmAt); + AtGsm_SetRegistrationAutomatic(&env->gsm->gsmAt); osMutexRelease(env->gsm->gsmAt.access); } @@ -542,16 +542,17 @@ _Noreturn void EgtsProcessing_TransmitterTaskMain(tEgtsProcessing *env) { Gsm_SetProfileINTERNET(env); + Gsm_ActivatePdp(env); Gsm_ActivateApn(env); Gsm_ActivatePdp(env); } - if (env->deviceTeledataStorageData->telematica.telematicaIsActive) { +// if (env->deviceTeledataStorageData->telematica.telematicaIsActive) { env->isEnableTelematicaSendPoints = true; - } else { - env->isEnableTelematicaSendPoints = env->deviceTeledataStorageData->telematica.EGTS_SERVER_ENABLE_TELEMATICA; - } +// } else { +// env->isEnableTelematicaSendPoints = env->deviceTeledataStorageData->telematica.EGTS_SERVER_ENABLE_TELEMATICA; +// } } else { @@ -627,7 +628,7 @@ _Noreturn void EgtsProcessing_TransmitterTaskMain(tEgtsProcessing *env) { env->fl_firstStartTimeUpdateEBU = true; } - addTeledataQueueEvent(env, EVENT_TCP_CONNECTION_START); +// addTeledataQueueEvent(env, EVENT_TCP_CONNECTION_START); break; } diff --git a/EgtsProcessing.h b/EgtsProcessing.h index 0c83dc3..b30e9f3 100644 --- a/EgtsProcessing.h +++ b/EgtsProcessing.h @@ -355,7 +355,7 @@ typedef struct { // uint8_t wb[1024 * 10]; - char hexString[512]; + char hexString[1024]; tLocationPointInDegDouble *bleLoc; tGsmWithGnss *gsm; diff --git a/EgtsTeledataPoint.c b/EgtsTeledataPoint.c index 18088f3..923219d 100644 --- a/EgtsTeledataPoint.c +++ b/EgtsTeledataPoint.c @@ -443,7 +443,7 @@ _Noreturn void EgtsProcessing_EventTaskTeledata(tEgtsProcessing *env) { env->egtsPointEnv.beginAngle = 0; env->egtsPointEnv.beginDist = 0; - uint32_t timeTimestamp; + uint32_t timeTimestamp = 0; eEgtsTsStatus egtsTsStatus = TS_STATUS_UNKNOWN;