Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
srefgeqfeqrfg
arduino-esp32
提交
abb8ea99
A
arduino-esp32
项目概览
srefgeqfeqrfg
/
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,体验更适合开发者的 AI 搜索 >>
提交
abb8ea99
编写于
7月 30, 2018
作者:
C
copercini
提交者:
Me No Dev
7月 30, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix WiFiMulti Logs (#1690)
上级
30b3eeba
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
22 addition
and
39 deletion
+22
-39
libraries/WiFi/src/WiFiMulti.cpp
libraries/WiFi/src/WiFiMulti.cpp
+22
-29
libraries/WiFi/src/WiFiMulti.h
libraries/WiFi/src/WiFiMulti.h
+0
-10
未找到文件。
libraries/WiFi/src/WiFiMulti.cpp
浏览文件 @
abb8ea99
...
...
@@ -60,13 +60,12 @@ uint8_t WiFiMulti::run(uint32_t connectTimeout)
uint8_t
bestBSSID
[
6
];
int32_t
bestChannel
=
0
;
DEBUG_WIFI_MULTI
(
"[WIFI] scan done
\n
"
);
delay
(
0
);
log_i
(
"[WIFI] scan done"
);
if
(
scanResult
<=
0
)
{
DEBUG_WIFI_MULTI
(
"[WIFI] no networks found
\n
"
);
log_e
(
"[WIFI] no networks found
"
);
}
else
{
DEBUG_WIFI_MULTI
(
"[WIFI] %d networks found
\n
"
,
scanResult
);
log_i
(
"[WIFI] %d networks found
"
,
scanResult
);
for
(
int8_t
i
=
0
;
i
<
scanResult
;
++
i
)
{
String
ssid_scan
;
...
...
@@ -96,24 +95,18 @@ uint8_t WiFiMulti::run(uint32_t connectTimeout)
}
if
(
known
)
{
DEBUG_WIFI_MULTI
(
" ---> "
);
log_d
(
" ---> %d: [%d][%02X:%02X:%02X:%02X:%02X:%02X] %s (%d) %c"
,
i
,
chan_scan
,
BSSID_scan
[
0
],
BSSID_scan
[
1
],
BSSID_scan
[
2
],
BSSID_scan
[
3
],
BSSID_scan
[
4
],
BSSID_scan
[
5
],
ssid_scan
.
c_str
(),
rssi_scan
,
(
sec_scan
==
WIFI_AUTH_OPEN
)
?
' '
:
'*'
);
}
else
{
DEBUG_WIFI_MULTI
(
" "
);
log_d
(
" %d: [%d][%02X:%02X:%02X:%02X:%02X:%02X] %s (%d) %c"
,
i
,
chan_scan
,
BSSID_scan
[
0
],
BSSID_scan
[
1
],
BSSID_scan
[
2
],
BSSID_scan
[
3
],
BSSID_scan
[
4
],
BSSID_scan
[
5
],
ssid_scan
.
c_str
(),
rssi_scan
,
(
sec_scan
==
WIFI_AUTH_OPEN
)
?
' '
:
'*'
);
}
DEBUG_WIFI_MULTI
(
" %d: [%d][%02X:%02X:%02X:%02X:%02X:%02X] %s (%d) %c
\n
"
,
i
,
chan_scan
,
BSSID_scan
[
0
],
BSSID_scan
[
1
],
BSSID_scan
[
2
],
BSSID_scan
[
3
],
BSSID_scan
[
4
],
BSSID_scan
[
5
],
ssid_scan
.
c_str
(),
rssi_scan
,
(
sec_scan
==
WIFI_AUTH_OPEN
)
?
' '
:
'*'
);
delay
(
0
);
}
}
// clean up ram
WiFi
.
scanDelete
();
DEBUG_WIFI_MULTI
(
"
\n\n
"
);
delay
(
0
);
if
(
bestNetwork
.
ssid
)
{
DEBUG_WIFI_MULTI
(
"[WIFI] Connecting BSSID: %02X:%02X:%02X:%02X:%02X:%02X SSID: %s Channal: %d (%d)
\n
"
,
bestBSSID
[
0
],
bestBSSID
[
1
],
bestBSSID
[
2
],
bestBSSID
[
3
],
bestBSSID
[
4
],
bestBSSID
[
5
],
bestNetwork
.
ssid
,
bestChannel
,
bestNetworkDb
);
log_i
(
"[WIFI] Connecting BSSID: %02X:%02X:%02X:%02X:%02X:%02X SSID: %s Channal: %d (%d)
"
,
bestBSSID
[
0
],
bestBSSID
[
1
],
bestBSSID
[
2
],
bestBSSID
[
3
],
bestBSSID
[
4
],
bestBSSID
[
5
],
bestNetwork
.
ssid
,
bestChannel
,
bestNetworkDb
);
WiFi
.
begin
(
bestNetwork
.
ssid
,
bestNetwork
.
passphrase
,
bestChannel
,
bestBSSID
);
status
=
WiFi
.
status
();
...
...
@@ -131,31 +124,31 @@ uint8_t WiFiMulti::run(uint32_t connectTimeout)
case
3
:
ip
=
WiFi
.
localIP
();
mac
=
WiFi
.
BSSID
();
DEBUG_WIFI_MULTI
(
"[WIFI] Connecting done.
\n
"
);
DEBUG_WIFI_MULTI
(
"[WIFI] SSID: %s
\n
"
,
WiFi
.
SSID
());
DEBUG_WIFI_MULTI
(
"[WIFI] IP: %d.%d.%d.%d
\n
"
,
ip
[
0
],
ip
[
1
],
ip
[
2
],
ip
[
3
]);
DEBUG_WIFI_MULTI
(
"[WIFI] MAC: %02X:%02X:%02X:%02X:%02X:%02X
\n
"
,
mac
[
0
],
mac
[
1
],
mac
[
2
],
mac
[
3
],
mac
[
4
],
mac
[
5
]);
DEBUG_WIFI_MULTI
(
"[WIFI] Channel: %d
\n
"
,
WiFi
.
channel
());
log_i
(
"[WIFI] Connecting done.
"
);
log_d
(
"[WIFI] SSID: %s
"
,
WiFi
.
SSID
());
log_d
(
"[WIFI] IP: %d.%d.%d.%d
"
,
ip
[
0
],
ip
[
1
],
ip
[
2
],
ip
[
3
]);
log_d
(
"[WIFI] MAC: %02X:%02X:%02X:%02X:%02X:%02X
"
,
mac
[
0
],
mac
[
1
],
mac
[
2
],
mac
[
3
],
mac
[
4
],
mac
[
5
]);
log_d
(
"[WIFI] Channel: %d
"
,
WiFi
.
channel
());
break
;
case
1
:
DEBUG_WIFI_MULTI
(
"[WIFI] Connecting Failed AP not found.
\n
"
);
log_e
(
"[WIFI] Connecting Failed AP not found.
"
);
break
;
case
4
:
DEBUG_WIFI_MULTI
(
"[WIFI] Connecting Failed.
\n
"
);
log_e
(
"[WIFI] Connecting Failed.
"
);
break
;
default:
DEBUG_WIFI_MULTI
(
"[WIFI] Connecting Failed (%d).
\n
"
,
status
);
log_e
(
"[WIFI] Connecting Failed (%d).
"
,
status
);
break
;
}
}
else
{
DEBUG_WIFI_MULTI
(
"[WIFI] no matching wifi found!
\n
"
);
log_e
(
"[WIFI] no matching wifi found!
"
);
}
}
else
{
// start scan
DEBUG_WIFI_MULTI
(
"[WIFI] delete old wifi config...
\n
"
);
log_d
(
"[WIFI] delete old wifi config...
"
);
WiFi
.
disconnect
();
DEBUG_WIFI_MULTI
(
"[WIFI] start scan
\
n
"
);
log_d
(
"[WIFI] start sca
n"
);
// scan wifi async mode
WiFi
.
scanNetworks
(
true
);
}
...
...
@@ -172,34 +165,34 @@ bool WiFiMulti::APlistAdd(const char* ssid, const char *passphrase)
if
(
!
ssid
||
*
ssid
==
0x00
||
strlen
(
ssid
)
>
31
)
{
// fail SSID to long or missing!
DEBUG_WIFI_MULTI
(
"[WIFI][APlistAdd] no ssid or ssid to long
\n
"
);
log_e
(
"[WIFI][APlistAdd] no ssid or ssid to long
"
);
return
false
;
}
if
(
passphrase
&&
strlen
(
passphrase
)
>
63
)
{
// fail passphrase to long!
DEBUG_WIFI_MULTI
(
"[WIFI][APlistAdd] passphrase to long
\n
"
);
log_e
(
"[WIFI][APlistAdd] passphrase to long
"
);
return
false
;
}
newAP
.
ssid
=
strdup
(
ssid
);
if
(
!
newAP
.
ssid
)
{
DEBUG_WIFI_MULTI
(
"[WIFI][APlistAdd] fail newAP.ssid == 0
\n
"
);
log_e
(
"[WIFI][APlistAdd] fail newAP.ssid == 0
"
);
return
false
;
}
if
(
passphrase
&&
*
passphrase
!=
0x00
)
{
newAP
.
passphrase
=
strdup
(
passphrase
);
if
(
!
newAP
.
passphrase
)
{
DEBUG_WIFI_MULTI
(
"[WIFI][APlistAdd] fail newAP.passphrase == 0
\n
"
);
log_e
(
"[WIFI][APlistAdd] fail newAP.passphrase == 0
"
);
free
(
newAP
.
ssid
);
return
false
;
}
}
APlist
.
push_back
(
newAP
);
DEBUG_WIFI_MULTI
(
"[WIFI][APlistAdd] add SSID: %s
\n
"
,
newAP
.
ssid
);
log_i
(
"[WIFI][APlistAdd] add SSID: %s
"
,
newAP
.
ssid
);
return
true
;
}
...
...
libraries/WiFi/src/WiFiMulti.h
浏览文件 @
abb8ea99
...
...
@@ -31,16 +31,6 @@
#undef max
#include <vector>
#ifdef DEBUG_ESP_WIFI
#ifdef DEBUG_ESP_PORT
#define DEBUG_WIFI_MULTI(...) DEBUG_ESP_PORT.printf( __VA_ARGS__ )
#endif
#endif
#ifndef DEBUG_WIFI_MULTI
#define DEBUG_WIFI_MULTI(...)
#endif
typedef
struct
{
char
*
ssid
;
char
*
passphrase
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录