From 4ddf48475760e7d5b22e391573a940fd604847f8 Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 11 May 2012 22:07:06 +0000 Subject: Fix a few STMPE11 touchscreen and NxWM touchscreen calibration bugs git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4723 42af7a65-404d-4744-a932-0658087f49c3 --- NxWidgets/nxwm/include/ccalibration.hxx | 1 + NxWidgets/nxwm/include/ctouchscreen.hxx | 12 +----------- NxWidgets/nxwm/include/nxwmconfig.hxx | 9 ++++++++- 3 files changed, 10 insertions(+), 12 deletions(-) (limited to 'NxWidgets/nxwm/include') diff --git a/NxWidgets/nxwm/include/ccalibration.hxx b/NxWidgets/nxwm/include/ccalibration.hxx index 42eb56ad2..535a14804 100644 --- a/NxWidgets/nxwm/include/ccalibration.hxx +++ b/NxWidgets/nxwm/include/ccalibration.hxx @@ -133,6 +133,7 @@ namespace NxWM struct nxgl_point_s m_touchPos; /**< This is the last touch position */ bool m_stop; /**< True: We have been asked to stop the calibration */ bool m_touched; /**< True: The screen is touched */ + uint8_t m_touchId; /**< The ID of the touch */ sem_t m_waitSem; /**< Supports wait for calibration data */ struct nxgl_point_s m_calibData[CALIB_DATA_POINTS]; diff --git a/NxWidgets/nxwm/include/ctouchscreen.hxx b/NxWidgets/nxwm/include/ctouchscreen.hxx index c3aa198cb..52433c1de 100644 --- a/NxWidgets/nxwm/include/ctouchscreen.hxx +++ b/NxWidgets/nxwm/include/ctouchscreen.hxx @@ -175,17 +175,7 @@ namespace NxWM * @param data. A reference to the touchscreen data. */ - inline void setCalibrationData(struct SCalibrationData &caldata) - { - // Save a copy of the calibration data - - m_calibData = caldata; - - // Note that we have calibration data. Data will now be scaled and forwarded - // to NX (unless we are still in cpature mode) - - m_calibrated = true; - } + void setCalibrationData(struct SCalibrationData &caldata); /** * Capture raw driver data. This method will capture mode one raw touchscreen diff --git a/NxWidgets/nxwm/include/nxwmconfig.hxx b/NxWidgets/nxwm/include/nxwmconfig.hxx index 4e51cea1d..359f7d095 100644 --- a/NxWidgets/nxwm/include/nxwmconfig.hxx +++ b/NxWidgets/nxwm/include/nxwmconfig.hxx @@ -356,8 +356,11 @@ * CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR * CONFIG_NXWM_CALIBRATION_LINECOLOR - The color of the lines used in the * touchscreen calibration display. Default: MKRGB(0, 0, 128) (dark blue) - * CONFIG_NXWM_CALIBRATION_BACKGROUNDCOLOR - The background color of the + * 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 + * 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 */ @@ -374,6 +377,10 @@ # define CONFIG_NXWM_CALIBRATION_CIRCLECOLOR MKRGB(255, 255, 255) #endif +#ifndef CONFIG_NXWM_CALIBRATION_TOUCHEDCOLOR +# define CONFIG_NXWM_CALIBRATION_TOUCHEDCOLOR MKRGB(255, 255, 96) +#endif + #ifndef CONFIG_NXWM_CALIBRATION_ICON # define CONFIG_NXWM_CALIBRATION_ICON NxWM::g_calibrationBitmap #endif -- cgit v1.2.3