From 7097643b7721bb69938b057c9a23bc9e8e209d19 Mon Sep 17 00:00:00 2001 From: cfif Date: Wed, 15 Oct 2025 15:22:54 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B9=20=D0=BF=D0=B0=D1=80?= =?UTF-8?q?=D0=B0=D0=BC=D0=B5=D1=82=D1=80=20=D0=B8=20=D0=B2=D1=8B=D0=B2?= =?UTF-8?q?=D0=BE=D0=B4=20=D0=B2=20=D1=84=D0=B0=D0=B9=D0=BB=20=D0=B8=D0=B7?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=20=D0=BD=D0=B0=20=D0=B1=D0=B8?= =?UTF-8?q?=D0=BD=D0=B0=D1=80=D0=BD=D1=8B=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APP/main.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/APP/main.c b/APP/main.c index 4e9484a..4f1e8fe 100644 --- a/APP/main.c +++ b/APP/main.c @@ -233,19 +233,20 @@ int main(int argc, char *argv[]) { uint8_t msdEncoded[512] = {0}; msdEncoded[0] = 0; - msdEncoded[1] = 15; - memcpy(&msdEncoded[2], "000000000000000", 15); - msdEncoded[17] = strlen(phoneJS->valuestring); - memcpy(&msdEncoded[18], phoneJS->valuestring, strlen(phoneJS->valuestring)); +// msdEncoded[1] = 15; + memcpy(&msdEncoded[1], "000000000000000", 15); + msdEncoded[16] = strlen(phoneJS->valuestring); + memcpy(&msdEncoded[17], phoneJS->valuestring, strlen(phoneJS->valuestring)); - msdEncoded[18 + strlen(phoneJS->valuestring)] = 0; - size_t msdEncodedSize = EraGlonassMsdEncode(&msd, MSD_V_2, &msdEncoded[20 + strlen(phoneJS->valuestring)]); - msdEncoded[19 + strlen(phoneJS->valuestring)] = msdEncodedSize; + msdEncoded[17 + strlen(phoneJS->valuestring)] = 0; + size_t msdEncodedSize = EraGlonassMsdEncode(&msd, MSD_V_2, &msdEncoded[19 + strlen(phoneJS->valuestring)]); + msdEncoded[18 + strlen(phoneJS->valuestring)] = msdEncodedSize; char egtsHexStr[1024] = {0}; size_t egtsHexStrLen = 0; - vAsciiStringAddBytesAsHex(egtsHexStr, &egtsHexStrLen, msdEncoded, 20 + strlen(phoneJS->valuestring) + msdEncodedSize); + vAsciiStringAddBytesAsHex(egtsHexStr, &egtsHexStrLen, msdEncoded, 19 + strlen(phoneJS->valuestring) + msdEncodedSize); + size_t egtsBinStrLen = 19 + strlen(phoneJS->valuestring) + msdEncodedSize; FILE *output_file = fopen(argv[2], "w"); if (output_file == NULL) { @@ -254,9 +255,9 @@ int main(int argc, char *argv[]) { return 1; } - size_t bytes_written = fwrite(egtsHexStr, 1, egtsHexStrLen, output_file); + size_t bytes_written = fwrite(msdEncoded, 1, egtsBinStrLen, output_file); - if (bytes_written != egtsHexStrLen) { + if (bytes_written != egtsBinStrLen) { printf("Error: Failed to write file %s\n", argv[2]); fflush(stdout); return 1;