johannes.payr/pizzabox-main
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bugfixes...

Browse source
This commit is contained in:
jpunkt 2021-11-04 14:21:33 +01:00
parent 711454a06c
commit 939a8b4e4a
2 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pizzactrl/hal_serial.py
View file

@ -35,6 +35,7 @@ class SerialCommands(Enum):
BACKLIGHT = 'B' BACKLIGHT = 'B'
FRONTLIGHT = 'F' FRONTLIGHT = 'F'
USER_INTERACTION = 'U' USER_INTERACTION = 'U'
RECORD = 'C'
REWIND = 'R' REWIND = 'R'
@ -135,7 +136,7 @@ def wait_for_input(hal: PizzaHAL, go_callback: Any,
:param to_callback: called on timeout :param to_callback: called on timeout
:param timeout: inactivity timeout in seconds (default 120) :param timeout: inactivity timeout in seconds (default 120)
""" """
resp = hal.send_cmd(SerialCommands.USER_INTERACTION, timeout) resp = hal.send_cmd(SerialCommands.USER_INTERACTION, timeout).strip()
if resp == 'B': if resp == 'B':
go_callback(**kwargs) go_callback(**kwargs)
elif resp == 'R': elif resp == 'R':
@ -208,8 +209,11 @@ def record_sound(hal: PizzaHAL, filename: Any, duration: int,
myrecording = sd.rec(int(duration * AUDIO_REC_SR), myrecording = sd.rec(int(duration * AUDIO_REC_SR),
samplerate=AUDIO_REC_SR, samplerate=AUDIO_REC_SR,
channels=2) channels=2)
# TODO user interaction instead resp = hal.send_cmd(SerialCommands.RECORD, duration).strip()
sd.wait() # Wait until recording is finished if resp == 'I':
sd.stop()
else:
sd.wait() # Wait until recording is finished
# TODO test # TODO test
myrecording = np.int16(myrecording) myrecording = np.int16(myrecording)
song = pydub.AudioSegment(myrecording.tobytes(), frame_rate=AUDIO_REC_SR, sample_width=2, channels=2) song = pydub.AudioSegment(myrecording.tobytes(), frame_rate=AUDIO_REC_SR, sample_width=2, channels=2)

37
pizzactrl/sb_en.py
View file

@ -2,43 +2,42 @@ from pizzactrl import storyboard, fs_names
STORYBOARD = [ STORYBOARD = [
storyboard.Chapter( storyboard.Chapter(
# storyboard.Do(storyboard.Activity.ADVANCE_UP), storyboard.Do(storyboard.Activity.LIGHT_LAYER, # VERT01
storyboard.Do(storyboard.Activity.LIGHT_BACK, # Bild 1
intensity=1.0, fade=1.0) intensity=1.0, fade=1.0)
), ),
storyboard.Chapter( storyboard.Chapter(
storyboard.Do(storyboard.Activity.PLAY_SOUND, storyboard.Do(storyboard.Activity.PLAY_SOUND,
sound=fs_names.StoryFile('03en')), sound=fs_names.StoryFile('01en')),
storyboard.Do(storyboard.Activity.PLAY_SOUND,
sound=fs_names.StoryFile('02en')),
storyboard.Do(storyboard.Activity.WAIT_FOR_INPUT), storyboard.Do(storyboard.Activity.WAIT_FOR_INPUT),
storyboard.Do(storyboard.Activity.ADVANCE_UP) # Bild 2 storyboard.Do(storyboard.Activity.ADVANCE_UP) # VERT02up
), ),
storyboard.Chapter( storyboard.Chapter(
storyboard.Do(storyboard.Activity.LIGHT_BACK, # Bild 1
intensity=1.0, fade=1.0),
storyboard.Do(storyboard.Activity.PLAY_SOUND, storyboard.Do(storyboard.Activity.PLAY_SOUND,
sound=fs_names.StoryFile('04en')), sound=fs_names.StoryFile('03en')),
storyboard.Do(storyboard.Activity.ADVANCE_UP), # Bild 3 storyboard.Do(storyboard.Activity.ADVANCE_UP), # VERT02down
storyboard.Do(storyboard.Activity.LIGHT_BACK,
intensity=1.0, fade=0.5),
storyboard.Do(storyboard.Activity.LIGHT_LAYER,
intensity=0.0, fade=0.5),
storyboard.Do(storyboard.Activity.PLAY_SOUND, storyboard.Do(storyboard.Activity.PLAY_SOUND,
sound=fs_names.StoryFile('05en')), sound=fs_names.StoryFile('05en')),
storyboard.Do(storyboard.Activity.ADVANCE_UP), # VERT03
storyboard.Do(storyboard.Activity.PLAY_SOUND, storyboard.Do(storyboard.Activity.PLAY_SOUND,
sound=fs_names.StoryFile('06en')), sound=fs_names.StoryFile('06en')),
storyboard.Do(storyboard.Activity.LIGHT_BACK,
intensity=0.0, fade=1.0),
storyboard.Do(storyboard.Activity.PLAY_SOUND, storyboard.Do(storyboard.Activity.PLAY_SOUND,
sound=fs_names.StoryFile('07en')), sound=fs_names.StoryFile('07en')),
storyboard.Do(storyboard.Activity.ADVANCE_UP), # Bild 4
storyboard.Do(storyboard.Activity.PLAY_SOUND,
sound=fs_names.StoryFile('08en')),
storyboard.Do(storyboard.Activity.PLAY_SOUND,
sound=fs_names.StoryFile('09en')),
storyboard.Do(storyboard.Activity.LIGHT_BACK,
intensity=0.0),
storyboard.Do(storyboard.Activity.WAIT_FOR_INPUT), storyboard.Do(storyboard.Activity.WAIT_FOR_INPUT),
storyboard.Do(storyboard.Activity.ADVANCE_UP), # Bild 5 storyboard.Do(storyboard.Activity.ADVANCE_UP), # VERT04
storyboard.Do(storyboard.Activity.LIGHT_LAYER,
intensity=1.0, fade=1.0),
), ),
storyboard.Chapter( storyboard.Chapter(
storyboard.Do(storyboard.Activity.LIGHT_BACK,
intensity=1.0),
storyboard.Do(storyboard.Activity.PLAY_SOUND, storyboard.Do(storyboard.Activity.PLAY_SOUND,
sound=fs_names.StoryFile('10en')), sound=fs_names.StoryFile('08en')),
storyboard.Do(storyboard.Activity.PLAY_SOUND, storyboard.Do(storyboard.Activity.PLAY_SOUND,
sound=fs_names.StoryFile('11en')), sound=fs_names.StoryFile('11en')),
storyboard.Do(storyboard.Activity.PLAY_SOUND, storyboard.Do(storyboard.Activity.PLAY_SOUND,