Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
f510e658
Commit
f510e658
authored
Mar 15, 2015
by
funshine
Browse files
merge master solve conflicts
parents
c4600006
a1be293f
Changes
2
Hide whitespace changes
Inline
Side-by-side
README.md
View file @
f510e658
# **NodeMCU** #
# **NodeMCU** #
version 0.9.5
version 0.9.5
[

](https://gitter.im/nodemcu/nodemcu-firmware?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[

](https://travis-ci.org/nodemcu/nodemcu-firmware)
[

](https://github.com/nodemcu/nodemcu-firmware/releases/latest)
[

](https://travis-ci.org/nodemcu/nodemcu-firmware)
[

](https://github.com/nodemcu/nodemcu-firmware/releases/latest)
###A lua based firmware for wifi-soc esp8266
###A lua based firmware for wifi-soc esp8266
...
...
app/lua/lauxlib.c
View file @
f510e658
...
@@ -659,13 +659,19 @@ typedef struct LoadFSF {
...
@@ -659,13 +659,19 @@ typedef struct LoadFSF {
static
const
char
*
getFSF
(
lua_State
*
L
,
void
*
ud
,
size_t
*
size
)
{
static
const
char
*
getFSF
(
lua_State
*
L
,
void
*
ud
,
size_t
*
size
)
{
LoadFSF
*
lf
=
(
LoadFSF
*
)
ud
;
LoadFSF
*
lf
=
(
LoadFSF
*
)
ud
;
(
void
)
L
;
(
void
)
L
;
if
(
L
==
NULL
&&
size
==
NULL
)
// Direct mode check
return
NULL
;
if
(
lf
->
extraline
)
{
if
(
lf
->
extraline
)
{
lf
->
extraline
=
0
;
lf
->
extraline
=
0
;
*
size
=
1
;
*
size
=
1
;
return
"
\n
"
;
return
"
\n
"
;
}
}
if
(
fs_eof
(
lf
->
f
))
return
NULL
;
if
(
fs_eof
(
lf
->
f
))
return
NULL
;
*
size
=
fs_read
(
lf
->
f
,
lf
->
buff
,
sizeof
(
lf
->
buff
));
*
size
=
fs_read
(
lf
->
f
,
lf
->
buff
,
sizeof
(
lf
->
buff
));
return
(
*
size
>
0
)
?
lf
->
buff
:
NULL
;
return
(
*
size
>
0
)
?
lf
->
buff
:
NULL
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment