From 1eaaadf509795914ae51319efb2faa41f188146a Mon Sep 17 00:00:00 2001 From: Christian Kroll Date: Mon, 7 Nov 2011 22:35:57 +0000 Subject: [PATCH] Spot the German! --- Makefile-old | 2 +- animations/Makefile | 2 +- animations/config.in | 40 ++++++++++---------- animations/{programm.c => program.c} | 56 ++++++++++++++++------------ animations/{programm.h => program.h} | 6 +-- config.in | 11 +++--- display_loop.c | 14 +++---- profiles/borg-16 | 14 +++---- profiles/borg-andre | 14 +++---- profiles/borg-ls | 14 +++---- simulator/Makefile.osx | 8 ++-- 11 files changed, 96 insertions(+), 85 deletions(-) rename animations/{programm.c => program.c} (73%) rename animations/{programm.h => program.h} (79%) diff --git a/Makefile-old b/Makefile-old index 68d666b..8f39dd6 100644 --- a/Makefile-old +++ b/Makefile-old @@ -1,5 +1,5 @@ -OBJ = borg_hw.o main.o util.o pixel.o programm.o borg_can.o can.o \ +OBJ = borg_hw.o main.o util.o pixel.o program.o borg_can.o can.o \ spi.o scrolltext3.o font_arial8.o joystick.o snake.o \ eeprom_reserve.o persistentCounter.o prng.o matrix.o \ invader_draw.o invader_init.o invader_proc.o invaders2.o \ diff --git a/animations/Makefile b/animations/Makefile index bf57a48..16ee5ca 100644 --- a/animations/Makefile +++ b/animations/Makefile @@ -3,7 +3,7 @@ TOPDIR = .. include $(TOPDIR)/defaults.mk -SRC = programm.c +SRC = program.c ifeq ($(ANIMATION_SNAKE),y) SRC += snake.c diff --git a/animations/config.in b/animations/config.in index f2b48f3..047b84d 100644 --- a/animations/config.in +++ b/animations/config.in @@ -1,29 +1,29 @@ mainmenu_option next_comment comment "Animations" dep_bool "Scrolltext" ANIMATION_SCROLLTEXT $SCROLLTEXT_SUPPORT - bool "Spirale" ANIMATION_SPIRALE + bool "Spiral" ANIMATION_SPIRAL bool "Joern1" ANIMATION_JOERN1 - dep_bool_menu "Snake" ANIMATION_SNAKE $RANDOM_SUPPORT - int "Snake round delay" SNAKE_CYCLE_DELAY 100 - int "Snake termination delay" SNAKE_TERMINATION_DELAY 60 - uint "Snake max length" SNAKE_MAX_LENGTH 64 - int "Snake max apples" SNAKE_MAX_APPLES 10 + dep_bool_menu "Snake" ANIMATION_SNAKE $RANDOM_SUPPORT + int "Snake Round Delay" SNAKE_CYCLE_DELAY 100 + int "Snake Termination Delay" SNAKE_TERMINATION_DELAY 60 + uint "Snake Max Length" SNAKE_MAX_LENGTH 64 + int "Snake Max Apples" SNAKE_MAX_APPLES 10 endmenu - bool "Schachbrett" ANIMATION_SCHACHBRETT + bool "Chessboard" ANIMATION_CHESSBOARD - dep_bool_menu "Feuer" ANIMATION_FEUER $RANDOM_SUPPORT - int "FEUER_S" FEUER_S 30 - int "FEUER_N" FEUER_N 5 - int "FEUER_DIV" FEUER_DIV 44 - int "FEUER_DELAY" FEUER_DELAY 50 - int "Fire number of cycles" FIRE_CYCLES 800 + dep_bool_menu "Fire" ANIMATION_FIRE $RANDOM_SUPPORT + int "FIRE_S" FIRE_S 30 + int "FIRE_N" FIRE_N 5 + int "FIRE_DIV" FIRE_DIV 44 + int "FIRE_DELAY" FIRE_DELAY 50 + int "Fire Number of Cycles" FIRE_CYCLES 800 endmenu - dep_bool_menu "Matrix" ANIMATION_MATRIX $RANDOM_SUPPORT - int "Number of streamers" MATRIX_STREAMER_NUM 30 - int "Run for this number of rounds" MATRIX_CYCLES 500 + dep_bool_menu "Matrix" ANIMATION_MATRIX $RANDOM_SUPPORT + int "Number of Streamers" MATRIX_STREAMER_NUM 30 + int "Run For This Number of Rounds" MATRIX_CYCLES 500 endmenu dep_bool "Random Bright" ANIMATION_RANDOM_BRIGHT $RANDOM_SUPPORT @@ -31,8 +31,8 @@ comment "Animations" dep_bool "Flying Dots" ANIMATION_FLYINGDOTS $RANDOM_SUPPORT dep_bool_menu "Game of Life" ANIMATION_GAMEOFLIFE $RANDOM_SUPPORT - int "Game of Life round delay (ms)" GOL_DELAY 100 - int "Game of Life max rounds" GOL_CYCLES 360 + int "Game of Life Round Delay (ms)" GOL_DELAY 100 + int "Game of Life Max Rounds" GOL_CYCLES 360 endmenu dep_bool "Breakout Demo" ANIMATION_BREAKOUT $GAME_BREAKOUT @@ -40,8 +40,8 @@ comment "Animations" dep_bool "Langton Ant" ANIMATION_LTN_ANT $RANDOM_SUPPORT dep_bool_menu "Time Display" ANIMATION_TIME $SCROLLTEXT_SUPPORT $LAP_TIME_EXTENSION - int "Time master address (int)" TIME_MASTER_ADDR 00 - int "Request timeout (ms)" TIME_UPDATE_TIMEOUT 50 + int "Time Master address (int)" TIME_MASTER_ADDR 00 + int "Request Timeout (ms)" TIME_UPDATE_TIMEOUT 50 endmenu dep_bool_menu "Bitmap Scroller" ANIMATION_BMSCROLLER y $RANDOM_SUPPORT diff --git a/animations/programm.c b/animations/program.c similarity index 73% rename from animations/programm.c rename to animations/program.c index 091179e..879f8ef 100644 --- a/animations/programm.c +++ b/animations/program.c @@ -46,7 +46,7 @@ void test_palette2(){ #endif -#ifdef ANIMATION_SPIRALE +#ifdef ANIMATION_SPIRAL static void walk(cursor_t* cur, unsigned char steps, unsigned int delay){ unsigned char x; for(x=steps;x--;){ @@ -55,7 +55,7 @@ static void walk(cursor_t* cur, unsigned char steps, unsigned int delay){ } } -void spirale(unsigned int delay){ +void spiral(unsigned int delay){ clear_screen(0); cursor_t cur; @@ -110,8 +110,8 @@ unsigned char i, j, x; #endif -#ifdef ANIMATION_SCHACHBRETT -void schachbrett(unsigned char times){ +#ifdef ANIMATION_CHESSBOARD +void chessboard(unsigned char times){ while (times--) { for (unsigned char row = 0; row < NUM_ROWS; ++row) { for (unsigned char col = 0; col < NUM_COLS; ++col) { @@ -124,41 +124,51 @@ void schachbrett(unsigned char times){ #endif -#ifdef ANIMATION_FEUER +#ifdef ANIMATION_FIRE #ifndef FIRE_CYCLES #define FIRE_CYCLES 800 #endif -#define FEUER_Y (NUM_ROWS + 3) -void feuer() +#define FIRE_Y (NUM_ROWS + 3) +void fire() { unsigned char y, x; unsigned int t; - unsigned char world[NUM_COLS][FEUER_Y]; // double buffer + unsigned char world[NUM_COLS][FIRE_Y]; // double buffer - for(t=0; t> 5) ); + for (y = 0; y < NUM_ROWS; y++) { + for (x = 0; x < NUM_COLS; x++) { + setpixel((pixel) {x,y}, world[x][y] >> 5); } - }; + } - wait(FEUER_DELAY); + wait(FIRE_DELAY); } } #endif diff --git a/animations/programm.h b/animations/program.h similarity index 79% rename from animations/programm.h rename to animations/program.h index a6e02ca..49214ce 100644 --- a/animations/programm.h +++ b/animations/program.h @@ -20,10 +20,10 @@ inline static void off() } #endif -void spirale(unsigned int delay); +void spiral(unsigned int delay); void joern1(); -void schachbrett(unsigned char times); -void feuer(); +void chessboard(unsigned char times); +void fire(); void random_bright(unsigned cycles); #endif /* PROGRAMM_H_ */ diff --git a/config.in b/config.in index 69da934..0f7f25f 100644 --- a/config.in +++ b/config.in @@ -7,9 +7,9 @@ comment "General Setup" choice 'Target MCU' \ "ATmega8 atmega8 \ - ATmega32 atmega32 \ + ATmega32 atmega32 \ ATmega644 atmega644 \ - ATmega644p atmega644p \ + ATmega644p atmega644p \ ATmega8515 atmega8515" \ 'ATmega32' MCU @@ -27,7 +27,7 @@ source borg_hw/config.in mainmenu_option next_comment comment "Features" bool "prng random number generator" RANDOM_SUPPORT y - dep_bool "CAN Time Extension" LAP_TIME_EXTENSION $CAN_SUPPORT + dep_bool "CAN Time Extension" LAP_TIME_EXTENSION $CAN_SUPPORT endmenu ############################################################################### @@ -48,7 +48,7 @@ source can/config.in ### Borg Menu ################################################################# -dep_bool "menu support" MENU_SUPPORT $JOYSTICK_SUPPORT +dep_bool "Menu Support" MENU_SUPPORT $JOYSTICK_SUPPORT depends on JOYSTICK_SUPPORT ############################################################################### @@ -62,6 +62,7 @@ source games/config.in source animations/config.in ############################################################################### -### small Animations Menu ########################################################### + +### small Animations Menu ##################################################### source smallani/config.in ############################################################################### diff --git a/display_loop.c b/display_loop.c index f2eb017..5998a38 100644 --- a/display_loop.c +++ b/display_loop.c @@ -5,7 +5,7 @@ #include "config.h" #include "scrolltext/scrolltext.h" #include "animations/snake.h" -#include "animations/programm.h" +#include "animations/program.h" #include "animations/matrix.h" #include "animations/gameoflife.h" #include "animations/stonefly.h" @@ -95,9 +95,9 @@ void display_loop(){ #endif #endif -#ifdef ANIMATION_SPIRALE +#ifdef ANIMATION_SPIRAL case 2: - spirale(5); + spiral(5); break; #endif @@ -113,15 +113,15 @@ void display_loop(){ break; #endif -#ifdef ANIMATION_SCHACHBRETT +#ifdef ANIMATION_CHESSBOARD case 5: - schachbrett(20); + chessboard(20); break; #endif -#ifdef ANIMATION_FEUER +#ifdef ANIMATION_FIRE case 6: - feuer(); + fire(); break; #endif diff --git a/profiles/borg-16 b/profiles/borg-16 index a93bf45..b6e68cd 100644 --- a/profiles/borg-16 +++ b/profiles/borg-16 @@ -72,19 +72,19 @@ GAME_SNAKE=y # Animations # ANIMATION_SCROLLTEXT=y -ANIMATION_SPIRALE=y +ANIMATION_SPIRAL=y ANIMATION_JOERN1=y ANIMATION_SNAKE=y SNAKE_CYCLE_DELAY=100 SNAKE_TERMINATION_DELAY=60 SNAKE_MAX_LENGTH=64 SNAKE_MAX_APPLES=10 -ANIMATION_SCHACHBRETT=y -ANIMATION_FEUER=y -FEUER_S=30 -FEUER_N=5 -FEUER_DIV=44 -FEUER_DELAY=50 +ANIMATION_CHESSBOARD=y +ANIMATION_FIRE=y +FIRE_S=30 +FIRE_N=5 +FIRE_DIV=44 +FIRE_DELAY=50 FIRE_CYCLES=800 ANIMATION_MATRIX=y MATRIX_STREAMER_NUM=30 diff --git a/profiles/borg-andre b/profiles/borg-andre index d10a8fa..aad04a3 100644 --- a/profiles/borg-andre +++ b/profiles/borg-andre @@ -69,19 +69,19 @@ GAME_BREAKOUT=y # Animations # ANIMATION_SCROLLTEXT=y -ANIMATION_SPIRALE=y +ANIMATION_SPIRAL=y ANIMATION_JOERN1=y ANIMATION_SNAKE=y SNAKE_CYCLE_DELAY=100 SNAKE_TERMINATION_DELAY=60 SNAKE_MAX_LENGTH=64 SNAKE_MAX_APPLES=10 -ANIMATION_SCHACHBRETT=y -ANIMATION_FEUER=y -FEUER_S=30 -FEUER_N=5 -FEUER_DIV=44 -FEUER_DELAY=50 +ANIMATION_CHESSBOARD=y +ANIMATION_FIRE=y +FIRE_S=30 +FIRE_N=5 +FIRE_DIV=44 +FIRE_DELAY=50 FIRE_CYCLES=800 ANIMATION_MATRIX=y MATRIX_STREAMER_NUM=30 diff --git a/profiles/borg-ls b/profiles/borg-ls index d319c26..8cb8256 100644 --- a/profiles/borg-ls +++ b/profiles/borg-ls @@ -64,19 +64,19 @@ SPI_PIN_MCP_INT=2 # Animations # ANIMATION_SCROLLTEXT=y -ANIMATION_SPIRALE=y +ANIMATION_SPIRAL=y ANIMATION_JOERN1=y ANIMATION_SNAKE=y SNAKE_CYCLE_DELAY=50 SNAKE_TERMINATION_DELAY=60 SNAKE_MAX_LENGTH=64 SNAKE_MAX_APPLES=10 -ANIMATION_SCHACHBRETT=y -ANIMATION_FEUER=y -FEUER_S=30 -FEUER_N=5 -FEUER_DIV=47 -FEUER_DELAY=30 +ANIMATION_CHESSBOARD=y +ANIMATION_FIRE=y +FIRE_S=30 +FIRE_N=5 +FIRE_DIV=47 +FIRE_DELAY=30 FIRE_CYCLES=200 ANIMATION_MATRIX=y MATRIX_STREAMER_NUM=30 diff --git a/simulator/Makefile.osx b/simulator/Makefile.osx index 4262f63..3412484 100644 --- a/simulator/Makefile.osx +++ b/simulator/Makefile.osx @@ -11,7 +11,7 @@ override LDFLAGS = -Wl --prebind OBJ = breakpoint.o font_arial8.o font_small6.o font_uni53.o invader_draw.o \ invader_init.o invader_proc.o invaders2.o joystick.o main.o menu.o pixel.o \ - programm.o scrolltext3.o snake.o trackball.o util.o tetris/input.o \ + program.o scrolltext3.o snake.o trackball.o util.o tetris/input.o \ tetris/logic.o tetris/piece.o tetris/playfield.o tetris/view.o all: Makefile.osx $(APP) @@ -56,7 +56,7 @@ invaders2.o: invaders2.c util.h invaders2.h pixel.h config.h scrolltext.h \ joystick.o: joystick.c joystick.h $(CC) $(CFLAGS) -c -o joystick.o joystick.c -main.o: main.c config.h pixel.h util.h programm.h menu.h tetris/logic.h \ +main.o: main.c config.h pixel.h util.h program.h menu.h tetris/logic.h \ tetris/piece.h trackball.h snake.h scrolltext.h $(CC) $(CFLAGS) -c -o main.o main.c @@ -67,8 +67,8 @@ menu.o: menu.c menu.h config.h util.h pixel.h joystick.h snake.h \ pixel.o: pixel.c pixel.h util.h config.h $(CC) $(CFLAGS) -c -o pixel.o pixel.c -programm.o: programm.c pixel.h util.h config.h programm.h joystick.h - $(CC) $(CFLAGS) -c -o programm.o programm.c +program.o: program.c pixel.h util.h config.h program.h joystick.h + $(CC) $(CFLAGS) -c -o program.o program.c scrolltext3.o: scrolltext3.c config.h scrolltext.h pixel.h util.h \ font_arial8.h font.h font_small6.h font_uni53.h