summaryrefslogtreecommitdiff
path: root/nuttx/include
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-11-26 14:15:34 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-11-26 14:15:34 -0600
commita351c1f15c1fd4747d13f46ba1f2c89c7389d750 (patch)
treea5ed7cab21759375d017e12d4e9c86a77276b60c /nuttx/include
parent003cf50e2d2790c0797f32a25667b0eb68814f04 (diff)
downloadnuttx-a351c1f15c1fd4747d13f46ba1f2c89c7389d750.tar.gz
nuttx-a351c1f15c1fd4747d13f46ba1f2c89c7389d750.tar.bz2
nuttx-a351c1f15c1fd4747d13f46ba1f2c89c7389d750.zip
Two new fonts from Pierre-noel Bouteville
Diffstat (limited to 'nuttx/include')
-rw-r--r--nuttx/include/nuttx/nx/nxfonts.h18
1 files changed, 18 insertions, 0 deletions
diff --git a/nuttx/include/nuttx/nx/nxfonts.h b/nuttx/include/nuttx/nx/nxfonts.h
index 1d8f9748c..9c6d57ff2 100644
--- a/nuttx/include/nuttx/nx/nxfonts.h
+++ b/nuttx/include/nuttx/nx/nxfonts.h
@@ -113,6 +113,14 @@
#elif defined(CONFIG_NXFONT_SERIF38X49B)
# define NXFONT_DEFAULT FONTID_SERIF38X49B
+/* Pixel fonts */
+
+#elif defined(CONFIG_NXFONT_PIXEL_UNICODE)
+# define NXFONT_DEFAULT FONTID_PIXEL_UNICODE
+
+#elif defined(CONFIG_NXFONT_PIXEL_LCD_MACHINE)
+# define NXFONT_DEFAULT FONTID_PIXEL_LCD_MACHINE
+
/* Mono-space fonts */
#elif defined(CONFIG_NXFONT_MONO5X8)
@@ -211,6 +219,16 @@ enum nx_fontid_e
#ifdef CONFIG_NXFONT_SERIF38X49B
, FONTID_SERIF38X49B = 13 /* The 38x49 serif bold font */
#endif
+
+/* Pixel fonts */
+
+#ifdef CONFIG_NXFONT_PIXEL_UNICODE
+ , FONTID_PIXEL_UNICODE = 19 /* Pixel UniCode font */
+#endif
+
+#ifdef CONFIG_NXFONT_PIXEL_LCD_MACHINE
+ , FONTID_PIXEL_LCD_MACHINE = 20 /* Pixel lcd machine font */
+#endif
};
/* This structures provides the metrics for one glyph */