From b837726013a912281c82ba1735df22cd86decd6b Mon Sep 17 00:00:00 2001 From: devsaurus Date: Mon, 20 Jul 2015 22:07:59 +0200 Subject: [PATCH] simplify device/display macros --- app/include/u8g_config.h | 8 ++++---- app/modules/u8g.c | 8 +++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/include/u8g_config.h b/app/include/u8g_config.h index 6d5f70d9..381cb5fd 100644 --- a/app/include/u8g_config.h +++ b/app/include/u8g_config.h @@ -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 // // *************************************************************************** diff --git a/app/modules/u8g.c b/app/modules/u8g.c index 6381bae7..64327e10 100644 --- a/app/modules/u8g.c +++ b/app/modules/u8g.c @@ -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