# HG changeset patch # User Malte Bayer # Date 1355942804 -3600 # Node ID be47571ed2fdc778f5ca8078bbf4c4956f0e6667 # Parent c12c7396f22b651afc559a090d3af81cdf18d108 release prepare diff -r c12c7396f22b -r be47571ed2fd .hgignore --- a/.hgignore Sat Dec 15 23:46:28 2012 +0100 +++ b/.hgignore Wed Dec 19 19:46:44 2012 +0100 @@ -10,4 +10,5 @@ *.apk -custom-sound/* \ No newline at end of file +custom-sound/* +dist/* \ No newline at end of file diff -r c12c7396f22b -r be47571ed2fd blackbox/Makefile --- a/blackbox/Makefile Sat Dec 15 23:46:28 2012 +0100 +++ b/blackbox/Makefile Wed Dec 19 19:46:44 2012 +0100 @@ -89,6 +89,9 @@ backup: $(AVRDUDE) $(PROGRAMMER) -b $(ISP_BAUD) -i 1 -p $(MCU) -V -U flash:r:$(PRG)_backup.hex:i +restore: + $(AVRDUDE) $(PROGRAMMER) -b $(ISP_BAUD) -i 1 -p $(MCU) -V -U flash:w:$(PRG).hex:i + fuse: $(AVRDUDE) -c $(PROGRAMMER) -p $(MCU) -V $(FUSES) diff -r c12c7396f22b -r be47571ed2fd blackbox/main.h --- a/blackbox/main.h Sat Dec 15 23:46:28 2012 +0100 +++ b/blackbox/main.h Wed Dec 19 19:46:44 2012 +0100 @@ -4,7 +4,7 @@ #include #include -#define VERSION "1.5" +#define VERSION "1.8" #define COUNTDOWN_DELAY 10 // x/10 seconds diff -r c12c7396f22b -r be47571ed2fd slotUI/README --- a/slotUI/README Sat Dec 15 23:46:28 2012 +0100 +++ b/slotUI/README Wed Dec 19 19:46:44 2012 +0100 @@ -1,3 +1,6 @@ -At the moment just for testing stuff & rudimentary protocol definition +openslot gui -+ GTK GUI testing \ No newline at end of file +aptitude install python python-serial + +und noch irgend eine dependency die mir gerade nicht einfällt, die python +aber beim starten dann anmeckern wird \ No newline at end of file diff -r c12c7396f22b -r be47571ed2fd slotUI/sound/info.txt --- a/slotUI/sound/info.txt Sat Dec 15 23:46:28 2012 +0100 +++ b/slotUI/sound/info.txt Wed Dec 19 19:46:44 2012 +0100 @@ -1,4 +1,22 @@ The sounds are just examples, you can exchange them with whatever you want The sound files are public domain, downloaded from: -http://www.mediacollege.com/downloads/permission/public-domain.html \ No newline at end of file +http://www.mediacollege.com/downloads/permission/public-domain.html + +full list of sound triggers: + + "countdown_start": os.path.abspath(SOUNDPREFIX + "sound/countdown.mp3"), + "race_start": os.path.abspath(SOUNDPREFIX + "sound/racestart.mp3"), + "race_prepare": os.path.abspath(SOUNDPREFIX + "sound/prepare.mp3"), + "lap_record": os.path.abspath(SOUNDPREFIX + "sound/laprecord.mp3"), +# "first_position": os.path.abspath(SOUNDPREFIX + "sound/laprecord.mp3"), + "fuel_warning1": os.path.abspath(SOUNDPREFIX + "sound/fuel1.mp3"), + "fuel_warning2": os.path.abspath(SOUNDPREFIX + "sound/fuel2.mp3"), + "fuel_full": os.path.abspath(SOUNDPREFIX + "sound/fuel_full.mp3"), + "pitlane_enter": os.path.abspath(SOUNDPREFIX + "sound/pitlane_enter.mp3"), + "pitlane_exit": os.path.abspath(SOUNDPREFIX + "sound/pitlane_exit.mp3"), + "data_error": os.path.abspath(SOUNDPREFIX + "sound/data_error.mp3"), + "panic": os.path.abspath(SOUNDPREFIX + "sound/panic.mp3"), + "panic_shortcut": os.path.abspath(SOUNDPREFIX + "sound/panic_shortcut.mp3"), + "resume": os.path.abspath(SOUNDPREFIX + "sound/resume.mp3"), + "win": os.path.abspath(SOUNDPREFIX + "sound/win.mp3"),