From 1fb79e3ddafa8fa737b2a9be16d5ebcbed15272a Mon Sep 17 00:00:00 2001
From: Christian Kroll <chris@das-labor.org>
Date: Sun, 4 Dec 2011 08:03:19 +0000
Subject: [PATCH] added some config options and updated the profiles

---
 animations/config.in  | 21 +++++++++++++--------
 animations/matrix.c   |  3 +++
 display_loop.c        |  6 +++++-
 profiles/borg-16      |  3 +++
 profiles/borg-ancient | 16 +++++++++-------
 profiles/borg-andre   |  3 +++
 profiles/borg-ls      |  3 +++
 7 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/animations/config.in b/animations/config.in
index 91c6250..df35351 100644
--- a/animations/config.in
+++ b/animations/config.in
@@ -1,7 +1,11 @@
 mainmenu_option next_comment
 comment "Animations"
 	dep_bool "Scrolltext"    ANIMATION_SCROLLTEXT    $SCROLLTEXT_SUPPORT
-	bool     "Spiral"        ANIMATION_SPIRAL
+
+	dep_bool_menu "Spiral"   ANIMATION_SPIRAL y
+		int "Delay between frames"  SPIRAL_DELAY 5
+	endmenu
+	
 	bool     "Joern1"        ANIMATION_JOERN1
 
 	dep_bool_menu "Snake"    ANIMATION_SNAKE         $RANDOM_SUPPORT
@@ -14,16 +18,17 @@ comment "Animations"
 	bool     "Checkerboard"    ANIMATION_CHECKERBOARD
 
 	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
+		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 "Run For This Number of Rounds" 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
+		int "Number of Streamers"           MATRIX_STREAMER_NUM 30
+		int "Run For This Number of Rounds" MATRIX_CYCLES       500
+		int "Delay between frames"          MATRIX_DELAY        60
 	endmenu
 
 	dep_bool "Random Bright" ANIMATION_RANDOM_BRIGHT $RANDOM_SUPPORT
diff --git a/animations/matrix.c b/animations/matrix.c
index d2c2b85..20d9c4a 100644
--- a/animations/matrix.c
+++ b/animations/matrix.c
@@ -11,6 +11,9 @@
 #ifndef MATRIX_STREAMER_NUM
 	#define MATRIX_STREAMER_NUM 30
 #endif
