From 735599ee7f1912ee675bd40ba6bdafb97f7c8d6b Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>
Date: Thu, 25 Apr 2024 19:14:46 +0200
Subject: [PATCH] better pling

---
 sound-driver/melody_pling.c  | 35 +++++++++++++++++++++++++++++++----
 sound-driver/melody_tetris.c |  2 +-
 sound-driver/melody_tusch1.c |  2 +-
 sound-driver/spi.S           |  1 +
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/sound-driver/melody_pling.c b/sound-driver/melody_pling.c
index fa0770e..ccd9890 100644
--- a/sound-driver/melody_pling.c
+++ b/sound-driver/melody_pling.c
@@ -5,18 +5,45 @@
 #include "scheduler.h"
 
 const t_tone plingVoice1[] = {
-  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_4,     .legato = false, .staccato = true  },
-  { .octave = e_O_5,    .note = e_E,     .length = e_L_1_4,     .legato = false, .staccato = true  },
+  { .octave = e_O_5,    .note = e_C,     .length = e_L_1_16,    .legato = false, .staccato = false },
+  { .octave = e_O_5,    .note = e_Cis,   .length = e_L_1_16,    .legato = false, .staccato = false },
+  { .octave = e_O_5,    .note = e_D,     .length = e_L_1_16,    .legato = false, .staccato = false },
+  { .octave = e_O_5,    .note = e_Dis,   .length = e_L_1_16,    .legato = false, .staccato = false },
+  { .octave = e_O_5,    .note = e_E,     .length = e_L_1_4,     .legato = false, .staccato = false },
 
   { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
   { .octave = e_O_Null, .note = e_Null,  .length = e_L_StopMark,.legato = false, .staccato = false },
 
   { .octave = e_O_Null, .note = e_Null,  .length = e_L_EndMark, .legato = false, .staccato = false },
 };
+const t_tone plingVoice2[] = {
+  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_16,    .legato = false, .staccato = false },
+  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_16,    .legato = false, .staccato = false },
+  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_16,    .legato = false, .staccato = false },
+  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_16,    .legato = false, .staccato = false },
+  { .octave = e_O_5,    .note = e_Gis,   .length = e_L_1_4,     .legato = false, .staccato = false },
+
+  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
+  { .octave = e_O_Null, .note = e_Null,  .length = e_L_HoldMark,.legato = false, .staccato = false },
+
+  { .octave = e_O_Null, .note = e_Null,  .length = e_L_EndMark, .legato = false, .staccato = false },
+};
+const t_tone plingVoice3[] = {
+  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_16,    .legato = false, .staccato = false },
+  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_16,    .legato = false, .staccato = false },
+  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_16,    .legato = false, .staccato = false },
+  { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_16,    .legato = false, .staccato = false },
+  { .octave = e_O_5,    .note = e_H,     .length = e_L_1_4,     .legato = false, .staccato = false },
+
+  { .octave = e_O_Null, .note = e_Null,  .length = e_L_SyncMark,.legato = false, .staccato = false },
+  { .octave = e_O_Null, .note = e_Null,  .length = e_L_HoldMark,.legato = false, .staccato = false },
+
+  { .octave = e_O_Null, .note = e_Null,  .length = e_L_EndMark, .legato = false, .staccato = false },
+};
 
 t_melodies pling = {
-  .melodies = { { .amplitude = 12, .tones = plingVoice1 } },
-  .numOfMelodies = 1,
+  .melodies = { { .amplitude = 12, .tones = plingVoice1 }, { .amplitude = 12, .tones = plingVoice2 }, { .amplitude = 12, .tones = plingVoice3 } },
+  .numOfMelodies = 3,
   .pace = 200,
   .chip = 1
 };
diff --git a/sound-driver/melody_tetris.c b/sound-driver/melody_tetris.c
index 598fe6c..75a7e3f 100644
--- a/sound-driver/melody_tetris.c
+++ b/sound-driver/melody_tetris.c
@@ -936,7 +936,7 @@ void playMelodyTetris() {
 }
 
 void playMelodyTetrisFaster() {
-  tetrisTheme.pace += 10;
+  tetrisTheme.pace += 15;
   sequencerChangePace(&tetrisTheme);
 }
 
diff --git a/sound-driver/melody_tusch1.c b/sound-driver/melody_tusch1.c
index 8c61445..043d1a2 100644
--- a/sound-driver/melody_tusch1.c
+++ b/sound-driver/melody_tusch1.c
@@ -80,7 +80,7 @@ t_melodies tusch1 = {
 
 void playTusch1() {
   sequencerPlayMelodies(&tusch1);
-  playMelodyTetrisFaster();
+//  playMelodyTetrisFaster();
 }
 
 
diff --git a/sound-driver/spi.S b/sound-driver/spi.S
index 97358e2..6b9288f 100644
--- a/sound-driver/spi.S
+++ b/sound-driver/spi.S
@@ -35,6 +35,7 @@ spiCmdHandler_4:
 spiCmdHandler_5:
   bit     #SOUND_FANFARE, &cmd
   jz      spiCmdHandler_6
+  call    #playMelodyTetrisFaster
   call    #playTusch1
   bic     #SOUND_FANFARE, &cmd
 spiCmdHandler_6: