From 0ad1dde4b8787d44f140127c9aeee2003f5c054d Mon Sep 17 00:00:00 2001
From: Hans-Gert Dahmen <sexyludernatascha@gmail.com>
Date: Fri, 28 Oct 2011 20:20:55 +0000
Subject: [PATCH] superseded by borgware

---
 Makefile               |  4 ++--
 animations/Makefile    | 16 ++++++++++------
 animations/borg_time.c |  6 +++---
 animations/config.in   |  1 +
 config.in              |  5 +++--
 display_loop.c         |  2 ++
 6 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index dbe7f21..cb4c378 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ SRC_SIM = \
 
 
 LAUNCH_BOOTLOADER = launch-bootloader
-#SERIAL = /dev/ttyUSB0	
+#SERIAL = /dev/ttyUSB0
 SERIAL = COM6
 export TOPDIR
 ##############################################################################
@@ -180,7 +180,7 @@ show-config: autoconf.h
 
 .PHONY: show-config
 
-autoconf.h .config: 
+autoconf.h .config:
 	@echo make\'s goal: $(MAKECMDGOALS)
 ifneq ($(MAKECMDGOALS),menuconfig)
 	# make sure menuconfig isn't called twice, on `make menuconfig'
diff --git a/animations/Makefile b/animations/Makefile
index 683ba51..bf57a48 100644
--- a/animations/Makefile
+++ b/animations/Makefile
@@ -13,13 +13,13 @@ ifeq ($(ANIMATION_MATRIX),y)
   SRC += matrix.c
 endif
 
-ifeq ($(ANIMATION_STONEFLY),y) 
-  SRC += stonefly.c 
-endif 
+ifeq ($(ANIMATION_STONEFLY),y)
+  SRC += stonefly.c
+endif
 
-ifeq ($(ANIMATION_FLYINGDOTS),y) 
-  SRC += flyingdots.c 
-endif 
+ifeq ($(ANIMATION_FLYINGDOTS),y)
+  SRC += flyingdots.c
+endif
 
 ifeq ($(ANIMATION_GAMEOFLIFE),y)
   SRC += gameoflife.c
@@ -57,4 +57,8 @@ ifneq (,$(filter y,$(ANIMATION_PLASMA) $(ANIMATION_PSYCHEDELIC)))
   SRC += fpmath_patterns.c
 endif
 
+ifeq ($(ANIMATION_TIME),y)
+  SRC += borg_time.c
+endif
+
 include $(TOPDIR)/rules.mk
diff --git a/animations/borg_time.c b/animations/borg_time.c
index 56726a3..006f083 100644
--- a/animations/borg_time.c
+++ b/animations/borg_time.c
@@ -8,10 +8,10 @@
 #include <stdlib.h>
 #include <avr/pgmspace.h>
 #include "../config.h"
-#include "../can.h"
-#include "../lap.h"
+#include "../can/can.h"
+#include "../can/lap.h"
 #include "../util.h"
-#include "../scrolltext.h"
+#include "../scrolltext/scrolltext.h"
 
 //address of the time master
 #define TIME_MASTER_ADDR 0x00
diff --git a/animations/config.in b/animations/config.in
index d1d02dd..477cdcc 100644
--- a/animations/config.in
+++ b/animations/config.in
@@ -14,6 +14,7 @@ comment "Animations"
 	dep_bool "Breakout Demo" ANIMATION_BREAKOUT      $GAME_BREAKOUT
 	bool     "Martin Herweg" ANIMATION_MHERWEG       $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 "Bitmap Scroller" ANIMATION_BMSCROLLER y $RANDOM_SUPPORT
 		dep_bool "LABOR Logo"       ANIMATION_LABORLOGO $ANIMATION_BMSCROLLER
diff --git a/config.in b/config.in
index c54bddc..69da934 100644
--- a/config.in
+++ b/config.in
@@ -12,7 +12,7 @@ comment "General Setup"
 	   ATmega644p     atmega644p   \
 	   ATmega8515     atmega8515" \
 	   'ATmega32' MCU
-	
+
 	int "MCU frequency" FREQ 16000000
 endmenu
 ###############################################################################
@@ -26,7 +26,8 @@ source borg_hw/config.in
 ### Features Menu #############################################################
 mainmenu_option next_comment
 comment "Features"
-	bool    "prng random number generator" RANDOM_SUPPORT y
+	bool     "prng random number generator" RANDOM_SUPPORT y
+	dep_bool "CAN Time Extension"   		LAP_TIME_EXTENSION $CAN_SUPPORT
 endmenu
 ###############################################################################
 
diff --git a/display_loop.c b/display_loop.c
index bd4a509..eba21cb 100644
--- a/display_loop.c
+++ b/display_loop.c
@@ -17,7 +17,9 @@
 #include "animations/outofspec.h"
 #include "animations/fpmath_patterns.h"
 #include "animations/mherweg.h"
+#ifdef ANIMATION_TIME
 #include "animations/borg_time.h"
+#endif
 #include "borg_hw/borg_hw.h"
 #include "can/borg_can.h"
 #include "random/prng.h"