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

clean u8g

This commit is contained in:
devsaurus 2015-08-09 16:38:08 +02:00
parent 02294955c5
commit ca1bc2cb18
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/modules/u8g.c
View File

@ -65,6 +65,8 @@ static int lu8g_setFont( lua_State *L )
u8g_fntpgm_uint8_t *font = (u8g_fntpgm_uint8_t *)lua_touserdata( L, 2 ); u8g_fntpgm_uint8_t *font = (u8g_fntpgm_uint8_t *)lua_touserdata( L, 2 );
if (font != NULL) if (font != NULL)
u8g_SetFont( LU8G, font ); u8g_SetFont( LU8G, font );
else
luaL_argerror(L, 2, "font data expected");
return 0; return 0;
} }
@ -301,32 +303,24 @@ static int lu8g_generic_drawStr( lua_State *L, uint8_t rot )
// Lua: pix_len = u8g.drawStr( self, x, y, string ) // Lua: pix_len = u8g.drawStr( self, x, y, string )
static int lu8g_drawStr( lua_State *L ) static int lu8g_drawStr( lua_State *L )
{ {
lu8g_userdata_t *lud;
return lu8g_generic_drawStr( L, 0 ); return lu8g_generic_drawStr( L, 0 );
} }
// Lua: pix_len = u8g.drawStr90( self, x, y, string ) // Lua: pix_len = u8g.drawStr90( self, x, y, string )
static int lu8g_drawStr90( lua_State *L ) static int lu8g_drawStr90( lua_State *L )
{ {
lu8g_userdata_t *lud;
return lu8g_generic_drawStr( L, 1 ); return lu8g_generic_drawStr( L, 1 );
} }
// Lua: pix_len = u8g.drawStr180( self, x, y, string ) // Lua: pix_len = u8g.drawStr180( self, x, y, string )
static int lu8g_drawStr180( lua_State *L ) static int lu8g_drawStr180( lua_State *L )
{ {
lu8g_userdata_t *lud;
return lu8g_generic_drawStr( L, 2 ); return lu8g_generic_drawStr( L, 2 );
} }
// Lua: pix_len = u8g.drawStr270( self, x, y, string ) // Lua: pix_len = u8g.drawStr270( self, x, y, string )
static int lu8g_drawStr270( lua_State *L ) static int lu8g_drawStr270( lua_State *L )
{ {
lu8g_userdata_t *lud;
return lu8g_generic_drawStr( L, 3 ); return lu8g_generic_drawStr( L, 3 );
} }
@ -1147,13 +1141,14 @@ LUALIB_API int luaopen_u8g( lua_State *L )
// Options for circle/ ellipse drawing // Options for circle/ ellipse drawing
MOD_REG_NUMBER( L, "DRAW_UPPER_RIGHT", U8G_DRAW_UPPER_RIGHT ); MOD_REG_NUMBER( L, "DRAW_UPPER_RIGHT", U8G_DRAW_UPPER_RIGHT );
MOD_REG_NUMBER( L, "DRAW_UPPER_LEFT", U8G_DRAW_UPPER_RIGHT ); MOD_REG_NUMBER( L, "DRAW_UPPER_LEFT", U8G_DRAW_UPPER_LEFT );
MOD_REG_NUMBER( L, "DRAW_LOWER_RIGHT", U8G_DRAW_UPPER_RIGHT ); MOD_REG_NUMBER( L, "DRAW_LOWER_RIGHT", U8G_DRAW_LOWER_RIGHT );
MOD_REG_NUMBER( L, "DRAW_LOWER_LEFT", U8G_DRAW_UPPER_RIGHT ); MOD_REG_NUMBER( L, "DRAW_LOWER_LEFT", U8G_DRAW_LOWER_LEFT );
MOD_REG_NUMBER( L, "DRAW_ALL", U8G_DRAW_ALL );
// Display modes // Display modes
MOD_REG_NUMBER( L, "MODE_BW", U8G_MODE_BW ); MOD_REG_NUMBER( L, "MODE_BW", U8G_MODE_BW );
MOD_REG_NUMBER( L, "MODE_GRAY2BIT", U8G_MODE_BW ); MOD_REG_NUMBER( L, "MODE_GRAY2BIT", U8G_MODE_GRAY2BIT );
// create metatable // create metatable
luaL_newmetatable(L, "u8g.display"); luaL_newmetatable(L, "u8g.display");