diff --git a/Pi/s.py b/Pi/s.py index 250fdb5..05bf8b0 100755 --- a/Pi/s.py +++ b/Pi/s.py @@ -1,6 +1,5 @@ #!/usr/bin/python3 - import serial import pygame @@ -12,9 +11,23 @@ pygame.mixer.init(buffer=32) #SoundC = pygame.mixer.Sound('ogg/C3v16.ogg') #SoundA = pygame.mixer.Sound('ogg/A3v16.ogg') #SoundFF = pygame.mixer.Sound('ogg/F#3v16.ogg') -SoundC = pygame.mixer.Sound('guitar/guitar_C4_very-long_forte_normal.wav') -SoundD = pygame.mixer.Sound('guitar/guitar_D4_very-long_forte_normal.wav') -SoundE = pygame.mixer.Sound('guitar/guitar_E4_very-long_forte_normal.wav') +Sound = [pygame.mixer.Sound('guitar/guitar_C4_very-long_forte_normal.wav'), + pygame.mixer.Sound('guitar/guitar_D4_very-long_forte_normal.wav'), + pygame.mixer.Sound('guitar/guitar_E4_very-long_forte_normal.wav'), + pygame.mixer.Sound('guitar/guitar_F4_very-long_forte_normal.wav'), + pygame.mixer.Sound('guitar/guitar_G4_very-long_forte_normal.wav'), + pygame.mixer.Sound('guitar/guitar_A4_very-long_forte_normal.wav'), + pygame.mixer.Sound('guitar/guitar_H4_very-long_forte_normal.wav'), + pygame.mixer.Sound('guitar/guitar_C5_very-long_forte_normal.wav') + ] +#SoundC = pygame.mixer.Sound('guitar/guitar_C4_very-long_forte_normal.wav') +#SoundD = pygame.mixer.Sound('guitar/guitar_D4_very-long_forte_normal.wav') +#SoundE = pygame.mixer.Sound('guitar/guitar_E4_very-long_forte_normal.wav') +#SoundF = pygame.mixer.Sound('guitar/guitar_F4_very-long_forte_normal.wav') +#SoundG = pygame.mixer.Sound('guitar/guitar_G4_very-long_forte_normal.wav') +#SoundA = pygame.mixer.Sound('guitar/guitar_A4_very-long_forte_normal.wav') +#SoundH = pygame.mixer.Sound('guitar/guitar_H4_very-long_forte_normal.wav') +#SoundC2 = pygame.mixer.Sound('guitar/guitar_C5_very-long_forte_normal.wav') # port = serial.Serial("/dev/ttyS0", baudrate=115200, timeout=.001) port = serial.Serial("/dev/ttyS0", baudrate=115200) @@ -24,33 +37,17 @@ oldrcv = port.read() while True: # rcv decodieren rcv = port.read() - + i=0 # Zustand merken, und nur "neu" starten, wenn sich etwas von 0 auf 1 veraendert hat. - - if rcv[0] & ( 1 << 2 ) : - if not oldrcv[0] & ( 1 << 2 ): - print("1"); - SoundE.stop() - SoundE.play() - else: - SoundE.stop() - rcvstate0 = False - - if rcv[0] & ( 1 << 1 ) : - if not oldrcv[0] & ( 1 << 1 ): - print("1"); - SoundD.stop() - SoundD.play() - else: - SoundD.stop() - rcvstate0 = False - - if rcv[0] & ( 1 << 0 ) : - if not oldrcv[0] & ( 1 << 0 ): - print("0"); - SoundC.stop() - SoundC.play() - else: - SoundC.stop() + for cs in Sound: + if rcv[0] & ( 1 << i ) : + if not oldrcv[0] & ( 1 << i ): + print(i) + cs.stop() + cs.play() + i+=1 + else: + cs.stop() + rcvstate0 = False oldrcv = rcv