sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix typos introduced into NxWM configuration by an earlier check-in today

Browse Source
This commit is contained in:
Gregory Nutt 2013-10-30 17:16:58 -06:00
parent 7a165b1eb9
commit ef56d18271
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Kconfig
View File

@ -741,7 +741,7 @@ config NXWM_TOUCHSCREEN_LISTENERSTACK
---help---
Touchscreen listener thread stack size. Default 1024
config NXWM_TOUSCHCREEN_CONFIGDATA
config NXWM_TOUCHSCREEN_CONFIGDATA
bool "Touchscreen configuration data"
default n
depends on PLATFORM_CONFIGDATA

10
UnitTests/nxwm/nxwm_main.cxx
View File

@ -44,8 +44,8 @@
#include <cstdlib>
#include <cunistd>
#ifdef CONFIG_NXWM_TOUCHCREEN_CONFIGDATA
# include <arch/platform/configdata.h>
#ifdef CONFIG_NXWM_TOUCHSCREEN_CONFIGDATA
# include <apps/platform/configdata.h>
#endif
#include "ctaskbar.hxx"
@ -496,7 +496,7 @@ static bool createCalibration(void)
}
showTestCaseMemory("createCalibration: After creating CCalibration");
#ifdef CONFIG_NXWM_TOUCHCREEN_CONFIGDATA
#ifdef CONFIG_NXWM_TOUCHSCREEN_CONFIGDATA
// Check if we have previously stored calibration data
int ret = platform_getconfig(CONFIGDATA_TSCALIBRATION, 0,
@ -761,7 +761,7 @@ int nxwm_main(int argc, char *argv[])
}
#ifdef CONFIG_NXWM_TOUCHSCREEN
#ifdef CONFIG_NXWM_TOUCHCREEN_CONFIGDATA
#ifdef CONFIG_NXWM_TOUCHSCREEN_CONFIGDATA
// There are two possibilies: (1) We started the calibration earlier and now
// need to obtain the calibration data from the calibration process, or (2)
// We have already obtained stored calibration data in which case, the calibration
@ -794,7 +794,7 @@ int nxwm_main(int argc, char *argv[])
}
else
{
#if 0 // ifdef CONFIG_NXWM_TOUCHCREEN_CONFIGDATA. Done in CCalibration
#if 0 // ifdef CONFIG_NXWM_TOUCHSCREEN_CONFIGDATA. Done in CCalibration
// Save the new calibration data so that we do not have to do this
// again the next time we start up.

6
nxwm/src/ccalibration.cxx
View File

@ -45,8 +45,8 @@
#include <assert.h>
#include <debug.h>
#ifdef CONFIG_NXWM_TOUCHCREEN_CONFIGDATA
# include <arch/platform/configdata.h>
#ifdef CONFIG_NXWM_TOUCHSCREEN_CONFIGDATA
# include <apps/platform/configdata.h>
#endif
#include "nxwmconfig.hxx"
@ -1103,7 +1103,7 @@ void CCalibration::finishCalibration(void)
struct SCalibrationData caldata;
if (createCalibrationData(caldata))
{
#ifdef CONFIG_NXWM_TOUCHCREEN_CONFIGDATA
#ifdef CONFIG_NXWM_TOUCHSCREEN_CONFIGDATA
// Save the new calibration data. The saved calibration
// data may be used to avoided recalibrating in the future.