Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DODO�
arduino-esp32
提交
cee7b423
A
arduino-esp32
项目概览
DODO�
/
arduino-esp32
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
1
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,发现更多精彩内容 >>
未验证
提交
cee7b423
编写于
11月 15, 2020
作者:
M
Me No Dev
提交者:
GitHub
11月 15, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into idf-release/v3.3
上级
954df2fc
e41fb08b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
48 addition
and
31 deletion
+48
-31
libraries/FFat/src/FFat.cpp
libraries/FFat/src/FFat.cpp
+15
-0
libraries/FFat/src/FFat.h
libraries/FFat/src/FFat.h
+1
-0
libraries/WebServer/src/WebServer.cpp
libraries/WebServer/src/WebServer.cpp
+6
-5
package/package_esp32_index.template.json
package/package_esp32_index.template.json
+26
-26
未找到文件。
libraries/FFat/src/FFat.cpp
浏览文件 @
cee7b423
...
...
@@ -135,6 +135,21 @@ size_t F_Fat::totalBytes()
return
tot_sect
*
sect_size
;
}
size_t
F_Fat
::
usedBytes
()
{
FATFS
*
fs
;
DWORD
free_clust
,
used_sect
,
sect_size
;
BYTE
pdrv
=
ff_diskio_get_pdrv_wl
(
_wl_handle
);
char
drv
[
3
]
=
{(
char
)(
48
+
pdrv
),
':'
,
0
};
if
(
f_getfree
(
drv
,
&
free_clust
,
&
fs
)
!=
FR_OK
){
return
0
;
}
used_sect
=
(
fs
->
n_fatent
-
2
-
free_clust
)
*
fs
->
csize
;
sect_size
=
CONFIG_WL_SECTOR_SIZE
;
return
used_sect
*
sect_size
;
}
size_t
F_Fat
::
freeBytes
()
{
...
...
libraries/FFat/src/FFat.h
浏览文件 @
cee7b423
...
...
@@ -31,6 +31,7 @@ public:
bool
begin
(
bool
formatOnFail
=
false
,
const
char
*
basePath
=
"/ffat"
,
uint8_t
maxOpenFiles
=
10
,
const
char
*
partitionLabel
=
(
char
*
)
FFAT_PARTITION_LABEL
);
bool
format
(
bool
full_wipe
=
FFAT_WIPE_QUICK
,
char
*
partitionLabel
=
(
char
*
)
FFAT_PARTITION_LABEL
);
size_t
totalBytes
();
size_t
usedBytes
();
size_t
freeBytes
();
void
end
();
bool
exists
(
const
char
*
path
);
...
...
libraries/WebServer/src/WebServer.cpp
浏览文件 @
cee7b423
...
...
@@ -313,11 +313,12 @@ void WebServer::handleClient() {
_contentLength
=
CONTENT_LENGTH_NOT_SET
;
_handleRequest
();
if
(
_currentClient
.
connected
())
{
_currentStatus
=
HC_WAIT_CLOSE
;
_statusChange
=
millis
();
keepCurrentClient
=
true
;
}
// Fix for issue with Chrome based browsers: https://github.com/espressif/arduino-esp32/issues/3652
// if (_currentClient.connected()) {
// _currentStatus = HC_WAIT_CLOSE;
// _statusChange = millis();
// keepCurrentClient = true;
// }
}
}
else
{
// !_currentClient.available()
if
(
millis
()
-
_statusChange
<=
HTTP_MAX_DATA_WAIT
)
{
...
...
package/package_esp32_index.template.json
浏览文件 @
cee7b423
...
...
@@ -41,7 +41,7 @@
{
"packager"
:
"esp32"
,
"name"
:
"esptool_py"
,
"version"
:
"
2.6.1
"
"version"
:
"
3.0.0
"
},
{
"packager"
:
"esp32"
,
...
...
@@ -102,49 +102,49 @@
},
{
"name"
:
"esptool_py"
,
"version"
:
"
2.6.1
"
,
"version"
:
"
3.0.0
"
,
"systems"
:
[
{
"host"
:
"i686-mingw32"
,
"url"
:
"https://dl.espressif.com/dl/esptool-
2.6.1
-windows.zip"
,
"archiveFileName"
:
"esptool-
2.6.1
-windows.zip"
,
"checksum"
:
"SHA-256:
84cf0b369a7707fe566434faba148852fc464992111d5baa95b658b374802f96
"
,
"size"
:
"34
22445
"
"url"
:
"https://dl.espressif.com/dl/esptool-
3.0.0.2
-windows.zip"
,
"archiveFileName"
:
"esptool-
3.0.0.2
-windows.zip"
,
"checksum"
:
"SHA-256:
b192bfc1545a3c92658ce586b4edcc2aca3f0ad4b3fa8417d658bc8a48f1387e
"
,
"size"
:
"34
34736
"
},
{
"host"
:
"x86_64-apple-darwin"
,
"url"
:
"https://dl.espressif.com/dl/esptool-
2.6.1
-macos.tar.gz"
,
"archiveFileName"
:
"esptool-
2.6.1
-macos.tar.gz"
,
"checksum"
:
"SHA-256:
f4eb758a301d6902cc9dfcd49d36345d2f075ad123da7cf8132d15cfb7533457
"
,
"size"
:
"38
3708
5"
"url"
:
"https://dl.espressif.com/dl/esptool-
3.0.0.2
-macos.tar.gz"
,
"archiveFileName"
:
"esptool-
3.0.0.2
-macos.tar.gz"
,
"checksum"
:
"SHA-256:
9213f46d5aa865558da4a2ef4218e87eef4782779128083c15ce2b3e4d07a1ea
"
,
"size"
:
"38
4961
5"
},
{
"host"
:
"x86_64-pc-linux-gnu"
,
"url"
:
"https://dl.espressif.com/dl/esptool-
2.6.1
-linux.tar.gz"
,
"archiveFileName"
:
"esptool-
2.6.1
-linux.tar.gz"
,
"checksum"
:
"SHA-256:
eaf82ff4070d9792f6a42ae1e485375de5a87bec59ef01dfb95de901519ec7fb
"
,
"size"
:
"
44762
"
"url"
:
"https://dl.espressif.com/dl/esptool-
3.0.0.2
-linux.tar.gz"
,
"archiveFileName"
:
"esptool-
3.0.0.2
-linux.tar.gz"
,
"checksum"
:
"SHA-256:
d5cb51da1c74ff69f81b820470d2ecccb5c7c3a2dec7776483d4c89588b00020
"
,
"size"
:
"
57526
"
},
{
"host"
:
"i686-pc-linux-gnu"
,
"url"
:
"https://dl.espressif.com/dl/esptool-
2.6.1
-linux.tar.gz"
,
"archiveFileName"
:
"esptool-
2.6.1
-linux.tar.gz"
,
"checksum"
:
"SHA-256:
eaf82ff4070d9792f6a42ae1e485375de5a87bec59ef01dfb95de901519ec7fb
"
,
"size"
:
"
44762
"
"url"
:
"https://dl.espressif.com/dl/esptool-
3.0.0.2
-linux.tar.gz"
,
"archiveFileName"
:
"esptool-
3.0.0.2
-linux.tar.gz"
,
"checksum"
:
"SHA-256:
d5cb51da1c74ff69f81b820470d2ecccb5c7c3a2dec7776483d4c89588b00020
"
,
"size"
:
"
57526
"
},
{
"host"
:
"arm-linux-gnueabihf"
,
"url"
:
"https://dl.espressif.com/dl/esptool-
2.6.1
-linux.tar.gz"
,
"archiveFileName"
:
"esptool-
2.6.1
-linux.tar.gz"
,
"checksum"
:
"SHA-256:
eaf82ff4070d9792f6a42ae1e485375de5a87bec59ef01dfb95de901519ec7fb
"
,
"size"
:
"
44762
"
"url"
:
"https://dl.espressif.com/dl/esptool-
3.0.0.2
-linux.tar.gz"
,
"archiveFileName"
:
"esptool-
3.0.0.2
-linux.tar.gz"
,
"checksum"
:
"SHA-256:
d5cb51da1c74ff69f81b820470d2ecccb5c7c3a2dec7776483d4c89588b00020
"
,
"size"
:
"
57526
"
},
{
"host"
:
"aarch64-linux-gnu"
,
"url"
:
"https://dl.espressif.com/dl/esptool-
2.6.1
-linux.tar.gz"
,
"archiveFileName"
:
"esptool-
2.6.1
-linux.tar.gz"
,
"checksum"
:
"SHA-256:
eaf82ff4070d9792f6a42ae1e485375de5a87bec59ef01dfb95de901519ec7fb
"
,
"size"
:
"
44762
"
"url"
:
"https://dl.espressif.com/dl/esptool-
3.0.0.2
-linux.tar.gz"
,
"archiveFileName"
:
"esptool-
3.0.0.2
-linux.tar.gz"
,
"checksum"
:
"SHA-256:
d5cb51da1c74ff69f81b820470d2ecccb5c7c3a2dec7776483d4c89588b00020
"
,
"size"
:
"
57526
"
}
]
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录