uGFX
/
ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

small doxygen cleanup

ugfx_release_2.6
Joel Bodenmann 2012-12-20 19:46:34 +01:00
parent 65aa1d42d6
commit bee9002fcc
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/gdisp/fonts.h
View File

@ -71,9 +71,6 @@ struct font {
const fontcolumn_t *dataTable; const fontcolumn_t *dataTable;
}; };
/**
* @brief Macros to get to the complex parts of the font structure.
*/
#define _getCharWidth(f,c) (((c) < (f)->minChar || (c) > (f)->maxChar) ? 0 : (f)->widthTable[(c) - (f)->minChar]) #define _getCharWidth(f,c) (((c) < (f)->minChar || (c) > (f)->maxChar) ? 0 : (f)->widthTable[(c) - (f)->minChar])
#define _getCharOffset(f,c) ((f)->offsetTable[(c) - (f)->minChar]) #define _getCharOffset(f,c) ((f)->offsetTable[(c) - (f)->minChar])
#define _getCharData(f,c) (&(f)->dataTable[_getCharOffset(f, c)]) #define _getCharData(f,c) (&(f)->dataTable[_getCharOffset(f, c)])

7
include/gdisp/gdisp.h
View File

@ -52,7 +52,8 @@ typedef int16_t coord_t;
/*===========================================================================*/ /*===========================================================================*/
/** /**
* @brief Some basic colors * @name Some basic colors
* @{
*/ */
#define White HTML2COLOR(0xFFFFFF) #define White HTML2COLOR(0xFFFFFF)
#define Black HTML2COLOR(0x000000) #define Black HTML2COLOR(0x000000)
@ -76,6 +77,7 @@ typedef int16_t coord_t;
#define Orange HTML2COLOR(0xFFA500) #define Orange HTML2COLOR(0xFFA500)
#define Pink HTML2COLOR(0xFFC0CB) #define Pink HTML2COLOR(0xFFC0CB)
#define SkyBlue HTML2COLOR(0x87CEEB) #define SkyBlue HTML2COLOR(0x87CEEB)
/** @} */
/*===========================================================================*/ /*===========================================================================*/
/* Low Level Driver details and error checks. */ /* Low Level Driver details and error checks. */
@ -102,9 +104,6 @@ typedef enum fontmetric {fontHeight, fontDescendersHeight, fontLineSpacing, font
/*===========================================================================*/ /*===========================================================================*/
#if (GDISP_NEED_TEXT && GDISP_OLD_FONT_DEFINITIONS) || defined(__DOXYGEN__) #if (GDISP_NEED_TEXT && GDISP_OLD_FONT_DEFINITIONS) || defined(__DOXYGEN__)
/**
* @brief Predefined fonts.
*/
#if GDISP_INCLUDE_FONT_SMALL #if GDISP_INCLUDE_FONT_SMALL
extern const struct font fontSmall; extern const struct font fontSmall;
extern const struct font fontSmallDouble; extern const struct font fontSmallDouble;

2
include/gdisp/options.h
View File

@ -163,7 +163,7 @@
#define GDISP_OLD_FONT_DEFINITIONS FALSE #define GDISP_OLD_FONT_DEFINITIONS FALSE
#endif #endif
/** /**
* @brief Predefined built in fonts. * @brief Predefined built in fonts
* @note Turning off the ones you are not using can save program size. * @note Turning off the ones you are not using can save program size.
*/ */
#ifndef GDISP_INCLUDE_FONT_SMALL #ifndef GDISP_INCLUDE_FONT_SMALL