Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
cb66837
added new boards
apicquot Dec 1, 2018
7037119
corrected block size error
apicquot Dec 2, 2018
24632ae
added board to last commit working well
apicquot Dec 7, 2018
8859aed
override of readString for File class
apicquot Dec 7, 2018
f385b02
Merge branch 'master' of https://github.com/esp8266/Arduino into impr…
apicquot Dec 7, 2018
9ea5551
correct indent
apicquot Dec 7, 2018
dc6b44b
correct indent
apicquot Dec 7, 2018
4fa9527
good indent
apicquot Dec 7, 2018
d6088bb
stricter test for end of string
apicquot Dec 7, 2018
acb99bc
same implementation than Stream by replacing timeRead by read
apicquot Dec 7, 2018
e2852c9
Merge branch 'master' into improved_readString_file
apicquot Dec 25, 2018
4844ad0
Merge branch 'master' into improved_readString_file
earlephilhower Jan 25, 2019
d16c23c
reading file by block of 256
apicquot Jan 26, 2019
9ae9ca1
make sure there is an end of string
apicquot Jan 26, 2019
6ffb881
Merge branch 'improved_readString_file' of https://github.com/apicquo…
apicquot Jan 26, 2019
3250224
Merge branch 'master' into improved_readString_file
apicquot Jan 26, 2019
d81e55a
fixed bug for file size multiple of 256
apicquot Jan 30, 2019
a2e7c6b
Merge branch 'improved_readString_file' of https://github.com/apicquo…
apicquot Jan 30, 2019
823dacb
Merge branch 'master' into improved_readString_file
apicquot Jan 31, 2019
df88c56
Merge branch 'master' into improved_readString_file
earlephilhower Feb 1, 2019
8e13d17
Merge branch 'master' into improved_readString_file
devyte Feb 4, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
stricter test for end of string
  • Loading branch information
apicquot committed Dec 7, 2018
commit d6088bb3308aa81270ef8fae61bc5360219ce427
7 changes: 3 additions & 4 deletions cores/esp8266/FS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,12 @@ const char* File::name() const {

String File::readString()
{
size_t sz = size() - position() - 1;
size_t sz = size() - position() + 1;
String str;
if (sz<1)
if (sz < 1)
return str;
str.reserve(sz);
size_t pos=0;
while (pos++ < sz)
while (available())
{
str += (char)read();
}
Expand Down