Let's get consistent with spelling: Use the US spelling of traveler with one 'l'

This commit is contained in:
Gregory Nutt 2014-11-30 14:06:05 -06:00
parent e1dd2a6221
commit 74e4ec91b6
19 changed files with 70 additions and 70 deletions

View File

@ -18,16 +18,16 @@ endmenu
endif # TIFF
config GRAPHICS_TRAVELER
bool "Traveller game"
bool "Traveler game"
default n
select SYSTEM_INIFILE
---help---
Enable or disable the graphic Traveller game
Enable or disable the graphic Traveler game
if GRAPHICS_TRAVELER
menu "Traveller game"
source "$APPSDIR/graphics/traveller/Kconfig"
menu "Traveler game"
source "$APPSDIR/graphics/traveler/Kconfig"
endmenu
endif # GRAPHICS_TRAVELER

View File

@ -43,5 +43,5 @@ CONFIGURED_APPS += graphics/screenshot
endif
ifeq ($(CONFIG_GRAPHICS_TRAVELER),y)
CONFIGURED_APPS += graphics/traveller
CONFIGURED_APPS += graphics/traveler
endif

View File

@ -37,7 +37,7 @@
# Sub-directories
SUBDIRS = tiff screenshot traveller
SUBDIRS = tiff screenshot traveler
# Sub-directories that might need context setup

View File

@ -1,5 +1,5 @@
############################################################################
# apps/graphics/traveller/Makefile
# apps/graphics/traveler/Makefile
#
# Copyright (C) 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
@ -39,7 +39,7 @@ include $(APPDIR)/Make.defs
# Hello, World! built-in application info
APPNAME = traveller
APPNAME = traveler
PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = 2048
@ -83,7 +83,7 @@ ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/graphics/traveller/include}
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/graphics/traveler/include}
DEPPATH = --dep-path src
VPATH = src

View File

@ -1,5 +1,5 @@
/****************************************************************************
* apps/graphics/traveller/include/trv_bitmaps.h
* apps/graphics/traveler/include/trv_bitmaps.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_BITMAPS_H
#define __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_BITMAPS_H
#ifndef __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_BITMAPS_H
#define __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_BITMAPS_H
/****************************************************************************
* Included Files
@ -54,4 +54,4 @@
* Public Function Prototypes
****************************************************************************/
#endif /* __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_BITMAPS_H */
#endif /* __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_BITMAPS_H */

View File

@ -1,5 +1,5 @@
/****************************************************************************
* apps/graphics/traveller/include/trv_color.h
* apps/graphics/traveler/include/trv_color.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_COLOR_H
#define __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_COLOR_H
#ifndef __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_COLOR_H
#define __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_COLOR_H
/****************************************************************************
* Included Files
@ -76,4 +76,4 @@ trv_pixel_t trv_color_rgb2pixel(FAR struct trv_color_rgb_s *pixel);
void trv_color_pixel2lum(trv_pixel_t pixel, FAR struct trv_color_lum_s *lum);
trv_pixel_t trv_color_lum2pixel(FAR struct trv_color_lum_s *lum);
#endif /* __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_COLOR_H */
#endif /* __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_COLOR_H */

View File

