MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

unbreak firmware build without u8g2 submodule

This commit is contained in:
devsaurus 2018-07-29 12:43:42 +02:00
parent c6f6c54bc8
commit 62f48fe170
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/modules/u8g2.c
View File

@ -1,6 +1,12 @@
// 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 ) {
} }
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) */

8
app/platform/u8x8_nodemcu_hal.c
View File

@ -1,4 +1,10 @@
// 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 *
return 1; return 1;
} }
#endif /* LUA_USE_MODULES_U8G2 */