Browse Source

读取显示板按键发送服务器

master
zhangsan 5 years ago
parent
commit
eb57449756
  1. BIN
      si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym
  2. BIN
      si4/soft_gsm_main.si4project/soft_gsm_main.siwork
  3. 6
      source/app/app_common.c
  4. 2
      source/app/app_common.h
  5. 7
      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.siwork

Binary file not shown.

6
source/app/app_common.c

@ -61,6 +61,12 @@ void Lu_register_init()
G.md_slaver_info[3].buf = (U8*)&G.rfid; G.md_slaver_info[3].buf = (U8*)&G.rfid;
G.md_slaver_info[3].mask = 0; G.md_slaver_info[3].mask = 0;
G.md_slaver_info[4].slaver = SLAVER_SHOW01_ID; //显示板按键
G.md_slaver_info[4].oper = MODBUS_OPER_READ;
G.md_slaver_info[4].reg = 0x08;
G.md_slaver_info[4].regnum = 0x01;
G.md_slaver_info[4].mask = 2;
for(i=0;i<CCMD_SLAVER_INFO_MAX;i++) for(i=0;i<CCMD_SLAVER_INFO_MAX;i++)
{ {
G.ccmd_slaver_info[i].mask = 0; G.ccmd_slaver_info[i].mask = 0;

2
source/app/app_common.h

@ -162,7 +162,7 @@ typedef struct
#define SLAVER_SHOW01_ID 0x13 #define SLAVER_SHOW01_ID 0x13
#define SLAVER_TCP_SERVER_ID 0x14 #define SLAVER_TCP_SERVER_ID 0x14
#define MD_SLAVER_INFO_MAX 4 #define MD_SLAVER_INFO_MAX 5
#define CCMD_SLAVER_INFO_MAX 4 #define CCMD_SLAVER_INFO_MAX 4
//需要持久化的参数,不能超过72字节,否则会导致eeprom溢出 //需要持久化的参数,不能超过72字节,否则会导致eeprom溢出

7
source/app/app_task_485.c

@ -70,6 +70,13 @@ void L3_task_485_handle(TS_485 *s)
G.asga.yaxis = (U16)(s->pAckPkg->buf[3]) << 8 | (U16)(s->pAckPkg->buf[4]); G.asga.yaxis = (U16)(s->pAckPkg->buf[3]) << 8 | (U16)(s->pAckPkg->buf[4]);
G.asga.zaxis = (U16)(s->pAckPkg->buf[5]) << 8 | (U16)(s->pAckPkg->buf[6]); G.asga.zaxis = (U16)(s->pAckPkg->buf[5]) << 8 | (U16)(s->pAckPkg->buf[6]);
} }
else if(s->pAckPkg->salver == G.md_slaver_info[4].slaver && s->pAckPkg->oper == MODBUS_OPER_READ)
{
if(s->pAckPkg->buf[1] != 0 && s->pAckPkg->buf[2] != 0) //按键不为0
{
G.rfid = s->pAckPkg->buf[1] << 8 | s->pAckPkg->buf[2];
}
}
} }
} }
s->retryTimes++; s->retryTimes++;

Loading…
Cancel
Save