ctdo
/
borgware-2d
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed a lot of config options

This commit is contained in:
Hans-Gert Dahmen 2011-10-28 21:52:17 +00:00
parent 0c379920a1
commit acd84305c6
10 changed files with 76 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
animations/borg_time.c
View File

@ -13,12 +13,6 @@
#include "../util.h" #include "../util.h"
#include "../scrolltext/scrolltext.h" #include "../scrolltext/scrolltext.h"
//address of the time master
#define TIME_MASTER_ADDR 0x00
//update timeout in ms
#define TIME_UPDATE_TIMEOUT 100
//hackhack //hackhack
extern can_addr myaddr; extern can_addr myaddr;

26
animations/config.in
View File

@ -3,10 +3,24 @@ comment "Animations"
dep_bool "Scrolltext" ANIMATION_SCROLLTEXT $SCROLLTEXT_SUPPORT dep_bool "Scrolltext" ANIMATION_SCROLLTEXT $SCROLLTEXT_SUPPORT
bool "Spirale" ANIMATION_SPIRALE bool "Spirale" ANIMATION_SPIRALE
bool "Joern1" ANIMATION_JOERN1 bool "Joern1" ANIMATION_JOERN1
dep_bool "Snake" ANIMATION_SNAKE $RANDOM_SUPPORT
dep_bool_menu "Snake" ANIMATION_SNAKE $RANDOM_SUPPORT
int "Snake delay" SNAKE_DELAY 100
endmenu
bool "Schachbrett" ANIMATION_SCHACHBRETT bool "Schachbrett" ANIMATION_SCHACHBRETT
dep_bool "Feuer" ANIMATION_FEUER $RANDOM_SUPPORT
dep_bool "Matrix" ANIMATION_MATRIX $RANDOM_SUPPORT 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
endmenu
dep_bool_menu "Matrix" ANIMATION_MATRIX $RANDOM_SUPPORT
int "Number of streamers" STREAMER_NUM 30
endmenu
dep_bool "Random Bright" ANIMATION_RANDOM_BRIGHT $RANDOM_SUPPORT dep_bool "Random Bright" ANIMATION_RANDOM_BRIGHT $RANDOM_SUPPORT
dep_bool "Stonefly" ANIMATION_STONEFLY $GAME_TETRIS_CORE dep_bool "Stonefly" ANIMATION_STONEFLY $GAME_TETRIS_CORE
dep_bool "Flying Dots" ANIMATION_FLYINGDOTS $RANDOM_SUPPORT dep_bool "Flying Dots" ANIMATION_FLYINGDOTS $RANDOM_SUPPORT
@ -14,7 +28,11 @@ comment "Animations"
dep_bool "Breakout Demo" ANIMATION_BREAKOUT $GAME_BREAKOUT dep_bool "Breakout Demo" ANIMATION_BREAKOUT $GAME_BREAKOUT
bool "Martin Herweg" ANIMATION_MHERWEG $RANDOM_SUPPORT bool "Martin Herweg" ANIMATION_MHERWEG $RANDOM_SUPPORT
dep_bool "Langton Ant" ANIMATION_LTN_ANT $RANDOM_SUPPORT dep_bool "Langton Ant" ANIMATION_LTN_ANT $RANDOM_SUPPORT
dep_bool "Time Display" ANIMATION_TIME $SCROLLTEXT_SUPPORT $LAP_TIME_EXTENSION
dep_bool_menu "Time Display" ANIMATION_TIME $SCROLLTEXT_SUPPORT $LAP_TIME_EXTENSION
hex "Time master address (hex)" TIME_MASTER_ADDR 0x00
int "Request timeout (ms)" TIME_UPDATE_TIMEOUT 23
endmenu
dep_bool_menu "Bitmap Scroller" ANIMATION_BMSCROLLER y $RANDOM_SUPPORT dep_bool_menu "Bitmap Scroller" ANIMATION_BMSCROLLER y $RANDOM_SUPPORT
dep_bool "LABOR Logo" ANIMATION_LABORLOGO $ANIMATION_BMSCROLLER dep_bool "LABOR Logo" ANIMATION_LABORLOGO $ANIMATION_BMSCROLLER

37
config.h
View File

