From 1f9aa178641613a70424f2d4396fb6c95725ec80 Mon Sep 17 00:00:00 2001 From: forth32 Date: Thu, 6 Oct 2016 12:14:43 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5=D0=B4=D1=83?= =?UTF-8?q?=D1=80=D0=B0=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=BA=D0=BE=D0=BB=D0=B0=20-=20=D0=BD=D0=B5?= =?UTF-8?q?=20=D0=B2=D1=81=D0=B5=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BC=D1=8B=20?= =?UTF-8?q?=D0=BE=D1=82=D0=B4=D0=B0=D1=8E=D1=82=20=D0=BA=D0=BE=D0=B4=207?= =?UTF-8?q?=D0=95=20=D0=B2=20=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=D0=B5=20=D0=BF?= =?UTF-8?q?=D0=B0=D0=BA=D0=B5=D1=82=D0=B0.=20=D0=94=D0=BE=D0=B1=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=20=D1=80=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=20webui=5Fr1=20=D0=B2=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86?= =?UTF-8?q?=D1=83=20=D0=BA=D0=BE=D0=B4=D0=BE=D0=B2=20=D1=80=D0=B0=D0=B7?= =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- balong_flash.c | 11 ++++++----- ptable.c | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/balong_flash.c b/balong_flash.c index d302a5a..5405053 100644 --- a/balong_flash.c +++ b/balong_flash.c @@ -435,7 +435,7 @@ if (res == 0) { // Если надо, отправляем команду цифровой подписи if (gflag) { - printf("\n Отправлем signver..."); + printf("\n Отправляем signver..."); res=atcmd(signver,replybuf); if (memcmp(replybuf,SVrsp,sizeof(SVrsp)) != 0) { printf("\n ! Ошибка проверки цифровой сигнатуры\n"); @@ -469,15 +469,16 @@ if (memcmp(replybuf,OKrsp,6) != 0) { hdlc: iolen=send_cmd(cmdver,1,replybuf); -if ((iolen == 0)||(replybuf[1] != 0x0d)) { +if (replybuf[0] == 0x7e) memcpy(replybuf,replybuf+1,iolen-1); +if ((iolen == 0)||(replybuf[0] != 0x0d)) { printf("\n Ошибка получения версии протокола\n"); return; } -i=replybuf[2]; -replybuf[3+i]=0; +i=replybuf[1]; +replybuf[2+i]=0; printf("ok"); -printf("\n Версия протокола: %s",replybuf+3); +printf("\n Версия протокола: %s",replybuf+2); iolen=send_cmd(cmd_getproduct,1,replybuf); diff --git a/ptable.c b/ptable.c index 3ba6203..46fdd36 100644 --- a/ptable.c +++ b/ptable.c @@ -63,8 +63,9 @@ struct { {"VxWorks_R1",0x550103}, {"Fastboot_R1",0104}, {"Kernel_R1",0x105}, - {"System_r1",0x107}, - {"Nvimage_r1",0x66}, + {"System_R1",0x107}, + {"Nvimage_R1",0x66}, + {"WEBUI_R1",0x113}, {0,0} };