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

调整 字段

This commit is contained in:
cdyong 2015-12-16 04:03:50 +00:00
parent 627513ad4b
commit 28324f1ede
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
TinyNet/DiscoverMessage.cpp
View File

@ -3,10 +3,11 @@
// 初始化消息，各字段为0 // 初始化消息，各字段为0
DiscoverMessage::DiscoverMessage() : HardID(0x10), Pass(0x08) DiscoverMessage::DiscoverMessage() : HardID(0x10), Pass(0x08)
{ {
Type = Sys.Code; Type = Sys.Code;
Version = Sys.Version; Version = Sys.Version;
Switchs = 0; PanID = 0;
Analogs = 0; SendMode = 0;
Channel = 0;
} }
// 从数据流中读取消息 // 从数据流中读取消息
@ -14,11 +15,12 @@ bool DiscoverMessage::Read(Stream& ms)
{ {
if(!Reply) if(!Reply)
{ {
Type = ms.ReadUInt16(); Type = ms.ReadUInt16();
HardID = ms.ReadArray(); HardID = ms.ReadArray();
Version = ms.ReadUInt16(); Version = ms.ReadUInt16();
Switchs = ms.ReadByte(); PanID = ms.ReadUInt16();
Analogs = ms.ReadByte(); SendMode = ms.ReadByte();
Channel = ms.ReadByte();
} }
else else
{ {
@ -37,8 +39,9 @@ void DiscoverMessage::Write(Stream& ms)
ms.Write(Type); ms.Write(Type);
ms.WriteArray(HardID); ms.WriteArray(HardID);
ms.Write(Version); ms.Write(Version);
ms.Write(Switchs); ms.Write(PanID);
ms.Write(Analogs); ms.Write(SendMode);
ms.Write(Channel);
} }
else else
{ {
@ -56,8 +59,9 @@ String& DiscoverMessage::ToStr(String& str) const
str.Append(" Type=").Append(Type, 16, 4); str.Append(" Type=").Append(Type, 16, 4);
str = str + " HardID=" + HardID; str = str + " HardID=" + HardID;
str.Append(" Ver=").Append(Version, 16, 4); str.Append(" Ver=").Append(Version, 16, 4);
str = str + " Switchs=" + Switchs; str = str + " PanID=" +.Append(PanID,16, 4);
str = str + " Analogs=" + Analogs; str = str + " SendMode=" + SendMode;
str = str + " Channel=" + SendMode;
} }
else else
{ {

8
TinyNet/DiscoverMessage.h
View File

@ -12,11 +12,9 @@ public:
ushort Type; // 类型 ushort Type; // 类型
ByteArray HardID; // 硬件ID。一般16字节 ByteArray HardID; // 硬件ID。一般16字节
ushort Version; //软件版本 ushort Version; //软件版本
byte Switchs; ushort PanID; //无线网段
byte Analogs; byte SendMode; //发送模式
//ushort PanID; //无线网段 byte Channel; //通道号
//byte SendMode //发送模式
//byte Channel; //通道号
// 响应数据 // 响应数据
byte Address;// 分配得到的设备ID byte Address;// 分配得到的设备ID

2
TinyNet/TinyConfig.h
View File

@ -25,7 +25,7 @@ struct TinyConfig
byte Server; // 网关ID byte Server; // 网关ID
ushort PanID; //无线网段 ushort PanID; //无线网段
byte Channel; // 通道 byte Channel; // 通道
byte SendMode //发送模式 byte SendMode; //发送模式
ushort Speed; // 传输速度 ushort Speed; // 传输速度
byte HardVer; // 硬件版本 byte HardVer; // 硬件版本
byte SoftVer; // 软件版本 byte SoftVer; // 软件版本