NewLife
/
SmartOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

This commit is contained in:
nnhy 2015-11-14 02:32:23 +00:00
parent 98ab6c18ad
commit ae8bf94e70
2 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
TinyNet/TinyClient.cpp
View File

@ -325,58 +325,47 @@ void TinyClient::Report(Message& msg)
if(!Server) return; if(!Server) return;
Stream ms = msg.ToStream(); Stream ms = msg.ToStream();
ms.Write((byte)0x01); // 子功能码
ms.Write((byte)0x01); // 起始地址。跳过第一个字节
byte len = Store.Data.Length() - 1; ReportPing0x01(ms);
ms.Write(len); // 长度 ReportPing0x03(ms);
ms.Write(Array(Store.Data.GetBuffer(), len)); ReportPing0x02(ms);
msg.Length = ms.Position(); msg.Length = ms.Position();
} }
// 0x01子功能，主数据区 // 0x01子功能，主数据区
void TinyClient::ReportPing0x01(Message& msg) void TinyClient::ReportPing0x01(Stream& ms)
{ {
if(!Server) return; byte len = Store.Data.Length() - 1;
if(ms.Position() + 3 + len > Control->Port->MaxSize) return;
Stream ms = msg.ToStream();
ms.Write((byte)0x01); // 子功能码 ms.Write((byte)0x01); // 子功能码
ms.Write((byte)0x01); // 起始地址 ms.Write((byte)0x01); // 起始地址
byte len = Store.Data.Length() - 1;
ms.Write(len); // 长度 ms.Write(len); // 长度
ms.Write(Array(Store.Data.GetBuffer(), len)); ms.Write(Array(Store.Data.GetBuffer(), len));
msg.Length += ms.Position();
} }
// 0x02子功能，配置区 // 0x02子功能，配置区
void TinyClient::ReportPing0x02(Message& msg) void TinyClient::ReportPing0x02(Stream& ms)
{ {
// 没有服务端时不要上报
if(!Server) return;
byte len = Store.Data.Length() - 1; byte len = Store.Data.Length() - 1;
if(msg.Size() + 3 + len > Control->Port->MaxSize) return; if(ms.Position() + 3 + len > Control->Port->MaxSize) return;
//主数据区长度超过18字节不带CRC校验
Stream ms = msg.ToStream();
ms.Write((byte)0x02); // 子功能码 ms.Write((byte)0x02); // 子功能码
ms.Write((byte)0x01); // 起始地址 ms.Write((byte)0x01); // 起始地址
ms.Write(len); // 长度 ms.Write(len); // 长度
ms.Write(Array(Store.Data.GetBuffer(), len)); ms.Write(Array(Store.Data.GetBuffer(), len));
msg.Length += ms.Position();
} }
// 0x03子功能，硬件校验码 // 0x03子功能，硬件校验码
void TinyClient::ReportPing0x03(Message& msg) void TinyClient::ReportPing0x03(Stream& ms)
{ {
if(msg.Size() + 3 > Control->Port->MaxSize) return; if(ms.Position() + 3 > Control->Port->MaxSize) return;
Stream ms = msg.ToStream();
ms.Write((byte)0x03); // 子功能码 ms.Write((byte)0x03); // 子功能码
ms.Write(HardCrc); //硬件CRC ms.Write(HardCrc); //硬件CRC
msg.Length += ms.Position();
} }
bool TinyClient::Report(uint offset, byte dat) bool TinyClient::Report(uint offset, byte dat)
@ -584,8 +573,6 @@ void TinyClient::Ping()
msg.Code = 3; msg.Code = 3;
Report(msg); Report(msg);
ReportPing0x03(msg);
ReportPing0x02(msg);
Send(msg); Send(msg);

6
TinyNet/TinyClient.h
View File

@ -49,9 +49,9 @@ public:
bool Report(uint offset, byte dat); bool Report(uint offset, byte dat);
bool Report(uint offset, const Array& bs); bool Report(uint offset, const Array& bs);
//特色心跳上报 //特色心跳上报
void ReportPing0x01(Message& msg); void ReportPing0x01(Stream& ms);
void ReportPing0x02(Message& msg); void ReportPing0x02(Stream& ms);
void ReportPing0x03(Message& msg); void ReportPing0x03(Stream& ms);
uint NextReport; // 下次上报偏移，0不动 uint NextReport; // 下次上报偏移，0不动
void ReportAsync(uint offset); void ReportAsync(uint offset);