From 74e4ec91b6c4052eb381261befc4b0fd86674ca6 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 30 Nov 2014 14:06:05 -0600 Subject: [PATCH] Let's get consistent with spelling: Use the US spelling of traveler with one 'l' --- graphics/Kconfig | 8 ++--- graphics/Make.defs | 2 +- graphics/Makefile | 2 +- graphics/{traveller => traveler}/.gitignore | 0 graphics/{traveller => traveler}/Kconfig | 0 graphics/{traveller => traveler}/Makefile | 6 ++-- .../include/trv_bitmaps.h | 8 ++--- .../include/trv_color.h | 8 ++--- .../include/trv_debug.h | 30 +++++++++---------- .../include/trv_doors.h | 8 ++--- .../include/trv_graphics.h | 8 ++--- .../include/trv_input.h | 8 ++--- .../include/trv_main.h | 8 ++--- .../{traveller => traveler}/include/trv_pov.h | 8 ++--- .../include/trv_raycntl.h | 8 ++--- .../include/trv_rayrend.h | 8 ++--- .../include/trv_types.h | 8 ++--- .../include/trv_world.h | 8 ++--- .../{traveller => traveler}/src/trv_main.c | 4 +-- 19 files changed, 70 insertions(+), 70 deletions(-) rename graphics/{traveller => traveler}/.gitignore (100%) rename graphics/{traveller => traveler}/Kconfig (100%) rename graphics/{traveller => traveler}/Makefile (97%) rename graphics/{traveller => traveler}/include/trv_bitmaps.h (91%) rename graphics/{traveller => traveler}/include/trv_color.h (93%) rename graphics/{traveller => traveler}/include/trv_debug.h (81%) rename graphics/{traveller => traveler}/include/trv_doors.h (91%) rename graphics/{traveller => traveler}/include/trv_graphics.h (93%) rename graphics/{traveller => traveler}/include/trv_input.h (91%) rename graphics/{traveller => traveler}/include/trv_main.h (92%) rename graphics/{traveller => traveler}/include/trv_pov.h (92%) rename graphics/{traveller => traveler}/include/trv_raycntl.h (92%) rename graphics/{traveller => traveler}/include/trv_rayrend.h (92%) rename graphics/{traveller => traveler}/include/trv_types.h (92%) rename graphics/{traveller => traveler}/include/trv_world.h (92%) rename graphics/{traveller => traveler}/src/trv_main.c (99%) diff --git a/graphics/Kconfig b/graphics/Kconfig index 55002bcc1..74f084956 100644 --- a/graphics/Kconfig +++ b/graphics/Kconfig @@ -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 diff --git a/graphics/Make.defs b/graphics/Make.defs index 3376e941a..987c387b6 100644 --- a/graphics/Make.defs +++ b/graphics/Make.defs @@ -43,5 +43,5 @@ CONFIGURED_APPS += graphics/screenshot endif ifeq ($(CONFIG_GRAPHICS_TRAVELER),y) -CONFIGURED_APPS += graphics/traveller +CONFIGURED_APPS += graphics/traveler endif diff --git a/graphics/Makefile b/graphics/Makefile index 551e21472..7f33fe2a4 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -37,7 +37,7 @@ # Sub-directories -SUBDIRS = tiff screenshot traveller +SUBDIRS = tiff screenshot traveler # Sub-directories that might need context setup diff --git a/graphics/traveller/.gitignore b/graphics/traveler/.gitignore similarity index 100% rename from graphics/traveller/.gitignore rename to graphics/traveler/.gitignore diff --git a/graphics/traveller/Kconfig b/graphics/traveler/Kconfig similarity index 100% rename from graphics/traveller/Kconfig rename to graphics/traveler/Kconfig diff --git a/graphics/traveller/Makefile b/graphics/traveler/Makefile similarity index 97% rename from graphics/traveller/Makefile rename to graphics/traveler/Makefile index 7a11a7b21..75d48566f 100644 --- a/graphics/traveller/Makefile +++ b/graphics/traveler/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/graphics/traveller/Makefile +# apps/graphics/traveler/Makefile # # Copyright (C) 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -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 diff --git a/graphics/traveller/include/trv_bitmaps.h b/graphics/traveler/include/trv_bitmaps.h similarity index 91% rename from graphics/traveller/include/trv_bitmaps.h rename to graphics/traveler/include/trv_bitmaps.h index 43e6c84ea..82df0c145 100644 --- a/graphics/traveller/include/trv_bitmaps.h +++ b/graphics/traveler/include/trv_bitmaps.h @@ -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 @@ -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 */ diff --git a/graphics/traveller/include/trv_color.h b/graphics/traveler/include/trv_color.h similarity index 93% rename from graphics/traveller/include/trv_color.h rename to graphics/traveler/include/trv_color.h index 3f11b4148..04e9d1523 100644 --- a/graphics/traveller/include/trv_color.h +++ b/graphics/traveler/include/trv_color.h @@ -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 @@ -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 */ diff --git a/graphics/traveller/include/trv_debug.h b/graphics/traveler/include/trv_debug.h similarity index 81% rename from graphics/traveller/include/trv_debug.h rename to graphics/traveler/include/trv_debug.h index e0912f4fe..d54b1eb13 100644 --- a/graphics/traveller/include/trv_debug.h +++ b/graphics/traveler/include/trv_debug.h @@ -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 @@ -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 */ diff --git a/graphics/traveller/include/trv_doors.h b/graphics/traveler/include/trv_doors.h similarity index 91% rename from graphics/traveller/include/trv_doors.h rename to graphics/traveler/include/trv_doors.h index 44ab7e18c..9179e2979 100644 --- a/graphics/traveller/include/trv_doors.h +++ b/graphics/traveler/include/trv_doors.h @@ -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 @@ -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 */ diff --git a/graphics/traveller/include/trv_graphics.h b/graphics/traveler/include/trv_graphics.h similarity index 93% rename from graphics/traveller/include/trv_graphics.h rename to graphics/traveler/include/trv_graphics.h index d63557b1b..5364c8bc7 100644 --- a/graphics/traveller/include/trv_graphics.h +++ b/graphics/traveler/include/trv_graphics.h @@ -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 @@ -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 */ diff --git a/graphics/traveller/include/trv_input.h b/graphics/traveler/include/trv_input.h similarity index 91% rename from graphics/traveller/include/trv_input.h rename to graphics/traveler/include/trv_input.h index beeeb8179..b4b4cf442 100644 --- a/graphics/traveller/include/trv_input.h +++ b/graphics/traveler/include/trv_input.h @@ -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 @@ -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 */ diff --git a/graphics/traveller/include/trv_main.h b/graphics/traveler/include/trv_main.h similarity index 92% rename from graphics/traveller/include/trv_main.h rename to graphics/traveler/include/trv_main.h index 9d53c3ad5..08d16ef2b 100644 --- a/graphics/traveller/include/trv_main.h +++ b/graphics/traveler/include/trv_main.h @@ -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 @@ -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 */ diff --git a/graphics/traveller/include/trv_pov.h b/graphics/traveler/include/trv_pov.h similarity index 92% rename from graphics/traveller/include/trv_pov.h rename to graphics/traveler/include/trv_pov.h index 986480e11..2edc5b7a2 100644 --- a/graphics/traveller/include/trv_pov.h +++ b/graphics/traveler/include/trv_pov.h @@ -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 @@ -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 */ diff --git a/graphics/traveller/include/trv_raycntl.h b/graphics/traveler/include/trv_raycntl.h similarity index 92% rename from graphics/traveller/include/trv_raycntl.h rename to graphics/traveler/include/trv_raycntl.h index a843cd2c8..01cbed191 100644 --- a/graphics/traveller/include/trv_raycntl.h +++ b/graphics/traveler/include/trv_raycntl.h @@ -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 @@ -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 */ diff --git a/graphics/traveller/include/trv_rayrend.h b/graphics/traveler/include/trv_rayrend.h similarity index 92% rename from graphics/traveller/include/trv_rayrend.h rename to graphics/traveler/include/trv_rayrend.h index 3773a977c..189e17e46 100644 --- a/graphics/traveller/include/trv_rayrend.h +++ b/graphics/traveler/include/trv_rayrend.h @@ -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 @@ -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 */ diff --git a/graphics/traveller/include/trv_types.h b/graphics/traveler/include/trv_types.h similarity index 92% rename from graphics/traveller/include/trv_types.h rename to graphics/traveler/include/trv_types.h index 83ee29dd4..6fbf61071 100644 --- a/graphics/traveller/include/trv_types.h +++ b/graphics/traveler/include/trv_types.h @@ -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 @@ -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 */ diff --git a/graphics/traveller/include/trv_world.h b/graphics/traveler/include/trv_world.h similarity index 92% rename from graphics/traveller/include/trv_world.h rename to graphics/traveler/include/trv_world.h index 5e06fc9a7..b590e2f87 100644 --- a/graphics/traveller/include/trv_world.h +++ b/graphics/traveler/include/trv_world.h @@ -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 @@ -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 */ diff --git a/graphics/traveller/src/trv_main.c b/graphics/traveler/src/trv_main.c similarity index 99% rename from graphics/traveller/src/trv_main.c rename to graphics/traveler/src/trv_main.c index 6e4339f84..6f74055ba 100755 --- a/graphics/traveller/src/trv_main.c +++ b/graphics/traveler/src/trv_main.c @@ -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