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

superseded by borgware

This commit is contained in:
Hans-Gert Dahmen 2011-10-28 20:20:55 +00:00
parent fe8f3302c0
commit 0ad1dde4b8
6 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -15,7 +15,7 @@ SRC_SIM = \
LAUNCH_BOOTLOADER = launch-bootloader LAUNCH_BOOTLOADER = launch-bootloader
#SERIAL = /dev/ttyUSB0 #SERIAL = /dev/ttyUSB0
SERIAL = COM6 SERIAL = COM6
export TOPDIR export TOPDIR
############################################################################## ##############################################################################
@ -180,7 +180,7 @@ show-config: autoconf.h
.PHONY: show-config .PHONY: show-config
autoconf.h .config: autoconf.h .config:
@echo make\'s goal: $(MAKECMDGOALS) @echo make\'s goal: $(MAKECMDGOALS)
ifneq ($(MAKECMDGOALS),menuconfig) ifneq ($(MAKECMDGOALS),menuconfig)
# make sure menuconfig isn't called twice, on `make menuconfig' # make sure menuconfig isn't called twice, on `make menuconfig'

16
animations/Makefile
View File

@ -13,13 +13,13 @@ ifeq ($(ANIMATION_MATRIX),y)
SRC += matrix.c SRC += matrix.c
endif endif
ifeq ($(ANIMATION_STONEFLY),y) ifeq ($(ANIMATION_STONEFLY),y)
SRC += stonefly.c SRC += stonefly.c
endif endif
ifeq ($(ANIMATION_FLYINGDOTS),y) ifeq ($(ANIMATION_FLYINGDOTS),y)
SRC += flyingdots.c SRC += flyingdots.c
endif endif
ifeq ($(ANIMATION_GAMEOFLIFE),y) ifeq ($(ANIMATION_GAMEOFLIFE),y)
SRC += gameoflife.c SRC += gameoflife.c
@ -57,4 +57,8 @@ ifneq (,$(filter y,$(ANIMATION_PLASMA) $(ANIMATION_PSYCHEDELIC)))
SRC += fpmath_patterns.c SRC += fpmath_patterns.c
endif endif
ifeq ($(ANIMATION_TIME),y)
SRC += borg_time.c
endif
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk

6
animations/borg_time.c
View File

@ -8,10 +8,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <avr/pgmspace.h> #include <avr/pgmspace.h>
#include "../config.h" #include "../config.h"
#include "../can.h" #include "../can/can.h"
#include "../lap.h" #include "../can/lap.h"
#include "../util.h" #include "../util.h"
#include "../scrolltext.h" #include "../scrolltext/scrolltext.h"
//address of the time master //address of the time master
#define TIME_MASTER_ADDR 0x00 #define TIME_MASTER_ADDR 0x00

1
animations/config.in
View File

@ -14,6 +14,7 @@ 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 "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

5
config.in
View File

@ -12,7 +12,7 @@ comment "General Setup"
ATmega644p atmega644p \ ATmega644p atmega644p \
ATmega8515 atmega8515" \ ATmega8515 atmega8515" \
'ATmega32' MCU 'ATmega32' MCU
int "MCU frequency" FREQ 16000000 int "MCU frequency" FREQ 16000000
endmenu endmenu
############################################################################### ###############################################################################
@ -26,7 +26,8 @@ source borg_hw/config.in
### Features Menu ############################################################# ### Features Menu #############################################################
mainmenu_option next_comment mainmenu_option next_comment
comment "Features" 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 endmenu
############################################################################### ###############################################################################

2
display_loop.c
View File

@ -17,7 +17,9 @@
#include "animations/outofspec.h" #include "animations/outofspec.h"
#include "animations/fpmath_patterns.h" #include "animations/fpmath_patterns.h"
#include "animations/mherweg.h" #include "animations/mherweg.h"
#ifdef ANIMATION_TIME
#include "animations/borg_time.h" #include "animations/borg_time.h"
#endif
#include "borg_hw/borg_hw.h" #include "borg_hw/borg_hw.h"
#include "can/borg_can.h" #include "can/borg_can.h"
#include "random/prng.h" #include "random/prng.h"