+#ifndef MATRIX_DELAY
+	#define MATRIX_STREAMER_NUM 60
+#endif
 
 typedef struct{
 	pixel start;
diff --git a/display_loop.c b/display_loop.c
index 3240060..ec39888 100644
--- a/display_loop.c
+++ b/display_loop.c
@@ -97,8 +97,12 @@ void display_loop(){
 #endif
 
 #ifdef ANIMATION_SPIRAL
+#		ifndef SPIRAL_DELAY
+#			define SPIRAL_DELAY 5
+#		endif
+
 		case 2:
-			spiral(5);
+			spiral(SPIRAL_DELAY);
 			break;
 #endif
 
diff --git a/profiles/borg-16 b/profiles/borg-16
index ef3a631..b39be00 100644
--- a/profiles/borg-16
+++ b/profiles/borg-16
@@ -73,6 +73,7 @@ GAME_SNAKE=y
 #
 ANIMATION_SCROLLTEXT=y
 ANIMATION_SPIRAL=y
+SPIRAL_DELAY=5
 ANIMATION_JOERN1=y
 ANIMATION_SNAKE=y
 SNAKE_CYCLE_DELAY=100
@@ -89,6 +90,7 @@ FIRE_CYCLES=800
 ANIMATION_MATRIX=y
 MATRIX_STREAMER_NUM=30
 MATRIX_CYCLES=500
+MATRIX_DELAY=60
 ANIMATION_RANDOM_BRIGHT=y
 # ANIMATION_STONEFLY is not set
 # ANIMATION_FLYINGDOTS is not set
@@ -105,6 +107,7 @@ ANIMATION_BMSCROLLER=y
 ANIMATION_LABORLOGO=y
 # ANIMATION_AMPHIBIAN is not set
 # ANIMATION_LOGO_OOS is not set
+# ANIMATION_LOGO_28C3 is not set
 ANIMATION_PLASMA=y
 ANIMATION_PSYCHEDELIC=y
 ANIMATION_TESTS=y
diff --git a/profiles/borg-ancient b/profiles/borg-ancient
index 5a5fdee..08a7087 100644
--- a/profiles/borg-ancient
+++ b/profiles/borg-ancient
@@ -28,11 +28,11 @@ ROWPORT=PORTA
 RANDOM_SUPPORT=y
 # LAP_TIME_EXTENSION is not set
 SCROLLTEXT_SUPPORT=y
-SCROLLTEXT_FONT=FONT_ARIAL8
+SCROLLTEXT_FONT=FONT_SMALL6
 SCROLLTEXT_BUFFER_SIZE=128
 SCROLL_X_SPEED=20
 SCROLL_Y_SPEED=20
-SCROLLTEXT_TEXT="</#www.das-labor.org"
+SCROLLTEXT_TEXT="</#LABOR BORG - WIDERSTAND IST ZWECKLOS"
 # JOYSTICK_SUPPORT is not set
 # CAN_SUPPORT is not set
 # MENU_SUPPORT is not set
@@ -53,6 +53,7 @@ SCROLLTEXT_TEXT="</#www.das-labor.org"
 #
 ANIMATION_SCROLLTEXT=y
 ANIMATION_SPIRAL=y
+SPIRAL_DELAY=20
 ANIMATION_JOERN1=y
 ANIMATION_SNAKE=y
 SNAKE_CYCLE_DELAY=100
@@ -61,14 +62,15 @@ SNAKE_MAX_LENGTH=64
 SNAKE_MAX_APPLES=10
 ANIMATION_CHECKERBOARD=y
 ANIMATION_FIRE=y
-FIRE_S=30
-FIRE_N=5
-FIRE_DIV=44
-FIRE_DELAY=50
+FIRE_S=8
+FIRE_N=2
+FIRE_DIV=14
+FIRE_DELAY=70
 FIRE_CYCLES=800
 ANIMATION_MATRIX=y
-MATRIX_STREAMER_NUM=30
+MATRIX_STREAMER_NUM=20
 MATRIX_CYCLES=500
+MATRIX_DELAY=80
 ANIMATION_RANDOM_BRIGHT=y
 # ANIMATION_STONEFLY is not set
 ANIMATION_FLYINGDOTS=y
diff --git a/profiles/borg-andre b/profiles/borg-andre
index c79168d..2b35134 100644
--- a/profiles/borg-andre
+++ b/profiles/borg-andre
@@ -70,6 +70,7 @@ GAME_BREAKOUT=y
 #
 ANIMATION_SCROLLTEXT=y
 ANIMATION_SPIRAL=y
+SPIRAL_DELAY=5
 ANIMATION_JOERN1=y
 ANIMATION_SNAKE=y
 SNAKE_CYCLE_DELAY=100
@@ -86,6 +87,7 @@ FIRE_CYCLES=800
 ANIMATION_MATRIX=y
 MATRIX_STREAMER_NUM=30
 MATRIX_CYCLES=500
+MATRIX_DELAY=60
 ANIMATION_RANDOM_BRIGHT=y
 ANIMATION_STONEFLY=y
 ANIMATION_FLYINGDOTS=y
@@ -102,6 +104,7 @@ ANIMATION_BMSCROLLER=y
 ANIMATION_LABORLOGO=y
 ANIMATION_AMPHIBIAN=y
 ANIMATION_LOGO_OOS=y
+# ANIMATION_LOGO_28C3 is not set
 ANIMATION_PLASMA=y
 ANIMATION_PSYCHEDELIC=y
 # ANIMATION_TESTS is not set
diff --git a/profiles/borg-ls b/profiles/borg-ls
index 6d9d798..1919e0b 100644
--- a/profiles/borg-ls
+++ b/profiles/borg-ls
@@ -65,6 +65,7 @@ SPI_PIN_MCP_INT=2
 #
 ANIMATION_SCROLLTEXT=y
 ANIMATION_SPIRAL=y
+SPIRAL_DELAY=5
 ANIMATION_JOERN1=y
 ANIMATION_SNAKE=y
 SNAKE_CYCLE_DELAY=50
@@ -81,6 +82,7 @@ FIRE_CYCLES=200
 ANIMATION_MATRIX=y
 MATRIX_STREAMER_NUM=30
 MATRIX_CYCLES=250
+MATRIX_DELAY=60
 ANIMATION_RANDOM_BRIGHT=y
 # ANIMATION_STONEFLY is not set
 # ANIMATION_FLYINGDOTS is not set
@@ -97,6 +99,7 @@ TIME_UPDATE_TIMEOUT=50
 # ANIMATION_LABORLOGO is not set
 # ANIMATION_AMPHIBIAN is not set
 # ANIMATION_LOGO_OOS is not set
+# ANIMATION_LOGO_28C3 is not set
 # ANIMATION_PLASMA is not set
 # ANIMATION_PSYCHEDELIC is not set
 ANIMATION_TESTS=y