From 3d5fe2a0bfe5a9b6f39d7937eddd0a47a76c23f2 Mon Sep 17 00:00:00 2001 From: Jonas Gunz Date: Sun, 25 Jun 2017 19:51:22 +0200 Subject: Cleanups --- .vs/floppyMusic/v14/.atsuo | Bin 72704 -> 63488 bytes floppyMusic/floppy.c | 12 ++---- floppyMusic/floppy.h | 1 - floppyMusic/main.c | 13 ++++-- floppyMusic/midi.c | 105 +++++++++++++++++++-------------------------- floppyMusic/midi.h | 29 +++++++++---- floppyMusic/music.c | 14 +++--- 7 files changed, 85 insertions(+), 89 deletions(-) diff --git a/.vs/floppyMusic/v14/.atsuo b/.vs/floppyMusic/v14/.atsuo index 3cb21b3..148c79a 100644 Binary files a/.vs/floppyMusic/v14/.atsuo and b/.vs/floppyMusic/v14/.atsuo differ diff --git a/floppyMusic/floppy.c b/floppyMusic/floppy.c index b065302..3cd699a 100644 --- a/floppyMusic/floppy.c +++ b/floppyMusic/floppy.c @@ -9,8 +9,6 @@ ISR(TIMER0_OVF_vect) { - cli(); - timer_overflow_counter ++; *fPORT = 0xff; //Deactivate all previously activated pins @@ -23,8 +21,6 @@ ISR(TIMER0_OVF_vect) floppy_pulse(i); } } - - sei(); } void floppy_setup(unsigned char *_pulse_port, unsigned char *_pulse_ddr, unsigned char *_direction_port, unsigned char *_direction_ddr) @@ -89,12 +85,12 @@ void floppy_setup(unsigned char *_pulse_port, unsigned char *_pulse_ddr, unsigne uint8_t floppy_calc_freq(uint32_t _f_hz) { + uint32_t f = _f_hz; - ///TODO Shift notes out of effective range of FDD into range if(_f_hz < 31) return 255; - if(_f_hz > 7813) - return 1; + if(_f_hz > 400) //FDD cant go over 400Hz so the tone is shifted down in octaves + for(f = _f_hz; f > 400; f /= 2); - return 7913 / _f_hz; + return 7913 / f; } \ No newline at end of file diff --git a/floppyMusic/floppy.h b/floppyMusic/floppy.h index b0a45cb..86d2be1 100644 --- a/floppyMusic/floppy.h +++ b/floppyMusic/floppy.h @@ -49,5 +49,4 @@ uint8_t floppy_calc_freq(uint32_t _f_hz); * _f_hz : Frequency in Hz */ - #endif /* FLOPPY_H_ */ \ No newline at end of file diff --git a/floppyMusic/main.c b/floppyMusic/main.c index 6256e97..8719312 100644 --- a/floppyMusic/main.c +++ b/floppyMusic/main.c @@ -5,15 +5,16 @@ * Author : Jonas */ -#define _TEST_MODE +//#define _TEST_MODE #include #include "floppy.h" -#include "midi.h" #ifdef _TEST_MODE #include "music.h" +#else +#include "midi.h" #endif int main(void) @@ -27,14 +28,18 @@ int main(void) for(;;) { play_imperial_march(); - _delay_ms(2000); + _delay_ms(1000); } #else //Normal MIDI mode midi_setup(); - for(;;); + for(;;) + { + while (!(UCSRA & (1<> 4) & 0x0f; // Shift channel into first 4 bits; - note = data1; - velocity = data2; - + /*channel = data[0] & 0x0f; //Mask out last 4 bits*/ + command = (data[0] >> 4) & 0x0f; // Shift command into first 4 bits; + note = data[1]; + /*velocity = data2;*/ + + //PORTA = ~command; + switch(command) { case 0x08: //Note off + PORTA = 1; midi_update_note(note, 0); break; - midi_update_note(note, 1); - case 0x09: //Note on + case 0x09: //Note on + PORTA = 2; + midi_update_note(note, 1); break; + /* + case 0x0A:break; //Note Fade Out + + case 0x0B:break; //Control Change - case 0x0A: //Note Fade Out - //unused - break; - - case 0x0B: //Control Change - //unused - break; + case 0x0C:break; //Channel Fade Out - case 0x0C: //Channel Fade Out - //unused - break; - - case 0x0E: //Note Pitch change - //unused - break; + case 0x0E:break; //Note Pitch change + */ + default:break; } - - } void midi_setup() { midi_active_channels = 0x00; - + DDRA = 0xff; + PORTA = 0xff; //UART init unsigned int ubrr = (F_CPU / (16 * _MIDI_LINK_SPEED)) - 1; UBRRH = (unsigned char) (ubrr>>8) & 0xff; UBRRL = (unsigned char) ubrr & 0xff; - UCSRB = (1< +#include #include #include "floppy.h" @@ -32,14 +49,8 @@ void midi_setup(); void midi_update_note(uint16_t _note, uint8_t _status); /* -* _note : MIDI standard note # +* _note : MIDI-standard note # * _status : 0=OFF >0=ON */ -char midi_recieve(); -/* -* reads UART recieve buffer -*/ - - #endif /* MIDI_H_ */ \ No newline at end of file diff --git a/floppyMusic/music.c b/floppyMusic/music.c index 5dc644f..f0aed39 100644 --- a/floppyMusic/music.c +++ b/floppyMusic/music.c @@ -26,7 +26,7 @@ beep(cH, 150); beep(a, 650); - delay_ms(150); + _delay_ms(150); //end of first bit beep(eH, 500); @@ -39,7 +39,7 @@ beep(cH, 150); beep(a, 650); - delay_ms(150); + _delay_ms(150); //end of second bit... beep(aH, 500); @@ -52,7 +52,7 @@ beep(fH, 125); beep(fSH, 250); - delay_ms(250); + _delay_ms(250); beep(aS, 250); beep(dSH, 400); @@ -62,7 +62,7 @@ beep(b, 125); beep(cH, 250); - delay_ms(250); + _delay_ms(250); beep(f, 125); beep(gS, 500); @@ -86,7 +86,7 @@ beep(fH, 125); beep(fSH, 250); - delay_ms(250); + _delay_ms(250); beep(aS, 250); beep(dSH, 400); @@ -96,7 +96,7 @@ beep(b, 125); beep(cH, 250); - delay_ms(250); + _delay_ms(250); beep(f, 250); beep(gS, 500); @@ -243,5 +243,5 @@ floppy_set_frequency(0, 0); floppy_set_frequency(1, 0); - delay_ms(10); + _delay_ms(10); } \ No newline at end of file -- cgit v1.2.3