From f42fdde5c560b331a36f16d5166be59c0af99b61 Mon Sep 17 00:00:00 2001 From: patacongo Date: Thu, 29 Sep 2011 16:25:21 +0000 Subject: [PATCH] Add a simple touchscreen test git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3995 42af7a65-404d-4744-a932-0658087f49c3 --- ChangeLog.txt | 2 + examples/Makefile | 5 +- examples/README.txt | 37 +++++- examples/touchscreen/Makefile | 105 +++++++++++++++++ examples/touchscreen/tc.h | 132 ++++++++++++++++++++++ examples/touchscreen/tc_main.c | 199 +++++++++++++++++++++++++++++++++ 6 files changed, 478 insertions(+), 2 deletions(-) create mode 100644 examples/touchscreen/Makefile create mode 100644 examples/touchscreen/tc.h create mode 100644 examples/touchscreen/tc_main.c diff --git a/ChangeLog.txt b/ChangeLog.txt index 5dad355a7..0a362e849 100755 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -118,3 +118,5 @@ * apps/examples/usbterm: A USB terminal example.. more of a USB chat or serial bridge: Data received on local console echoed via USB serial; data received on USB serial is echoed on the local console. + * apps/examples/touchscreen: Add a simple, generic test for any + touschscreen driver. diff --git a/examples/Makefile b/examples/Makefile index 48e450bd5..e0af2bfc7 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -40,7 +40,7 @@ SUBDIRS = buttons dhcpd ftpc hello helloxx hidkbd igmp lcdrw mm mount \ nettest nsh null nx nxffs nxflat nxhello nximage nxlines \ nxtext ostest pashello pipe poll rgmp romfs sendmail serloop \ - thttpd tiff udp uip usbserial usbstorage usbterm wget wlan + thttpd tiff touchscreen udp uip usbserial usbstorage usbterm wget wlan # Sub-directories that might need context setup @@ -67,6 +67,9 @@ endif ifeq ($(CONFIG_EXAMPLES_TIFF_BUILTIN),y) CNTXTDIRS += tiff endif +ifeq ($(CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN),y) +CNTXTDIRS += touchscreen +endif ifeq ($(CONFIG_EXAMPLES_USBSTRG_BUILTIN),y) CNTXTDIRS += usbstorage endif diff --git a/examples/README.txt b/examples/README.txt index ca58fbb27..fbd770309 100644 --- a/examples/README.txt +++ b/examples/README.txt @@ -758,11 +758,46 @@ examples/tiff will be used in the file creation. Defaults are "/tmp/tmpfile1.dat" and "/tmp/tmpfile2.dat" - The following must also be defined in your appconfig file: + The following must also be defined in your apps/ configuration file: CONFIGURED_APPS += examples/tiff CONFIGURED_APPS += graphics/tiff +examples/touchscreen +^^^^^^^^^^^^^^^^^^^^ + + This configuration implements a simple touchscreen test at + apps/examples/touchscreen. This test will create an empty X11 window + and will print the touchscreen output as it is received from the + simulated touchscreen driver. + + CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN - Build the touchscreen test as + an NSH built-in function. Default: Built as a standalone problem + CONFIG_EXAMPLES_TOUCHSCREEN_MINOR - The minor device number. Minor=N + correspnds to touchscreen device /dev/input0. Note this value must + with CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH. Default 0. + CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH - The path to the touchscreen + device. This must be consistent with CONFIG_EXAMPLES_TOUCHSCREEN_MINOR. + Default: "/dev/input0" + + The following additional configurations must be set in the NuttX + configuration file: + + CONFIG_INPUTP=y + (Plus any touchscreen-specific settings). + + The following must also be defined in your apps configuration file: + + CONFIGURED_APPS += examples/tiff + CONFIGURED_APPS += graphics/tiff + + The board-specific logic must provide the following interfaces that will + be called by the example in order to initialize and uninitialize the + touchscreen hardware: + + int arch_tcinitialize(int minor); + int arch_tcuninitialize(void); + examples/udp ^^^^^^^^^^^^ diff --git a/examples/touchscreen/Makefile b/examples/touchscreen/Makefile new file mode 100644 index 000000000..264a54916 --- /dev/null +++ b/examples/touchscreen/Makefile @@ -0,0 +1,105 @@ +############################################################################ +# apps/examples/touchscreen/Makefile +# +# Copyright (C) 2011 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# 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. +# +############################################################################ + +-include $(TOPDIR)/.config +-include $(TOPDIR)/Make.defs +include $(APPDIR)/Make.defs + +# NuttX NX Graphics Example. + +ASRCS = +CSRCS = tc_main.c + +AOBJS = $(ASRCS:.S=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) + +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) + +ifeq ($(WINTOOL),y) + BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}" +else + BIN = "$(APPDIR)/libapps$(LIBEXT)" +endif + +ROOTDEPPATH = --dep-path . + +# NXHELLO built-in application info + +APPNAME = tc +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 + +# Common build + +VPATH = + +all: .built +.PHONY: context clean depend distclean + +$(AOBJS): %$(OBJEXT): %.S + $(call ASSEMBLE, $<, $@) + +$(COBJS): %$(OBJEXT): %.c + $(call COMPILE, $<, $@) + +.built: $(OBJS) + @( for obj in $(OBJS) ; do \ + $(call ARCHIVE, $(BIN), $${obj}); \ + done ; ) + @touch .built + +.context: +ifeq ($(CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN),y) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + @touch $@ +endif + +context: .context + +.depend: Makefile $(SRCS) + @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ + +depend: .depend + +clean: + @rm -f *.o *~ .*.swp .built + $(call CLEAN) + +distclean: clean + @rm -f Make.dep .depend + +-include Make.dep diff --git a/examples/touchscreen/tc.h b/examples/touchscreen/tc.h new file mode 100644 index 000000000..d431c9a5b --- /dev/null +++ b/examples/touchscreen/tc.h @@ -0,0 +1,132 @@ +/**************************************************************************** + * examples/touchscreen/tc.h + * + * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * 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. + * + ****************************************************************************/ + +#ifndef __APPS_EXAMPLES_TOUCHSCREEN_TC_H +#define __APPS_EXAMPLES_TOUCHSCREEN_TC_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + + +/**************************************************************************** + * Definitions + ****************************************************************************/ +/* Configuration ************************************************************/ +/* CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN - Build the touchscreen test as + * an NSH built-in function. Default: Built as a standalone problem + * CONFIG_EXAMPLES_TOUCHSCREEN_MINOR - The minor device number. Minor=N + * correspnds to touchscreen device /dev/input0. Note this value must + * with CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH. Default 0. + * CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH - The path to the touchscreen + * device. This must be consistent with CONFIG_EXAMPLES_TOUCHSCREEN_MINOR. + * Default: "/dev/input0" + */ + +#ifndef CONFIG_INPUT +# error "Input device support is not enabled (CONFIG_INPUT)" +#endif + +#ifndef CONFIG_EXAMPLES_TOUCHSCREEN_MINOR +# undef CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH +# define CONFIG_EXAMPLES_TOUCHSCREEN_MINOR 0 +# define CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH "/dev/input0" +#endif + +#ifndef CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH +# undef CONFIG_EXAMPLES_TOUCHSCREEN_MINOR +# define CONFIG_EXAMPLES_TOUCHSCREEN_MINOR 0 +# define CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH "/dev/input0" +#endif + +/* Debug ********************************************************************/ + +#ifdef CONFIG_CPP_HAVE_VARARGS +# ifdef CONFIG_DEBUG +# define message(...) lib_rawprintf(__VA_ARGS__) +# define msgflush() +# else +# define message(...) printf(__VA_ARGS__) +# define msgflush() fflush(stdout) +# endif +#else +# ifdef CONFIG_DEBUG +# define message lib_rawprintf +# define msgflush() +# else +# define message printf +# define msgflush() fflush(stdout) +# endif +#endif + +/**************************************************************************** + * Public Types + ****************************************************************************/ + +/**************************************************************************** + * Public Variables + ****************************************************************************/ + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +/**************************************************************************** + * Name: arch_tcinitialize() + * + * Description: + * Perform architecuture-specific initialization of the touchscreen + * hardware. This interface must be provided by all configurations + * using apps/examples/touchscreen + * + ****************************************************************************/ + +int arch_tcinitialize(int minor); + +/**************************************************************************** + * Name: arch_tcuninitialize() + * + * Description: + * Perform architecuture-specific un-initialization of the touchscreen + * hardware. This interface must be provided by all configurations + * using apps/examples/touchscreen + * + ****************************************************************************/ + +void arch_tcuninitialize(void); + +#endif /* __APPS_EXAMPLES_TOUCHSCREEN_TC_H */ diff --git a/examples/touchscreen/tc_main.c b/examples/touchscreen/tc_main.c new file mode 100644 index 000000000..7547ee489 --- /dev/null +++ b/examples/touchscreen/tc_main.c @@ -0,0 +1,199 @@ +/**************************************************************************** + * examples/touchscreen/tc_main.c + * + * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * 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 + +#include + +#include +#include +#include +#include +#include + +#include + +#include "tc.h" + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Types + ****************************************************************************/ + +/**************************************************************************** + * Private Function Prototypes + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: user_start/nxhello_main + ****************************************************************************/ + +#ifdef CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN +# define MAIN_NAME tc_main +# define MAIN_STRING "tc_main: " +#else +# define MAIN_NAME user_start +# define MAIN_STRING "user_start: " +#endif + +int MAIN_NAME(int argc, char *argv[]) +{ + struct touch_sample_s sample; + ssize_t nbytes; +#ifdef CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN + long nsamples; +#endif + int fd; + int errval = 0; + int ret; + + /* If this example is configured as an NX add-on, then limit the number of + * samples that we collect before returning. Otherwise, we never return + */ + +#ifdef CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN + nsamples = 1; + if (argc > 1) + { + nsamples = strtol(argv[1]); + } +#endif + + /* Initialization of the touchscreen hardware is performed by logic + * external to this test. + */ + + message(MAIN_STRING "Initializing external touschscreen device\n"); + ret = arch_tcinitialize(CONFIG_EXAMPLES_TOUCHSCREEN_MINOR); + if (ret != OK) + { + message(MAIN_STRING "arch_tcinitialize failed: %d\n", ret); + errval = 1; + goto errout; + } + + /* Open the framebuffer device for reading */ + + fd = open(CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH, O_RDONLY); + if (fd < 0) + { + message(MAIN_STRING "open %s failed: %d\n", + CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH, errno); + errval = 2; + goto errout_with_tc; + } + + /* Now loop the appropriate number of times, displaying the collected + * touchscreen samples. + */ + +#ifdef CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN + for (; namples > 0; nsamples--) +#else + for (;;) +#endif + { + /* Read one sample */ + + nbytes = read(fd, &sample, sizeof(struct touch_sample_s)); + + /* Handle unexpected return values */ + + if (nbytes < 0) + { + errval = errno; + if (errval != EINTR) + { + message(MAIN_STRING "read %s failed: %d\n", + CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH, errval); + errval = 3; + goto errout_with_dev; + } + + message(MAIN_STRING "Interrupted read...\n"); + } + else if (nbytes != sizeof(struct touch_sample_s)) + { + message(MAIN_STRING "Unexpected read size=%d, expected=%d, Ignoring\n", + nbytes, sizeof(struct touch_sample_s)); + } + + /* Print the sample data on successful return */ + + else + { + message("Sample :\n"); + message(" npoints : %d\n", sample.npoints); + message("Point 1 :\n"); + message(" id : %d\n", sample.point[1].id); + message(" flags : %02x\n", sample.point[1].flags); + message(" x : %d\n", sample.point[1].x); + message(" y : %d\n", sample.point[1].y); + message(" h : %d\n", sample.point[1].h); + message(" w : %d\n", sample.point[1].w); + message(" pressure : %d\n", sample.point[1].pressure); + } + } + +errout_with_dev: + close(fd); +errout_with_tc: + arch_tcuninitialize(); +errout: + return errval; +}