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
971c4b56
Commit
971c4b56
authored
Jan 08, 2015
by
funshine
Browse files
fix net.socket:send(), fix file.read() when 0xFF reached
parent
b65fb02c
Changes
10
Hide whitespace changes
Inline
Side-by-side
README.md
View file @
971c4b56
...
@@ -26,19 +26,18 @@ Tencent QQ group QQ群: 309957875<br />
...
@@ -26,19 +26,18 @@ Tencent QQ group QQ群: 309957875<br />
-
add coap module
-
add coap module
# Change log
# Change log
2015-01-08
<br
/>
fix net.socket:send() issue when multi sends are called.
<br
/>
*NOTE*
: if data length is bigger than 1460, send next packet AFTER "sent" callback is called.
<br
/>
fix file.read() api, take 0xFF as a regular byte, not EOF.
<br
/>
pre_build/latest/nodemcu_512k_latest.bin is removed. use pre_build/latest/nodemcu_latest.bin instead.
2015-01-07
<br
/>
2015-01-07
<br
/>
retrive more ram back.
<br
/>
retrive more ram back.
<br
/>
add api file.format() to rebuild file system.
<br
/>
add api file.format() to rebuild file system.
<br
/>
rename "NodeMcu" to "NodeMCU" in firmware.
<br
/>
rename "NodeMcu" to "NodeMCU" in firmware.
<br
/>
add some check for file system op.
add some check for file system op.
2015-01-06
<br
/>
update sdk to 0.9.5.
<br
/>
pre_build bin now compiled by gcc toolchain.
<br
/>
memory/heap usage optimized.
<br
/>
add support for multiple platform and toolchain include eclipse.
<br
/>
combine firmware for 512K, 1M, 2M, 4M flash to one. flash size auto-detected.
[
more change log
](
https://github.com/nodemcu/nodemcu-firmware/wiki/nodemcu_api_en#change_log
)
<br
/>
[
more change log
](
https://github.com/nodemcu/nodemcu-firmware/wiki/nodemcu_api_en#change_log
)
<br
/>
[
更多变更日志
](
https://github.com/nodemcu/nodemcu-firmware/wiki/nodemcu_api_cn#change_log
)
[
更多变更日志
](
https://github.com/nodemcu/nodemcu-firmware/wiki/nodemcu_api_cn#change_log
)
...
...
app/.settings/language.settings.xml
View file @
971c4b56
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<provider
copy-of=
"extension"
id=
"org.eclipse.cdt.ui.UserLanguageSettingsProvider"
/>
<provider
copy-of=
"extension"
id=
"org.eclipse.cdt.ui.UserLanguageSettingsProvider"
/>
<provider-reference
id=
"org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider"
ref=
"shared-provider"
/>
<provider-reference
id=
"org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider"
ref=
"shared-provider"
/>
<provider
copy-of=
"extension"
id=
"org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"
/>
<provider
copy-of=
"extension"
id=
"org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"
/>
<provider
class=
"org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector"
console=
"false"
env-hash=
"
1912993350869412582
"
id=
"org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector"
keep-relative-paths=
"false"
name=
"CDT Cross GCC Built-in Compiler Settings"
parameter=
"${COMMAND} ${FLAGS} -E -P -v -dD "${INPUTS}""
prefer-non-shared=
"true"
>
<provider
class=
"org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector"
console=
"false"
env-hash=
"
-1433312569745558301
"
id=
"org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector"
keep-relative-paths=
"false"
name=
"CDT Cross GCC Built-in Compiler Settings"
parameter=
"${COMMAND} ${FLAGS} -E -P -v -dD "${INPUTS}""
prefer-non-shared=
"true"
>
<language-scope
id=
"org.eclipse.cdt.core.gcc"
/>
<language-scope
id=
"org.eclipse.cdt.core.gcc"
/>
<language-scope
id=
"org.eclipse.cdt.core.g++"
/>
<language-scope
id=
"org.eclipse.cdt.core.g++"
/>
</provider>
</provider>
...
...
app/include/user_config.h
View file @
971c4b56
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
#define NODE_VERSION_INTERNAL 0U
#define NODE_VERSION_INTERNAL 0U
#define NODE_VERSION "NodeMCU 0.9.5"
#define NODE_VERSION "NodeMCU 0.9.5"
#define BUILD_DATE "build 2015010
7
"
#define BUILD_DATE "build 2015010
8
"
// #define FLASH_512K
// #define FLASH_512K
// #define FLASH_1M
// #define FLASH_1M
...
...
app/lwip/app/espconn.c
View file @
971c4b56
...
@@ -272,7 +272,8 @@ espconn_sent(struct espconn *espconn, uint8 *psent, uint16 length)
...
@@ -272,7 +272,8 @@ espconn_sent(struct espconn *espconn, uint8 *psent, uint16 length)
value
=
espconn_find_connection
(
espconn
,
&
pnode
);
value
=
espconn_find_connection
(
espconn
,
&
pnode
);
switch
(
espconn
->
type
)
{
switch
(
espconn
->
type
)
{
case
ESPCONN_TCP
:
case
ESPCONN_TCP
:
if
(
value
&&
(
pnode
->
pcommon
.
write_len
==
pnode
->
pcommon
.
write_total
)){
// if (value && (pnode->pcommon.write_len == pnode->pcommon.write_total)){
if
(
value
&&
(
pnode
->
pcommon
.
cntr
==
0
)){
espconn_tcp_sent
(
pnode
,
psent
,
length
);
espconn_tcp_sent
(
pnode
,
psent
,
length
);
}
else
}
else
return
ESPCONN_ARG
;
return
ESPCONN_ARG
;
...
...
app/lwip/app/espconn_tcp.c
View file @
971c4b56
...
@@ -188,7 +188,7 @@ espconn_tcp_sent(void *arg, uint8 *psent, uint16 length)
...
@@ -188,7 +188,7 @@ espconn_tcp_sent(void *arg, uint8 *psent, uint16 length)
data_to_send
=
true
;
data_to_send
=
true
;
ptcp_sent
->
pcommon
.
ptrbuf
=
psent
+
len
;
ptcp_sent
->
pcommon
.
ptrbuf
=
psent
+
len
;
ptcp_sent
->
pcommon
.
cntr
=
length
-
len
;
ptcp_sent
->
pcommon
.
cntr
=
length
-
len
;
ptcp_sent
->
pcommon
.
write_len
=
len
;
ptcp_sent
->
pcommon
.
write_len
+
=
len
;
espconn_printf
(
"espconn_tcp_sent sending %d bytes, remain %d
\n
"
,
len
,
ptcp_sent
->
pcommon
.
cntr
);
espconn_printf
(
"espconn_tcp_sent sending %d bytes, remain %d
\n
"
,
len
,
ptcp_sent
->
pcommon
.
cntr
);
}
}
...
...
app/modules/file.c
View file @
971c4b56
...
@@ -159,23 +159,23 @@ static int file_g_read( lua_State* L, int n, int16_t end_char )
...
@@ -159,23 +159,23 @@ static int file_g_read( lua_State* L, int n, int16_t end_char )
n
=
LUAL_BUFFERSIZE
;
n
=
LUAL_BUFFERSIZE
;
if
(
end_char
<
0
||
end_char
>
255
)
if
(
end_char
<
0
||
end_char
>
255
)
end_char
=
EOF
;
end_char
=
EOF
;
signed
char
ec
=
(
signed
char
)
end_char
;
int
ec
=
(
int
)
end_char
;
luaL_Buffer
b
;
luaL_Buffer
b
;
if
((
FS_OPEN_OK
-
1
)
==
file_fd
)
if
((
FS_OPEN_OK
-
1
)
==
file_fd
)
return
luaL_error
(
L
,
"open a file first"
);
return
luaL_error
(
L
,
"open a file first"
);
luaL_buffinit
(
L
,
&
b
);
luaL_buffinit
(
L
,
&
b
);
char
*
p
=
luaL_prepbuffer
(
&
b
);
char
*
p
=
luaL_prepbuffer
(
&
b
);
signed
char
c
=
EOF
;
int
c
=
EOF
;
int
i
=
0
;
int
i
=
0
;
do
{
do
{
c
=
(
signed
char
)
fs_getc
(
file_fd
);
c
=
fs_getc
(
file_fd
);
if
(
c
==
EOF
){
if
(
c
==
EOF
){
break
;
break
;
}
}
p
[
i
++
]
=
c
;
p
[
i
++
]
=
(
char
)(
0xFF
&
c
)
;
}
while
((
c
!=
EOF
)
&&
(
c
!=
ec
)
&&
(
i
<
n
)
);
}
while
((
c
!=
EOF
)
&&
(
c
!=
ec
)
&&
(
i
<
n
)
);
#if 0
#if 0
...
...
app/spiffs/spiffs.c
View file @
971c4b56
...
@@ -133,16 +133,18 @@ int myspiffs_tell( int fd ){
...
@@ -133,16 +133,18 @@ int myspiffs_tell( int fd ){
return
SPIFFS_tell
(
&
fs
,
(
spiffs_file
)
fd
);
return
SPIFFS_tell
(
&
fs
,
(
spiffs_file
)
fd
);
}
}
int
myspiffs_getc
(
int
fd
){
int
myspiffs_getc
(
int
fd
){
char
c
=
EO
F
;
unsigned
char
c
=
0xF
F
;
int
res
;
int
res
;
if
(
!
myspiffs_eof
(
fd
)){
if
(
!
myspiffs_eof
(
fd
)){
res
=
SPIFFS_read
(
&
fs
,
(
spiffs_file
)
fd
,
&
c
,
1
);
res
=
SPIFFS_read
(
&
fs
,
(
spiffs_file
)
fd
,
&
c
,
1
);
if
(
res
!=
1
)
{
if
(
res
!=
1
)
{
NODE_DBG
(
"getc errno %i
\n
"
,
SPIFFS_errno
(
&
fs
));
NODE_DBG
(
"getc errno %i
\n
"
,
SPIFFS_errno
(
&
fs
));
return
(
int
)
EOF
;
return
(
int
)
EOF
;
}
else
{
return
(
int
)
c
;
}
}
}
}
return
(
int
)
c
;
return
(
int
)
EOF
;
}
}
int
myspiffs_ungetc
(
int
c
,
int
fd
){
int
myspiffs_ungetc
(
int
c
,
int
fd
){
return
SPIFFS_lseek
(
&
fs
,
(
spiffs_file
)
fd
,
-
1
,
SEEK_CUR
);
return
SPIFFS_lseek
(
&
fs
,
(
spiffs_file
)
fd
,
-
1
,
SEEK_CUR
);
...
...
pre_build/
latest
/nodemcu_
512k_latest
.bin
→
pre_build/
0.9.5
/nodemcu_
20150107
.bin
View file @
971c4b56
File moved
pre_build/0.9.5/nodemcu_latest.bin
View file @
971c4b56
No preview for this file type
pre_build/latest/nodemcu_latest.bin
View file @
971c4b56
No preview for this file type
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