Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
0f6046d8
Commit
0f6046d8
authored
Mar 03, 2015
by
funshine
Browse files
Merge branch 'master' into dev
parents
c374b7df
2e6b5af6
Changes
4
Show whitespace changes
Inline
Side-by-side
CONTRIBUTING.md
0 → 100644
View file @
0f6046d8
## Contributing
Thank you everyone for contributing to this project.
Pull requests for new features and major fixes should be opened against the
`dev`
branch.
*Note that the `pre_build` bin in the dev branch is never up-to-date.*
README.md
View file @
0f6046d8
...
@@ -92,7 +92,7 @@ build pre_build bin.
...
@@ -92,7 +92,7 @@ build pre_build bin.
<td>
6
</td><td>
GPIO12
</td><td></td><td></td>
<td>
6
</td><td>
GPIO12
</td><td></td><td></td>
</tr>
</tr>
<tr>
<tr>
<td>
7
</td><td>
GPIO13
</td
<td
></td><td></td>
<td>
7
</td><td>
GPIO13
</td
>
<td></td><td></td>
</tr>
</tr>
</table>
</table>
#### [*] D0(GPIO16) can only be used as gpio read/write. no interrupt supported. no pwm/i2c/ow supported.
#### [*] D0(GPIO16) can only be used as gpio read/write. no interrupt supported. no pwm/i2c/ow supported.
...
...
lua_examples/telnet.lua
View file @
0f6046d8
...
@@ -29,11 +29,11 @@ function startServer()
...
@@ -29,11 +29,11 @@ function startServer()
print
(
"===Now, logon and input LUA.===="
)
print
(
"===Now, logon and input LUA.===="
)
end
end
tmr
.
alarm
(
1000
,
1
,
function
()
tmr
.
alarm
(
1
,
1000
,
1
,
function
()
if
wifi
.
sta
.
getip
()
==
"0.0.0.0"
then
if
wifi
.
sta
.
getip
()
==
"0.0.0.0"
then
print
(
"Connect AP, Waiting..."
)
print
(
"Connect AP, Waiting..."
)
else
else
startServer
()
startServer
()
tmr
.
stop
()
tmr
.
stop
(
1
)
end
end
end
)
end
)
lua_modules/dht22/dht22.lua
View file @
0f6046d8
...
@@ -62,17 +62,17 @@ function M.read(pin)
...
@@ -62,17 +62,17 @@ function M.read(pin)
--DHT data acquired, process.
--DHT data acquired, process.
for
i
=
1
,
16
,
1
do
for
i
=
1
,
16
,
1
do
if
(
bitStream
[
i
]
>
4
)
then
if
(
bitStream
[
i
]
>
3
)
then
humidity
=
humidity
+
2
^
(
16
-
i
)
humidity
=
humidity
+
2
^
(
16
-
i
)
end
end
end
end
for
i
=
1
,
16
,
1
do
for
i
=
1
,
16
,
1
do
if
(
bitStream
[
i
+
16
]
>
4
)
then
if
(
bitStream
[
i
+
16
]
>
3
)
then
temperature
=
temperature
+
2
^
(
16
-
i
)
temperature
=
temperature
+
2
^
(
16
-
i
)
end
end
end
end
for
i
=
1
,
8
,
1
do
for
i
=
1
,
8
,
1
do
if
(
bitStream
[
i
+
32
]
>
4
)
then
if
(
bitStream
[
i
+
32
]
>
3
)
then
checksum
=
checksum
+
2
^
(
8
-
i
)
checksum
=
checksum
+
2
^
(
8
-
i
)
end
end
end
end
...
...
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