From 98bb52c4a4b7a48ac508adfb6206368166cc356b Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 28 Nov 2014 15:37:33 -0600 Subject: apps/examples/djoystick: Add a test of the discreate joystick driver --- apps/examples/Kconfig | 1 + apps/examples/Make.defs | 4 + apps/examples/Makefile | 29 +++-- apps/examples/README.txt | 18 +++ apps/examples/djoystick/.gitignore | 11 ++ apps/examples/djoystick/Kconfig | 23 ++++ apps/examples/djoystick/Makefile | 137 ++++++++++++++++++++ apps/examples/djoystick/djoy_main.c | 252 ++++++++++++++++++++++++++++++++++++ 8 files changed, 461 insertions(+), 14 deletions(-) create mode 100644 apps/examples/djoystick/.gitignore create mode 100644 apps/examples/djoystick/Kconfig create mode 100644 apps/examples/djoystick/Makefile create mode 100644 apps/examples/djoystick/djoy_main.c (limited to 'apps/examples') diff --git a/apps/examples/Kconfig b/apps/examples/Kconfig index 81dd38e79..238cc3a63 100644 --- a/apps/examples/Kconfig +++ b/apps/examples/Kconfig @@ -13,6 +13,7 @@ source "$APPSDIR/examples/configdata/Kconfig" source "$APPSDIR/examples/cpuhog/Kconfig" source "$APPSDIR/examples/cxxtest/Kconfig" source "$APPSDIR/examples/dhcpd/Kconfig" +source "$APPSDIR/examples/djoystick/Kconfig" source "$APPSDIR/examples/elf/Kconfig" source "$APPSDIR/examples/ftpc/Kconfig" source "$APPSDIR/examples/ftpd/Kconfig" diff --git a/apps/examples/Make.defs b/apps/examples/Make.defs index d22a56b89..2dda9bf45 100644 --- a/apps/examples/Make.defs +++ b/apps/examples/Make.defs @@ -74,6 +74,10 @@ ifeq ($(CONFIG_EXAMPLES_DHCPD),y) CONFIGURED_APPS += examples/dhcpd endif +ifeq ($(CONFIG_EXAMPLES_DJOYSTICK),y) +CONFIGURED_APPS += examples/djoystick +endif + ifeq ($(CONFIG_EXAMPLES_DISCOVER),y) CONFIGURED_APPS += examples/discover endif diff --git a/apps/examples/Makefile b/apps/examples/Makefile index 3beef72a5..339fbe0cb 100644 --- a/apps/examples/Makefile +++ b/apps/examples/Makefile @@ -37,14 +37,15 @@ # Sub-directories -SUBDIRS = adc bastest bridge buttons can cc3000 cpuhog cxxtest dhcpd discover -SUBDIRS += elf flash_test ftpc ftpd hello helloxx hidkbd igmp i2schar json -SUBDIRS += keypadtest lcdrw mm modbus mount mtdpart mtdrwb netpkt nettest -SUBDIRS += nrf24l01_term nsh null nx nxterm nxffs nxflat nxhello nximage -SUBDIRS += nxlines nxtext ostest pashello pipe poll posix_spawn pwm qencoder -SUBDIRS += random relays rgmp romfs sendmail serialblaster serloop serialrx -SUBDIRS += slcd smart smart_test tcpecho telnetd thttpd tiff touchscreen udp -SUBDIRS += usbserial usbterm watchdog webserver wget wgetjson xmlrpc +SUBDIRS = adc bastest bridge buttons can cc3000 cpuhog cxxtest dhcpd +SUBDIRS += discover djoystick elf flash_test ftpc ftpd hello helloxx hidkbd +SUBDIRS += igmp i2schar json keypadtest lcdrw mm modbus mount mtdpart +SUBDIRS += mtdrwb netpkt nettest nrf24l01_term nsh null nx nxterm nxffs +SUBDIRS += nxflat nxhello nximage nxlines nxtext ostest pashello pipe poll +SUBDIRS += posix_spawn pwm qencoder random relays rgmp romfs sendmail +SUBDIRS += serialblaster serloop serialrx slcd smart smart_test tcpecho +SUBDIRS += telnetd thttpd tiff touchscreen udp usbserial usbterm watchdog +SUBDIRS += webserver wget wgetjson xmlrpc # Sub-directories that might need context setup. Directories may need # context setup for a variety of reasons, but the most common is because @@ -53,12 +54,12 @@ SUBDIRS += usbserial usbterm watchdog webserver wget wgetjson xmlrpc CNTXTDIRS = pwm ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) -CNTXTDIRS += adc bridge can cc3000 cpuhog cxxtest dhcpd discover flash_test ftpd -CNTXTDIRS += hello helloxx i2schar json keypadtestmodbus lcdrw mtdpart mtdrwb -CNTXTDIRS += netpkt nettest nx nxhello nximage nxlines nxtext nrf24l01_term -CNTXTDIRS += ostest random relays qencoder serialblasterslcd serialrx -CNTXTDIRS += smart_test tcpecho telnetd tiff touchscreen usbterm watchdog -CNTXTDIRS += wgetjson +CNTXTDIRS += adc bridge can cc3000 cpuhog cxxtest dhcpd discover djoystick +CNTXTDIRS += flash_test ftpd hello helloxx i2schar json keypadtest modbus +CNTXTDIRS += lcdrw mtdpart mtdrwb netpkt nettest nx nxhello nximage nxlines +CNTXTDIRS += nxtext nrf24l01_term ostest random relays qencoder +CNTXTDIRS += serialblasters lcd serialrx smart_test tcpecho telnetd tiff +CNTXTDIRS += touchscreen usbterm watchdog wgetjson endif all: nothing diff --git a/apps/examples/README.txt b/apps/examples/README.txt index dbb59adde..fa4361609 100644 --- a/apps/examples/README.txt +++ b/apps/examples/README.txt @@ -273,6 +273,24 @@ examples/discover CONFIG_EXAMPLES_DISCOVER_DRIPADDR - Router IP address CONFIG_EXAMPLES_DISCOVER_NETMASK - Network Mask +examples/djoystick +^^^^^^^^^^^^^^^^^^ + + This is a simple test of the discrete joystick driver. See details about + this driver in nuttx/include/nuttx/input/djoystick.h. + + Configuration Pre-requisites: + + CONFIG_DISABLE_SIGNALS - Must *NOT* be selected + CONFIG_DJOYSTICK - The discrete joystick driver + + Example Configuration: + CONFIG_EXAMPLES_DJOYSTICK - Enabled the discrete joystick example + CONFIG_EXAMPLES_DJOYSTICK_DEVNAME - Joystick device name. Default + "/dev/djoy0" + CONFIG_EXAMPLES_DJOYSTICK_SIGNO - Signal used to signal the test + application. Default 13. + examples/elf ^^^^^^^^^^^^ diff --git a/apps/examples/djoystick/.gitignore b/apps/examples/djoystick/.gitignore new file mode 100644 index 000000000..105259c49 --- /dev/null +++ b/apps/examples/djoystick/.gitignore @@ -0,0 +1,11 @@ +/Make.dep +/.context +/.depend +/.built +/*.asm +/*.rel +/*.lst +/*.sym +/*.adb +/*.lib +/*.src diff --git a/apps/examples/djoystick/Kconfig b/apps/examples/djoystick/Kconfig new file mode 100644 index 000000000..aa2955fe3 --- /dev/null +++ b/apps/examples/djoystick/Kconfig @@ -0,0 +1,23 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# + +config EXAMPLES_DJOYSTICK + bool "Discrete joystick example" + default n + depends on DJOYSTICK && !DISABLE_SIGNALS + ---help--- + Enable the discrete joystick example + +if EXAMPLES_DJOYSTICK + +config EXAMPLES_DJOYSTICK_DEVNAME + string "Joystick device name" + default "/dev/djoy0" + +config EXAMPLES_DJOYSTICK_SIGNO + int "Joystick signal" + default 13 + +endif diff --git a/apps/examples/djoystick/Makefile b/apps/examples/djoystick/Makefile new file mode 100644 index 000000000..c1897b3e7 --- /dev/null +++ b/apps/examples/djoystick/Makefile @@ -0,0 +1,137 @@ +############################################################################ +# apps/examples/djoystick/Makefile +# +# Copyright (C) 2014 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 + +# Hello, World! Example + +ASRCS = +CSRCS = +MAINSRC = djoy_main.c + +AOBJS = $(ASRCS:.S=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) +MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) + +SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) +OBJS = $(AOBJS) $(COBJS) + +ifneq ($(CONFIG_BUILD_KERNEL),y) + OBJS += $(MAINOBJ) +endif + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + BIN = ..\..\libapps$(LIBEXT) +else +ifeq ($(WINTOOL),y) + BIN = ..\\..\\libapps$(LIBEXT) +else + BIN = ../../libapps$(LIBEXT) +endif +endif + +ifeq ($(WINTOOL),y) + INSTALL_DIR = "${shell cygpath -w $(BIN_DIR)}" +else + INSTALL_DIR = $(BIN_DIR) +endif + +CONFIG_DJOY_PROGNAME ?= djoy$(EXEEXT) +PROGNAME = $(CONFIG_DJOY_PROGNAME) + +ROOTDEPPATH = --dep-path . + +# Buttons built-in application info + +APPNAME = djoy +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 + +# Common build + +VPATH = + +all: .built +.PHONY: context clean depend distclean + +$(AOBJS): %$(OBJEXT): %.S + $(call ASSEMBLE, $<, $@) + +$(COBJS) $(MAINOBJ): %$(OBJEXT): %.c + $(call COMPILE, $<, $@) + +.built: $(OBJS) + $(call ARCHIVE, $(BIN), $(OBJS)) + @touch .built + +ifeq ($(CONFIG_BUILD_KERNEL),y) +$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) + @echo "LD: $(PROGNAME)" + $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) + $(Q) $(NM) -u $(INSTALL_DIR)$(DELIM)$(PROGNAME) + +install: $(BIN_DIR)$(DELIM)$(PROGNAME) + +else +install: + +endif + +ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat +else +context: +endif + +.depend: Makefile $(SRCS) + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ + +depend: .depend + +clean: + $(call DELFILE, .built) + $(call CLEAN) + +distclean: clean + $(call DELFILE, Make.dep) + $(call DELFILE, .depend) + +-include Make.dep diff --git a/apps/examples/djoystick/djoy_main.c b/apps/examples/djoystick/djoy_main.c new file mode 100644 index 000000000..ee4b83e85 --- /dev/null +++ b/apps/examples/djoystick/djoy_main.c @@ -0,0 +1,252 @@ +/**************************************************************************** + * examplex/djoystick/djoy_main.c + * + * Copyright (C) 2014 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 + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ +/* Configuration ************************************************************/ + +#ifndef CONFIG_DJOYSTICK +# error "CONFIG_DJOYSTICK is not defined in the configuration" +#endif + +#ifndef CONFIG_EXAMPLES_DJOYSTICK_DEVNAME +# define CONFIG_EXAMPLES_DJOYSTICK_DEVNAME "/dev/djoy0" +#endif + +#ifndef CONFIG_EXAMPLES_DJOYSTICK_SIGNO +# define CONFIG_EXAMPLES_DJOYSTICK_SIGNO 13 +#endif + +/* Helpers ******************************************************************/ + +#ifndef MIN +# define MIN(a,b) (a < b ? a : b) +#endif +#ifndef MAX +# define MAX(a,b) (a > b ? a : b) +#endif + +/**************************************************************************** + * Private Function Prototypes + ****************************************************************************/ + +static void show_joystick(djoy_buttonset_t oldset, djoy_buttonset_t newset); + +/**************************************************************************** + * Private Data + ****************************************************************************/ +/* The set of supported joystick discretes */ + +static djoy_buttonset_t g_djoysupported; + +/* Last sampled discrete set */ + +static djoy_buttonset_t g_djoylast; + +/* Joystick discrete names */ + +static const char *g_djoynames[DJOY_NDISCRETES] = +{ + "UP", "DOWN", "LEFT", "RIGHT", "SELECT", "FIRE", "JUMP", "RUN" +}; + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +static void show_joystick(djoy_buttonset_t oldset, djoy_buttonset_t newset) +{ + djoy_buttonset_t chgset = oldset ^ newset; + int i; + + /* Show each discrete state change */ + + for (i = 0; i <= DJOY_NDISCRETES; i++) + { + djoy_buttonset_t mask = (1 << i); + if ((chgset & mask) != 0) + { + FAR const char *state; + + /* Get the discrete state */ + + if ((newset & mask) != 0) + { + state = "selected"; + } + else + { + state = "released"; + } + + printf(" %-6s: %s\n", g_djoynames[i], state); + } + } +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * djoy_main + ****************************************************************************/ + +#ifdef CONFIG_BUILD_KERNEL +int main(int argc, FAR char *argv[]) +#else +int djoy_main(int argc, char *argv[]) +#endif +{ + struct djoy_notify_s notify; + int fd; + int tmp; + int ret; + int err = EXIT_FAILURE; + + /* Open the djoystick device */ + + fd = open(CONFIG_EXAMPLES_DJOYSTICK_DEVNAME, O_RDONLY); + if (fd < 0) + { + fprintf(stderr, "ERROR: Failed to open %s: %d\n", + CONFIG_EXAMPLES_DJOYSTICK_DEVNAME, errno); + return EXIT_FAILURE; + } + + /* Get the set of supported discretes */ + + ret = ioctl(fd, DJOYIOC_SUPPORTED, (unsigned long)((uintptr_t)&tmp)); + if (ret < 0) + { + fprintf(stderr, "ERROR: ioctl(DJOYIOC_SUPPORTED) failed: %d\n", errno); + goto errout_with_fd; + } + + g_djoysupported = (djoy_buttonset_t)tmp; + printf("Supported joystick discretes:\n"); + show_joystick(0, g_djoysupported); + + /* Register to receive a signal on any change in the joystick discretes. */ + + notify.dn_press = g_djoysupported; + notify.dn_release = g_djoysupported; + notify.dn_signo = CONFIG_EXAMPLES_DJOYSTICK_SIGNO; + + ret = ioctl(fd, DJOYIOC_REGISTER, (unsigned long)((uintptr_t)¬ify)); + if (ret < 0) + { + fprintf(stderr, "ERROR: ioctl(DJOYIOC_REGISTER) failed: %d\n", errno); + goto errout_with_fd; + } + + /* Then loop, receiving signals indicating joystick events. If this is an + * NSH builtin application, we will turn as soon as the SELECT button is + * depressed. + */ + +#ifdef CONFIG_NSH_BUILTIN_APPS + while ((g_djoylast & DJOY_BUTTON_SELECT_BIT) == 0) +#else + for (;;) +#endif + { + struct siginfo value; + sigset_t sigset; + djoy_buttonset_t newset; + ssize_t nread; + + /* Wait for a signal */ + + (void)sigemptyset(&sigset); + (void)sigaddset(&sigset, CONFIG_EXAMPLES_DJOYSTICK_SIGNO); + ret = sigwaitinfo(&sigset, &value); + if (ret < 0) + { + fprintf(stderr, "ERROR: sigwaitinfo() failed: %d\n", errno); + goto errout_with_fd; + } + + /* Show the set of joystick discretes accompanying the signal */ + + printf("Signalled set\n"); + newset = (djoy_buttonset_t)value.si_value.sival_int; + show_joystick(g_djoylast, newset); + g_djoylast = newset; + + /* Read the signal set and compare */ + + nread = read(fd, &newset, sizeof(djoy_buttonset_t)); + if (nread < 0) + { + fprintf(stderr, "ERROR: read() failed: %d\n", errno); + goto errout_with_fd; + } + else if (nread != sizeof(djoy_buttonset_t)) + { + fprintf(stderr, "ERROR: read() unexpected size: %ld vs %d\n", + (long)nread, sizeof(djoy_buttonset_t)); + goto errout_with_fd; + } + + /* Show the set of joystick discretes that we just read */ + + printf("Read set\n"); + show_joystick(g_djoylast, newset); + g_djoylast = newset; + } + + err = EXIT_SUCCESS; + +errout_with_fd: + close(fd); + return err; +} -- cgit v1.2.3