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
a01bda03
Commit
a01bda03
authored
Mar 18, 2015
by
zeroday
Browse files
Merge pull request #294 from nodemcu/json
Json branch merged to master
parents
fa7cf878
808a359e
Changes
41
Show whitespace changes
Inline
Side-by-side
app/modules/modules.h
View file @
a01bda03
...
...
@@ -141,6 +141,13 @@
#define ROM_MODULES_WS2812
#endif
#if defined(LUA_USE_MODULES_CJSON)
#define MODULES_CJSON "cjson"
#define ROM_MODULES_CJSON \
_ROM(MODULES_CJSON, luaopen_cjson, cjson_map)
#else
#define ROM_MODULES_CJSON
#endif
#define LUA_MODULES_ROM \
ROM_MODULES_GPIO \
...
...
@@ -159,7 +166,8 @@
ROM_MODULES_UART \
ROM_MODULES_OW \
ROM_MODULES_BIT \
ROM_MODULES_WS2812
ROM_MODULES_WS2812 \
ROM_MODULES_CJSON
#endif
Prev
1
2
3
Next
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