diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-04-27 18:29:04 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-04-27 18:29:04 +0000 |
commit | 4511f9758bf8027c5ee01b654b3b1558ebb2d11a (patch) | |
tree | 53266b0ceb89f5706fd21c7d83c824a329b0a002 /nuttx/configs | |
parent | bef5049f0198760cc241a0ef137e6c39e3edff8c (diff) | |
download | px4-nuttx-4511f9758bf8027c5ee01b654b3b1558ebb2d11a.tar.gz px4-nuttx-4511f9758bf8027c5ee01b654b3b1558ebb2d11a.tar.bz2 px4-nuttx-4511f9758bf8027c5ee01b654b3b1558ebb2d11a.zip |
More STM3240G-EVAL LCD updates
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4665 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs')
-rw-r--r-- | nuttx/configs/stm3240g-eval/nsh/defconfig | 6 | ||||
-rw-r--r-- | nuttx/configs/stm3240g-eval/nxconsole/defconfig | 7 | ||||
-rw-r--r-- | nuttx/configs/stm3240g-eval/src/up_lcd.c | 4 |
3 files changed, 15 insertions, 2 deletions
diff --git a/nuttx/configs/stm3240g-eval/nsh/defconfig b/nuttx/configs/stm3240g-eval/nsh/defconfig index 3e6e768e5..70eee412f 100644 --- a/nuttx/configs/stm3240g-eval/nsh/defconfig +++ b/nuttx/configs/stm3240g-eval/nsh/defconfig @@ -1260,6 +1260,12 @@ CONFIG_LCD_PORTRAIT=n CONFIG_LCD_RPORTRAIT=y # +# STM3240G-EVAL specific LCD settings +# +CONFIG_STM32_ILI9320_DISABLE=n +CONFIG_STM32_ILI9325_DISABLE=n + +# # Settings for examples/uip # CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) diff --git a/nuttx/configs/stm3240g-eval/nxconsole/defconfig b/nuttx/configs/stm3240g-eval/nxconsole/defconfig index f48f04f24..d845c7206 100644 --- a/nuttx/configs/stm3240g-eval/nxconsole/defconfig +++ b/nuttx/configs/stm3240g-eval/nxconsole/defconfig @@ -1259,6 +1259,13 @@ CONFIG_LCD_LANDSCAPE=y CONFIG_LCD_PORTRAIT=n CONFIG_LCD_RPORTRAIT=n + +# +# STM3240G-EVAL specific LCD settings +# +CONFIG_STM32_ILI9320_DISABLE=n +CONFIG_STM32_ILI9325_DISABLE=n + # # Settings for examples/uip # diff --git a/nuttx/configs/stm3240g-eval/src/up_lcd.c b/nuttx/configs/stm3240g-eval/src/up_lcd.c index c77af6ac0..4ab5c0258 100644 --- a/nuttx/configs/stm3240g-eval/src/up_lcd.c +++ b/nuttx/configs/stm3240g-eval/src/up_lcd.c @@ -914,7 +914,7 @@ static inline void stm3240g_lcdinitialize(void) { uint16_t id; - /* Check if the LCD is xxx Controller (or the compatible) */ + /* Check LCD ID */ id = stm3240g_readreg(LCD_REG_0); lcddbg("LCD ID: %04x\n", id); @@ -1197,6 +1197,6 @@ void stm3240g_lcdclear(uint16_t color) for (i = 0; i < STM3240G_XRES * STM3240G_YRES; i++) { LCD->value = color; - } + } } |