Add STMPE11 temperature sensor logic

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4704 7fd9a85b-ad96-42d3-883c-3090e2eb8679

5 files changed, 238 insertions, 3 deletions

diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html
index e59308b7c5..23c4126790 100644
--- a/nuttx/Documentation/NuttxPortingGuide.html
+++ b/nuttx/Documentation/NuttxPortingGuide.html
@@ -4711,7 +4711,7 @@ build
     functionality is disabled).
   </li>
   <li>
-    <code>CONFIG_STMPE11_TS_DISABLE</code>:
+    <code>CONFIG_STMPE11_TEMP_DISABLE</code>:
     Disable driver temperature sensor functionlaity.
   </li>
 </ul>
diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt
index 6f91944b7e..2cffc07508 100644
--- a/nuttx/configs/README.txt
+++ b/nuttx/configs/README.txt
@@ -804,7 +804,7 @@ defconfig -- This is a configuration file similar to the Linux
     CONFIG_STMPE11_GPIOINT_DISABLE
       Disable driver GPIO interrupt functionlality (ignored if GPIO
       functionality is disabled).
-    CONFIG_STMPE11_TS_DISABLE
+    CONFIG_STMPE11_TEMP_DISABLE
       Disable driver temperature sensor functionlaity.
 
   Analog Devices
diff --git a/nuttx/drivers/input/Make.defs b/nuttx/drivers/input/Make.defs
index c8d24649b9..c7c715b709 100644
--- a/nuttx/drivers/input/Make.defs
+++ b/nuttx/drivers/input/Make.defs
@@ -58,6 +58,9 @@ endif
 ifneq ($(CONFIG_INPUT_STMPE11_ADC_DISABLE),y)
   CSRCS += stmpe11_adc.c
 endif
+ifneq ($(CONFIG_INPUT_STMPE11_TEMP_DISABLE),y)
+  CSRCS += stmpe11_temp.c
+endif
 endif
 
 # Include input device driver build support