@ -1,5 +1,5 @@
/****************************************************************************
* apps/graphics/traveller/include/trv_debug.h
* apps/graphics/traveler/include/trv_debug.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_DEBUG_H
#define __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_DEBUG_H
#ifndef __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_DEBUG_H
#define __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_DEBUG_H
/****************************************************************************
* Included Files
@ -50,11 +50,11 @@
/* Feature Selection Switches
*
* CONFIG_GRAPHICS_TRAVELLER_DEBUG_LEVEL == 3 turns off sound and video and
* CONFIG_GRAPHICS_TRAVELER_DEBUG_LEVEL == 3 turns off sound and video and
* enables verbose debug messages on stdout.
* CONFIG_GRAPHICS_TRAVELLER_DEBUG_LEVEL == 2 turns off sound and video and
* CONFIG_GRAPHICS_TRAVELER_DEBUG_LEVEL == 2 turns off sound and video and
* enables normal debug output
* CONFIG_GRAPHICS_TRAVELLER_DEBUG_LEVEL == 1 turns off sound and enables
* CONFIG_GRAPHICS_TRAVELER_DEBUG_LEVEL == 1 turns off sound and enables
* normal debug output
* OTHERWISE, all debugging features are disabled.
*/
@ -63,16 +63,16 @@
#define ENABLE_VIDEO 1
#undef TRV_VERBOSE
#ifndef CONFIG_GRAPHICS_TRAVELLER_DEBUG_LEVEL
# define CONFIG_GRAPHICS_TRAVELLER_DEBUG_LEVEL 0
#ielf (CONFIG_GRAPHICS_TRAVELLER_DEBUG_LEVEL == 3)
#ifndef CONFIG_GRAPHICS_TRAVELER_DEBUG_LEVEL
# define CONFIG_GRAPHICS_TRAVELER_DEBUG_LEVEL 0
#ielf (CONFIG_GRAPHICS_TRAVELER_DEBUG_LEVEL == 3)
# undef ENABLE_SOUND
# undef ENABLE_VIDEO
# define TRV_VERBOSE 1
#elif (CONFIG_GRAPHICS_TRAVELLER_DEBUG_LEVEL == 2)
#elif (CONFIG_GRAPHICS_TRAVELER_DEBUG_LEVEL == 2)
# undef ENABLE_SOUND
# undef ENABLE_VIDEO
#elif (CONFIG_GRAPHICS_TRAVELLER_DEBUG_LEVEL == 1)
#elif (CONFIG_GRAPHICS_TRAVELER_DEBUG_LEVEL == 1)
# undef ENABLE_SOUND
#endif
@ -83,7 +83,7 @@
/* Debug output macros */
#ifdef CONFIG_CPP_HAVE_VARARGS
# if (CONFIG_GRAPHICS_TRAVELLER_DEBUG_LEVEL > 0)
# if (CONFIG_GRAPHICS_TRAVELER_DEBUG_LEVEL > 0)
# define trv_debug(format, ...) \
printf(EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
@ -106,7 +106,7 @@
/* Variadic macros NOT supported */
# if (CONFIG_GRAPHICS_TRAVELLER_DEBUG_LEVEL > 0)
# if (CONFIG_GRAPHICS_TRAVELER_DEBUG_LEVEL > 0)
# ifdef TRV_VERBOSE
# define trv_vdebug trv_debug
# else
@ -132,8 +132,8 @@
* arguments, then this additional interface will be built.
*/
#ifndef CONFIG_CPP_HAVE_VARARGS && (CONFIG_GRAPHICS_TRAVELLER_DEBUG_LEVEL > 0)
#ifndef CONFIG_CPP_HAVE_VARARGS && (CONFIG_GRAPHICS_TRAVELER_DEBUG_LEVEL > 0)
int trv_debug(FAR const char *format, ...);
#endif
#endif /* __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_DEBUG_H */
#endif /* __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_DEBUG_H */

View File

@ -1,5 +1,5 @@
/****************************************************************************
* apps/graphics/traveller/include/trv_doors.h
* apps/graphics/traveler/include/trv_doors.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_DOORS_H
#define __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_DOORS_H
#ifndef __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_DOORS_H
#define __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_DOORS_H
/****************************************************************************
* Included Files
@ -49,4 +49,4 @@
void trv_door_initialize(void);
void trv_door_animate(void);
#endif /* __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_DOORS_H */
#endif /* __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_DOORS_H */

View File

@ -1,5 +1,5 @@
/****************************************************************************
* apps/graphics/traveller/include/trv_graphics.h
* apps/graphics/traveler/include/trv_graphics.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_GRAPHICS_H
#define __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_GRAPHICS_H
#ifndef __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_GRAPHICS_H
#define __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_GRAPHICS_H
/****************************************************************************
* Included Files
@ -79,4 +79,4 @@ trv_pixel_t trv_graphics_index2pixel(int index);
void trv_display_update(struct trv_framebuffer_s *fb);
trv_pixel_t *trv_get_renderbuffer(uint16_t width, uint16_t height);
#endif /* __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_GRAPHICS_H */
#endif /* __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_GRAPHICS_H */

View File

@ -1,5 +1,5 @@
/****************************************************************************
* apps/graphics/traveller/include/trv_input.h
* apps/graphics/traveler/include/trv_input.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_INPUT_H
#define __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_INPUT_H
#ifndef __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_INPUT_H
#define __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_INPUT_H
/****************************************************************************
* Included Files
@ -50,4 +50,4 @@ void trv_input_initialize(void);
void trv_input_read(void);
void trv_input_terminate(void);
#endif /* __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_INPUT_H */
#endif /* __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_INPUT_H */

View File

@ -1,5 +1,5 @@
/****************************************************************************
* apps/graphics/traveller/include/trv_main.h
* apps/graphics/traveler/include/trv_main.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_MAIN_H
#define __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_MAIN_H
#ifndef __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_MAIN_H
#define __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_MAIN_H
/****************************************************************************
* Included Files
@ -58,4 +58,4 @@ extern bool g_trv_terminate;
void trv_abort(FAR char *format, ...);
#endif /* __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_MAIN_H */
#endif /* __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_MAIN_H */

View File

@ -1,5 +1,5 @@
/****************************************************************************
* apps/graphics/traveller/include/trv_pov.h
* apps/graphics/traveler/include/trv_pov.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_POV_H
#define __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_POV_H
#ifndef __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_POV_H
#define __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_POV_H
/****************************************************************************
* Included Files
@ -58,4 +58,4 @@ extern struct trv_camera_s g_trv_player;
void trv_pov_reset(void);
void trv_pov_new(void);
#endif /* __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_POV_H */
#endif /* __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_POV_H */

View File

@ -1,5 +1,5 @@
/****************************************************************************
* apps/graphics/traveller/include/trv_raycntl.h
* apps/graphics/traveler/include/trv_raycntl.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_RAYCNTL_H
#define __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_RAYCNTL_H
#ifndef __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_RAYCNTL_H
#define __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_RAYCNTL_H
/****************************************************************************
* Included Files
@ -60,4 +60,4 @@ extern uint8_t *trv_raycaster_initialize(uint16_t screen_width,
FAR uint8_t *screen_buffer);
extern void trv_raycaster(FAR struct trv_camera_s *player);
#endif /* __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_RAYCNTL_H */
#endif /* __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_RAYCNTL_H */

View File

@ -1,5 +1,5 @@
/****************************************************************************
* apps/graphics/traveller/include/trv_rayrend.h
* apps/graphics/traveler/include/trv_rayrend.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_RAYEND_H
#define __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_RAYEND_H
#ifndef __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_RAYEND_H
#define __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_RAYEND_H
/****************************************************************************
* Included Files
@ -57,4 +57,4 @@
void trv_rend_backdrop (struct trv_camera_s *camera);
#endif /* __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_RAYEND_H */
#endif /* __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_RAYEND_H */

View File

@ -1,5 +1,5 @@
/****************************************************************************
* apps/graphics/traveller/include/trv_types.h
* apps/graphics/traveler/include/trv_types.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_TYPES_H
#define __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_TYPES_H
#ifndef __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_TYPES_H
#define __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_TYPES_H
/****************************************************************************
* Included Files
@ -69,4 +69,4 @@ typedef uint8_t trv_pixel_t;
* Public Function Prototypes
****************************************************************************/
#endif /* __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_TYPES_H */
#endif /* __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_TYPES_H */

View File

@ -1,5 +1,5 @@
/****************************************************************************
* apps/graphics/traveller/include/trv_world.h
* apps/graphics/traveler/include/trv_world.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_WORLD_H
#define __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_WORLD_H
#ifndef __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_WORLD_H
#define __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_WORLD_H
/****************************************************************************
* Included Files
@ -66,4 +66,4 @@ struct trv_camera_s
int trv_world_create(FAR const char *mapfile);
void trv_world_destroy(void);
#endif /* __APPS_GRAPHICS_TRAVELLER_INCLUDE_TRV_WORLD_H */
#endif /* __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_WORLD_H */

View File

@ -1,6 +1,6 @@
/****************************************************************************
* apps/graphics/traveller/trv_debug.h
* This file contains the main logic for the NuttX version of Traveller
* apps/graphics/traveler/trv_debug.h
* 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>