Add UG-2864AMBAG01 initialization for use on STM32F4Discovery

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5321 42af7a65-404d-4744-a932-0658087f49c3

nuttx/ChangeLog

@@ -3578,7 +3578,9 @@
 	  contributed by Freddie Chopin.
 	* arch/arm/src/stm32_otgfsdev.c:  Partial fix from Petteri Aimonen.
 	* drivers/lcd/ug-2864ambag01.c and include/nuttx/lcd/ug_2864ambag01.h:
-	  LCD driver for the Univision OLED of the same name.
+	  LCD driver for the Univision OLED of the same name (untested on
+	  initial check-in).
 	* configs/stm32f4discovery/nxlines:  Configure to use mconf/Kconfig
 	  tool.
-
+	* configs/stm32f4discovery/src/up_ug2864ambag01.c:  Board-specific
+	  initialization for UG-2864AMBAG01 OLED connecte to STM32F4Disovery.

nuttx/configs/lpcxpresso-lpc1768/src/up_oled.c

@@ -68,7 +68,7 @@
 #endif
 
 /* Debug ********************************************************************/
-/* Define the CONFIG_LCD_UGDEBUG to enable detailed debug output (stuff you
+/* Define the CONFIG_DEBUG_LCD to enable detailed debug output (stuff you
  * would never want to see unless you are debugging this file).
  *
  * Verbose debug must also be enabled
@@ -80,10 +80,10 @@
 #endif
 
 #ifndef CONFIG_DEBUG_VERBOSE
-#  undef CONFIG_LCD_UGDEBUG
+#  undef CONFIG_DEBUG_LCD
 #endif
 
-#ifdef CONFIG_LCD_UGDEBUG
+#ifdef CONFIG_DEBUG_LCD
 #  define ugdbg(format, arg...)  vdbg(format, ##arg)
 #  define oleddc_dumpgpio(m)     lpc17_dumpgpio(LPCXPRESSO_OLED_POWER, m)
 #  define oledcs_dumpgpio(m)     lpc17_dumpgpio(LPCXPRESSO_OLED_CS, m)

nuttx/configs/stm32f4discovery/src/Makefile

@@ -96,6 +96,10 @@ CSRCS		+= up_ssd1289.c
 endif
 endif
 
+ifeq ($(CONFIG_LCD_UG2864AMBAG01),y)
+CSRCS		+= up_ug2864ambag01.c
+endif
+
 COBJS		= $(CSRCS:.c=$(OBJEXT))
 
 SRCS		= $(ASRCS) $(CSRCS)

nuttx/configs/stm32f4discovery/src/up_ug2864ambag01.c

@@ -0,0 +1,206 @@
+/****************************************************************************
+ * config/stm32f4discovery/src/up_ug2864ambag01.c
+ * arch/arm/src/board/up_ug2864ambag01.c
+ *
+ *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+#include <debug.h>
+#include <errno.h>
+
+#include <nuttx/spi.h>
+#include <nuttx/lcd/lcd.h>
+#include <nuttx/lcd/ug-2864ambag01.h>
+
+#include "stm32f4discovery-internal.h"
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+/* Configuration ************************************************************/
+/* This module is only built if CONFIG_NX_LCDDRIVER is selected.  In this
+ * case, it would be an error if SSP1 is not also enabled.
+ */
+
+#ifndef CONFIG_STM32_SPI1
+#  error "The OLED driver requires CONFIG_STM32_SPI1 in the configuration"
+#endif
+
+#ifndef CONFIG_SPI_CMDDATA
+#  error "The OLED driver requires CONFIG_SPI_CMDDATA in the configuration"
+#endif
+
+/* Pin Configuration ********************************************************/
+/* Connector CON10 J1:
+ *
+ * 1 3v3        2 5V Vcc
+ * 3 RESET      4 DI
+ * 5 CS         6 SCLK
+ * 7 A0         8 LED- (N/C)
+ * 9 LED+ (N/C) 9 GND
+ */
+
+#define STM32_OLED_RESET
+#define STM32_OLED_A0
+
+/* Debug ********************************************************************/
+/* Define the CONFIG_DEBUG_LCD to enable detailed debug output (stuff you
+ * would never want to see unless you are debugging this file).
+ *
+ * Verbose debug must also be enabled
+ */
+
+#ifndef CONFIG_DEBUG
+#  undef CONFIG_DEBUG_VERBOSE
+#  undef CONFIG_DEBUG_GRAPHICS
+#endif
+
+#ifndef CONFIG_DEBUG_VERBOSE
+#  undef CONFIG_DEBUG_LCD
+#endif
+
+#ifdef CONFIG_DEBUG_LCD
+#  define lcddbg(format, arg...) vdbg(format, ##arg)
+#  define oleddc_dumpgpio(m)     stm32_dumpgpio(STM32_OLED_POWER, m)
+#  define oledcs_dumpgpio(m)     stm32_dumpgpio(STM32_OLED_CS, m)
+#else
+#  define lcddbg(x...)
+#  define oleddc_dumpgpio(m)
+#  define oledcs_dumpgpio(m)
+#endif
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: up_nxdrvinit
+ *
+ * Description:
+ *   Called by NX initialization logic to configure the OLED.
+ *
+ ****************************************************************************/
+
+FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno)
+{
+  FAR struct spi_dev_s *spi;
+  FAR struct lcd_dev_s *dev;
+
+  /* Configure the OLED GPIOs. For the SPI interface, insert jumpers in J42,
+   * J43, J45 pin1-2 and J46 pin 1-2.
+   */
+ 
+  oledcs_dumpgpio("up_nxdrvinit: After OLED CS setup");
+  oleddc_dumpgpio("up_nxdrvinit: On entry");
+
+  (void)stm32_configgpio(STM32_OLED_RESET); /* OLED reset */
+  (void)stm32_configgpio(STM32_OLED_A0);    /* OLED Command/Data */
+
+  oleddc_dumpgpio("up_nxdrvinit: After OLED GPIO setup");
+
+  /* Wait a bit then release the OLED from the reset state */
+
+  up_mdelay(20);
+  stm32_gpiowrite(STM32_OLED_A0, true);
+
+  /* Get the SSI port (configure as a Freescale SPI port) */
+
+  spi = up_spiinitialize(1);
+  if (!spi)
+    {
+      glldbg("Failed to initialize SSI port 1\n");
+    }
+  else
+    {
+      /* Bind the SSI port to the OLED */
+
+      dev = ug2864ambag01_initialize(spi, devno);
+      if (!dev)
+        {
+          glldbg("Failed to bind SSI port 1 to OLED %d: %d\n", devno);
+        }
+     else
+        {
+          gllvdbg("Bound SSI port 1 to OLED %d\n", devno);
+
+          /* And turn the OLED on */
+
+          (void)dev->setpower(dev, CONFIG_LCD_MAXPOWER);
+          return dev;
+        }
+    }
+
+  return NULL;
+}
+
+/****************************************************************************
+ * Name:  stm32_ssp1cmddata
+ *
+ * Description:
+ *   Set or clear the SD1329 D/Cn bit to select data (true) or command
+ *   (false).  This function must be provided by platform-specific logic.
+ *   This is an implementation of the cmddata method of the SPI
+ *   interface defined by struct spi_ops_s (see include/nuttx/spi.h).
+ *
+ * Input Parameters:
+ *
+ *   spi - SPI device that controls the bus the device that requires the CMD/
+ *         DATA selection.
+ *   devid - If there are multiple devices on the bus, this selects which one
+ *         to select cmd or data.  NOTE:  This design restricts, for example,
+ *         one one SPI display per SPI bus.
+ *   cmd - true: select command; false: select data
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+
+int stm32_ssp1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
+{
+  if (devid == SPIDEV_DISPLAY)
+    {
+      /* Set GPIO to 1 for data, 0 for command */
+
+      (void)stm32_gpiowrite(STM32_OLED_A0, !cmd);
+      return OK;
+    }
+
+  return -ENODEV;
+}