@ -3,36 +3,27 @@
#include "autoconf.h" #include "autoconf.h"
#define STREAMER_NUM 30
#define FEUER_N 5
#define FEUER_S 30
#define FEUER_DIV 44
#define FEUER_DELAY 50
#define SNAKE_DELAY 100
#ifdef CAN_SUPPORT #ifdef CAN_SUPPORT
#define BORG_CAN #define BORG_CAN
// spi.[ch] defines
// spi.[ch] defines
//spi port default config
#if SPI_PORTIDX == 0 #if SPI_PORTIDX == 0
#define SPI_PORT PORTA #define SPI_PORT PORTA
#define SPI_DDR DDRA #define SPI_DDR DDRA
#define SPI_PIN PINA #define SPI_PIN PINA
#elif SPI_PORTIDX == 1 #elif SPI_PORTIDX == 1
#define SPI_PORT PORTB #define SPI_PORT PORTB
#define SPI_DDR DDRB #define SPI_DDR DDRB
#define SPI_PIN PINB #define SPI_PIN PINB
#elif SPI_PORTIDX == 2 #elif SPI_PORTIDX == 2
#define SPI_PORT PORTC #define SPI_PORT PORTC
#define SPI_DDR DDRC #define SPI_DDR DDRC
#define SPI_PIN PINC #define SPI_PIN PINC
#elif SPI_PORTIDX == 3 #elif SPI_PORTIDX == 3
#define SPI_PORT PORTD #define SPI_PORT PORTD
#define SPI_DDR DDRD #define SPI_DDR DDRD
#define SPI_PIN PIND #define SPI_PIN PIND
#endif #endif
// can.[ch] defines // can.[ch] defines

9
display_loop.c
View File

