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 1505250..7e6cdac 100644 Binary files a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym and b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym differ 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 20f8fa1..ce6efda 100644 Binary files a/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xm and b/si4/soft_gsm_main.si4project/soft_gsm_main.sip_xm differ diff --git a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork index 9078c1e..f39bad8 100644 Binary files a/si4/soft_gsm_main.si4project/soft_gsm_main.siwork and b/si4/soft_gsm_main.si4project/soft_gsm_main.siwork differ diff --git a/source/app/app_drv.c b/source/app/app_drv.c index cb7b5dd..480df67 100644 --- a/source/app/app_drv.c +++ b/source/app/app_drv.c @@ -72,7 +72,6 @@ void L3_UARTcom3_exp_protocol(TS_Handle_PH3 *p) { G.rfid = G._rfid = ccmodbus.buf[0]; } - L0_uart3_uc(G.rfid & 0xFF); #else L0_uart3_uc(p->reg); #endif diff --git a/source/app/app_task_485.c b/source/app/app_task_485.c index 162525e..85af9a5 100644 --- a/source/app/app_task_485.c +++ b/source/app/app_task_485.c @@ -65,9 +65,6 @@ void L3_task_485_handle(TS_485 *s) //TODO 这里可以根据modbus协议让代码通用, if(s->pAckPkg->oper == MODBUS_OPER_READ) { - L0_uart0_uc(s->pAckPkg->salver); - Lc_delay_ms(70); - L0_uart0_uc(G.md_slaver_info[4].slaver); if(s->pAckPkg->salver == G.md_slaver_info[0].slaver) { G.total_weight = @@ -82,9 +79,6 @@ void L3_task_485_handle(TS_485 *s) } else if(s->pAckPkg->salver == G.md_slaver_info[4].slaver) { - L0_uart0_uc(s->pAckPkg->buf[1]); - Lc_delay_ms(70); - L0_uart0_uc(s->pAckPkg->buf[2]); //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]);