Browse Source

净化输出

master
zhangsan 5 years ago
parent
commit
508d7d27b3
  1. BIN
      si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym
  2. BIN
      si4/soft_gsm_main.si4project/soft_gsm_main.sip_xm
  3. BIN
      si4/soft_gsm_main.si4project/soft_gsm_main.siwork
  4. 1
      source/app/app_drv.c
  5. 6
      source/app/app_task_485.c

BIN
si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym

Binary file not shown.

BIN
si4/soft_gsm_main.si4project/soft_gsm_main.sip_xm

Binary file not shown.

BIN
si4/soft_gsm_main.si4project/soft_gsm_main.siwork

Binary file not shown.

1
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]; G.rfid = G._rfid = ccmodbus.buf[0];
} }
L0_uart3_uc(G.rfid & 0xFF);
#else #else
L0_uart3_uc(p->reg); L0_uart3_uc(p->reg);
#endif #endif

6
source/app/app_task_485.c

@ -65,9 +65,6 @@ void L3_task_485_handle(TS_485 *s)
//TODO 这里可以根据modbus协议让代码通用, //TODO 这里可以根据modbus协议让代码通用,
if(s->pAckPkg->oper == MODBUS_OPER_READ) 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) if(s->pAckPkg->salver == G.md_slaver_info[0].slaver)
{ {
G.total_weight = 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) 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 //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]); // G.rfid = (U16)(s->pAckPkg->buf[1]) << 8 | (U16)(s->pAckPkg->buf[2]);

Loading…
Cancel
Save