0801，0802，pandora 底板 默认启用定时策略
This commit is contained in:
cdyong
parent
97727ccc5d
commit
79cdde44a1
|
|
@ -192,7 +192,7 @@ void AP0801::InitClient()
|
|||
Client = tc;
|
||||
|
||||
tc->MaxNotActive = 480000;
|
||||
|
||||
InitAlarm();
|
||||
// 重启
|
||||
tc->Register("Gateway/Restart", &TokenClient::InvokeRestart, tc);
|
||||
// 重置
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
#include "..\App\FlushPort.h"
|
||||
|
||||
AP0802 * AP0802::Current = nullptr;
|
||||
static TokenClient* Client = nullptr; // 令牌客户端
|
||||
|
||||
AP0802::AP0802()
|
||||
{
|
||||
|
|
@ -96,7 +97,7 @@ void* AP0802::InitData(void* data, int size)
|
|||
|
||||
void AP0802::InitLeds()
|
||||
{
|
||||
for(int i=0; i<LedPins.Count(); i++)
|
||||
for (int i = 0; i < LedPins.Count(); i++)
|
||||
{
|
||||
auto port = new OutputPort(LedPins[i]);
|
||||
port->Open();
|
||||
|
|
@ -110,9 +111,38 @@ void ButtonOnpress(InputPort* port, bool down, void* param)
|
|||
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++)
|
||||
for (int i = 0; i < ButtonPins.Count(); i++)
|
||||
{
|
||||
auto port = new InputPort(ButtonPins[i]);
|
||||
port->Invert = true;
|
||||
|
|
@ -165,7 +195,7 @@ ISocketHost* AP0802::Create8266(bool apOnly)
|
|||
|
||||
void AP0802::InitClient()
|
||||
{
|
||||
if(Client) return;
|
||||
if (Client) return;
|
||||
|
||||
auto tk = TokenConfig::Current;
|
||||
|
||||
|
|
@ -175,6 +205,8 @@ void AP0802::InitClient()
|
|||
|
||||
// 需要使用本地连接
|
||||
//client->UseLocal();
|
||||
//配置闹钟
|
||||
InitAlarm();
|
||||
|
||||
Client = client;
|
||||
Client->MaxNotActive = 480000;
|
||||
|
|
@ -189,7 +221,7 @@ void AP0802::InitClient()
|
|||
// 获取所有Ivoke命令
|
||||
Client->Register("Api/All", &TokenClient::InvokeGetAllApi, Client);
|
||||
|
||||
if(Data && Size > 0)
|
||||
if (Data && Size > 0)
|
||||
{
|
||||
auto& ds = Client->Store;
|
||||
ds.Data.Set(Data, Size);
|
||||
|
|
@ -197,9 +229,9 @@ void AP0802::InitClient()
|
|||
|
||||
// 如果若干分钟后仍然没有打开令牌客户端，则重启系统
|
||||
Sys.AddTask(
|
||||
[](void* p){
|
||||
[](void* p) {
|
||||
auto& client = *(TokenClient*)p;
|
||||
if(!client.Opened)
|
||||
if (!client.Opened)
|
||||
{
|
||||
debug_printf("联网超时，准备重启系统！\r\n\r\n");
|
||||
Sys.Reboot();
|
||||
|
|
@ -210,7 +242,7 @@ void AP0802::InitClient()
|
|||
|
||||
void AP0802::Register(int index, IDataPort& dp)
|
||||
{
|
||||
if(!Client) return;
|
||||
if (!Client) return;
|
||||
|
||||
auto& ds = Client->Store;
|
||||
ds.Register(index, dp);
|
||||
|
|
@ -235,16 +267,16 @@ void AP0802::OpenClient(ISocketHost& host)
|
|||
|
||||
// 网络就绪后，打开指示灯
|
||||
auto net = dynamic_cast<W5500*>(&host);
|
||||
if(net && !net->Led) net->SetLed(*Leds[0]);
|
||||
if (net && !net->Led) net->SetLed(*Leds[0]);
|
||||
|
||||
auto esp = dynamic_cast<Esp8266*>(&host);
|
||||
if(esp && !esp->Led) esp->SetLed(*Leds[1]);
|
||||
if (esp && !esp->Led) esp->SetLed(*Leds[1]);
|
||||
|
||||
auto tk = TokenConfig::Current;
|
||||
NetUri uri(NetType::Udp, IPAddress::Broadcast(), 3355);
|
||||
|
||||
// 避免重复打开
|
||||
if(Host)
|
||||
if (Host)
|
||||
{
|
||||
if (Host == esp) // 8266 作为Host的时候 使用 Master 和广播端口两个 HostAP 为空
|
||||
{
|
||||
|
|
@ -326,7 +358,7 @@ TokenController* AP0802::AddControl(ISocketHost& host, const NetUri& uri, ushort
|
|||
|
||||
// 创建客户端
|
||||
auto client = Client;
|
||||
if(localPort == 0)
|
||||
if (localPort == 0)
|
||||
client->Master = ctrl;
|
||||
else
|
||||
{
|
||||
|
|
@ -363,7 +395,7 @@ void OnInitNet(void* param)
|
|||
auto host = (W5500*)bsp.Create5500();
|
||||
// 软路由的DHCP要求很严格，必须先把自己IP设为0
|
||||
host->IP = IPAddress::Any();
|
||||
if(host->Open())
|
||||
if (host->Open())
|
||||
{
|
||||
host->EnableDNS();
|
||||
host->EnableDHCP();
|
||||
|
|
@ -375,25 +407,25 @@ void OnInitNet(void* param)
|
|||
}
|
||||
|
||||
// 没有接网线，需要完整WiFi通道
|
||||
if(!bsp.Host)
|
||||
if (!bsp.Host)
|
||||
{
|
||||
auto esp = bsp.Create8266(false);
|
||||
if(esp)
|
||||
if (esp)
|
||||
{
|
||||
// 未组网时，主机留空，仅保留AP主机
|
||||
bool join = esp->SSID && *esp->SSID;
|
||||
if(join && esp->IsStation())
|
||||
if (join && esp->IsStation())
|
||||
bsp.Host = esp;
|
||||
else
|
||||
bsp.HostAP = esp;
|
||||
}
|
||||
}
|
||||
// 接了网线，同时需要AP
|
||||
else if(host->IsAP())
|
||||
else if (host->IsAP())
|
||||
{
|
||||
// 如果Host已存在，则8266仅作为AP
|
||||
auto esp = bsp.Create8266(true);
|
||||
if(esp) bsp.HostAP = esp;
|
||||
if (esp) bsp.HostAP = esp;
|
||||
}
|
||||
|
||||
// 打开DHCP，完成时会打开客户端
|
||||
|
|
@ -413,7 +445,7 @@ int Fix2401(const Buffer& bs)
|
|||
//auto& bs = *(Buffer*)param;
|
||||
// 微网指令特殊处理长度
|
||||
uint rs = bs.Length();
|
||||
if(rs >= 8)
|
||||
if (rs >= 8)
|
||||
{
|
||||
rs = bs[5] + 8;
|
||||
//if(rs < bs.Length()) bs.SetLength(rs);
|
||||
|
|
@ -430,14 +462,14 @@ ITransport* AP0802::Create2401(SPI spi_, Pin ce, Pin irq, Pin power, bool powerI
|
|||
nrf.Init(&spi, ce, irq, power);
|
||||
|
||||
auto tc = TinyConfig::Create();
|
||||
if(tc->Channel == 0)
|
||||
if (tc->Channel == 0)
|
||||
{
|
||||
tc->Channel = 120;
|
||||
tc->Speed = 250;
|
||||
}
|
||||
if(tc->Interval == 0)
|
||||
if (tc->Interval == 0)
|
||||
{
|
||||
tc->Interval= 40;
|
||||
tc->Interval = 40;
|
||||
tc->Timeout = 1000;
|
||||
}
|
||||
|
||||
|
|
@ -460,12 +492,12 @@ ITransport* AP0802::Create2401()
|
|||
{
|
||||
auto port = new FlushPort();
|
||||
port->Port = Leds[2];
|
||||
return Create2401(Spi3,PD12,PE3,PE6,true,port);
|
||||
return Create2401(Spi3, PD12, PE3, PE6, true, port);
|
||||
}
|
||||
|
||||
void AP0802::Restore()
|
||||
{
|
||||
if(Client) Client->Reset("按键重置");
|
||||
if (Client) Client->Reset("按键重置");
|
||||
}
|
||||
|
||||
void AP0802::OnLongPress(InputPort* port, bool down)
|
||||
|
|
@ -475,14 +507,14 @@ void AP0802::OnLongPress(InputPort* port, bool down)
|
|||
debug_printf("Press P%c%d Time=%d ms\r\n", _PIN_NAME(port->_Pin), port->PressTime);
|
||||
|
||||
ushort time = port->PressTime;
|
||||
auto client = AP0802::Current->Client;
|
||||
auto client =Client;
|
||||
if (time >= 5000 && time < 10000)
|
||||
{
|
||||
if(client) client->Reset("按键重置");
|
||||
if (client) client->Reset("按键重置");
|
||||
}
|
||||
else if (time >= 3000)
|
||||
{
|
||||
if(client) client->Reboot("按键重启");
|
||||
if (client) client->Reboot("按键重启");
|
||||
Sys.Reboot(1000);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
|
||||
#include "TokenNet\TokenClient.h"
|
||||
#include "Device\Port.h"
|
||||
#include "App\Alarm.h"
|
||||
|
||||
#define HardwareVerFist 0
|
||||
#define HardwareVerAt160712 1
|
||||
|
|
@ -25,7 +26,6 @@ public:
|
|||
|
||||
ISocketHost* Host; // 网络主机
|
||||
ISocketHost* HostAP; // 网络主机
|
||||
TokenClient* Client; // 令牌客户端
|
||||
byte HardwareVer;
|
||||
|
||||
AP0802();
|
||||
|
|
@ -37,7 +37,7 @@ public:
|
|||
// 设置数据区
|
||||
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();
|
||||
|
|
@ -65,7 +65,7 @@ private:
|
|||
bool NetBra;
|
||||
bool EspMaster;
|
||||
bool EspBra;
|
||||
|
||||
Alarm* AlarmObj;
|
||||
// uint Flag; // 内部使用 标识Controller创建情况
|
||||
|
||||
void OpenClient(ISocketHost& host);
|
||||
|
|
|
|||
|
|
@ -102,6 +102,7 @@ void PA0903::InitClient()
|
|||
|
||||
Client = client;
|
||||
|
||||
InitAlarm();
|
||||
// 重启
|
||||
Client->Register("Gateway/Restart", &TokenClient::InvokeRestart, Client);
|
||||
// 重置
|
||||
|
|
|
|||
Loading…
Reference in New Issue