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

0802继承自0801，0802支持不懂版本不同引脚配置

This commit is contained in:
大石头 2017-03-25 16:42:15 +08:00
parent 87c19a0934
commit 823df604ff
6 changed files with 82 additions and 397 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
Board/AP0801.cpp
View File

@ -17,10 +17,10 @@
#include "Message\ProxyFactory.h" #include "Message\ProxyFactory.h"
AP0801* AP0801::Current = nullptr; AP0801* AP0801::Current = nullptr;
static TokenClient* Client = nullptr; // 令牌客户端 static TokenClient* Client = nullptr; // 令牌客户端
static ProxyFactory* ProxyFac = nullptr; // 透传管理器 static ProxyFactory* ProxyFac = nullptr; // 透传管理器
AP0801::AP0801() AP0801::AP0801()
{ {
@ -29,14 +29,24 @@ AP0801::AP0801()
ButtonPins.Add(PE13); ButtonPins.Add(PE13);
ButtonPins.Add(PE14); ButtonPins.Add(PE14);
Client = nullptr; Client = nullptr;
ProxyFac = nullptr; ProxyFac = nullptr;
AlarmObj = nullptr; AlarmObj = nullptr;
Data = nullptr; Data = nullptr;
Size = 0; Size = 0;
Current = this; Net.Spi = Spi2;
Net.Irq = PE1;
Net.Reset = PD13;
Esp.Com = COM4;
Esp.Baudrate = 115200;
Esp.Power = PE2;
Esp.Reset = PD3;
Esp.LowPower = P0;
Current = this;
} }
void AP0801::Init(ushort code, cstring name, COM message) void AP0801::Init(ushort code, cstring name, COM message)
@ -116,8 +126,8 @@ void AP0801::InitButtons(const Delegate2<InputPort&, bool>& press)
auto port = new InputPort(ButtonPins[i]); auto port = new InputPort(ButtonPins[i]);
port->Invert = true; port->Invert = true;
port->ShakeTime = 40; port->ShakeTime = 40;
port->Index = i; port->Index = i;
port->Press = press; port->Press = press;
port->UsePress(); port->UsePress();
port->Open(); port->Open();
Buttons.Add(port); Buttons.Add(port);
@ -128,9 +138,9 @@ NetworkInterface* AP0801::Create5500()
{ {
debug_printf("\r\nW5500::Create \r\n"); debug_printf("\r\nW5500::Create \r\n");
auto net = new W5500(Spi2, PE1, PD13); auto net = new W5500(Net.Spi, Net.Irq, Net.Reset);
net->SetLed(*Leds[0]); net->SetLed(*Leds[0]);
if(!net->Open()) if (!net->Open())
{ {
delete net; delete net;
return nullptr; return nullptr;
@ -142,27 +152,27 @@ NetworkInterface* AP0801::Create5500()
return net; return net;
} }
NetworkInterface* AP0801::Create8266(bool apOnly) NetworkInterface* AP0801::Create8266()
{ {
debug_printf("\r\nEsp8266::Create \r\n"); debug_printf("\r\nEsp8266::Create \r\n");
auto esp = new Esp8266(); auto esp = new Esp8266();
esp->Init(COM4); esp->Init(Esp.Com, Esp.Baudrate);
esp->Set(PE2, PD3); esp->Set(Esp.Power, Esp.Reset, Esp.LowPower);
esp->SetLed(*Leds[1]); esp->SetLed(*Leds[1]);
// 初次需要指定模式 否则为 Wire // 初次需要指定模式 否则为 Wire
bool join = esp->SSID && *esp->SSID; bool join = esp->SSID && *esp->SSID;
if (!join) if (!join)
{ {
*esp->SSID = "WSWL"; *esp->SSID = "WSWL";
*esp->Pass = "12345678"; *esp->Pass = "12345678";
esp->Mode = NetworkType::STA_AP; esp->Mode = NetworkType::STA_AP;
esp->WorkMode = NetworkType::STA_AP; esp->WorkMode = NetworkType::STA_AP;
} }
if(!esp->Open()) if (!esp->Open())
{ {
delete esp; delete esp;
return nullptr; return nullptr;
@ -209,10 +219,10 @@ void AP0801::Register(uint offset, uint size, Handler hook)
static void OnInitNet(void* param) static void OnInitNet(void* param)
{ {
auto& bsp = *(AP0801*)param; auto& bsp = *(AP0801*)param;
bsp.Create5500(); bsp.Create5500();
bsp.Create8266(false); bsp.Create8266();
Client->Open(); Client->Open();
} }
@ -249,11 +259,11 @@ void AP0801::InitProxy()
static void OnAlarm(AlarmItem& item) static void OnAlarm(AlarmItem& item)
{ {
// 1长度n + 1类型 + 1偏移 + (n-2)数据 // 1长度n + 1类型 + 1偏移 + (n-2)数据
auto bs = item.GetData(); auto bs = item.GetData();
debug_printf("OnAlarm "); debug_printf("OnAlarm ");
bs.Show(true); bs.Show(true);
if(bs[1] == 0x06) if (bs[1] == 0x06)
{ {
auto client = Client; auto client = Client;
client->Store.Write(bs[2], bs.Sub(3, bs[0] - 2)); client->Store.Write(bs[2], bs.Sub(3, bs[0] - 2));
@ -271,7 +281,7 @@ void AP0801::InitAlarm()
Client->Register("Policy/AlarmSet", &Alarm::Set, AlarmObj); Client->Register("Policy/AlarmSet", &Alarm::Set, AlarmObj);
Client->Register("Policy/AlarmGet", &Alarm::Get, AlarmObj); Client->Register("Policy/AlarmGet", &Alarm::Get, AlarmObj);
AlarmObj->OnAlarm = OnAlarm; AlarmObj->OnAlarm = OnAlarm;
AlarmObj->Start(); AlarmObj->Start();
} }
@ -329,7 +339,7 @@ void AP0801::Restore()
{ {
if (!Client) return; if (!Client) return;
if(Client) Client->Reset("按键重置"); if (Client) Client->Reset("按键重置");
} }
int AP0801::GetStatus() int AP0801::GetStatus()
@ -346,14 +356,14 @@ void AP0801::OnLongPress(InputPort* port, bool down)
debug_printf("Press P%c%d Time=%d ms\r\n", _PIN_NAME(port->_Pin), port->PressTime); debug_printf("Press P%c%d Time=%d ms\r\n", _PIN_NAME(port->_Pin), port->PressTime);
ushort time = port->PressTime; ushort time = port->PressTime;
auto client = Client; auto client = Client;
if (time >= 5000 && time < 10000) if (time >= 5000 && time < 10000)
{ {
if(client) client->Reset("按键重置"); if (client) client->Reset("按键重置");
} }
else if (time >= 3000) else if (time >= 3000)
{ {
if(client) client->Reboot("按键重启"); if (client) client->Reboot("按键重启");
Sys.Reboot(1000); Sys.Reboot(1000);
} }
} }

11
Board/AP0801.h
View File

@ -7,7 +7,11 @@
#include "App\Alarm.h" #include "App\Alarm.h"
// 阿波罗0801/0802 #include "Device\Spi.h"
#include "Drivers\W5500.h"
#include "Drivers\Esp8266\Esp8266.h"
// 阿波罗0801
class AP0801 class AP0801
{ {
public: public:
@ -21,6 +25,9 @@ public:
Alarm* AlarmObj; Alarm* AlarmObj;
W5500Config Net;
Esp8266Config Esp;
AP0801(); AP0801();
// 设置系统参数 // 设置系统参数
@ -43,7 +50,7 @@ public:
// 打开以太网W5500 // 打开以太网W5500
NetworkInterface* Create5500(); NetworkInterface* Create5500();
// 打开Esp8266，作为主控或者纯AP // 打开Esp8266，作为主控或者纯AP
NetworkInterface* Create8266(bool apOnly); NetworkInterface* Create8266();
// ITransport* Create2401(); // ITransport* Create2401();

314
Board/AP0802.cpp
View File

@ -1,62 +1,11 @@
#include "AP0802.h" #include "AP0802.h"
#include "Kernel\Task.h" AP0802::AP0802(int hardver) : AP0801()
#include "Device\WatchDog.h"
#include "Config.h"
#include "Drivers\NRF24L01.h"
#include "Drivers\W5500.h"
#include "Drivers\Esp8266\Esp8266.h"
#include "TokenNet\TokenController.h"
#include "..\TinyNet\TinyConfig.h"
#include "..\App\FlushPort.h"
#include "Device\RTC.h"
AP0802 * AP0802::Current = nullptr;
static TokenClient* Client = nullptr; // 令牌客户端
AP0802::AP0802()
{ {
Client = nullptr; LedPins.Clear();
ButtonPins.Clear();
Data = nullptr; if (hardver > 160712)
Size = 0;
Current = this;
HardwareVer = HardwareVerLast;
}
void AP0802::Init(ushort code, cstring name, COM message)
{
auto& sys = (TSys&)Sys;
sys.Code = code;
sys.Name = (char*)name;
// RTC 提取时间
HardRTC::Start(false, false);
// 初始化系统
sys.Init();
#if DEBUG
sys.MessagePort = message; // 指定printf输出的串口
Sys.ShowInfo();
WatchDog::Start(20000, 10000);
#else
WatchDog::Start();
// 系统休眠时自动进入低功耗
Power::AttachTimeSleep();
#endif
// Flash最后一块作为配置区
Config::Current = &Config::CreateFlash();
if (HardwareVer == HardwareVerLast)
{ {
LedPins.Add(PE5); LedPins.Add(PE5);
LedPins.Add(PE4); LedPins.Add(PE4);
@ -65,8 +14,7 @@ void AP0802::Init(ushort code, cstring name, COM message)
ButtonPins.Add(PE9); ButtonPins.Add(PE9);
ButtonPins.Add(PE14); ButtonPins.Add(PE14);
} }
else
if (HardwareVer <= HardwareVerAt160712)
{ {
LedPins.Add(PE5); LedPins.Add(PE5);
LedPins.Add(PE4); LedPins.Add(PE4);
@ -75,257 +23,9 @@ void AP0802::Init(ushort code, cstring name, COM message)
ButtonPins.Add(PE13); ButtonPins.Add(PE13);
ButtonPins.Add(PE14); ButtonPins.Add(PE14);
} }
}
void* AP0802::InitData(void* data, int size) Esp.Power = PE0;
{ Esp.Reset = PD3;
// 启动信息
auto hot = &HotConfig::Current();
hot->Times++;
data = hot->Next();
if (hot->Times == 1)
{
Buffer ds(data, size);
ds.Clear();
ds[0] = size;
}
Data = data;
Size = size;
return data;
}
void AP0802::InitLeds()
{
for (int i = 0; i < LedPins.Count(); i++)
{
auto port = new OutputPort(LedPins[i]);
port->Open();
Leds.Add(port);
}
}
void ButtonOnpress(InputPort* port, bool down, void* param)
{
if (port->PressTime > 1000)
AP0802::OnLongPress(port, down);
}
static void OnAlarm(AlarmItem& item)
{
// 1长度n + 1类型 + 1偏移 + (n-2)数据
auto bs = item.GetData();
debug_printf("OnAlarm ");
bs.Show(true);
if (bs[1] == 0x06)
{
auto client = Client;
client->Store.Write(bs[2], bs.Sub(3, bs[0] - 2));
// 主动上报状态
client->ReportAsync(bs[2], bs[0] - 2);
}
}
void AP0802::InitAlarm()
{
if (!Client)return;
if (!AlarmObj)AlarmObj = new Alarm();
Client->Register("Policy/AlarmSet", &Alarm::Set, AlarmObj);
Client->Register("Policy/AlarmGet", &Alarm::Get, AlarmObj);
AlarmObj->OnAlarm = OnAlarm;
AlarmObj->Start();
}
void AP0802::InitButtons(const Delegate2<InputPort&, bool>& press)
{
for (int i = 0; i < ButtonPins.Count(); i++)
{
auto port = new InputPort(ButtonPins[i]);
port->Invert = true;
port->Index = i;
port->Press = press;
port->UsePress();
port->Open();
Buttons.Add(port);
}
}
NetworkInterface* AP0802::Create5500()
{
debug_printf("\r\nW5500::Create \r\n");
auto net = new W5500(Spi2, PE1, PD13);
net->SetLed(*Leds[0]);
if(!net->Open())
{
delete net;
return nullptr;
}
net->EnableDNS();
net->EnableDHCP();
return net;
}
NetworkInterface* AP0802::Create8266(bool apOnly)
{
auto esp = new Esp8266();
esp->Init(COM4);
esp->Set(PE0, PD3);
esp->SetLed(*Leds[1]);
// 初次需要指定模式 否则为 Wire
bool join = esp->SSID && *esp->SSID;
//if (!join) esp->Mode = NetworkType::AP;
if (!join)
{
*esp->SSID = "WSWL";
*esp->Pass = "12345678";
esp->Mode = NetworkType::STA_AP;
esp->WorkMode = NetworkType::STA_AP;
}
if(!esp->Open())
{
delete esp;
return nullptr;
}
Client->Register("SetWiFi", &Esp8266::SetWiFi, esp);
Client->Register("GetWiFi", &Esp8266::GetWiFi, esp);
return esp;
}
/******************************** Token ********************************/
void AP0802::InitClient()
{
if (Client) return;
// 初始化令牌网
auto tk = TokenConfig::Create("smart.wslink.cn", NetType::Udp, 33333, 3377);
// 创建客户端
auto tc = TokenClient::CreateFast(Buffer(Data, Size));
tc->Cfg = tk;
tc->MaxNotActive = 8 * 60 * 1000;
tc->UseLocal();
Client = tc;
}
void AP0802::Register(int index, IDataPort& dp)
{
if (!Client) return;
auto& ds = Client->Store;
ds.Register(index, dp);
}
static void OnInitNet(void* param)
{
auto& bsp = *(AP0802*)param;
bsp.Create5500();
bsp.Create8266(false);
Client->Open();
}
void AP0802::InitNet()
{
Sys.AddTask(OnInitNet, this, 0, -1, "InitNet");
}
/******************************** 2401 ********************************/
static int Fix2401(const Buffer& bs)
{
//auto& bs = *(Buffer*)param;
// 微网指令特殊处理长度
uint rs = bs.Length();
if (rs >= 8)
{
rs = bs[5] + 8;
//if(rs < bs.Length()) bs.SetLength(rs);
}
return rs;
}
ITransport* AP0802::Create2401(SPI spi_, Pin ce, Pin irq, Pin power, bool powerInvert, IDataPort* led)
{
debug_printf("\r\n Create2401 \r\n");
static Spi spi(spi_, 10000000, true);
static NRF24L01 nrf;
nrf.Init(&spi, ce, irq, power);
auto tc = TinyConfig::Create();
if (tc->Channel == 0)
{
tc->Channel = 120;
tc->Speed = 250;
}
if (tc->Interval == 0)
{
tc->Interval = 40;
tc->Timeout = 1000;
}
nrf.AutoAnswer = false;
nrf.DynPayload = false;
nrf.Channel = tc->Channel;
//nrf.Channel = 120;
nrf.Speed = tc->Speed;
nrf.FixData = Fix2401;
//if(WirelessLed) net->Led = CreateFlushPort(WirelessLed);
nrf.Master = true;
return &nrf;
}
ITransport* AP0802::Create2401()
{
auto port = new FlushPort();
port->Port = Leds[2];
return Create2401(Spi3, PD12, PE3, PE6, true, port);
}
void AP0802::Restore()
{
if (Client) Client->Reset("按键重置");
}
void AP0802::OnLongPress(InputPort* port, bool down)
{
if (down) return;
debug_printf("Press P%c%d Time=%d ms\r\n", _PIN_NAME(port->_Pin), port->PressTime);
ushort time = port->PressTime;
auto client =Client;
if (time >= 5000 && time < 10000)
{
if (client) client->Reset("按键重置");
}
else if (time >= 3000)
{
if (client) client->Reboot("按键重启");
Sys.Reboot(1000);
}
} }
/* /*

61
Board/AP0802.h
View File

@ -1,66 +1,13 @@
#ifndef _AP0802_H_ #ifndef _AP0802_H_
#define _AP0802_H_ #define _AP0802_H_
#include "Kernel\Sys.h" #include "AP0801.h"
#include "Net\ITransport.h"
#include "Net\Socket.h"
#include "TokenNet\TokenClient.h" // 阿波罗0802
#include "Device\Port.h" class AP0802 : public AP0801
#include "App\Alarm.h"
#define HardwareVerFist 0
#define HardwareVerAt160712 1
#define HardwareVerLast 2
// 阿波罗0801/0802
class AP0802
{ {
public: public:
List<Pin> LedPins; AP0802(int hardver);
List<Pin> ButtonPins;
List<OutputPort*> Leds;
List<InputPort*> Buttons;
List<OutputPort*> Outputs;
List<InputPort*> Inputs;
byte HardwareVer;
AP0802();
static AP0802* Current;
// 设置系统参数
void Init(ushort code, cstring name, COM message = COM1);
// 设置数据区
void* InitData(void* data, int size);
void Register(int index, IDataPort& dp);
void InitAlarm();
void InitLeds();
void InitButtons(const Delegate2<InputPort&, bool>& press);
void InitPort();
// 打开以太网W5500
NetworkInterface* Create5500();
// 打开Esp8266，作为主控或者纯AP
NetworkInterface* Create8266(bool apOnly);
ITransport* Create2401(SPI spi_, Pin ce, Pin irq, Pin power, bool powerInvert, IDataPort* led);
ITransport* Create2401();
void InitClient();
void InitNet();
void Restore();
static void OnLongPress(InputPort* port, bool down);
private:
void* Data;
int Size;
Alarm* AlarmObj;
}; };
#endif #endif

11
Drivers/Esp8266/Esp8266.h
View File

@ -126,4 +126,15 @@ private:
void OnReceive(Buffer& bs); void OnReceive(Buffer& bs);
}; };
// Esp8266配置
class Esp8266Config
{
public:
COM Com;
int Baudrate;
Pin Power;
Pin Reset;
Pin LowPower;
};
#endif #endif

10
Drivers/W5500.h
View File

@ -3,6 +3,7 @@
#include "Net\NetworkInterface.h" #include "Net\NetworkInterface.h"
#include "Net\Socket.h" #include "Net\Socket.h"
#include "Device\Spi.h"
// W5500以太网驱动 // W5500以太网驱动
class W5500 : public NetworkInterface class W5500 : public NetworkInterface
@ -96,4 +97,13 @@ private:
void OnIRQ(); void OnIRQ();
}; };
// W5500配置
class W5500Config
{
public:
SPI Spi;
Pin Irq;
Pin Reset;
};
#endif #endif