Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
过眠
arduino-esp32
提交
f648ad7c
A
arduino-esp32
项目概览
过眠
/
arduino-esp32
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
arduino-esp32
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f648ad7c
编写于
9月 18, 2017
作者:
M
me-no-dev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow WiFi Event Callback to read the event info
Helps in cases where Event Info is needed (WPS and others)
上级
db79c2ee
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
42 addition
and
7 deletion
+42
-7
libraries/WiFi/src/WiFiGeneric.cpp
libraries/WiFi/src/WiFiGeneric.cpp
+39
-2
libraries/WiFi/src/WiFiGeneric.h
libraries/WiFi/src/WiFiGeneric.h
+3
-5
未找到文件。
libraries/WiFi/src/WiFiGeneric.cpp
浏览文件 @
f648ad7c
...
...
@@ -120,6 +120,12 @@ static bool espWiFiStop(){
// ------------------------------------------------- Generic WiFi function -----------------------------------------------
// -----------------------------------------------------------------------------------------------------------------------
typedef
struct
{
WiFiEventCb
cb
;
WiFiEventFullCb
fcb
;
system_event_id_t
event
;
}
WiFiEventCbList_t
;
// arduino dont like std::vectors move static here
static
std
::
vector
<
WiFiEventCbList_t
>
cbEventList
;
...
...
@@ -143,6 +149,19 @@ void WiFiGenericClass::onEvent(WiFiEventCb cbEvent, system_event_id_t event)
}
WiFiEventCbList_t
newEventHandler
;
newEventHandler
.
cb
=
cbEvent
;
newEventHandler
.
fcb
=
NULL
;
newEventHandler
.
event
=
event
;
cbEventList
.
push_back
(
newEventHandler
);
}
void
WiFiGenericClass
::
onEvent
(
WiFiEventFullCb
cbEvent
,
system_event_id_t
event
)
{
if
(
!
cbEvent
)
{
return
;
}
WiFiEventCbList_t
newEventHandler
;
newEventHandler
.
cb
=
NULL
;
newEventHandler
.
fcb
=
cbEvent
;
newEventHandler
.
event
=
event
;
cbEventList
.
push_back
(
newEventHandler
);
}
...
...
@@ -166,6 +185,20 @@ void WiFiGenericClass::removeEvent(WiFiEventCb cbEvent, system_event_id_t event)
}
}
void
WiFiGenericClass
::
removeEvent
(
WiFiEventFullCb
cbEvent
,
system_event_id_t
event
)
{
if
(
!
cbEvent
)
{
return
;
}
for
(
uint32_t
i
=
0
;
i
<
cbEventList
.
size
();
i
++
)
{
WiFiEventCbList_t
entry
=
cbEventList
[
i
];
if
(
entry
.
fcb
==
cbEvent
&&
entry
.
event
==
event
)
{
cbEventList
.
erase
(
cbEventList
.
begin
()
+
i
);
}
}
}
/**
* callback for WiFi events
* @param arg
...
...
@@ -208,9 +241,13 @@ esp_err_t WiFiGenericClass::_eventCallback(void *arg, system_event_t *event)
for
(
uint32_t
i
=
0
;
i
<
cbEventList
.
size
();
i
++
)
{
WiFiEventCbList_t
entry
=
cbEventList
[
i
];
if
(
entry
.
cb
)
{
if
(
entry
.
cb
||
entry
.
fcb
)
{
if
(
entry
.
event
==
(
system_event_id_t
)
event
->
event_id
||
entry
.
event
==
SYSTEM_EVENT_MAX
)
{
entry
.
cb
((
system_event_id_t
)
event
->
event_id
);
if
(
entry
.
cb
){
entry
.
cb
((
system_event_id_t
)
event
->
event_id
);
}
else
{
entry
.
fcb
((
system_event_id_t
)
event
->
event_id
,
(
system_event_info_t
)
event
->
event_info
);
}
}
}
}
...
...
libraries/WiFi/src/WiFiGeneric.h
浏览文件 @
f648ad7c
...
...
@@ -28,11 +28,7 @@
#include <esp_event_loop.h>
typedef
void
(
*
WiFiEventCb
)(
system_event_id_t
event
);
typedef
struct
{
WiFiEventCb
cb
;
system_event_id_t
event
;
}
WiFiEventCbList_t
;
typedef
void
(
*
WiFiEventFullCb
)(
system_event_id_t
event
,
system_event_info_t
info
);
class
WiFiGenericClass
{
...
...
@@ -41,7 +37,9 @@ public:
WiFiGenericClass
();
void
onEvent
(
WiFiEventCb
cbEvent
,
system_event_id_t
event
=
SYSTEM_EVENT_MAX
);
void
onEvent
(
WiFiEventFullCb
cbEvent
,
system_event_id_t
event
=
SYSTEM_EVENT_MAX
);
void
removeEvent
(
WiFiEventCb
cbEvent
,
system_event_id_t
event
=
SYSTEM_EVENT_MAX
);
void
removeEvent
(
WiFiEventFullCb
cbEvent
,
system_event_id_t
event
=
SYSTEM_EVENT_MAX
);
int32_t
channel
(
void
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录