pipIrr-SV.git - Gitblit

			@@ -2,6 +2,8 @@

			import com.dy.common.mw.protocol.*;
			import com.dy.common.mw.protocol.p206V1_0_0.*;
			import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd39And69Vo;
			import com.dy.common.util.ByteUtil;
			import com.dy.common.util.ByteUtilUnsigned;
			import org.apache.logging.log4j.LogManager;
			import org.apache.logging.log4j.Logger;
			@@ -32,7 +34,7 @@
			para.upCode,
			para.data) ;
			}
			log.info("分析命令应答数据<" + CodeV1_0_1.getCodeName(para.upCode) + " RTU地址=" + para.rtuAddr + ">:\n" + para.data.toString());
			log.info("\n分析命令应答数据<" + CodeV1_0_1.getCodeName(para.upCode) + " RTU地址=" + para.rtuAddr + ">:\n" + para.data.toString());

			MidResultFromRtu midRs = new MidResultFromRtu() ;
			midRs.protocolName = para.protocolName ;//协议名称
			@@ -59,6 +61,7 @@
			DataV1_0_1 dV1 = (DataV1_0_1)data.getSubData() ;
			DataCd39And69Vo cdData = new DataCd39And69Vo() ;
			dV1.subData = cdData ;
			//int alarm = ByteUtil.BCD2Int_LE(bs, ProtocolConstantV206V1_0_0.dataIndex, ProtocolConstantV206V1_0_0.dataIndex + 1) ;
			int alarm = ByteUtilUnsigned.bytes2Short_LE(bs, ProtocolConstantV206V1_0_0.dataIndex) ;
			cdData.batteryVoltAlarm = alarm/100.0D ;
			}