fixed:RW功能修改

service/impl/ProtocolImpl.cpp

@@ -231,6 +231,7 @@ std::map<int, int> ProtocolImpl::handleDataLess(PBYTE pbuf,int len,int regNum,in
 std::map<int,int> ProtocolImpl::handleDataGreater(PBYTE pbuf,int len,int regNum,int datasLen)
 {
 	log_i("handleDataGreater:收到实际数据长度:%d,请求采集个数:%d,理想情况下收到数据长度:%d", len, regNum, datasLen);
+	log_i("进入handDataGreater时间");
 	std::map<int, int> dataSet;
 
 	for (int count = 0; (count < len) && (len - count >= 12); count += 12)
@@ -261,7 +262,7 @@ std::map<int,int> ProtocolImpl::handleDataGreater(PBYTE pbuf,int len,int regNum,
 		// 每个块的数据部分为8字节（从count+4到count+11）
 
 	}
-
+	log_i("出去handDataGreater时间");
 	return dataSet;
 
 }
@@ -343,48 +344,26 @@ std::string  ProtocolImpl::sGetItemParaConfig(Item *pitem, std::string attribute
 
 void ProtocolImpl::setData(Item *pitem,int16_t pbuf,int receiveData,int paraData,std::string t_sDataType,std::string t_sByteOrder,string t_sBits)
 {
+
 	Item* t_item = pitem;
 	int16_t buf = pbuf;
 	string t_str;
 	char t[256];
-	//log_i("receiveData:0x%x,paraData:0x%x",receiveData,paraData);
 	if(receiveData == paraData)
 	{
+		log_i("当前时间,比对成功，设置数据");
 		//log_i("ID匹配，处理数据");
 		if (t_sDataType == "I")
 		{
 			//log_i("数据类型为I，调用merge16函数,buf=0x%x",buf);
 			t_item->setValue(merge16(buf, t_sByteOrder));
-//			if(t_sByteOrder == "B")
-//			{
-//				log_i("字符类型B");
-//				int index = t_sBits.find(".");
-//				log_i("t_sBits =%s, index = %d",t_sBits.c_str(),index);
-//				if (index != -1)
-//				{
-//					string t_sBitnum = t_sBits.substr(0,index);
-//					int t_iBitnum =(int) (strtol(t_sBitnum.c_str(),NULL, 10));	//----位起始地址
-//					int t_Bits =(int) (strtol(t_sBits.substr(index + 1).c_str(),NULL, 10));
-//					unsigned short t_usdata =(unsigned short) (strtol(merge16_u(buf,t_sByteOrder).c_str(),NULL, 10));
-//					unsigned short bits = 0;
-//					log_i("位起始地址t_iBitnum = %d, t_Bits= %d, t_usdata = %d",t_iBitnum,t_Bits,t_usdata);
-//					for (int i = 0; i < t_Bits; i++)
-//					{
-//						unsigned short bit = (t_usdata >> (t_iBitnum + i))& 0x0001;
-//						bits += bit * pow(2, i);
-//					}
-//					snprintf(t, 256, "%d", bits);
-//					log_i("bits:%d",bits);
-//					t_str = t;
-//					log_i("字符类型设置:%s",t_str.c_str());
-//					t_item->setValue(t_str);
-//				}
-//			}
+
 		}
 		else if (t_sDataType == "UI")
 		{
 			//log_i("数据类型为UI，调用merge16函数");
 			t_item->setValue(merge16(buf, t_sByteOrder));
+			log_i("当前时间，设置数据成功，数据类型UI");
 		}
 		else if (t_sDataType == "B")
 		{
@@ -408,8 +387,9 @@ void ProtocolImpl::setData(Item *pitem,int16_t pbuf,int receiveData,int paraData
 				snprintf(t, 256, "%d", bits);
 				t_str = t;
 				t_item->setValue(t_str);
-				//log_i("字符类型设置:%s",t_str.c_str());
+
 			}
+			log_i("当前时间，设置数据成功，数据类型B");
 		}
 	}
 }
@@ -614,8 +594,6 @@ HRESULT ProtocolImpl::onRead(Device *pdevice, Packet *ppacket, Item *pitem,
 	log_i("onRead");
 
 	Channel *pC = pdevice->getParent();
-
-	log_i("Channel pointer: %p", pC);
 	if (pC == nullptr)
 	{
 		log_i("Channel pointer is null");
@@ -641,30 +619,30 @@ HRESULT ProtocolImpl::onRead(Device *pdevice, Packet *ppacket, Item *pitem,
 		if(currentId != 1)
 		{
 			log_i("发送延迟计数:%d",sendDelayCout);
-			if(sendDelayCout > 3)
+			if(sendDelayCout > 2)
 			{
-
 				sendAllocFrame(pbuf,currentId , len);
 				//sendDelayCout = 0;
-
-
 			}
-			sendDelayCout ++;
+			sendDelayCout++;
+
 		}
 		else
 		{
 			sendAllocFrame(pbuf,currentId , len);
+			timeOut = 0;
 		}
-		timeOut = 0;
+
 		//pdevice->getBase().setRwstate(READ_WAIT);
 		pdevice->getBase().setRwstate(WRITE_WAIT);
 	}
 
 	if(currentState == RECEIVED)
 	{
-		if(timeOut > 30)
+		if(timeOut > 10)
 		{
 			currentState = INIT;
+			sendDelayCout = 0;
 		}
 		timeOut ++;
 	}
@@ -691,6 +669,7 @@ HRESULT ProtocolImpl::onRead(Device *pdevice, Packet *ppacket, Item *pitem,
 		int iParaId;
 		Base &t_base = ppacket->getVitem().at(0)->getBase();
 		sParaId = t_base.getParam("功能码");
+
 		log_i("sParaId =%s,对应的实际名称=%s",sParaId.c_str() ,t_base.getName().c_str());
 		iParaId = strtol(sParaId.c_str(), NULL, HEX);
 		string t_saddr;
@@ -704,8 +683,6 @@ HRESULT ProtocolImpl::onRead(Device *pdevice, Packet *ppacket, Item *pitem,
 			log_i("Invalid packet or item");
 			return S_FALSE;
 		}
-
-		//iParaId |=  (t_iaddr << 19);
 		//判断寄存器是读寄存器
 		if(frameFuncCode == 0x030000)
 		{
@@ -739,12 +716,11 @@ HRESULT ProtocolImpl::onRead(Device *pdevice, Packet *ppacket, Item *pitem,
 			}
 			pdevice->getBase().setRwstate(READ_WAIT);	//----设置设备状态
 		}
-		//判断寄存器是读写寄存器
-		if(frameFuncCode == 0x010000)
-		{
-			pdevice->getBase().setRwstate(WRITE_WAIT);
-		}
-
+		//寄存器是读写寄存器
+//		if(frameFuncCode == 0x010000 )
+//		{
+//			pdevice->getBase().setRwstate(WRITE_O);
+//		}
 		//初始化数据库容器
 		if (pC != NULL)
 		{
@@ -762,39 +738,78 @@ HRESULT ProtocolImpl::onRead(Device *pdevice, Packet *ppacket, Item *pitem,
 							j < pC->getVDevice().at(i)->getVitem().size(); j++)
 					{
 						string t_sId;
+						string rsId;
 						Base &t_base =
 								pC->getVDevice().at(i)->getVitem().at(j)->getBase();
 						t_sId = t_base.getParam("写功能码");
-						//log_i("写功能码: %s", t_sId.c_str());
 						int t_iId = 0;
 						t_iId = strtol(t_sId.c_str(), NULL, HEX);	//----获取帧ID
-						//log_i("功能码转换为整数: 0x%x", t_iId);
-						string t_stype;
-						t_stype = t_base.getParam("帧类型");
-						//log_i("帧类型: %s", t_stype.c_str());
 
-						if (t_stype == "1")
+						//写功能是读寄存器响应
+						if(t_iId == 0x04040000)
 						{
-							t_iId |= 0x80000000;
-							log_i("帧类型为1，功能码更新为: 0x%x", t_iId);
+							string t_stype;
+							t_stype = t_base.getParam("帧类型");
+							//log_i("帧类型: %s", t_stype.c_str());
+
+							if (t_stype == "1")
+							{
+								t_iId |= 0x80000000;
+								log_i("帧类型为1，功能码更新为: 0x%x", t_iId);
+							}
+
+							string sStartAddr;
+							//sStartAddr = pC->getVDevice().at(i)->getBase().getParam("起始地址");
+							sStartAddr = t_base.getParam("起始地址");
+							//log_i("起始地址 =%s", sStartAddr.c_str());
+
+							int iStartAddr = 0;
+							iStartAddr = strtol(sStartAddr.c_str(), NULL, HEX);
+							//log_i("起始地址转换为整数: 0x%x", iStartAddr);
+							t_iId += iStartAddr;
+							string t_saddr;
+							t_saddr = pC->getVDevice().at(i)->getBase().getParam("站地址");
+							int t_iaddr = 0;
+							t_iaddr = strtol(t_saddr.c_str(), NULL, HEX);
+							//log_i("站地址:%d",t_iaddr);
+							t_iId |=  (t_iaddr << 19);
+							//log_i("t_Id = %d",t_iId);
+						}
+						else
+						{
+							if(t_iId == 0x04010000)
+							{
+								t_iId = 0x04040000;
+								//log_i("2.t_iId = 0x%x",t_iId);
+								string t_stype;
+								t_stype = t_base.getParam("帧类型");
+								//log_i("帧类型: %s", t_stype.c_str());
+
+								if (t_stype == "1")
+								{
+									t_iId |= 0x80000000;
+									log_i("帧类型为1，功能码更新为: 0x%x", t_iId);
+								}
+
+								string sStartAddr;
+								//sStartAddr = pC->getVDevice().at(i)->getBase().getParam("起始地址");
+								sStartAddr = t_base.getParam("起始地址");
+								//log_i("起始地址 =%s", sStartAddr.c_str());
+
+								int iStartAddr = 0;
+								iStartAddr = strtol(sStartAddr.c_str(), NULL, HEX);
+								//log_i("起始地址转换为整数: 0x%x", iStartAddr);
+								t_iId += iStartAddr;
+								string t_saddr;
+								t_saddr = pC->getVDevice().at(i)->getBase().getParam("站地址");
+								int t_iaddr = 0;
+								t_iaddr = strtol(t_saddr.c_str(), NULL, HEX);
+								//log_i("站地址:%d",t_iaddr);
+								t_iId |=  (t_iaddr << 19);
+								//log_i("3.t_iId = 0x%x",t_iId);
+
+							}
 						}
-
-						string sStartAddr;
-						//sStartAddr = pC->getVDevice().at(i)->getBase().getParam("起始地址");
-						sStartAddr = t_base.getParam("起始地址");
-						//log_i("起始地址 =%s", sStartAddr.c_str());
-
-						int iStartAddr = 0;
-						iStartAddr = strtol(sStartAddr.c_str(), NULL, HEX);
-						//log_i("起始地址转换为整数: 0x%x", iStartAddr);
-						t_iId += iStartAddr;
-						string t_saddr;
-						t_saddr = pC->getVDevice().at(i)->getBase().getParam("站地址");
-						int t_iaddr = 0;
-						t_iaddr = strtol(t_saddr.c_str(), NULL, HEX);
-						//log_i("站地址:%d",t_iaddr);
-						t_iId |=  (t_iaddr << 19);
-						//log_i("t_Id = %d",t_iId);
 						tmpItems.insert(
 								make_pair(t_iId,
 										pC->getVDevice().at(i)->getVitem().at(j)));
@@ -844,7 +859,7 @@ HRESULT ProtocolImpl::onWrite(Device *pdevice, Packet *ppacket, Item *pitem,
 	}
 
 	string t_sFuncCode;
-	t_sFuncCode = base.getParam("功能码");
+	t_sFuncCode = base.getParam("写功能码");
 	int t_iFuncCode = 0;
 	t_iFuncCode = strtol(t_sFuncCode.c_str(), NULL, HEX);	//----获取帧ID
 
@@ -859,7 +874,7 @@ HRESULT ProtocolImpl::onWrite(Device *pdevice, Packet *ppacket, Item *pitem,
 	int t_iaddr = 0;
 	t_iaddr = strtol(t_saddr.c_str(), NULL, HEX);
 	t_iFuncCode |=  (t_iaddr << 19);
-
+    log_i("采集点名称是:%s,站地址=%d,功能码=0x%x",base.getName().c_str(),t_iaddr,t_iFuncCode);
 
 	*(pbuf + (t_len++)) = HHByte(t_iFuncCode);
 	*(pbuf + (t_len++)) = HLByte(t_iFuncCode);
@@ -927,10 +942,10 @@ HRESULT ProtocolImpl::onWrite(Device *pdevice, Packet *ppacket, Item *pitem,
 	}
 	log_i( "待发送数据为: %s", sbuf.c_str());
 
-	log_i( "%%x, %x", data.data0, data.data1);
+	log_i( "0x%x, 0x%x", data.data0, data.data1);
 	m_tmpwritedata[t_sFuncCode] = data;
 
-	pitem->setValue(swritebuf);
+	//pitem->setValue(swritebuf);
 
 //	pdevice->getBase().setRwstate(WRITE_O);
 	pdevice->getBase().setRwstate(WRITE_WAIT);
@@ -959,10 +974,18 @@ HRESULT ProtocolImpl::isResponseOK(Device *pdevice, Packet *ppacket,
 	{
 	case READ_O:
 	case WRITE_WAIT:
+//		return S_OK;
+		//ret = retStateResponse(ppacket, pitem, len,pbuf);
+//		log_i("写等待操作,isResponse 返回值 =%d",ret);
+//		if(ret == S_OK)
+//		{
+//			return S_OK;
+//		}
+//		return S_FALSE;
 		return S_OK;
 	case READ_WAIT:
 		ret = retStateResponse(ppacket, pitem, len,pbuf);
-		log_i("isResponseOK返回值:%d", ret);
+		log_i("读等待操作，isResponseOK返回值:%d", ret);
 		if (ret == S_OK)
 		{
 			return S_OK;
@@ -977,6 +1000,7 @@ HRESULT ProtocolImpl::isResponseOK(Device *pdevice, Packet *ppacket,
 		return S_FALSE;
 	case WRITE_O:
 	//case WRITE_WAIT:
+		log_i("只写操作");
 
 		return S_OK;
 	}
@@ -1074,13 +1098,12 @@ int ProtocolImpl::normalDatasResponse(Device* pdevice,Packet* ppacket,Item* pite
 	//stringOutput(pbuf,len);
 	dataSet = retDataSet(ppacket, pitem,pbuf,len);
 
-	//log_i("pbuf[4]= 0x%x,pbuf[5] = 0x%x,pbuf[6] = 0x%x,pbuf[7] = 0x%x",pbuf[4],pbuf[5],pbuf[6],pbuf[7]);
-
 //	for (const auto &entry : dataSet)
 //	{
 //		log_i("dataSet填充返回值：addrFrame = 0x%x, value = 0x%x", entry.first,
 //				entry.second);
 //	}
+	log_i("数据集开始时间");
 	for (const auto &dataPair : dataSet)
 	{
 		//log_i("addData.size=%d", dataSet.size());
@@ -1089,27 +1112,19 @@ int ProtocolImpl::normalDatasResponse(Device* pdevice,Packet* ppacket,Item* pite
 		id = (0x7fffffff) & id;
 		buf = dataPair.second;
 
-		//log_i("Processing data pair with ID: 0x%x", id);
+		log_i("当前时间:Processing data pair with ID: 0x%x", id);
 
 		if (m_tmpItems.count(pC->getBase().getObjid().toString()) > 0)
 		{
 
-			//log_i("Found temporary items for Channel ID: %s",
-					//pC->getBase().getObjid().toString().c_str());
 			std::multimap<int, Item*> tmpItms = m_tmpItems.find(
 					pC->getBase().getObjid().toString())->second; //是否有效
-//			for (const auto &data : tmpItms)
-//			{
-//				log_i("缓存条目中的缓存地址:0x%x,0x%x", data.first, data.second);
-//			}
-			//log_i("Temporary items size: %zu", tmpItms.size());
-
-			std::multimap<int, Item*>::size_type cnt = tmpItms.count(
-					id);
-			//log_i("Number of items with ID 0x%x: %zu", id, cnt);
+
+			std::multimap<int, Item*>::size_type cnt = tmpItms.count(id);
 			std::multimap<int, Item*>::iterator iter = tmpItms.find(id);
 			if (iter != tmpItms.end())
 			{
+				log_i("遍历容器条目开始时间,容器中含有条目当前0x%x,%d个",id,cnt);
 				for (; cnt > 0; cnt--, iter++)
 				{
 					//log_i("Processing item %zu for ID 0x%x", cnt, id);
@@ -1118,24 +1133,39 @@ int ProtocolImpl::normalDatasResponse(Device* pdevice,Packet* ppacket,Item* pite
 
 					if (t_item != NULL && pdevice != NULL)
 					{
-
-						int iId = iGetItemParaConfig(t_item,"写功能码");
+						int iwId = iGetItemParaConfig(t_item,"写功能码");
 						int iStartAddr = iGetItemParaConfig(t_item,"起始地址");
 						string t_stype = sGetItemParaConfig(t_item,"帧类型");
 						string t_sDataType = sGetItemParaConfig(t_item,"数据类型");
 						string t_sByteOrder = sGetItemParaConfig(t_item,"字节序");
 						string t_sBits= sGetItemParaConfig(t_item ,"位地址");
-						iId += iStartAddr;
+						iwId += iStartAddr;
 						string t_saddr;
 						t_saddr = pdevice->getBase().getParam("站地址");
 						int t_iaddr = 0;
 						t_iaddr = strtol(t_saddr.c_str(), NULL, HEX);
 						//log_i("t_iId = 0x%x,t_iaddr =%d,",iId,t_iaddr);
+						int itemFuncCode  = (iwId & 0x070000);
+						//条目写功能码解析是读响应
+						if(itemFuncCode == 0x040000)
+						{
 
-						iId |=  (t_iaddr << 19);
-
-						//log_i("设置的数据buf=%d,paraID = 0x%x",buf,iId);
-						setData(t_item, buf,id,iId,t_sDataType,t_sByteOrder,t_sBits);
+							iwId |=  (t_iaddr << 19);
+							//log_i("设置的数据buf=%d,paraID = 0x%x",buf,iId);
+							log_i("进入设置函数");
+							setData(t_item, buf,id,iwId,t_sDataType,t_sByteOrder,t_sBits);
+						}
+						else
+						{
+							//条目写功能码解析是写功能码
+							if(itemFuncCode == 0x010000)
+							{
+                                iwId = iwId  | 0x00040000;
+                                iwId = iwId  & 0xfff4ffff;
+                                iwId |=  (t_iaddr << 19);
+								setData(t_item, buf,id,iwId,t_sDataType,t_sByteOrder,t_sBits);
+							}
+						}
 					}
 
 					else
@@ -1147,6 +1177,7 @@ int ProtocolImpl::normalDatasResponse(Device* pdevice,Packet* ppacket,Item* pite
 						return S_FALSE;
 					}
 				}
+				log_i("遍历容器条目结束时间,容器中含有条目当前0x%x,%d个",id,cnt);
 			}
 		}
 		else
@@ -1154,7 +1185,9 @@ int ProtocolImpl::normalDatasResponse(Device* pdevice,Packet* ppacket,Item* pite
 			log_i("m_tmpItems.count(pC->getBase().getObjid().toString()) <0");
 			return S_FALSE;
 		}
+
 	}
+	log_i("数据集结束时间");
 	return S_OK;
 }