diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html index 87383058b1c..f8586682140 100644 --- a/Documentation/NuttX.html +++ b/Documentation/NuttX.html @@ -970,7 +970,7 @@ @@ -2913,7 +2913,7 @@ nuttx-6.18 2012-05-19 Gregory Nutt <gnutt@nuttx.org> position, not an offset. * graphics/nxtk/nxtk_drawframe.c: Framed windows are now drawn in three colors (instead of just two). - * drivers/input/stmpe11_*: Added a driver to support the STMicro STMPE11 + * drivers/input/stmpe811_*: Added a driver to support the STMicro STMPE811 IO Expander and touchscreen driver. * configs/stm3240g-eval/nxwm: Added to configuration for testing the NxWM window manager on the STM3240G-EVAL board. @@ -2925,8 +2925,8 @@ nuttx-6.18 2012-05-19 Gregory Nutt <gnutt@nuttx.org> Then add CONFIG_NX_WRITEONLY which is the more generic way of saying that no NX component should try to read from the underlying graphic device (LCD or other). - * configs/stm3240g-eval/src/up_stmpe11.c: Add board-specific support for the - the STMPE11 I/O expander on the STM3240G-EVAL board. Verfied that the + * configs/stm3240g-eval/src/up_stmpe811.c: Add board-specific support for the + the STMPE811 I/O expander on the STM3240G-EVAL board. Verfied that the STM3240G-EVAL touchscreen is now fully functional. * include/cxx/cfcntl: Added std:: header file. * graphics/nxbe/nxbe_filltrapezoid.c and graphics/nxglib/fb/nxglib_filltrapezoid.c: @@ -2935,14 +2935,14 @@ nuttx-6.18 2012-05-19 Gregory Nutt <gnutt@nuttx.org> * configs/sam3u-ek, configs/sim, arch/sim/src/up_touchscreen.c, and apps/examples/touchscreen: Standardize the board-specific, touchscreen initialization interfaces. - * drivers/input/stmpe11_base.c and configs/stm3240g-eval: The STMPE11-based + * drivers/input/stmpe811_base.c and configs/stm3240g-eval: The STMPE811-based touchscreen seems to work better with edge (vs. level) interrupts - * drivers/input/stmpe11_tsc.c: Fix some status checks so that the touchscreen + * drivers/input/stmpe811_tsc.c: Fix some status checks so that the touchscreen interrupt handling logic does not read data if the fifo is not at the threshold level. * include/nuttx/wqueue.h: Add macro work_available() to determine if the previously scheduled work has completed. - * drivers/stmpe11_tsc.c: Correct errors: (1) Since all interrupt logic is done on + * drivers/stmpe811_tsc.c: Correct errors: (1) Since all interrupt logic is done on the worker thread, disabling interrupts does not provide protected; Need to disable pre-emption. (2) Fix handling of touch ID and (2) add some logic to prevent certain kinds of data overrun. @@ -2951,7 +2951,7 @@ nuttx-6.18 2012-05-19 Gregory Nutt <gnutt@nuttx.org> other logic can use the defaults. * graphics/nxtk/nxtk_events.c: Fixed an important but in the logic that translates the mouse/touchscreen position data for framed windows and toolbars. - * drivers/input/stmpe11_tsc.c, tsc2007.c, and ads7843e.c: Need to keep track of + * drivers/input/stmpe811_tsc.c, tsc2007.c, and ads7843e.c: Need to keep track of when if positional data is valid. When the touch is released, the X/Y position of the release must be the same as the X/Y position of the last touch (se that the release occurs in the same window as the last touch). @@ -2965,7 +2965,7 @@ nuttx-6.18 2012-05-19 Gregory Nutt <gnutt@nuttx.org> window to revert to the previous window. Not good behavior. * sched/sched_mergepending.c: Add task switching instrumentation. There is a case here where instrumentation was missing. Contributed by Petri Tanskanen. - * CONFIG_STMPE11_THRESHX, CONFIG_STMPE11_THRESHX, and drivers/stmpe11_tsc.c: Add some + * CONFIG_STMPE811_THRESHX, CONFIG_STMPE811_THRESHX, and drivers/stmpe811_tsc.c: Add some thresholding controls to all slow down processing of touchscreen samples. This is a problem with NX in multi-user mode: touchscreen data gets sent via a message and when the message queue gets full the sender blocks and @@ -2974,7 +2974,7 @@ nuttx-6.18 2012-05-19 Gregory Nutt <gnutt@nuttx.org> * include/sched.h: Fix a typo (missing semicolon) in prototype of on_exit(); * sched/on_exit.c and include/nuttx/sched.h: Fix some old typos that caused compilation errors when CONFIG_SCHED_ONEXIT is defined. - * configs/stm3240g-eval/nxwm/defconfig: The default NxWM now uses the STMPE11 + * configs/stm3240g-eval/nxwm/defconfig: The default NxWM now uses the STMPE811 touchscreen. * include/cxx/csched: Added * graphic/nxmu/nxmu_sendserver.c, nxmu_sendwindow.c, and nxmu_sendclient.c: diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html index 15019ad102d..18ff07d19c4 100644 --- a/Documentation/NuttxPortingGuide.html +++ b/Documentation/NuttxPortingGuide.html @@ -4673,69 +4673,69 @@ build multiple touchscreens with the same driver.
  • - CONFIG_INPUT_STMPE11: - Enables support for the STMPE11 driver (Needs CONFIG_INPUT) + CONFIG_INPUT_STMPE811: + Enables support for the STMPE811 driver (Needs CONFIG_INPUT)
  • - CONFIG_STMPE11_SPI: + CONFIG_STMPE811_SPI: Enables support for the SPI interface (not currenly supported)
  • - CONFIG_STMPE11_I2C: + CONFIG_STMPE811_I2C: Enables support for the I2C interface
  • - CONFIG_STMPE11_MULTIPLE : - Can be defined to support multiple STMPE11 devices on board. + CONFIG_STMPE811_MULTIPLE : + Can be defined to support multiple STMPE811 devices on board.
  • - CONFIG_STMPE11_ACTIVELOW: + CONFIG_STMPE811_ACTIVELOW: Interrupt is generated by an active low signal (or falling edge).
  • - CONFIG_STMPE11_EDGE: + CONFIG_STMPE811_EDGE: Interrupt is generated on an edge (vs. on the active level)
  • - CONFIG_STMPE11_NPOLLWAITERS: + CONFIG_STMPE811_NPOLLWAITERS: Maximum number of threads that can be waiting on poll() (ignored if CONFIG_DISABLE_POLL is set).
  • - CONFIG_STMPE11_TSC_DISABLE: + CONFIG_STMPE811_TSC_DISABLE: Disable driver touchscreen functionality.
  • - CONFIG_STMPE11_ADC_DISABLE: + CONFIG_STMPE811_ADC_DISABLE: Disable driver ADC functionality.
  • - CONFIG_STMPE11_GPIO_DISABLE: + CONFIG_STMPE811_GPIO_DISABLE: Disable driver GPIO functionlaity.
  • - CONFIG_STMPE11_GPIOINT_DISABLE: + CONFIG_STMPE811_GPIOINT_DISABLE: Disable driver GPIO interrupt functionality (ignored if GPIO functionality is disabled).
  • - CONFIG_STMPE11_SWAPXY: + CONFIG_STMPE811_SWAPXY: Reverse the meaning of X and Y to handle different LCD orientations.
  • - CONFIG_STMPE11_TEMP_DISABLE: + CONFIG_STMPE811_TEMP_DISABLE: Disable driver temperature sensor functionality.
  • - CONFIG_STMPE11_REGDEBUG: + CONFIG_STMPE811_REGDEBUG: Enabled very low register-level debug output. Requires CONFIG_DEBUG.
  • - CONFIG_STMPE11_THRESHX and CONFIG_STMPE11_THRESHY: - STMPE11 touchscreen data comes in a a very high rate. New touch positions + CONFIG_STMPE811_THRESHX and CONFIG_STMPE811_THRESHY: + STMPE811 touchscreen data comes in a a very high rate. New touch positions will only be reported when the X or Y data changes by these thresholds. This trades reduces data rate for some loss in dragging accuracy. The - STMPE11 is configure for 12-bit values so the raw ranges are 0-4095. So + STMPE811 is configure for 12-bit values so the raw ranges are 0-4095. So for example, if your display is 320x240, then THRESHX=13 and THRESHY=17 would correspond to one pixel. Default: 12