florian66
/
Sound4Calc
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

struct wave

This commit is contained in:
flo 2017-02-26 21:54:38 +01:00
parent 62dacc7f0d
commit cf189355a9
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/sound4calc.h
View File

@ -3,11 +3,17 @@
extern struct Note
{
char* wave_signal;
struct Wave wave;
unsigned short duration;
unsigned int freq;
} note;
struct Wave
{
char* signal;
unsigned short length;
};
void CallSequence();
void CallNote();
void PutPinState(char level);

12
src/main.c
View File

@ -19,11 +19,13 @@ int main(void)
dclear();
dprint(1, 1, "%d", note.freq);
dprint(1, 10, "%s", note.wave_signal);
dprint(1, 20, "%d, %d", strlen(note.wave_signal), place);
dprint(1, 10, "%s", note.wave.signal);
dprint(1, 20, "%d", place);
dprint(1, 30, "F1:note/F2:sequence");
dtext(1, 50, "F5 _ F6 -");
note.wave.length = place;
dupdate();
key = getkey();
@ -35,9 +37,9 @@ int main(void)
case KEY_UP : note.freq+=10; break;
case KEY_DOWN : note.freq-=10; break;
case KEY_F5 : *(note.wave_signal+place++) = '_'; break;
case KEY_F6 : *(note.wave_signal+place++) = '-'; break;
case KEY_DEL : place=(place>0 ? place - 1 : 0); *(note.wave_signal+place) = 0; break;
case KEY_F5 : *(note.wave.signal+place++) = '_'; break;
case KEY_F6 : *(note.wave.signal+place++) = '-'; break;
case KEY_DEL : place=(place>0 ? place - 1 : 0); *(note.wave.signal+place) = 0; break;
case KEY_F1 : CallNote(); break;
case KEY_F2 : CallSequence(); break;

8
src/sound4calc.c
View File

@ -38,7 +38,7 @@ void CallSequence()
}
// update of the number of turn
length_end = strlen(note.wave_signal) * seq[notes].freq * seq[notes].length_ms / 1000;
length_end = strlen(note.wave.signal) * seq[notes].freq * seq[notes].length_ms / 1000;
// start or reload the timer
timer_start(TIMER_USER, 2 * seq[notes].freq, Clock_Hz, CallSequence, 0);
}
@ -50,7 +50,7 @@ void CallSequence()
void CallNote()
{
note.duration = 1000;
timer_start(TIMER_USER, note.freq * strlen(note.wave_signal), Clock_Hz, PlayNote, strlen(note.wave_signal) * note.freq * note.duration / 1000);
timer_start(TIMER_USER, note.freq * note.wave.length, Clock_Hz, PlayNote, note.wave.length * note.freq * note.duration / 1000);
}
/*
@ -68,9 +68,9 @@ void PlayNote()
{
static int x = 0;
PutPinState(note.wave_signal[x]=='-');
PutPinState(note.wave.signal[x]=='-');
x = x + 1;
if(!(note.wave_signal[x])) x = 0;
if(!(note.wave.signal[x])) x = 0;
}
/*