Splash and ingame sounds + sound effects

Author: daniiki

master/main.c

@@ -276,6 +276,7 @@ int main(void)
 {
 	init();
 
+    uart_putc(0); // play title music
     // show splash screen until button A is pressed
     initial_level = eeprom_read_dword(&initial_level_stored);
     drawsplash(initial_level != 0);
@@ -339,7 +340,11 @@ int main(void)
     bombstruct = &bomb_;
 
     left_door_open = true;
-    right_door_open = true;    
+    right_door_open = true;
+    
+    //ingame music
+    uart_putc(1);
+    
     newgame();
 
     while (1)
@@ -672,6 +677,7 @@ int main(void)
         {
             if (explode < getMsTimer())
             {
+                uart_putc('e');
                 uint8_t blast_x1;
                 uint8_t blast_x2;
                 uint8_t blast_y1;

music/Boss_Musik_1.mid

@@ -6,6 +6,7 @@
 #include <inttypes.h>
 #include <util/delay.h>
 #include <avr/interrupt.h>
+#include <math.h>
 #include "uart.h"
 #include "timer.h"
 #include "music.h"
@@ -17,61 +18,105 @@ SIGNAL(TIMER1_COMPA_vect)
     PORTB ^= (1 << 1);
 }
 
+const uint16_t* playing;
+uint16_t i;
+void play(const uint16_t* music)
+{
+    while (1)
+    {
+        while (1)
+        {
+            uint16_t delay = pgm_read_word(&music[i]);
+            if (i > 0 && delay == 0)
+                break;
+            reset_timer();
+            while(getMsTimer() < delay && !uart_data_waiting());
+            if (uart_data_waiting())
+                break;
+            OCR1A = pgm_read_word(&music[i+1]);
+            i += 2;
+        }
+        OCR1A = 0;
+        if (uart_data_waiting())
+            break;
+        i = 0;
+    }
+}
+
+void start_playing(const uint16_t* music)
+{
+    i = 0;
+    playing = music;
+    play(music);
+}
+
+void continue_playing()
+{
+    play(playing);
+}
+
 int main()
 {
     init();
-
-    /*while (1)
+    
+    uint16_t j = 0;
+    while (1)
     {
         while(!uart_data_waiting());
         switch (uart_getc())
         {
-            case 's':
-                // shoot
+            case 0:
+                start_playing(splash);
+                break;
+            case 1:
+                start_playing(ingame);
+                break;
+            case 's': // shoot
                 for (uint16_t i = 0; i < 10000; i += 15)
                 {
                     OCR1A = i;
                     _delay_us(500);
                 }
                 OCR1A = 0;
                 break;
+            case 'e': // explosion
+                if (j % 2)
+                {
+                    for (uint16_t i = 50000; i > 5000; i -= 500)
+                    {
+                        OCR1A = i;
+                        _delay_ms(1);
+                    }
+                    for (uint16_t i = 5000; i < 50000; i += 40)
+                    {
+                        OCR1A = i;
+                        _delay_ms(1);
+                    }
+                }
+                else
+                {
+                    for (uint16_t i = 5000; i < 40000; i *= 1.002)
+                    {
+                        OCR1A = i;
+                        _delay_us(1000);
+                        OCR1A /= 2;
+                        _delay_us(100);
+                    }
+                }
+                OCR1A = 0;
+                j++;
+                break;
         }
+        if (!uart_data_waiting())
+            continue_playing();
     }
 
-    // explosion
-    for (uint16_t i = 5000; i < 40000; i *= 1.002)
-    {
-        OCR1A = i;
-        _delay_us(1000);
-        OCR1A /= 2;
-        _delay_us(100);
-    }
-    OCR1A = 0;
-    _delay_ms(1000);*/
-
     // random
     /*while(1)
     {
         OCR1A = random() % 100 * 100 + 2000;
         _delay_ms(300);
     }*/
-
-    while (1)
-    {
-        uint8_t i = 0;
-        while (1)
-        {
-            uint16_t delay = pgm_read_word(&elise[i]);
-            if (i > 0 && delay == 0)
-                break;
-            reset_timer();
-            while(getMsTimer() < delay);
-            OCR1A = pgm_read_word(&elise[i+1]);
-            i += 2;
-        }
-        OCR1A = 0;
-        _delay_ms(100);
-    }
 }
 
 void init()

music/Boss_Musik_2.mid

@@ -4,6 +4,10 @@
 #include <inttypes.h>
 #include <avr/pgmspace.h>
 
-extern const uint16_t elise[821] PROGMEM;
+extern const uint16_t elise[39] PROGMEM;
+
+extern const uint16_t splash[95] PROGMEM;
+
+extern const uint16_t ingame[83] PROGMEM;
 
 #endif

music/Combat 2.mid

@@ -11,7 +11,7 @@ class Synth():
     def __init__(self, hfile, cfile):
         self.hfile = hfile
         self.cfile = cfile
-    def writeCArray(self,filename,arrayname,allow_pause=True,includeTracks=[]):
+    def writeCArray(self,filename,arrayname,allow_pause=True,timescale=1,includeTracks=[],pitch=1):
         mid = MidiFile(filename)
         events=[]
         for i, track in enumerate(mid.tracks):
@@ -21,7 +21,7 @@ def writeCArray(self,filename,arrayname,allow_pause=True,includeTracks=[]):
             for message in track:
                 t+=message.time
                 if (message.type=="note_on" or message.type=="note_off") :
-                    e={}
+                    e={} 
                     if message.velocity==0:
                         e["type"]="note_off"
                     else:
@@ -53,20 +53,20 @@ def writeCArray(self,filename,arrayname,allow_pause=True,includeTracks=[]):
                 if note not in notes or max(notes) > note:
                     note = max(notes)
                     t = e[0]
-                    delay = int((t - last_time) * 10 ** (-3) / 480. * tempo) # in ms
+                    delay = int(timescale*(t - last_time) * 10 ** (-3) / 480. * tempo) # in ms
                     last_time = t
                     freq = 2.0 ** ((note - 69) / 12.0) * 440.0 # in Hz
                     period = 1.0 / freq # in seconds
                     # value for compare register with prescaler=8
                     # /2 because the timer counts up twice per period
-                    compare = F_CPU * period / 8 / 2
+                    compare = F_CPU * period / 8 / 2 / pitch
                     if delay == 0 and len(changes) > 0:
                         changes[-1]["freq"] = int(compare)
                     else:
                         changes.append({"delay": delay, "freq": int(compare)})
             elif allow_pause: # there is currently no note playing
                 t = e[0]
-                delay = int((t - last_time) * 10 ** (-3) / 480. * tempo) # in ms
+                delay = int(timescale*(t - last_time) * 10 ** (-3) / 480. * tempo) # in ms
                 last_time = t
                 compare = 0 # sound off
                 if delay == 0 and len(changes) > 0:
@@ -91,5 +91,10 @@ def writeCArray(self,filename,arrayname,allow_pause=True,includeTracks=[]):
         hfile.write("#ifndef MUSIC_H\n#define MUSIC_H\n\n#include <inttypes.h>\n#include <avr/pgmspace.h>\n\n")
         synth=Synth(hfile, cfile)
         # for ... in os.walk("../music"):
-        synth.writeCArray("../music/sevenfortyam.mid", "elise", True)
+        synth.writeCArray("../../bomb_explosion_1.wav.mid", "elise", True)
+        #synth.writeCArray("../music/sevenfortyam.mid", "splash", True)
+        #synth.writeCArray("../music/Combat 2.mid", "splash", True, 4, [3])
+        #synth.writeCArray("../music/SERAPHO.MID", "splash", True, 1, [1], .5)
+        synth.writeCArray("../music/Boss_Musik_2.mid", "splash", True)
+        synth.writeCArray("../music/Ingame_Musik_Tief.mid", "ingame", True)
         hfile.write("#endif")