nuttx/drivers/lcd/ug-2864ambag01.c

@@ -324,18 +324,6 @@ static void ug2864ambag01_lock(FAR struct spi_dev_s *spi);
 static void ug2864ambag01_unlock(FAR struct spi_dev_s *spi);
 #endif
 
-/* Buffer Management */
-
-static int ug2864ambag01_readdisplay(FAR struct ug2864ambag01_dev_s *priv,
-                                     fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
-                                     size_t npixels);
-static int ug2864ambag01_putbuffer(FAR struct ug2864ambag01_dev_s *priv,
-                                   fb_coord_t row, fb_coord_t col,
-                                   FAR const uint8_t *buffer, size_t npixels);
-static int ug2864ambag01_getbuffer(FAR struct ug2864ambag01_dev_s *priv,
-                                   fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
-                                   size_t npixels);
-
 /* LCD Data Transfer Methods */
 
 static int ug2864ambag01_putrun(fb_coord_t row, fb_coord_t col,
@@ -1115,7 +1103,6 @@ void ug2864ambag01_fill(FAR struct lcd_dev_s *dev, uint8_t color)
 {
   FAR struct ug2864ambag01_dev_s  *priv = &g_oleddev;
   unsigned int page;
-  unsigned int col;
 
   /* Make an 8-bit version of the selected color */
 

nuttx/include/nuttx/lcd/ug-2864ambag01.h

@@ -47,8 +47,16 @@
  * Included Files
  **************************************************************************************/
 
+#include <nuttx/config.h>
+
 #include <stdbool.h>
 
+#include <nuttx/arch.h>
+
+#include "stm32_gpio.h"
+
+#ifdef CONFIG_LCD_UG2864AMBAG01
+
 /**************************************************************************************
  * Pre-processor Definitions
  **************************************************************************************/
@@ -214,8 +222,8 @@ extern "C"
  *
  **************************************************************************************/
 
-struct lcd_dev_s; /* See nuttx/lcd.h */
+struct lcd_dev_s; /* See include/nuttx/lcd/lcd.h */
-struct spi_dev_s; /* See nuttx/spi.h */
+struct spi_dev_s; /* See include/nuttx/spi.h */
 FAR struct lcd_dev_s *ug2864ambag01_initialize(FAR struct spi_dev_s *spi,
                                                unsigned int devno);
 
@@ -240,4 +248,5 @@ void ug2864ambag01_fill(FAR struct lcd_dev_s *dev, uint8_t color);
 }
 #endif
 
+#endif /* CONFIG_LCD_UG2864AMBAG01 */
 #endif /* __INCLUDE_NUTTX_UG_8264AMBAG01_H */