@ -84,10 +84,15 @@ void display_loop(){
#endif #endif
#endif #endif
#ifdef ANIMATION_TIME #ifdef ANIMATION_TIME
time_anim(); #ifndef ANIMATION_SCROLLTEXT
case 1:
#endif #endif
#ifdef ANIMATION_TIME || ANIMATION_SCROLLTEXT time_anim();
break; break;
#else ANIMATION
#ifdef ANIMATION_SCROLLTEXT
break;
#endif
#endif #endif
#ifdef ANIMATION_SPIRALE #ifdef ANIMATION_SPIRALE

2
profiles/borg-16
View File

@ -35,7 +35,7 @@ PIN_DATA=7
# #
RANDOM_SUPPORT=y RANDOM_SUPPORT=y
SCROLLTEXT_SUPPORT=y SCROLLTEXT_SUPPORT=y
SCROLLTEXT_FONT=font_arial8 SCROLLTEXT_FONT=FONT_ARIAL8
SCROLLTEXT_BUFFER_SIZE=128 SCROLLTEXT_BUFFER_SIZE=128
SCROLL_X_SPEED=20 SCROLL_X_SPEED=20
SCROLL_Y_SPEED=20 SCROLL_Y_SPEED=20

10
profiles/borg-ls
View File

@ -31,7 +31,7 @@ PIN_LINE_EN=5
RANDOM_SUPPORT=y RANDOM_SUPPORT=y
LAP_TIME_EXTENSION=y LAP_TIME_EXTENSION=y
SCROLLTEXT_SUPPORT=y SCROLLTEXT_SUPPORT=y
SCROLLTEXT_FONT=font_arial8 SCROLLTEXT_FONT=font_uni53
SCROLLTEXT_BUFFER_SIZE=128 SCROLLTEXT_BUFFER_SIZE=128
SCROLL_X_SPEED=10 SCROLL_X_SPEED=10
SCROLL_Y_SPEED=30 SCROLL_Y_SPEED=30
@ -67,9 +67,15 @@ ANIMATION_SCROLLTEXT=y
ANIMATION_SPIRALE=y ANIMATION_SPIRALE=y
ANIMATION_JOERN1=y ANIMATION_JOERN1=y
ANIMATION_SNAKE=y ANIMATION_SNAKE=y
SNAKE_DELAY=50
ANIMATION_SCHACHBRETT=y ANIMATION_SCHACHBRETT=y
ANIMATION_FEUER=y ANIMATION_FEUER=y
FEUER_S=30
FEUER_N=5
FEUER_DIV=47
FEUER_DELAY=30
ANIMATION_MATRIX=y ANIMATION_MATRIX=y
STREAMER_NUM=100
ANIMATION_RANDOM_BRIGHT=y ANIMATION_RANDOM_BRIGHT=y
# ANIMATION_STONEFLY is not set # ANIMATION_STONEFLY is not set
# ANIMATION_FLYINGDOTS is not set # ANIMATION_FLYINGDOTS is not set
@ -78,6 +84,8 @@ ANIMATION_GAMEOFLIFE=y
# ANIMATION_MHERWEG is not set # ANIMATION_MHERWEG is not set
# ANIMATION_LTN_ANT is not set # ANIMATION_LTN_ANT is not set
ANIMATION_TIME=y ANIMATION_TIME=y
TIME_MASTER_ADDR=00
TIME_UPDATE_TIMEOUT=100
# ANIMATION_BMSCROLLER is not set # ANIMATION_BMSCROLLER is not set
# ANIMATION_LABORLOGO is not set # ANIMATION_LABORLOGO is not set
# ANIMATION_AMPHIBIAN is not set # ANIMATION_AMPHIBIAN is not set

2
scrolltext/Makefile
View File

@ -5,6 +5,6 @@ include $(TOPDIR)/defaults.mk
SRC = scrolltext3.c SRC = scrolltext3.c
SRC += $(SCROLLTEXT_FONT).c SRC += $(shell echo $(SCROLLTEXT_FONT) | tr A-Z a-z).c
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk

6
scrolltext/config.in
View File

@ -3,9 +3,9 @@ dep_bool_menu "Scrolltext Support" SCROLLTEXT_SUPPORT y
if [ "$SCROLLTEXT_SUPPORT" = "y" ]; then if [ "$SCROLLTEXT_SUPPORT" = "y" ]; then
choice 'Scrolltext Font' \ choice 'Scrolltext Font' \
"Arial_8 font_arial8 \ "Arial_8 FONT_ARIAL8 \
Small_6 font_small6 \ Small_6 FONT_SMALL6 \
Uni_53 font_uni53" \ Uni_53 FONT_UNI53" \
'Arial_8' SCROLLTEXT_FONT 'Arial_8' SCROLLTEXT_FONT
int "Scrolltest buffer size" SCROLLTEXT_BUFFER_SIZE 128 int "Scrolltest buffer size" SCROLLTEXT_BUFFER_SIZE 128

4
scrolltext/scrolltext.h
View File

@ -1,6 +1,10 @@
#ifndef SCROLLTEXT_H_ #ifndef SCROLLTEXT_H_
#define SCROLLTEXT_H_ #define SCROLLTEXT_H_
#define FONT_ARIAL8 1
#define FONT_SMALL6 2
#define FONT_UNI53 3
void scrolltext(char *str); void scrolltext(char *str);
#endif /* SCROLLTEXT_H_ */ #endif /* SCROLLTEXT_H_ */

17
scrolltext/scrolltext3.c
View File

@ -11,8 +11,19 @@
#include "../pixel.h" #include "../pixel.h"
#include "../util.h" #include "../util.h"
#include "font_arial8.h" #include "font_arial8.h"
// #include "font_small6.h" #if SCROLLTEXT_FONT == FONT_ARIAL8
// #include "font_uni53.h" #include "font_arial8.h"
#define FONT_NAME font_arial8
#elif SCROLLTEXT_FONT == FONT_SMALL6
#include "font_small6.h"
#define FONT_NAME font_small6
#elif SCROLLTEXT_FONT == FONT_UNI53
#include "font_uni53.h"
#define FONT_NAME font_uni53
#else
#include "font_arial8.h"
#define FONT_NAME font_arial8
#endif
#ifdef __CYGWIN__ #ifdef __CYGWIN__
#define strtok_r(a, b, c) strtok((a), (b)) #define strtok_r(a, b, c) strtok((a), (b))
@ -511,7 +522,7 @@ void scrolltext(char *str) {
char tmp_str[SCROLLTEXT_BUFFER_SIZE]; char tmp_str[SCROLLTEXT_BUFFER_SIZE];
int ljmp_retval; int ljmp_retval;
fonts[0] = SCROLLTEXT_FONT; fonts[0] = FONT_NAME;
unsigned char auto_pixmap[NUM_ROWS][LINEBYTES]; unsigned char auto_pixmap[NUM_ROWS][LINEBYTES];
text_pixmap = &auto_pixmap; text_pixmap = &auto_pixmap;