diff --git a/epicardium/epicardium.h b/epicardium/epicardium.h index 8e2b36ceb57eee3ddbbb68974de29f640cae9c07..7f02ffc3cf3727f72d7ef1c1ec84dfe65d4fed13 100644 --- a/epicardium/epicardium.h +++ b/epicardium/epicardium.h @@ -178,7 +178,7 @@ API(API_INTERRUPT_DISABLE, int epic_interrupt_disable(api_int_id_t int_id)); */ /** Line-Style */ -enum linestyle_t { +enum disp_linestyle { /** */ LINESTYLE_FULL = 0, /** */ @@ -186,7 +186,7 @@ enum linestyle_t { }; /** Fill-Style */ -enum fillstyle_t { +enum disp_fillstyle { /** */ FILLSTYLE_EMPTY = 0, /** */ @@ -269,7 +269,7 @@ API(API_DISP_LINE, uint16_t xend, uint16_t yend, uint16_t color, - enum linestyle_t linestyle, + enum disp_linestyle linestyle, uint16_t pixelsize) ); @@ -294,7 +294,7 @@ API(API_DISP_RECT, uint16_t xend, uint16_t yend, uint16_t color, - enum fillstyle_t fillstyle, + enum disp_fillstyle fillstyle, uint16_t pixelsize) ); @@ -317,7 +317,7 @@ API(API_DISP_CIRC, uint16_t y, uint16_t rad, uint16_t color, - enum fillstyle_t fillstyle, + enum disp_fillstyle fillstyle, uint16_t pixelsize) ); diff --git a/epicardium/modules/display.c b/epicardium/modules/display.c index 3401ec11d577b395db9f7b470ebaf57f0a8512d6..26db0d136baba57f0dca00733e063da574e92437 100644 --- a/epicardium/modules/display.c +++ b/epicardium/modules/display.c @@ -52,7 +52,7 @@ int epic_disp_line( uint16_t xend, uint16_t yend, uint16_t color, - enum linestyle_t linestyle, + enum disp_linestyle linestyle, uint16_t pixelsize ) { int cl = check_lock(); @@ -72,7 +72,7 @@ int epic_disp_rect( uint16_t xend, uint16_t yend, uint16_t color, - enum fillstyle_t fillstyle, + enum disp_fillstyle fillstyle, uint16_t pixelsize ) { int cl = check_lock(); @@ -91,7 +91,7 @@ int epic_disp_circ( uint16_t y, uint16_t rad, uint16_t color, - enum fillstyle_t fillstyle, + enum disp_fillstyle fillstyle, uint16_t pixelsize ) { int cl = check_lock();