Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-23 06:36:45 +08:00
Code Issues Actions 21 Packages Projects Releases Wiki Activity

Add more LCD-related Kconfig logic; Create a Kconfig file for NxWidgets

Browse Source 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5189 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2012-09-25 21:15:02 +00:00
parent 734ea8dc16
commit fd3df782b1
10 changed files with 690 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NxWidgets/ChangeLog.txt
+3
View File
@@ -163,3 +163,6 @@
* UnitTests/*/main.cxx: Change entry point name to be consistent
with with entry point naming conventions introduced in NuttX
6.22.
* Kconfig: Added a mconfig configuration file. Eventually, NxWidgets
needs to get hooked into the NuttX mconf configuration. Still not
exactly sure how to do that.
NxWidgets/Kconfig
+569
View File
File diff suppressed because it is too large Load Diff
NxWidgets/libnxwidgets/include/nxconfig.hxx
+1 -1
View File
@@ -117,7 +117,7 @@
* Default: MKRGB(192,192,192)
* CONFIG_NXWIDGETS_DEFAULT_ENABLEDTEXTCOLOR - Text color on a enabled widget:
* Default: MKRGB(248,248,248)
* CONFIG_NXWIDGETS_DEFAULT_DISABLEDTEXTCOLOR - Text color on a selected widget:
* CONFIG_NXWIDGETS_DEFAULT_SELECTEDTEXTCOLOR - Text color on a selected widget:
* Default: MKRGB(0,0,0)
* CONFIG_NXWIDGETS_DEFAULT_FONTCOLOR - Default font color: Default:
* MKRGB(255,255,255)
NxWidgets/nxwm/include/nxwmconfig.hxx
+6 -6
View File
@@ -270,13 +270,13 @@
* CONFIG_NXWM_STARTWINDOW_MXMSGS - The maximum number of messages to queue
* before blocking. Defualt 32
* CONFIG_NXWM_STARTWINDOW_MXMPRIO - The message priority. Default: 42.
* CONFIG_NXWM_STARTWINDOW_PRIO - Priority of the NxConsole task. Default:
* CONFIG_NXWM_STARTWINDOW_PRIO - Priority of the StartWindoW task. Default:
* SCHED_PRIORITY_DEFAULT. NOTE: This priority should be less than
* CONFIG_NXWIDGETS_SERVERPRIO or else there may be data overrun errors.
* Such errors would most likely appear as duplicated rows of data on the
* display.
* CONFIG_NXWM_STARTWINDOW_STACKSIZE - The stack size to use when starting the
* NxConsole task. Default: 2048 bytes.
* StartWindow task. Default: 2048 bytes.
*/
#ifndef CONFIG_NXWM_STARTWINDOW_VSPACING
@@ -421,7 +421,7 @@
/**
* Keyboard device settings
*
* CONFIG_NXWM_KEYBOARD_DEVNO - The full path to the touchscreen device.
* CONFIG_NXWM_KEYBOARD_DEVPATH - The full path to the keyboard device.
* Default: "/dev/console"
* CONFIG_NXWM_KEYBOARD_SIGNO - The realtime signal used to wake up the
* touchscreen listener thread. Default: 6
@@ -464,16 +464,16 @@
* touchscreen calibration display. Default: MKRGB(0, 0, 128) (dark blue)
* CONFIG_NXWM_CALIBRATION_CIRCLECOLOR - The color of the circle in the
* touchscreen calibration display. Default: MKRGB(255, 255, 255) (white)
* CONFIG_NXWM_CALIBRATION_CIRCLECOLOR - The color of the circle in the
* CONFIG_NXWM_CALIBRATION_TOUCHEDCOLOR - The color of the circle in the
* touchscreen calibration display after the touch is recorder. Default:
* MKRGB(255, 255, 96) (very light yellow)
* CONFIG_NXWM_CALIBRATION_ICON - The ICON to use for the touchscreen
* calibration application. Default: NxWM::g_calibrationBitmap
* CONFIG_NXWM_CALIBRATION_SIGNO - The realtime signal used to wake up the
* touchscreen calibration thread. Default: 5
* CONFIG_NXWM_CALIBRATION_LISTENERPRIO - Priority of the touchscreen listener
* CONFIG_NXWM_CALIBRATION_LISTENERPRIO - Priority of the calibration listener
* thread. Default: SCHED_PRIORITY_DEFAULT
* CONFIG_NXWM_CALIBRATION_LISTENERSTACK - Touchscreen listener thread stack
* CONFIG_NXWM_CALIBRATION_LISTENERSTACK - Calibration listener thread stack
* size. Default 2048
*/
nuttx/ChangeLog
+4 -1
View File
@@ -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.
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.
nuttx/Kconfig
+7
View File
@@ -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
nuttx/configs/shenzhou/Kconfig
+72
View File
@@ -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
nuttx/configs/shenzhou/src/up_lcd.c
+1 -2
View File
@@ -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
nuttx/drivers/lcd/Kconfig
+15
View File
@@ -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
nuttx/graphics/Kconfig
+12 -2
View File
@@ -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