diff --git a/nabclockd/sounds/fr_FR/nabclockd/12/1.mp3 b/nabclockd/sounds/fr_FR/nabclockd/12/1.mp3 index 4442e58d..f7774c0f 100644 Binary files a/nabclockd/sounds/fr_FR/nabclockd/12/1.mp3 and b/nabclockd/sounds/fr_FR/nabclockd/12/1.mp3 differ diff --git a/nabclockd/sounds/fr_FR/nabclockd/12/2.mp3 b/nabclockd/sounds/fr_FR/nabclockd/12/2.mp3 index b0ebf537..7f731225 100644 Binary files a/nabclockd/sounds/fr_FR/nabclockd/12/2.mp3 and b/nabclockd/sounds/fr_FR/nabclockd/12/2.mp3 differ diff --git a/nabclockd/sounds/fr_FR/nabclockd/12/3.mp3 b/nabclockd/sounds/fr_FR/nabclockd/12/3.mp3 index 13c2c820..0cb31b98 100644 Binary files a/nabclockd/sounds/fr_FR/nabclockd/12/3.mp3 and b/nabclockd/sounds/fr_FR/nabclockd/12/3.mp3 differ diff --git a/nabclockd/sounds/fr_FR/nabclockd/12/4.mp3 b/nabclockd/sounds/fr_FR/nabclockd/12/4.mp3 new file mode 100644 index 00000000..01f12a57 Binary files /dev/null and b/nabclockd/sounds/fr_FR/nabclockd/12/4.mp3 differ diff --git a/nabclockd/sounds/fr_FR/nabclockd/12/5.mp3 b/nabclockd/sounds/fr_FR/nabclockd/12/5.mp3 index dbc64d85..c79667b5 100644 Binary files a/nabclockd/sounds/fr_FR/nabclockd/12/5.mp3 and b/nabclockd/sounds/fr_FR/nabclockd/12/5.mp3 differ diff --git a/nabclockd/sounds/fr_FR/nabclockd/12/6.mp3 b/nabclockd/sounds/fr_FR/nabclockd/12/6.mp3 deleted file mode 100644 index 7473128c..00000000 Binary files a/nabclockd/sounds/fr_FR/nabclockd/12/6.mp3 and /dev/null differ diff --git a/nabclockd/sounds/fr_FR/nabclockd/20/1.mp3 b/nabclockd/sounds/fr_FR/nabclockd/20/1.mp3 index ea040f19..a0bd7af1 100644 Binary files a/nabclockd/sounds/fr_FR/nabclockd/20/1.mp3 and b/nabclockd/sounds/fr_FR/nabclockd/20/1.mp3 differ diff --git a/nabclockd/sounds/fr_FR/nabclockd/20/2.mp3 b/nabclockd/sounds/fr_FR/nabclockd/20/2.mp3 index 9bed886d..051c427b 100644 Binary files a/nabclockd/sounds/fr_FR/nabclockd/20/2.mp3 and b/nabclockd/sounds/fr_FR/nabclockd/20/2.mp3 differ diff --git a/nabclockd/sounds/fr_FR/nabclockd/20/3.mp3 b/nabclockd/sounds/fr_FR/nabclockd/20/3.mp3 index 9010968b..4a0b0449 100644 Binary files a/nabclockd/sounds/fr_FR/nabclockd/20/3.mp3 and b/nabclockd/sounds/fr_FR/nabclockd/20/3.mp3 differ diff --git a/nabclockd/sounds/fr_FR/nabclockd/20/4.mp3 b/nabclockd/sounds/fr_FR/nabclockd/20/4.mp3 index be6675d6..589ccea4 100644 Binary files a/nabclockd/sounds/fr_FR/nabclockd/20/4.mp3 and b/nabclockd/sounds/fr_FR/nabclockd/20/4.mp3 differ diff --git a/nabclockd/sounds/fr_FR/nabclockd/20/5.mp3 b/nabclockd/sounds/fr_FR/nabclockd/20/5.mp3 index 9acdef78..f2331dd8 100644 Binary files a/nabclockd/sounds/fr_FR/nabclockd/20/5.mp3 and b/nabclockd/sounds/fr_FR/nabclockd/20/5.mp3 differ diff --git a/nabclockd/sounds/fr_FR/nabclockd/20/6.mp3 b/nabclockd/sounds/fr_FR/nabclockd/20/6.mp3 deleted file mode 100644 index 228b73d2..00000000 Binary files a/nabclockd/sounds/fr_FR/nabclockd/20/6.mp3 and /dev/null differ diff --git a/nabclockd/sounds/fr_FR/nabclockd/20/7.mp3 b/nabclockd/sounds/fr_FR/nabclockd/20/7.mp3 deleted file mode 100644 index 4640529f..00000000 Binary files a/nabclockd/sounds/fr_FR/nabclockd/20/7.mp3 and /dev/null differ diff --git a/nabclockd/sounds/fr_FR/nabclockd/8/1.mp3 b/nabclockd/sounds/fr_FR/nabclockd/8/1.mp3 index c585e578..0b3f6e0c 100644 Binary files a/nabclockd/sounds/fr_FR/nabclockd/8/1.mp3 and b/nabclockd/sounds/fr_FR/nabclockd/8/1.mp3 differ diff --git a/nabclockd/sounds/fr_FR/nabclockd/8/2.mp3 b/nabclockd/sounds/fr_FR/nabclockd/8/2.mp3 index c2f4d2d3..1dd3f2b1 100644 Binary files a/nabclockd/sounds/fr_FR/nabclockd/8/2.mp3 and b/nabclockd/sounds/fr_FR/nabclockd/8/2.mp3 differ diff --git a/nabclockd/sounds/fr_FR/nabclockd/8/3.mp3 b/nabclockd/sounds/fr_FR/nabclockd/8/3.mp3 index a13f3676..6f03bcdb 100644 Binary files a/nabclockd/sounds/fr_FR/nabclockd/8/3.mp3 and b/nabclockd/sounds/fr_FR/nabclockd/8/3.mp3 differ diff --git a/nabclockd/sounds/fr_FR/nabclockd/8/4.mp3 b/nabclockd/sounds/fr_FR/nabclockd/8/4.mp3 index 7a9f7330..cd010868 100644 Binary files a/nabclockd/sounds/fr_FR/nabclockd/8/4.mp3 and b/nabclockd/sounds/fr_FR/nabclockd/8/4.mp3 differ diff --git a/nabclockd/sounds/fr_FR/nabclockd/8/5.mp3 b/nabclockd/sounds/fr_FR/nabclockd/8/5.mp3 new file mode 100644 index 00000000..827ca175 Binary files /dev/null and b/nabclockd/sounds/fr_FR/nabclockd/8/5.mp3 differ diff --git a/nabclockd/sounds/fr_FR/nabclockd/8/6.mp3 b/nabclockd/sounds/fr_FR/nabclockd/8/6.mp3 index 6c13af61..7e4c8461 100644 Binary files a/nabclockd/sounds/fr_FR/nabclockd/8/6.mp3 and b/nabclockd/sounds/fr_FR/nabclockd/8/6.mp3 differ diff --git a/nabd/leds.py b/nabd/leds.py index 6a2406bc..fa18e444 100644 --- a/nabd/leds.py +++ b/nabd/leds.py @@ -3,7 +3,6 @@ from enum import Enum, unique from threading import Condition, Lock, Thread - @unique class Led(Enum): BOTTOM = 4 @@ -12,44 +11,31 @@ class Led(Enum): LEFT = 1 NOSE = 0 - class Leds(object, metaclass=abc.ABCMeta): """Interface for leds""" @abc.abstractmethod def set1(self, led, red, green, blue): - """ - Set the color of a given led. - """ - raise NotImplementedError("Should have implemented") + raise NotImplementedError("Subclasses must implement set1") @abc.abstractmethod def pulse(self, led, red, green, blue): - """ - Set a given led to pulse to a given color. - """ - raise NotImplementedError("Should have implemented") + raise NotImplementedError("Subclasses must implement pulse") @abc.abstractmethod def setall(self, red, green, blue): - """ - Set the color of every led. - """ - raise NotImplementedError("Should have implemented") + raise NotImplementedError("Subclasses must implement setall") def stop(self): - """ - Stop the leds thread, if any. - """ - + """Stop the leds thread, if any.""" class LedsSoft(Leds, metaclass=abc.ABCMeta): """ Base implementation with software pulsing. """ - PULSING_RATE = 0.200 # every 200ms - PULSING_STEPS = 10 # number of steps to reach target color + PULSING_RATE = 0.05 # faster: every 50ms + PULSING_STEPS = 30 # smoother gradient def __init__(self): self.condition = Condition() @@ -176,12 +162,10 @@ def stop(self): @abc.abstractmethod def do_set(self, led, red, green, blue): - """ - Actually set a led. - """ + """Actually set a led.""" + raise NotImplementedError("Subclasses must implement do_set") @abc.abstractmethod def do_show(self): - """ - Show all leds at once. - """ + """Show all leds at once.""" + raise NotImplementedError("Subclasses must implement do_show") diff --git a/nabd/sounds/asr/acquired.wav b/nabd/sounds/asr/acquired.wav new file mode 100644 index 00000000..2841ba53 Binary files /dev/null and b/nabd/sounds/asr/acquired.wav differ diff --git a/nabd/sounds/asr/acquired.mp3 b/nabd/sounds/asr/acquired_old.mp3 similarity index 100% rename from nabd/sounds/asr/acquired.mp3 rename to nabd/sounds/asr/acquired_old.mp3 diff --git a/nabd/sounds/asr/listen.wav b/nabd/sounds/asr/listen.wav new file mode 100644 index 00000000..46c33081 Binary files /dev/null and b/nabd/sounds/asr/listen.wav differ diff --git a/nabd/sounds/asr/listen.mp3 b/nabd/sounds/asr/listen_old.mp3 similarity index 100% rename from nabd/sounds/asr/listen.mp3 rename to nabd/sounds/asr/listen_old.mp3 diff --git a/nabd/sounds/nabd/abort.wav b/nabd/sounds/nabd/abort.wav index bc411576..87b6e1e6 100644 Binary files a/nabd/sounds/nabd/abort.wav and b/nabd/sounds/nabd/abort.wav differ diff --git a/nabd/sounds/nabd/abort_old.wav b/nabd/sounds/nabd/abort_old.wav new file mode 100644 index 00000000..bc411576 Binary files /dev/null and b/nabd/sounds/nabd/abort_old.wav differ diff --git a/nabd/sounds/rfid/rfid.wav b/nabd/sounds/rfid/rfid.wav index cba16c93..3061cde2 100644 Binary files a/nabd/sounds/rfid/rfid.wav and b/nabd/sounds/rfid/rfid.wav differ diff --git a/nabd/sounds/rfid/rfid_old.wav b/nabd/sounds/rfid/rfid_old.wav new file mode 100644 index 00000000..cba16c93 Binary files /dev/null and b/nabd/sounds/rfid/rfid_old.wav differ