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

无线模块增加指示灯

This commit is contained in:
nnhy 2015-11-21 02:32:40 +00:00
parent c466a1a734
commit a942fee58d
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
TinyNet/Tiny.cpp
View File

@ -49,7 +49,7 @@ void Setup(ushort code, const char* name, COM_Def message, int baudRate)
#endif
}
ITransport* Create2401(SPI_TypeDef* spi_, Pin ce, Pin irq, Pin power, bool powerInvert)
ITransport* Create2401(SPI_TypeDef* spi_, Pin ce, Pin irq, Pin power, bool powerInvert, IDataPort* led)
{
Spi* spi = new Spi(spi_, 10000000, true);
NRF24L01* nrf = new NRF24L01();
@ -62,25 +62,24 @@ ITransport* Create2401(SPI_TypeDef* spi_, Pin ce, Pin irq, Pin power, bool power
nrf->Channel = TinyConfig::Current->Channel;
nrf->Speed = TinyConfig::Current->Speed;
nrf->Led = led;
//if(!nrf.Check()) debug_printf("请检查NRF24L01线路\r\n");
return nrf;
}
ITransport* CreateShunCom(COM_Def index, int baudRate, Pin rst, Pin power, Pin slp, Pin cfg)
ITransport* CreateShunCom(COM_Def index, int baudRate, Pin rst, Pin power, Pin slp, Pin cfg, IDataPort* led)
{
SerialPort* sp = new SerialPort(index, baudRate);
ShunCom* zb = new ShunCom();
zb->Power.Set(power);
//if(zb->Power.ReadInput()) zb->Power.Invert = true;
zb->Sleep.Init(slp, true);
zb->Config.Init(cfg, true);
zb->Init(sp, rst);
//sp->SetPower();
//zb->SetPower();
zb->Led = led;
return zb;
}

4
TinyNet/Tiny.h
View File

@ -14,8 +14,8 @@ void Setup(ushort code, const char* name, COM_Def message = COM1, int baudRate =
void* InitConfig(void* data, uint size);
void ClearConfig();
ITransport* Create2401(SPI_TypeDef* spi_, Pin ce, Pin irq, Pin power = P0, bool powerInvert = false);
ITransport* CreateShunCom(COM_Def index, int baudRate, Pin rst, Pin power, Pin slp, Pin cfg);
ITransport* Create2401(SPI_TypeDef* spi_, Pin ce, Pin irq, Pin power = P0, bool powerInvert = false, IDataPort* led = NULL);
ITransport* CreateShunCom(COM_Def index, int baudRate, Pin rst, Pin power, Pin slp, Pin cfg, IDataPort* led = NULL);
TinyClient* CreateTinyClient(ITransport* port);

7
TokenNet/Token.cpp
View File

@ -163,7 +163,7 @@ void Token::Setup(ushort code, const char* name, COM_Def message, int baudRate)
Config::Current = &Config::CreateFlash();
}
ITransport* Token::Create2401(SPI_TypeDef* spi_, Pin ce, Pin irq, Pin power, bool powerInvert)
ITransport* Token::Create2401(SPI_TypeDef* spi_, Pin ce, Pin irq, Pin power, bool powerInvert, IDataPort* led)
{
Spi* spi = new Spi(spi_, 10000000, true);
NRF24L01* nrf = new NRF24L01();
@ -175,6 +175,7 @@ ITransport* Token::Create2401(SPI_TypeDef* spi_, Pin ce, Pin irq, Pin power, boo
nrf->Channel = TinyConfig::Current->Channel;
nrf->Speed = TinyConfig::Current->Speed;
nrf->Led = led;
//if(!nrf.Check()) debug_printf("请检查NRF24L01线路\r\n");
return nrf;
@ -188,7 +189,7 @@ uint OnZig(ITransport* port, Array& bs, void* param, void* param2)
return 0;
}
ITransport* Token::CreateShunCom(COM_Def index, int baudRate, Pin rst, Pin power, Pin slp, Pin cfg)
ITransport* Token::CreateShunCom(COM_Def index, int baudRate, Pin rst, Pin power, Pin slp, Pin cfg, IDataPort* led)
{
SerialPort* sp = new SerialPort(index, baudRate);
ShunCom* zb = new ShunCom();
@ -197,6 +198,8 @@ ITransport* Token::CreateShunCom(COM_Def index, int baudRate, Pin rst, Pin power
zb->Config.Init(cfg, true);
zb->Init(sp, rst);
zb->Led = led;
return zb;
}

4
TokenNet/Token.h
View File

@ -20,8 +20,8 @@ public:
static ISocketHost* CreateW5500(SPI_TypeDef* spi, Pin irq, Pin rst = P0, Pin power = P0, IDataPort* led = NULL);
static ITransport* Create2401(SPI_TypeDef* spi_, Pin ce, Pin irq, Pin power = P0, bool powerInvert = false);
static ITransport* CreateShunCom(COM_Def index, int baudRate, Pin rst, Pin power, Pin slp, Pin cfg);
static ITransport* Create2401(SPI_TypeDef* spi_, Pin ce, Pin irq, Pin power = P0, bool powerInvert = false, IDataPort* led = NULL);
static ITransport* CreateShunCom(COM_Def index, int baudRate, Pin rst, Pin power, Pin slp, Pin cfg, IDataPort* led = NULL);
static TokenClient* CreateClient(ISocketHost* host);
static TinyServer* CreateServer(ITransport* port);