diff --git a/nuttx/drivers/input/stmpe11_temp.c b/nuttx/drivers/input/stmpe11_temp.c
new file mode 100644
index 0000000000..8c7406761b
--- /dev/null
+++ b/nuttx/drivers/input/stmpe11_temp.c
@@ -0,0 +1,174 @@
+/****************************************************************************
+ * drivers/input/stmpe11_temp.c
+ *
+ *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * References:
+ *   "STMPE811 S-Touch® advanced resistive touchscreen controller with 8-bit
+ *    GPIO expander," Doc ID 14489 Rev 6, CD00186725, STMicroelectronics"
+ *
+ * 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 <assert.h>
+#include <errno.h>
+#include <debug.h>
+
+#include <nuttx/input/stmpe11.h>
+
+#include "stmpe11.h"
+
+#if defined(CONFIG_INPUT) && defined(CONFIG_INPUT_STMPE11) && !defined(CONFIG_STMPE11_TEMP_DISABLE)
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stmpe11_tempinitialize
+ *
+ * Description:
+ *  Configure the temperature sensor.
+ *
+ * Input Parameters:
+ *   handle    - The handle previously returned by stmpe11_instantiate
+ *
+ * Returned Value:
+ *   Zero is returned on success.  Otherwise, a negated errno value is
+ *   returned to indicate the nature of the failure.
+ *
+ ****************************************************************************/
+
+int stmpe11_tempinitialize(STMPE11_HANDLE handle)
+{
+  FAR struct stmpe11_dev_s *priv = (FAR struct stmpe11_dev_s *)handle;
+  uint8_t regval;
+
+  /* Enable clocking for ADC and the temperature sensor */
+
+  regval = stmpe11_getreg8(priv, STMPE11_SYS_CTRL2);
+  regval &= ~(SYS_CTRL2_TS_OFF | SYS_CTRL2_ADC_OFF);
+  stmpe11_putreg8(priv, STMPE11_SYS_CTRL2, regval);
+
+  /* Enable the temperature sensor */
+
+  stmpe11_putreg8(priv, STMPE11_TEMP_CTRL, TEMP_CTRL_ENABLE);
+  
+  /* Aquire data enable */
+
+  stmpe11_putreg8(priv, STMPE11_TEMP_CTRL, (TEMP_CTRL_ACQ|TEMP_CTRL_ENABLE));
+  
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stmpe11_tempread
+ *
+ * Description:
+ *  Configure the temperature sensor.
+ *
+ * Input Parameters:
+ *   handle    - The handle previously returned by stmpe11_instantiate
+ *
+ * Returned Value:
+ *   Zero is returned on success.  Otherwise, a negated errno value is
+ *   returned to indicate the nature of the failure.
+ *
+ ****************************************************************************/
+
+uint16_t stmpe11_tempread(STMPE11_HANDLE handle)
+{
+  FAR struct stmpe11_dev_s *priv = (FAR struct stmpe11_dev_s *)handle;
+  uint32_t temp = 0;  
+  uint8_t  temp1;
+  uint8_t  temp2;
+    
+  /* Acquire data enable */
+
+  stmpe11_putreg8(priv, STMPE11_TEMP_CTRL, (TEMP_CTRL_ACQ|TEMP_CTRL_ENABLE));
+  
+  /* Read the tempreature */
+
+  temp1 = stmpe11_getreg8(priv, STMPE11_SYS_CTRL2);
+  temp2 = stmpe11_getreg8(priv, STMPE11_SYS_CTRL2+1);
+
+  /* Scale the tempreature */
+
+  temp = ((uint32_t)(temp1 & 3) << 8) | temp2;
+  temp = (uint32_t)((33 * temp * 100) / 751);
+  temp = (uint32_t)((temp + 5) / 10);
+
+  return (uint16_t)temp;
+}
+
+/****************************************************************************
+ * Name: stmpe11_tempinterrupt
+ *
+ * Description:
+ *  Configure the temperature sensor to sample the temperature periodically.
+ *  Set the temperature threshold to generate an interrupt and notify
+ *  to the client using the provide callback function pointer.
+ *
+ * Input Parameters:
+ *   handle    - The handle previously returned by stmpe11_instantiate
+ *   threshold - The threshold temperature value
+ *   direction - True: Generate an interrupt if the temperate exceeds the
+ *               threshold value; False:  Generate an interrupt if the
+ *               temperature falls below the threshold value.
+ *   callback  - The client callback function that will be called when
+ *               the termperature crosses the threshold.
+ *
+ * Returned Value:
+ *   Zero is returned on success.  Otherwise, a negated errno value is
+ *   returned to indicate the nature of the failure.
+ *
+ ****************************************************************************/
+/* Not implemented */
+
+#endif /* CONFIG_INPUT && CONFIG_INPUT_STMPE11 && !CONFIG_STMPE11_TEMP_DISABLE */
+
diff --git a/nuttx/include/nuttx/input/stmpe11.h b/nuttx/include/nuttx/input/stmpe11.h
index 0ad5cfb11f..bee90abfb7 100644
--- a/nuttx/include/nuttx/input/stmpe11.h
+++ b/nuttx/include/nuttx/input/stmpe11.h
@@ -80,7 +80,7 @@
  * CONFIG_STMPE11_GPIOINT_DISABLE
  *   Disable driver GPIO interrupt functionlality (ignored if GPIO functionality is
  *   disabled).
- * CONFIG_STMPE11_TS_DISABLE
+ * CONFIG_STMPE11_TEMP_DISABLE
  *   Disable driver temperature sensor functionlaity.
  */
 
@@ -693,6 +693,64 @@ EXTERN int stmpe11_adcconfig(STMPE11_HANDLE handle, int pin);
 EXTERN uint16_t stmpe11_adcread(STMPE11_HANDLE handle, int pin);
 #endif
 
+/********************************************************************************************
+ * Name: stmpe11_tempinitialize
+ *
+ * Description:
+ *  Configure the temperature sensor.
+ *
+ * Input Parameters:
+ *   handle    - The handle previously returned by stmpe11_instantiate
+ *
+ * Returned Value:
+ *   Zero is returned on success.  Otherwise, a negated errno value is returned to indicate
+ *   the nature of the failure.
+ *
+ ********************************************************************************************/
+
+EXTERN int stmpe11_tempinitialize(STMPE11_HANDLE handle);
+
+/********************************************************************************************
+ * Name: stmpe11_tempread
+ *
+ * Description:
+ *  Configure the temperature sensor.
+ *
+ * Input Parameters:
+ *   handle    - The handle previously returned by stmpe11_instantiate
+ *
+ * Returned Value:
+ *   Zero is returned on success.  Otherwise, a negated errno value is returned to indicate
+ *   the nature of the failure.
+ *
+ ********************************************************************************************/
+
+EXTERN uint16_t stmpe11_tempread(STMPE11_HANDLE handle);
+
+/********************************************************************************************
+ * Name: stmpe11_tempinterrupt
+ *
+ * Description:
+ *  Configure the temperature sensor to sample the temperature periodically.
+ *  Set the temperature threshold to generate an interrupt and notify
+ *  to the client using the provide callback function pointer.
+ *
+ * Input Parameters:
+ *   handle    - The handle previously returned by stmpe11_instantiate
+ *   threshold - The threshold temperature value
+ *   direction - True: Generate an interrupt if the temperate exceeds the
+ *               threshold value; False:  Generate an interrupt if the
+ *               temperature falls below the threshold value.
+ *   callback  - The client callback function that will be called when
+ *               the termperature crosses the threshold.
+ *
+ * Returned Value:
+ *   Zero is returned on success.  Otherwise, a negated errno value is returned to indicate
+ *   the nature of the failure.
+ *
+ ********************************************************************************************/
+/* Not implemented */
+
 #undef EXTERN
 #ifdef __cplusplus
 }