From 56c9b7f492725a57e3839c71e60d90e11190a9b0 Mon Sep 17 00:00:00 2001 From: zhangsan Date: Sat, 19 Dec 2020 21:01:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=A7=E5=A4=9A=E6=95=B0?= =?UTF-8?q?=E5=B1=80=E9=83=A8=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../soft_gsm_main.sip_sym | Bin 563192 -> 563192 bytes .../soft_gsm_main.sip_xm | Bin 324 -> 324 bytes .../soft_gsm_main.siwork | Bin 121394 -> 121689 bytes source/app/app_drv.c | 62 +++++------------- source/app/app_task_485.c | 4 -- source/bsp/bsp_config.c | 10 ++- source/tpc/tpc_0d0a.h | 2 +- source/tpc/tpc_ccmodbus.h | 2 +- 8 files changed, 26 insertions(+), 54 deletions(-) diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym index 7e6cdacab91a8f500d1c835c540e2494b7d558a8..bedf4dfa13c2ba5c17f7779a9a4725df286ffe13 100644 GIT binary patch delta 383 zcmXYrJxD@v6vglTzrWAV@=1t8LnOF{7TCwqTgpPAH#!tn(h^}tOGF_=rYs&ls@o{S0<3Mg`@A{$8k!>PZ0QI6IEuK&;J~-> z{sRrG6I@&y8iM8wp`kR;gmAOF=z$N<@H{-vpd1~PqoI%tkO$z30+3VziUPphZKR3h zBvGU8xU5s=2YEHejN{Urq*7&zam>@oi4e389@OgKbOCMSU7Y|=x(9kN7`w=tZq~&6 zZK_;Ls_3VE3bb*9v>}Q#)j@??Pq<2%D~VIBjg`Qw*YS(K`)b*}Mi6UM{KPQLeqfv$ zF{YDqDQL>HcjG?+MBLODJ_^)5mnGUuvvo4(8K+ziUud(9oF==tL`Is))Ldk1)C~*V zZG2Vk`>*?dYXCQ%`^zHC&~TSUsACIpdMhx|N)(uf;3f+EET$O$#Zl0$ ay3IXAw{A<%eO#u1DFiLYl3m9d$!Wi*lx)NR diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xm b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xm index ce6efda4c611e014098d3dffd01256a3a54144a2..20f8fa12c28a6520d2daa0832faa5f3163d99d78 100644 GIT binary patch delta 21 YcmX@YbcBhA0SFj@mnne03$*Ik^lez delta 21 ZcmX@YbcBhA0SFj@n2CXbeIt(rBLE|10+|2+ diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork index f39bad8bef11df7af005f72e5fbcd21c2b96edfe..3c4ef8270cf0b8dec06630541929a5d8dfefd89c 100644 GIT binary patch literal 121689 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

    p-t|EMWTZoQQkr^t&3txzYwJhft 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 literal 121394 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 diff --git a/source/app/app_drv.c b/source/app/app_drv.c index 480df67..4334335 100644 --- a/source/app/app_drv.c +++ b/source/app/app_drv.c @@ -51,21 +51,31 @@ void L3_UARTcom4_exp_protocol(TS_Handle_0d0a *p) { if (1 == p->ok ) { + #if 0 U8 array[D_s_SSTR_0D0A_len+1]; U8 num = p->buf[0]; byte_copy_uc(array,p->buf+1,num); - p->ok = 0; - + array[num] = 0; L3_protocol_handler_uart4_fun(array); + #else + if(p->buf[0] > D_s_SSTR_0D0A_len) + { + p->buf[0] = D_s_SSTR_0D0A_len; + } + p->buf[p->buf[0]] = 0; + L3_protocol_handler_uart4_fun(p->buf + 1); + #endif + p->ok = 0; } } + void L3_UARTcom3_exp_protocol(TS_Handle_PH3 *p) { if (1 == p->ok) { - #if 1 + #if 0 TS_PH3_ccmodbus ccmodbus; byte_copy_uc((U8*)&ccmodbus,(U8*)&p->ts_ccmodbus,p->ts_ccmodbus.num + 3); if(ccmodbus.buf[0] != G._rfid) //rfid发生改变 @@ -73,7 +83,10 @@ void L3_UARTcom3_exp_protocol(TS_Handle_PH3 *p) G.rfid = G._rfid = ccmodbus.buf[0]; } #else - L0_uart3_uc(p->reg); + if(p->ts_ccmodbus.buf[0] != G._rfid) //rfid发生改变 + { + G.rfid = G._rfid = p->ts_ccmodbus.buf[0]; + } #endif p->ok = 0; } @@ -84,48 +97,7 @@ void L3_UARTcom0_exp_protocol(TS_Handle_PH3 *p) { if (1 == p->ok) { - TS_PH3_ccmodbus ccmodbus; - //L0_uart0_uc(0xaa); - byte_copy_uc((U8*)&ccmodbus,(U8*)&p->ts_ccmodbus,p->ts_ccmodbus.num + 3); - p->ok = 0; - //L3_protocol_handler_uart0_fun(&ccmodbus,0); - } -} - -#if 0 -void L3_UARTcom2_exp_protocol(TS_Handle_PH1A *p) -{ - if (1 == p->ok ) - { - U8 slaveId = s_task_485.slaveId; - TS_PH1A_DAT tsph1A; - byte_copy_uc((U8*)&tsph1A,(U8*)&p->buf,D_HETU_FXA_buf_max); p->ok = 0; - switch(tsph1A.oper) - { - case OPER_ANGLE_DAT:{ - s_task_485.received = 1; - G.currentSensorVal[slaveId - U485_BASE] = (U16)tsph1A.xaxis[0] << 8 | tsph1A.xaxis[1]; - //ID已经在协议解析处过滤,这里不?要再处理 - #if 0 - L0_uart0_uc(tsph1A.filter);L0_uart0_uc(tsph1A.id); - L0_uart0_uc(tsph1A.xaxis[0]);L0_uart0_uc(tsph1A.xaxis[1]); - L0_uart0_uc(tsph1A.yaxis[0]);L0_uart0_uc(tsph1A.yaxis[1]); - L0_uart0_uc(tsph1A.zaxis[0]);L0_uart0_uc(tsph1A.zaxis[1]); - #endif - G.papers[slaveId - U485_BASE].version = APP_VERSION_HEX; - G.papers[slaveId - U485_BASE].LowPower = 0x00; //1bit - G.papers[slaveId - U485_BASE].cameraNotWorking = 0x00; //1bit - G.papers[slaveId - U485_BASE].cameraIndex = 0x00; //4bit - G.papers[slaveId - U485_BASE].paperNum = - L2_paper_count(slaveId - U485_BASE, (U16)tsph1A.xaxis[0] << 8 | tsph1A.xaxis[1]); //10bit - break; - } - case OPER_ANGLE_SET_ID: - L2_do_angle_setid_ack(tsph1A.xaxis[0]); - break; - } } } -#endif diff --git a/source/app/app_task_485.c b/source/app/app_task_485.c index 85af9a5..29cf828 100644 --- a/source/app/app_task_485.c +++ b/source/app/app_task_485.c @@ -79,10 +79,6 @@ void L3_task_485_handle(TS_485 *s) } else if(s->pAckPkg->salver == G.md_slaver_info[4].slaver) { - //if(s->pAckPkg->buf[1] != 0 || s->pAckPkg->buf[2] != 0) //按键不为0 - //{ - // G.rfid = (U16)(s->pAckPkg->buf[1]) << 8 | (U16)(s->pAckPkg->buf[2]); - //} if(s->pAckPkg->buf[2] != G._keyled) //按键发生改变 { G.rfid = G._keyled = s->pAckPkg->buf[2]; diff --git a/source/bsp/bsp_config.c b/source/bsp/bsp_config.c index ca6eab6..fdeffea 100644 --- a/source/bsp/bsp_config.c +++ b/source/bsp/bsp_config.c @@ -193,7 +193,7 @@ void L0_cpu_init(void) } //------------------------------串口协议配置 ------------------------------------ -TS_Handle_PH3 s_uart0_rec; +//TS_Handle_PH3 s_uart0_rec; TS_Handle_PH4 s_uart2_rec; TS_Handle_PH3 s_uart3_rec; TS_Handle_0d0a s_uart4_at_rec; @@ -211,12 +211,14 @@ void L1_s2b_PH4_2(unsigned char sbufreg) L1_s2b_PH4(&s_uart2_rec); } +#if 0 //uart0 void L1_s2b_PH3_0(unsigned char sbufreg) { s_uart0_rec.reg = sbufreg; L1_s2b_PH3(&s_uart0_rec); } +#endif //uart3 @@ -245,12 +247,14 @@ void L1_s2b_gm35(unsigned char sbufreg) void L1_uart_tpc_config(void) { +#if 0 //uart0 protocol setting... s_uart0_rec.head = 0; s_uart0_rec.ok = 0; s_uart0_rec.head_0 = D_CMD_Filter1_ff; s_uart0_rec.head_1 = D_CMD_Filter2_fe; s_uart0_rec.sp = (U8*)&(s_uart0_rec.ts_ccmodbus); +#endif //uart2 protocol setting... s_uart2_rec.head = 0; @@ -262,7 +266,7 @@ void L1_uart_tpc_config(void) s_uart3_rec.ok = 0; s_uart3_rec.head_0 = D_CMD_Filter1_ff; s_uart3_rec.head_1 = D_CMD_Filter2_fe; - s_uart3_rec.sp = (U8*)&(s_uart0_rec.ts_ccmodbus); + s_uart3_rec.sp = (U8*)&(s_uart3_rec.ts_ccmodbus); //uart4 s_uart4_at_rec.head = 0; @@ -277,7 +281,7 @@ void L1_uart_tpc_config(void) s_uart4_tcp_rec.head_1 = D_CMD_Filter2_fe; s_uart4_tcp_rec.sp = (U8*)&(s_uart4_tcp_rec.ts_ccmodbus); - Lp0_uart0_fun = L1_s2b_PH3_0; + //Lp0_uart0_fun = L1_s2b_PH3_0; Lp0_uart2_fun = L1_s2b_PH4_2; Lp0_uart3_fun = L1_s2b_PH3_3; Lp0_uart4_fun = L1_s2b_gm35; diff --git a/source/tpc/tpc_0d0a.h b/source/tpc/tpc_0d0a.h index c5efa27..426e5c4 100644 --- a/source/tpc/tpc_0d0a.h +++ b/source/tpc/tpc_0d0a.h @@ -4,7 +4,7 @@ #include "../clib/Type.h" ///----------------------------------------------------------------------------------------- -#define D_s_SSTR_0D0A_len 128 //str类的协议需要长度大一些,容易bug的地方,限制为接收64bytes的数据 +#define D_s_SSTR_0D0A_len 64 //str类的协议需要长度大一些,容易bug的地方,限制为接收64bytes的数据 #define FLAG_NONE 0 #define FLAG_DISCARD 1 #define FLAG_CCID 2 diff --git a/source/tpc/tpc_ccmodbus.h b/source/tpc/tpc_ccmodbus.h index a78471a..117e161 100644 --- a/source/tpc/tpc_ccmodbus.h +++ b/source/tpc/tpc_ccmodbus.h @@ -66,7 +66,7 @@ msp/uartx.c 底层代码 和cpu相关 /// 协议表达的意思为地址为0x52的从机, 功能码16 数据为11 22 33 44,校验码 F5 9F /// 校验码的范围为 -#define D_s_PH3_ccmodbus_max 128 +#define D_s_PH3_ccmodbus_max 64 #define D_s_PH3_ccmodbus_min 4 typedef struct