From 04343fa68e6b9d0f417b49b4aa7b488cef4140d3 Mon Sep 17 00:00:00 2001
From: starcalc <starcalc@ctdo.de>
Date: Mon, 29 Jun 2020 23:11:07 +0100
Subject: [PATCH] Umstellung auf die Gitarre

---
 Pi/s.py | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/Pi/s.py b/Pi/s.py
index 9b9aad2..8950003 100755
--- a/Pi/s.py
+++ b/Pi/s.py
@@ -8,36 +8,48 @@ pygame.init()
 pygame.mixer.quit()
 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('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')
 
 # port = serial.Serial("/dev/ttyS0", baudrate=115200, timeout=.001)
 port = serial.Serial("/dev/ttyS0", baudrate=115200)
 # port = serial.Serial("/dev/ttyAMA0", baudrate=115200)
 
-SoundA.play();
 oldrcv = port.read()
 while True:
 	# rcv decodieren
 	rcv = port.read()
 	
 	# 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");
-			SoundC.stop()
-			SoundC.play()
+			SoundD.stop()
+			SoundD.play()
 	else:
-		SoundC.stop()
+		SoundD.stop()
 		rcvstate0 = False
 
 	if rcv[0] & ( 1 << 0 ) :
 		if not oldrcv[0] & ( 1 << 0 ):
 			print("0");
-			SoundA.stop()
-			SoundA.play()
+			SoundC.stop()
+			SoundC.play()
 	else:
-		SoundA.stop()
+		SoundC.stop()
 
 	oldrcv = rcv