diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-07-27 14:43:45 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-07-27 14:43:45 +0000 |
commit | 99ffb319c5af373ef135c2a3e73bf1171e55559e (patch) | |
tree | 7aa08fa81a006d354469de2652043ab969d8a3c4 /apps/examples/nxhello/nxhello.h | |
parent | ce09509ff8c3127b4cc07ebcaae78229d5b2d90a (diff) | |
download | px4-nuttx-99ffb319c5af373ef135c2a3e73bf1171e55559e.tar.gz px4-nuttx-99ffb319c5af373ef135c2a3e73bf1171e55559e.tar.bz2 px4-nuttx-99ffb319c5af373ef135c2a3e73bf1171e55559e.zip |
Incorporated new fonts into examples; fix glyph allocation bug in nxhello
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3822 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/examples/nxhello/nxhello.h')
-rw-r--r-- | apps/examples/nxhello/nxhello.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/examples/nxhello/nxhello.h b/apps/examples/nxhello/nxhello.h index 93c6d8fac..169285856 100644 --- a/apps/examples/nxhello/nxhello.h +++ b/apps/examples/nxhello/nxhello.h @@ -46,8 +46,9 @@ #include <stdbool.h> #include <semaphore.h> -#include <nuttx/nx/nx.h> #include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxfonts.h> /**************************************************************************** * Definitions @@ -77,6 +78,10 @@ # endif #endif +#ifndef CONFIG_EXAMPLES_NXHELLO_FONTID +# define CONFIG_EXAMPLES_NXHELLO_FONTID NXFONT_DEFAULT +#endif + #ifndef CONFIG_EXAMPLES_NXHELLO_FONTCOLOR # if CONFIG_EXAMPLES_NXHELLO_BPP == 24 || CONFIG_EXAMPLES_NXHELLO_BPP == 32 # define CONFIG_EXAMPLES_NXHELLO_FONTCOLOR 0x00000000 |