From e6eb7fb0af366e370f125668d62e89eb0004f517 Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期一, 28 四月 2025 15:10:57 +0800
Subject: [PATCH] V1.108 edit by lijun 2025-04-28 1.添加锁具ID卡信息读取
---
Device_Simulator_DTS_Tester/src/com/dev/electlock/SPCommElectLock.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/Device_Simulator_DTS_Tester/src/com/dev/electlock/SPCommElectLock.java b/Device_Simulator_DTS_Tester/src/com/dev/electlock/SPCommElectLock.java
index 3ced3bc..998c2c3 100644
--- a/Device_Simulator_DTS_Tester/src/com/dev/electlock/SPCommElectLock.java
+++ b/Device_Simulator_DTS_Tester/src/com/dev/electlock/SPCommElectLock.java
@@ -244,11 +244,17 @@
if(++dt_cmd_cnt > 1000) {
dt_cmd_cnt = 0;
}
- rtu_rt.Cmd = MyModBusRtu.CMD_TYPE_READ_INPUT;
-
+ rtu_rt.Cmd = MyModBusRtu.CMD_TYPE_READ_INPUT;
rtu_rt.reg_addr = ElectLock_ComBase.LOCK_REAL_ADDR;
rtu_rt.reg_count = ElectLock_State.Reg_Count_Real;
+ if(dt_cmd_cnt%5 == 1) {
+ rtu_rt.reg_addr = ElectLock_ComBase.LOCK_IDCard1_ADDR;
+ rtu_rt.reg_count = ElectLock_State.Reg_Count_Card;
+ }else if(dt_cmd_cnt%5 == 2) {
+ rtu_rt.reg_addr = ElectLock_ComBase.LOCK_IDCard2_ADDR;
+ rtu_rt.reg_count = ElectLock_State.Reg_Count_Card;
+ }
} else {
//数据
@@ -446,6 +452,14 @@
if(m_ElectLock_State.putByteBuffer(bbf_rx)) {
isSuccess = true;
}
+ }else if(ElectLock_ComBase.LOCK_IDCard1_ADDR == rtu_rt.reg_addr) {
+ if(m_ElectLock_State.putCardByteBuffer(bbf_rx, 0)) {
+ isSuccess = true;
+ }
+ }else if(ElectLock_ComBase.LOCK_IDCard2_ADDR == rtu_rt.reg_addr) {
+ if(m_ElectLock_State.putCardByteBuffer(bbf_rx, 50)) {
+ isSuccess = true;
+ }
}
}else if(MyModBusRtu.CMD_TYPE_WRITE_YC == rtu_rx.Cmd){
if(ElectLock_ComBase.LOCK_CLEAR_AUTH_ADDR == rtu_rx.reg_addr) {
--
Gitblit v1.9.1