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

透传，配置

This commit is contained in:
cdyong 2016-08-08 07:01:33 +00:00
parent 10c5b9bf00
commit 967d605084
4 changed files with 54 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Board/AP0801.cpp
View File

@ -128,7 +128,7 @@ ISocketHost* AP0801::Create8266(bool apOnly)
//Sys.AddTask(SetWiFiTask, this, 0, -1, "SetWiFi"); //Sys.AddTask(SetWiFiTask, this, 0, -1, "SetWiFi");
Client->Register("SetWiFi", &Esp8266::SetWiFi, host); Client->Register("SetWiFi", &Esp8266::SetWiFi, host);
Client->Register("SetWiFi", &Esp8266::GetWiFi, host); Client->Register("GetWiFi", &Esp8266::GetWiFi, host);
host->OpenAsync(); host->OpenAsync();

2
Platform/STM32F1/startup_stm32f10x.s
View File

@ -122,7 +122,7 @@ Reset_Handler PROC
IMPORT SystemInit IMPORT SystemInit
IMPORT __main IMPORT __main
LDR R0, =SystemInit LDR R0, =SystemInit
BLX R0 BLX R0
LDR R0, =__main LDR R0, =__main
BX R0 BX R0

53
TokenNet/TokenClient.cpp
View File

@ -40,9 +40,16 @@ TokenClient::TokenClient()
NextReport = 0; NextReport = 0;
ReportLength = 0; ReportLength = 0;
// 重启
this->Register("Gateway/Restart", InvokeRestStart, this); this->Register("Gateway/Restart", InvokeRestStart, this);
// 重置
this->Register("Gateway/Reset", InvokeRestBoot, this); this->Register("Gateway/Reset", InvokeRestBoot, this);
// 透传
this->Register("Message/Transparent", InvokeMessage, this);
// 设置配置
this->Register("Config/Set", InvokeConfigSet, this);
// 获取配置
this->Register("Config/Get", InvokeConfigGet, this);
} }
@ -59,13 +66,13 @@ void TokenClient::Open()
// 令牌广播使用素数，避免跟别的任务重叠 // 令牌广播使用素数，避免跟别的任务重叠
//if (cs.Count() > 0) _taskBroadcast = Sys.AddTask(BroadcastHelloTask, this, 7000, 37000, "令牌广播"); //if (cs.Count() > 0) _taskBroadcast = Sys.AddTask(BroadcastHelloTask, this, 7000, 37000, "令牌广播");
auto cfg = Cfg; auto cfg = Cfg;
Cookie = cfg->Token(); Cookie = cfg->Token();
// 启动时记为最后一次活跃接收 // 启动时记为最后一次活跃接收
LastActive = Sys.Ms(); LastActive = Sys.Ms();
Opened = true; Opened = true;
} }
void TokenClient::Close() void TokenClient::Close()
@ -475,10 +482,10 @@ bool TokenClient::OnRedirect(HelloMessage& msg)
auto cfg = Cfg; auto cfg = Cfg;
cfg->Show(); cfg->Show();
cfg->Protocol = msg.Uri.Type; cfg->Protocol = msg.Uri.Type;
cfg->Server() = msg.Uri.Host; cfg->Server() = msg.Uri.Host;
cfg->ServerPort = msg.Uri.Port; cfg->ServerPort = msg.Uri.Port;
cfg->Token() = msg.Cookie; cfg->Token() = msg.Cookie;
cfg->Save(); cfg->Save();
cfg->Show(); cfg->Show();
@ -926,7 +933,7 @@ void TokenClient::OnInvoke(const TokenMessage& msg, TokenController* ctrl)
if (result.Position() > 0) if (result.Position() > 0)
{ {
// rs.SetError(0x03, (cstring)result.GetBuffer()); // rs.SetError(0x03, (cstring)result.GetBuffer());
rsbp.Set("ErrorCode",(byte)0x03); rsbp.Set("ErrorCode", (byte)0x03);
} }
else else
{ {
@ -1007,3 +1014,31 @@ bool TokenClient::InvokeRestBoot(void * param, const BinaryPair& args, Stream& r
return true; return true;
} }
bool TokenClient::InvokeMessage(void * param, const BinaryPair& args, Stream& result)
{
byte id;
ByteArray data;
if (!args.Get("id", id)) return false;
if (!args.Get("data", data)) return false;
// 拿到数据，根据ID分发给各个串口
//测试，原样返回结果
//result.Write("id");
result.Write(id);
//result.Write("data")
result.Write(data);
return true;
}
bool TokenClient::InvokeConfigGet(void * param, const BinaryPair& args, Stream& result)
{
}
bool TokenClient::InvokeConfigSet(void * param, const BinaryPair& args, Stream& result)
{
}

8
TokenNet/TokenClient.h
View File

@ -104,9 +104,17 @@ private:
void OnInvoke(const TokenMessage& msg, TokenController* ctrl); void OnInvoke(const TokenMessage& msg, TokenController* ctrl);
bool OnInvoke(const String& action, const BinaryPair& args, Stream& result); bool OnInvoke(const String& action, const BinaryPair& args, Stream& result);
// 重启，重置
static bool InvokeRestStart(void * param, const BinaryPair& args, Stream& result); static bool InvokeRestStart(void * param, const BinaryPair& args, Stream& result);
static bool InvokeRestBoot(void * param, const BinaryPair& args, Stream& result); static bool InvokeRestBoot(void * param, const BinaryPair& args, Stream& result);
//配置
static bool InvokeConfigSet(void * param, const BinaryPair& args, Stream& result);
static bool InvokeConfigGet(void * param, const BinaryPair& args, Stream& result);
//透传消息
static bool InvokeMessage(void * param, const BinaryPair& args, Stream& result);
private: private:
uint _task; uint _task;
uint _taskBroadcast; // 广播任务 uint _taskBroadcast; // 广播任务