diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-25 21:15:02 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-25 21:15:02 +0000 |
commit | 367c0f77ee3e82d47676931a8eea0c96de6f57a7 (patch) | |
tree | 556fbacce4a8b42af0333ed57296ecf1a62b8e1d /nuttx | |
parent | 6128e1302e09f9d598a4bc90964db586e4ce2533 (diff) | |
download | px4-nuttx-367c0f77ee3e82d47676931a8eea0c96de6f57a7.tar.gz px4-nuttx-367c0f77ee3e82d47676931a8eea0c96de6f57a7.tar.bz2 px4-nuttx-367c0f77ee3e82d47676931a8eea0c96de6f57a7.zip |
Add more LCD-related Kconfig logic; Create a Kconfig file for NxWidgets
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5189 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
-rw-r--r-- | nuttx/ChangeLog | 5 | ||||
-rw-r--r-- | nuttx/Kconfig | 7 | ||||
-rw-r--r-- | nuttx/configs/shenzhou/Kconfig | 72 | ||||
-rw-r--r-- | nuttx/configs/shenzhou/src/up_lcd.c | 3 | ||||
-rw-r--r-- | nuttx/drivers/lcd/Kconfig | 15 | ||||
-rw-r--r-- | nuttx/graphics/Kconfig | 14 |
6 files changed, 111 insertions, 5 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 895f2844f..56929ad2f 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -3396,4 +3396,7 @@ will need a completely need bit-banging interface; this initial check-in is only for the framework. * configs/shenzhou/src/up_ssd1289.c: Bit-banging driver is - code complete.
\ No newline at end of file + code complete. + * configs/shenzhou/src/up_lcd.c: Oops. Shenzhou LCD does not + have an SSD1289 controller. Its an ILI93xx. Ported the + STM3240G-EVAL ILI93xx driver to work on the Shenzhou board. diff --git a/nuttx/Kconfig b/nuttx/Kconfig index 520f09ebf..86e8849bc 100644 --- a/nuttx/Kconfig +++ b/nuttx/Kconfig @@ -286,6 +286,13 @@ config DEBUG_GRAPHICS ---help--- Enable NX graphics debug output (disabled by default) +config DEBUG_LCD + bool "Enable low-leve LCD debug output" + default n + depends on LCD + ---help--- + Enable low level debug output from the LCD driver (disabled by default) + config DEBUG_I2C bool "Enable I2C debug output" default n diff --git a/nuttx/configs/shenzhou/Kconfig b/nuttx/configs/shenzhou/Kconfig index 92d294099..bfd67abdf 100644 --- a/nuttx/configs/shenzhou/Kconfig +++ b/nuttx/configs/shenzhou/Kconfig @@ -4,4 +4,76 @@ # if ARCH_BOARD_SHENZHOU + +if LCD +menu "LCD Controller Selection" + +comment "Disable Unused LCD Controllers" + +config STM32_ILI1505_DISABLE + bool "Disable ILI1505" + default n + ---help--- + This may be defined to disable support for the ILI1505 LCD controller + You might want to eliminate unused LCD controll support in order to + reduce the FLASH footprint. + +config STM32_ILI9300_DISABLE + bool "Disable ILI9300" + default n + ---help--- + This may be defined to disable support for the ILI9300 LCD controller + You might want to eliminate unused LCD controll support in order to + reduce the FLASH footprint. + +config STM32_ILI9320_DISABLE + bool "Disable ILI9320" + default n + ---help--- + This may be defined to disable support for the ILI9320 LCD controller + You might want to eliminate unused LCD controll support in order to + reduce the FLASH footprint. + +config STM32_ILI9321_DISABLE + bool "Disable ILI9321" + default n + ---help--- + This may be defined to disable support for the ILI9321 LCD controller + You might want to eliminate unused LCD controll support in order to + reduce the FLASH footprint. + +config STM32_ILI9325_DISABLE + bool "Disable ILI9325" + default n + ---help--- + This may be defined to disable support for the ILI9325 LCD controller + You might want to eliminate unused LCD controll support in order to + reduce the FLASH footprint. + +config STM32_ILI9328_DISABLE + bool "Disable ILI9328" + default n + ---help--- + This may be defined to disable support for the ILI9328 LCD controller + You might want to eliminate unused LCD controll support in order to + reduce the FLASH footprint. + +config STM32_ILI9331_DISABLE + bool "Disable ILI9331" + default n + ---help--- + This may be defined to disable support for the ILI9331 LCD controller + You might want to eliminate unused LCD controll support in order to + reduce the FLASH footprint. + +config STM32_ILI9919_DISABLE + bool "Disable ILI9919" + default n + ---help--- + This may be defined to disable support for the ILI9919 LCD controller + You might want to eliminate unused LCD controll support in order to + reduce the FLASH footprint. + +endmenu +endif endif diff --git a/nuttx/configs/shenzhou/src/up_lcd.c b/nuttx/configs/shenzhou/src/up_lcd.c index a58b795c4..1de2a7d4b 100644 --- a/nuttx/configs/shenzhou/src/up_lcd.c +++ b/nuttx/configs/shenzhou/src/up_lcd.c @@ -135,8 +135,7 @@ * Pre-processor Definitions ************************************************************************************/ /* Configuration **********************************************************************/ -/* - * CONFIG_STM32_ILI1505_DISABLE may be defined to disable the LCD_ILI1505 +/* CONFIG_STM32_ILI1505_DISABLE may be defined to disable the LCD_ILI1505 * CONFIG_STM32_ILI9300_DISABLE may be defined to disable the LCD_ILI9300 * CONFIG_STM32_ILI9320_DISABLE may be defined to disable the LCD_ILI9320 * CONFIG_STM32_ILI9321_DISABLE may be defined to disable the LCD_ILI9321 diff --git a/nuttx/drivers/lcd/Kconfig b/nuttx/drivers/lcd/Kconfig index 081a79c89..851263d27 100644 --- a/nuttx/drivers/lcd/Kconfig +++ b/nuttx/drivers/lcd/Kconfig @@ -2,6 +2,21 @@ # For a description of the syntax of this configuration file, # see misc/tools/kconfig-language.txt. # + +config LCD_NOGETRUN + bool "Write-only LCD" + default n + ---help--- + Many LCD hardware interfaces provide only minimal graphics capability. In + particulary, many simple LCD interfaces are write only. That is we, can + write graphics data to the LCD device memory, but we cannot read it back. + If the LCD hardware does not support reading the graphics memory, then + this option should be defined so that the NX layer can taking alternative + measures when the LCD is not readable. For example, if the LCD is not + readable, then NX will not attempt to support transparency. + + See also NX_WRITEONLY in the graphics support menu. + config LCD_MAXCONTRAST int "LCD maximum contrast" default 63 if NOKIA6100_S1D15G10 diff --git a/nuttx/graphics/Kconfig b/nuttx/graphics/Kconfig index 1ae387605..18b1e1ab9 100644 --- a/nuttx/graphics/Kconfig +++ b/nuttx/graphics/Kconfig @@ -11,6 +11,16 @@ config NX if NX +config NX_LCDDRIVER + bool "LCD driver" + default y + depends on LCD + ---help--- + By default, the NX graphics system uses the frame buffer driver interface + defined in include/nuttx/fb.h. However, if LCD is support is enabled, + this this option is provide to select, instead, the LCD driver interface + defined in include/nuttx/lcd/lcd.h. + config NX_NPLANES int "Number of Color Planes" default 1 @@ -21,8 +31,8 @@ config NX_NPLANES config NX_WRITEONLY bool "Write-only Graphics Device" - default y if NX_LCDDRIVER && NX_LCDDRIVER - default n if !NX_LCDDRIVER || !NX_LCDDRIVER + default y if NX_LCDDRIVER && LCD_NOGETRUN + default n if !NX_LCDDRIVER || !LCD_NOGETRUN ---help--- Define if the underlying graphics device does not support read operations. Automatically defined if NX_LCDDRIVER and LCD_NOGETRUN are |