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

simplify device/display macros

This commit is contained in:
devsaurus 2015-07-20 22:07:59 +02:00
parent 05e3267f24
commit b837726013
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/include/u8g_config.h
View File

@ -23,14 +23,14 @@
// Stick to the assignments to *_I2C and *_SPI tables.
//
// I2C based displays go into here:
#define U8G_DISPLAY_TABLE_ENTRY(device, display, lua_api_name)
#define U8G_DISPLAY_TABLE_ENTRY(device, lua_api_name)
#define U8G_DISPLAY_TABLE_I2C \
U8G_DISPLAY_TABLE_ENTRY(ssd1306_128x64_i2c, ssd1306_128x64, ssd1306_128x64_i2c)
U8G_DISPLAY_TABLE_ENTRY(ssd1306_128x64_i2c, ssd1306_128x64_i2c)
// SPI based displays go into here:
#define U8G_DISPLAY_TABLE_SPI \
U8G_DISPLAY_TABLE_ENTRY(ssd1306_128x64_hw_spi, ssd1306_128x64, ssd1306_128x64_spi) \
// U8G_DISPLAY_TABLE_ENTRY(pcd8544_84x48_hw_spi, pcd8544_84x48, pcd8544_84x48_spi)
U8G_DISPLAY_TABLE_ENTRY(ssd1306_128x64_hw_spi, ssd1306_128x64_spi) \
// U8G_DISPLAY_TABLE_ENTRY(pcd8544_84x48_hw_spi, pcd8544_84x48_spi)
#undef U8G_DISPLAY_TABLE_ENTRY
//
// ***************************************************************************

8
app/modules/u8g.c
View File

@ -986,8 +986,7 @@ static int lu8g_close_display( lua_State *L )
//
// I2C based devices will use this function template to implement the Lua binding.
#undef U8G_DISPLAY_TABLE_ENTRY
#define U8G_DISPLAY_TABLE_ENTRY(device, display, lua_api_name) \
uint8_t u8g_dev_ ## display ## _fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, void *arg); \
#define U8G_DISPLAY_TABLE_ENTRY(device, lua_api_name) \
static int lu8g_ ## lua_api_name( lua_State *L ) \
{ \
unsigned addr = luaL_checkinteger( L, 1 ); \
@ -1015,8 +1014,7 @@ U8G_DISPLAY_TABLE_I2C
//
// SPI based devices will use this function template to implement the Lua binding.
#undef U8G_DISPLAY_TABLE_ENTRY
#define U8G_DISPLAY_TABLE_ENTRY(device, display, lua_api_name) \
uint8_t u8g_dev_ ## display ## _fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, void *arg); \
#define U8G_DISPLAY_TABLE_ENTRY(device, lua_api_name) \
static int lu8g_ ## lua_api_name( lua_State *L ) \
{ \
unsigned cs = luaL_checkinteger( L, 1 ); \
@ -1110,7 +1108,7 @@ static const LUA_REG_TYPE lu8g_display_map[] =
const LUA_REG_TYPE lu8g_map[] =
{
#undef U8G_DISPLAY_TABLE_ENTRY
#define U8G_DISPLAY_TABLE_ENTRY(device, display, lua_api_name) { LSTRKEY( #lua_api_name ), LFUNCVAL ( lu8g_ ##lua_api_name ) },
#define U8G_DISPLAY_TABLE_ENTRY(device, lua_api_name) { LSTRKEY( #lua_api_name ), LFUNCVAL ( lu8g_ ##lua_api_name ) },
U8G_DISPLAY_TABLE_I2C
U8G_DISPLAY_TABLE_SPI