diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-12-01 19:15:16 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-12-03 16:48:06 -0600 |
commit | 543073e801200b129b6ee011cfb677f10cb3f843 (patch) | |
tree | adaf254a11f3197ed90e4334321d242421dad8b6 /apps/graphics | |
parent | 30f24f48a97a475b7aa7b37e4d09e5b2da3485ec (diff) | |
download | px4-nuttx-543073e801200b129b6ee011cfb677f10cb3f843.tar.gz px4-nuttx-543073e801200b129b6ee011cfb677f10cb3f843.tar.bz2 px4-nuttx-543073e801200b129b6ee011cfb677f10cb3f843.zip |
Add framework for joystick input
Diffstat (limited to 'apps/graphics')
-rw-r--r-- | apps/graphics/traveler/Makefile | 2 | ||||
-rw-r--r-- | apps/graphics/traveler/include/trv_input.h | 43 | ||||
-rw-r--r--[-rwxr-xr-x] | apps/graphics/traveler/src/trv_color.c | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | apps/graphics/traveler/src/trv_graphics.c | 0 | ||||
-rw-r--r-- | apps/graphics/traveler/src/trv_input.c | 110 | ||||
-rw-r--r--[-rwxr-xr-x] | apps/graphics/traveler/src/trv_main.c | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | apps/graphics/traveler/src/trv_mem.c | 0 |
7 files changed, 156 insertions, 3 deletions
diff --git a/apps/graphics/traveler/Makefile b/apps/graphics/traveler/Makefile index c1e115986..71dbabeaf 100644 --- a/apps/graphics/traveler/Makefile +++ b/apps/graphics/traveler/Makefile @@ -46,7 +46,7 @@ STACKSIZE = 2048 # Hello, World! Example ASRCS = -CSRCS = trv_color.c trv_graphics.c trv_mem.c +CSRCS = trv_color.c trv_graphics.c trv_input.c trv_mem.c MAINSRC = trv_main.c ifeq ($(CONFIG_NX),y) diff --git a/apps/graphics/traveler/include/trv_input.h b/apps/graphics/traveler/include/trv_input.h index b4b4cf442..beb3b20a4 100644 --- a/apps/graphics/traveler/include/trv_input.h +++ b/apps/graphics/traveler/include/trv_input.h @@ -43,6 +43,49 @@ #include "trv_types.h" /**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Public Types + ****************************************************************************/ +/* INPUT */ + +enum trv_move_event_e +{ + INPUT_MOVE_NONE = 0, + INPUT_MOVE_FORWARD, + INPUT_MOVE_BACKWARD, + INPUT_MOVE_LEFT, + INPUT_MOVE_RIGHT +}; + +enum trv_turn_event_e +{ + INPUT_TURN_NONE = 0, + INPUT_TURN_UP, + INPUT_TURN_DOWN, + INPUT_TURN_LEFT, + INPUT_TURN_RIGHT, +}; + +enum trv_door_event_e +{ + INPUT_DOOR_NONE = 0, + INPUT_DOOR_OPEN, +}; + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +extern enum trv_move_event_e g_move_event; +extern enum trv_turn_event_e g_turn_event; +extern enum trv_door_event_e g_door_event; +extern trv_coord_t g_trv_move_rate; +extern trv_coord_t g_trv_turn_rate; + +/**************************************************************************** * Public Function Prototypes ****************************************************************************/ diff --git a/apps/graphics/traveler/src/trv_color.c b/apps/graphics/traveler/src/trv_color.c index f7b9b68f1..8760165a3 100755..100644 --- a/apps/graphics/traveler/src/trv_color.c +++ b/apps/graphics/traveler/src/trv_color.c @@ -1,5 +1,5 @@ /******************************************************************************* - * apps/graphics/traveler/src/trv_graphics.c + * apps/graphics/traveler/src/trv_color.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/apps/graphics/traveler/src/trv_graphics.c b/apps/graphics/traveler/src/trv_graphics.c index 02d9b61b9..02d9b61b9 100755..100644 --- a/apps/graphics/traveler/src/trv_graphics.c +++ b/apps/graphics/traveler/src/trv_graphics.c diff --git a/apps/graphics/traveler/src/trv_input.c b/apps/graphics/traveler/src/trv_input.c new file mode 100644 index 000000000..1bc9cbd38 --- /dev/null +++ b/apps/graphics/traveler/src/trv_input.c @@ -0,0 +1,110 @@ +/**************************************************************************** + * apps/graphics/traveler/trv_input.c + * This file contains the main logic for the NuttX version of Traveler + * + * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> + * + * 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 "trv_types.h" +#include "trv_input.h" + +/**************************************************************************** + * Public Data + *************************************************************************/ + +extern enum trv_move_event_e g_move_event; +extern enum trv_turn_event_e g_turn_event; +extern enum trv_door_event_e g_door_event; +extern trv_coord_t g_trv_move_rate; +extern trv_coord_t g_trv_turn_rate; + +/**************************************************************************** + * Private Function Prototypes + ****************************************************************************/ + +/**************************************************************************** + * Private Data + *************************************************************************/ + +static const char g_default_worldfile[] = "transfrm.wld"; +static FAR struct trv_graphics_info_s g_trv_ginfo; + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: trv_input_initialize + * + * Description: + * Initialize the selected input device + * + ****************************************************************************/ + +void trv_input_initialize(void) +{ +#warning Missing Logic +} + +/**************************************************************************** + * Name: trv_input_read + * + * Description: + * Read the next input froom the input device + * + ****************************************************************************/ + +void trv_input_read(void) +{ +#warning Missing Logic +} + +/**************************************************************************** + * Name: trv_input_terminate + * + * Description: + * Terminate input and free resources + * + ****************************************************************************/ + +void trv_input_terminate(void) +{ +#warning Missing Logic +} diff --git a/apps/graphics/traveler/src/trv_main.c b/apps/graphics/traveler/src/trv_main.c index 95c26eaf6..594513a9a 100755..100644 --- a/apps/graphics/traveler/src/trv_main.c +++ b/apps/graphics/traveler/src/trv_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/graphics/traveler/trv_debug.h + * apps/graphics/traveler/trv_main.c * This file contains the main logic for the NuttX version of Traveler * * Copyright (C) 2014 Gregory Nutt. All rights reserved. diff --git a/apps/graphics/traveler/src/trv_mem.c b/apps/graphics/traveler/src/trv_mem.c index 84e85c3d0..84e85c3d0 100755..100644 --- a/apps/graphics/traveler/src/trv_mem.c +++ b/apps/graphics/traveler/src/trv_mem.c |