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
62f48fe1
Commit
62f48fe1
authored
Jul 29, 2018
by
devsaurus
Browse files
unbreak firmware build without u8g2 submodule
parent
c6f6c54b
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/modules/u8g2.c
View file @
62f48fe1
// Module for binding the u8g2 library
// Module for binding the u8g2 library
// Note: This file is intended to be shared between esp8266 and esp32 platform
// Note: This file is intended to be shared between esp8266 and esp32 platform
// Do not use the code from u8g2 submodule and skip the complete source here
// if the u8g2 module is not selected.
// Reason: The whole u8g2 submodule code tree might not even exist in this case.
#include "user_modules.h"
#if defined(LUA_USE_MODULES_U8G2) || defined(ESP_PLATFORM)
#include "module.h"
#include "module.h"
#include "lauxlib.h"
#include "lauxlib.h"
...
@@ -806,3 +812,5 @@ int luaopen_u8g2( lua_State *L ) {
...
@@ -806,3 +812,5 @@ int luaopen_u8g2( lua_State *L ) {
}
}
NODEMCU_MODULE
(
U8G2
,
"u8g2"
,
lu8g2_map
,
luaopen_u8g2
);
NODEMCU_MODULE
(
U8G2
,
"u8g2"
,
lu8g2_map
,
luaopen_u8g2
);
#endif
/* defined(LUA_USE_MODULES_U8G2) || defined(ESP_PLATFORM) */
app/platform/u8x8_nodemcu_hal.c
View file @
62f48fe1
// Do not use the code from u8g2 submodule and skip the complete source here
// if the u8g2 module is not selected.
// Reason: The whole u8g2 submodule code tree might not even exist in this case.
#include "user_modules.h"
#ifdef LUA_USE_MODULES_U8G2
#include <string.h>
#include <string.h>
#include "c_stdlib.h"
#include "c_stdlib.h"
...
@@ -281,3 +287,5 @@ uint8_t u8x8_byte_nodemcu_spi(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *
...
@@ -281,3 +287,5 @@ uint8_t u8x8_byte_nodemcu_spi(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *
return
1
;
return
1
;
}
}
#endif
/* LUA_USE_MODULES_U8G2 */
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