diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-07-14 11:23:41 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-07-14 11:23:41 -0600 |
| commit | ee1c84ffbe4cdbe92308f45a2c084ec778651d77 (patch) | |
| tree | 8594cf47fe6cf7d9a645ad10bad15bf698cbc644 | |
| parent | a2e9dfd19b671e6aded04323b9bc94058cbe8311 (diff) | |
| download | px4-nuttx-ee1c84ffbe4cdbe92308f45a2c084ec778651d77.tar.gz px4-nuttx-ee1c84ffbe4cdbe92308f45a2c084ec778651d77.tar.bz2 px4-nuttx-ee1c84ffbe4cdbe92308f45a2c084ec778651d77.zip | |
SAMA4D3/4-EK NxWM: Use larger fonts
| -rw-r--r-- | nuttx/configs/sama5d3x-ek/nxwm/defconfig | 19 | ||||
| -rw-r--r-- | nuttx/configs/sama5d4-ek/nxwm/defconfig | 19 |
2 files changed, 22 insertions, 16 deletions
diff --git a/nuttx/configs/sama5d3x-ek/nxwm/defconfig b/nuttx/configs/sama5d3x-ek/nxwm/defconfig index 2e68a9b41..bd1a6052e 100644 --- a/nuttx/configs/sama5d3x-ek/nxwm/defconfig +++ b/nuttx/configs/sama5d3x-ek/nxwm/defconfig @@ -655,14 +655,14 @@ CONFIG_NXFONTS_CHARBITS=7 # CONFIG_NXFONT_MONO5X8 is not set # CONFIG_NXFONT_SANS17X22 is not set # CONFIG_NXFONT_SANS20X26 is not set -CONFIG_NXFONT_SANS23X27=y +# CONFIG_NXFONT_SANS23X27 is not set # CONFIG_NXFONT_SANS22X29 is not set -# CONFIG_NXFONT_SANS28X37 is not set +CONFIG_NXFONT_SANS28X37=y # CONFIG_NXFONT_SANS39X48 is not set # CONFIG_NXFONT_SANS17X23B is not set # CONFIG_NXFONT_SANS20X27B is not set -CONFIG_NXFONT_SANS22X29B=y -# CONFIG_NXFONT_SANS28X37B is not set +# CONFIG_NXFONT_SANS22X29B is not set +CONFIG_NXFONT_SANS28X37B=y # CONFIG_NXFONT_SANS40X49B is not set # CONFIG_NXFONT_SERIF22X29 is not set # CONFIG_NXFONT_SERIF29X37 is not set @@ -677,7 +677,7 @@ CONFIG_NXCONSOLE=y # CONFIG_NXCONSOLE_BPP=16 CONFIG_NXCONSOLE_CURSORCHAR=137 -CONFIG_NXCONSOLE_MXCHARS=325 +CONFIG_NXCONSOLE_MXCHARS=640 CONFIG_NXCONSOLE_CACHESIZE=32 CONFIG_NXCONSOLE_LINESEPARATION=0 # CONFIG_NXCONSOLE_NOWRAP is not set @@ -1044,6 +1044,8 @@ CONFIG_NXWM_TASKBAR_LEFT=y # NxWM Toolbar Configuration # # CONFIG_NXWM_CUSTOM_TOOLBAR_HEIGHT is not set +CONFIG_NXWM_TOOLBAR_CUSTOM_FONTID=y +CONFIG_NXWM_TOOLBAR_FONTID=6 # # NxWM Application Window Configuration @@ -1069,7 +1071,8 @@ CONFIG_NXWM_NXCONSOLE=y CONFIG_NXWM_NXCONSOLE_PRIO=100 CONFIG_NXWM_NXCONSOLE_STACKSIZE=1596 # CONFIG_NXWM_NXCONSOLE_CUSTOM_COLORS is not set -# CONFIG_NXWM_NXCONSOLE_CUSTOM_FONTID is not set +CONFIG_NXWM_NXCONSOLE_CUSTOM_FONTID=y +CONFIG_NXWM_NXCONSOLE_FONTID=3 # CONFIG_NXWM_CUSTOM_NXCONSOLE_ICON is not set # @@ -1108,7 +1111,7 @@ CONFIG_NXWM_CALIBRATION_MARGIN=80 # CONFIG_NXWM_CALIBRATION_CUSTOM_COLORS is not set CONFIG_NXWM_CALIBRATION_MESSAGES=y CONFIG_NXWM_CALIBRATION_CUSTOM_FONTID=y -CONFIG_NXWM_CALIBRATION_FONTID=5 +CONFIG_NXWM_CALIBRATION_FONTID=6 CONFIG_NXWM_CALIBRATION_AVERAGE=y CONFIG_NXWM_CALIBRATION_NSAMPLES=4 CONFIG_NXWM_CALIBRATION_DISCARD_MINMAX=y @@ -1124,7 +1127,7 @@ CONFIG_NXWM_CALIBRATION_LISTENERSTACK=1024 # CONFIG_NXWM_HEXCALCULATOR_CUSTOM_COLORS is not set # CONFIG_NXWM_CUSTOM_HEXCALCULATOR_ICON is not set CONFIG_NXWM_HEXCALCULATOR_CUSTOM_FONTID=y -CONFIG_NXWM_HEXCALCULATOR_FONTID=5 +CONFIG_NXWM_HEXCALCULATOR_FONTID=6 # CONFIG_NXWM_MEDIAPLAYER is not set # diff --git a/nuttx/configs/sama5d4-ek/nxwm/defconfig b/nuttx/configs/sama5d4-ek/nxwm/defconfig index b1184d15d..2776aac11 100644 --- a/nuttx/configs/sama5d4-ek/nxwm/defconfig +++ b/nuttx/configs/sama5d4-ek/nxwm/defconfig @@ -869,16 +869,16 @@ CONFIG_NXFONTS_CHARBITS=7 # CONFIG_NXFONT_MONO5X8 is not set # CONFIG_NXFONT_SANS17X22 is not set # CONFIG_NXFONT_SANS20X26 is not set -CONFIG_NXFONT_SANS23X27=y +# CONFIG_NXFONT_SANS23X27 is not set # CONFIG_NXFONT_SANS22X29 is not set -# CONFIG_NXFONT_SANS28X37 is not set +CONFIG_NXFONT_SANS28X37=y # CONFIG_NXFONT_SANS39X48 is not set # CONFIG_NXFONT_SANS17X23B is not set # CONFIG_NXFONT_SANS20X27B is not set # CONFIG_NXFONT_SANS22X29B is not set -# CONFIG_NXFONT_SANS28X37B is not set +CONFIG_NXFONT_SANS28X37B=y # CONFIG_NXFONT_SANS40X49B is not set -CONFIG_NXFONT_SERIF22X29=y +# CONFIG_NXFONT_SERIF22X29 is not set # CONFIG_NXFONT_SERIF29X37 is not set # CONFIG_NXFONT_SERIF38X48 is not set # CONFIG_NXFONT_SERIF22X28B is not set @@ -891,7 +891,7 @@ CONFIG_NXCONSOLE=y # CONFIG_NXCONSOLE_BPP=16 CONFIG_NXCONSOLE_CURSORCHAR=137 -CONFIG_NXCONSOLE_MXCHARS=325 +CONFIG_NXCONSOLE_MXCHARS=640 CONFIG_NXCONSOLE_CACHESIZE=32 CONFIG_NXCONSOLE_LINESEPARATION=0 # CONFIG_NXCONSOLE_NOWRAP is not set @@ -1311,6 +1311,8 @@ CONFIG_NXWM_TASKBAR_LEFT=y # NxWM Toolbar Configuration # # CONFIG_NXWM_CUSTOM_TOOLBAR_HEIGHT is not set +CONFIG_NXWM_TOOLBAR_CUSTOM_FONTID=y +CONFIG_NXWM_TOOLBAR_FONTID=6 # # NxWM Application Window Configuration @@ -1336,7 +1338,8 @@ CONFIG_NXWM_NXCONSOLE=y CONFIG_NXWM_NXCONSOLE_PRIO=100 CONFIG_NXWM_NXCONSOLE_STACKSIZE=1596 # CONFIG_NXWM_NXCONSOLE_CUSTOM_COLORS is not set -# CONFIG_NXWM_NXCONSOLE_CUSTOM_FONTID is not set +CONFIG_NXWM_NXCONSOLE_CUSTOM_FONTID=y +CONFIG_NXWM_NXCONSOLE_FONTID=3 # CONFIG_NXWM_CUSTOM_NXCONSOLE_ICON is not set # @@ -1375,7 +1378,7 @@ CONFIG_NXWM_CALIBRATION_MARGIN=80 # CONFIG_NXWM_CALIBRATION_CUSTOM_COLORS is not set CONFIG_NXWM_CALIBRATION_MESSAGES=y CONFIG_NXWM_CALIBRATION_CUSTOM_FONTID=y -CONFIG_NXWM_CALIBRATION_FONTID=5 +CONFIG_NXWM_CALIBRATION_FONTID=6 CONFIG_NXWM_CALIBRATION_AVERAGE=y CONFIG_NXWM_CALIBRATION_NSAMPLES=2 # CONFIG_NXWM_CALIBRATION_DISCARD_MINMAX is not set @@ -1391,7 +1394,7 @@ CONFIG_NXWM_CALIBRATION_LISTENERSTACK=1024 # CONFIG_NXWM_HEXCALCULATOR_CUSTOM_COLORS is not set # CONFIG_NXWM_CUSTOM_HEXCALCULATOR_ICON is not set CONFIG_NXWM_HEXCALCULATOR_CUSTOM_FONTID=y -CONFIG_NXWM_HEXCALCULATOR_FONTID=5 +CONFIG_NXWM_HEXCALCULATOR_FONTID=6 CONFIG_NXWM_MEDIAPLAYER=y # |