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

代码整理

This commit is contained in:
nnhy 2015-11-21 02:25:49 +00:00
parent 10dd416deb
commit c466a1a734
3 changed files with 8 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TinyNet/Tiny.cpp
View File

@ -167,4 +167,3 @@ void SetPower(ITransport* port)
Power* pwr = dynamic_cast<Power*>(port); Power* pwr = dynamic_cast<Power*>(port);
if(pwr) pwr->SetPower(); if(pwr) pwr->SetPower();
} }

39
TokenNet/Token.cpp
View File

@ -169,7 +169,6 @@ ITransport* Token::Create2401(SPI_TypeDef* spi_, Pin ce, Pin irq, Pin power, boo
NRF24L01* nrf = new NRF24L01(); NRF24L01* nrf = new NRF24L01();
nrf->Init(spi, ce, irq, power); nrf->Init(spi, ce, irq, power);
nrf->Power.Invert = powerInvert; nrf->Power.Invert = powerInvert;
nrf->SetPower();
nrf->AutoAnswer = false; nrf->AutoAnswer = false;
nrf->PayloadWidth = 32; nrf->PayloadWidth = 32;
@ -193,46 +192,14 @@ ITransport* Token::CreateShunCom(COM_Def index, int baudRate, Pin rst, Pin power
{ {
SerialPort* sp = new SerialPort(index, baudRate); SerialPort* sp = new SerialPort(index, baudRate);
ShunCom* zb = new ShunCom(); ShunCom* zb = new ShunCom();
//zb.Power.Init(power, TinyConfig::Current->HardVer < 0x08);
zb->Power.Set(power); zb->Power.Set(power);
if(zb->Power) zb->Power.Invert = true;
zb->Sleep.Init(slp, true); zb->Sleep.Init(slp, true);
zb->Config.Init(cfg, true); zb->Config.Init(cfg, true);
zb->Init(sp, rst); zb->Init(sp, rst);
sp->SetPower();
zb->SetPower();
return zb; return zb;
} }
void ClearConfig()
{
//TokenConfig* cfg = TokenConfig::Current;
//if(cfg) cfg->Clear();
// 退网
//TokenClient* client = TokenClient::Current;
//if(client) client->Logout();
Sys.Reset();
}
void CheckUserPress(InputPort* port, bool down, void* param)
{
if(down) return;
debug_printf("按下 P%c%d 时间=%d 毫秒 \r\n", _PIN_NAME(port->_Pin), port->PressTime);
// 按下5秒，清空设置并重启
if(port->PressTime >= 5000)
ClearConfig();
// 按下3秒，重启
else if(port->PressTime >= 3000)
Sys.Reset();
}
void StartGateway(void* param) void StartGateway(void* param)
{ {
ISocket* socket = NULL; ISocket* socket = NULL;
@ -279,3 +246,9 @@ void StartGateway(void* param)
} }
} }
} }
void Token::SetPower(ITransport* port)
{
Power* pwr = dynamic_cast<Power*>(port);
if(pwr) pwr->SetPower();
}

6
TokenNet/Token.h
View File

@ -25,10 +25,8 @@ public:
static TokenClient* CreateClient(ISocketHost* host); static TokenClient* CreateClient(ISocketHost* host);
static TinyServer* CreateServer(ITransport* port); static TinyServer* CreateServer(ITransport* port);
void SetPower(ITransport* port);
}; };
void ClearConfig();
void CheckUserPress(InputPort* port, bool down, void* param = NULL);
#endif #endif