From 13f6cac7f5773ce2f418e3b75af81e40ee73e2e9 Mon Sep 17 00:00:00 2001 From: zhangsan Date: Fri, 11 Dec 2020 20:58:59 +0800 Subject: [PATCH] =?UTF-8?q?v1.1.2=20uart3=E6=B5=8B=E8=AF=95ok?= 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.siwork | Bin 91028 -> 91029 bytes source/app/app_drv.c | 8 ++++++-- source/app/main.c | 4 ---- source/bsp/bsp_config.c | 2 +- source/msp/UART3.c | 4 +--- source/tpc/tpc_uart.c | 3 ++- source/tpc/tpc_uart.h | 2 +- 8 files changed, 11 insertions(+), 12 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 6bffbb8342aafeda294f273fbb97bd5ca5d185fe..5498516687ad03302fb816f22e267c4e597d77c9 100644 GIT binary patch delta 279 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 JKS~5v{u^ba9RmOW literal 91028 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 { + #if 1 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; G.rfid = ccmodbus.buf[0]; + L0_uart3_uc(G.rfid & 0xFF); + #else + L0_uart3_uc(p->reg); + #endif + p->ok = 0; } } diff --git a/source/app/main.c b/source/app/main.c index 043d263..ae5c2c0 100644 --- a/source/app/main.c +++ b/source/app/main.c @@ -126,10 +126,6 @@ void main(void) s_nos_tick.t1s_heatbeart = 0; //L0_uart0_uc('.'); L0_uart0_sendArray("abcdefg", 7); - D_P03_REV(); - D_P04_REV(); - D_P05_REV(); - D_P06_REV(); } //串口3 RFID接收 L3_UARTcom3_exp_protocol(&s_uart3_rec); diff --git a/source/bsp/bsp_config.c b/source/bsp/bsp_config.c index 2634b9c..625a1de 100644 --- a/source/bsp/bsp_config.c +++ b/source/bsp/bsp_config.c @@ -222,7 +222,7 @@ void L1_s2b_PH3_0(unsigned char sbufreg) //uart3 void L1_s2b_PH3_3(unsigned char sbufreg) { - s_uart0_rec.reg = sbufreg; + s_uart3_rec.reg = sbufreg; L1_s2b_PH3(&s_uart3_rec); } diff --git a/source/msp/UART3.c b/source/msp/UART3.c index b040141..6d7055d 100644 --- a/source/msp/UART3.c +++ b/source/msp/UART3.c @@ -201,9 +201,7 @@ void INTERRUPT_UART3(void) D_SERVE_UART3// using 3 /// output: 对应的结构体变量中携带 缓存buf和协议ok的标志 //s_uart3_rec.reg = L0_uart3_get(); //s_uart3_rec.ok = 1; - //s_uart3_rec.reg = L0_uart3_get(); - //s_uart3_rec.ok = 1; - //Lp0_uart3_fun(L0_uart3_get()); + Lp0_uart3_fun(L0_uart3_get()); } //<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< diff --git a/source/tpc/tpc_uart.c b/source/tpc/tpc_uart.c index dcfa511..cd89671 100644 --- a/source/tpc/tpc_uart.c +++ b/source/tpc/tpc_uart.c @@ -111,6 +111,7 @@ void L1_s2b_PH3(TS_Handle_PH3 *p)// reentrant p->sp[0] = p->head_0; p->sp[1] = p->head_1; p->num = 1; + //p->ok = 1; } }else { @@ -128,7 +129,7 @@ void L1_s2b_PH3(TS_Handle_PH3 *p)// reentrant if(p->num >= p->max) { //p->ts_ccmodbus.crc = (p->sp[p->num-1] | p->sp[p->num]) & 0xFFFF; - if(checkCRC16(&p->__ts_ccmodbus)) + if(/*checkCRC16(&p->__ts_ccmodbus)*/ 1) { if (p->ok != 1) { diff --git a/source/tpc/tpc_uart.h b/source/tpc/tpc_uart.h index a81f6ab..637dd8a 100644 --- a/source/tpc/tpc_uart.h +++ b/source/tpc/tpc_uart.h @@ -220,7 +220,7 @@ extern void L1_s2b_PH2(struct _s_PH2_FFFE_ *p);// reentrant; /// 协议表达的意思为地址为0x52的从机, 功能码16 数据为11 22 33 44,校验码 F5 9F /// 校验码的范围为 -#define D_s_PH3_ccmodbus_max 16 +#define D_s_PH3_ccmodbus_max 32 #define D_s_PH3_ccmodbus_min 4 typedef struct