wn/tetris
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sequencer states

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2024-03-26 22:12:46 +01:00
parent 9989a52c38
commit 2e629f12aa
5 changed files with 57 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
sound-driver/melody.c
View File

@ -6,29 +6,30 @@
const t_tone notes[] = { const t_tone notes[] = {
{ .octave = e_O_3, .note = e_G, .length = e_L_1_4, .legato = false }, { .octave = e_O_3, .note = e_G, .length = e_L_1_4, .legato = false },
{ .octave = e_O_3, .note = e_D, .length = e_L_1_8, .legato = false }, { .octave = e_O_3, .note = e_D, .length = e_L_1_8, .legato = false },
{ .octave = e_O_3, .note = e_Dis, .length = e_L_1_8, .legato = false }, { .octave = e_O_3, .note = e_Es, .length = e_L_1_8, .legato = false },
{ .octave = e_O_3, .note = e_F, .length = e_L_1_4, .legato = false }, { .octave = e_O_3, .note = e_F, .length = e_L_1_4, .legato = false },
{ .octave = e_O_3, .note = e_Dis, .length = e_L_1_8, .legato = false }, { .octave = e_O_3, .note = e_Es, .length = e_L_1_8, .legato = false },
{ .octave = e_O_3, .note = e_D, .length = e_L_1_8, .legato = false }, { .octave = e_O_3, .note = e_D, .length = e_L_1_8, .legato = false },
{ .octave = e_O_3, .note = e_C, .length = e_L_1_4, .legato = false }, { .octave = e_O_3, .note = e_C, .length = e_L_1_4, .legato = false },
{ .octave = e_O_3, .note = e_C, .length = e_L_1_8, .legato = false }, { .octave = e_O_3, .note = e_C, .length = e_L_1_8, .legato = false },
{ .octave = e_O_3, .note = e_Dis, .length = e_L_1_8, .legato = false }, { .octave = e_O_3, .note = e_Es, .length = e_L_1_8, .legato = false },
{ .octave = e_O_3, .note = e_G, .length = e_L_1_4, .legato = false }, { .octave = e_O_3, .note = e_G, .length = e_L_1_4, .legato = false },
{ .octave = e_O_3, .note = e_F, .length = e_L_1_8, .legato = false }, { .octave = e_O_3, .note = e_F, .length = e_L_1_8, .legato = false },
{ .octave = e_O_3, .note = e_Dis, .length = e_L_1_8, .legato = false }, { .octave = e_O_3, .note = e_Es, .length = e_L_1_8, .legato = false },
{ .octave = e_O_3, .note = e_D, .length = e_L_1_4, .legato = true }, { .octave = e_O_3, .note = e_D, .length = e_L_1_4, .legato = true },
{ .octave = e_O_3, .note = e_D, .length = e_L_1_8, .legato = false }, { .octave = e_O_3, .note = e_D, .length = e_L_1_8, .legato = false },
{ .octave = e_O_3, .note = e_Dis, .length = e_L_1_8, .legato = false }, { .octave = e_O_3, .note = e_Es, .length = e_L_1_8, .legato = false },
{ .octave = e_O_3, .note = e_F, .length = e_L_1_4, .legato = false }, { .octave = e_O_3, .note = e_F, .length = e_L_1_4, .legato = false },
{ .octave = e_O_3, .note = e_G, .length = e_L_1_4, .legato = false }, { .octave = e_O_3, .note = e_G, .length = e_L_1_4, .legato = false },
{ .octave = e_O_3, .note = e_Dis, .length = e_L_1_8, .legato = true }, // Staccato
{ .octave = e_O_3, .note = e_Dis, .length = e_L_1_16, .legato = false }, { .octave = e_O_3, .note = e_Es, .length = e_L_1_8, .legato = true },
{ .octave = e_O_3, .note = e_Es, .length = e_L_1_16, .legato = false },
{ .octave = e_O_Null, .note = e_Pause, .length = e_L_1_16, .legato = false }, { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_16, .legato = false },
{ .octave = e_O_3, .note = e_C, .length = e_L_1_8, .legato = true }, { .octave = e_O_3, .note = e_C, .length = e_L_1_8, .legato = true },
{ .octave = e_O_3, .note = e_C, .length = e_L_1_16, .legato = false }, { .octave = e_O_3, .note = e_C, .length = e_L_1_16, .legato = false },
@ -41,29 +42,30 @@ const t_tone notes[] = {
{ .octave = e_O_Null, .note = e_Pause, .length = e_L_1_8, .legato = false }, { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_8, .legato = false },
{ .octave = e_O_3, .note = e_F, .length = e_L_1_8, .legato = true }, { .octave = e_O_3, .note = e_F, .length = e_L_1_8, .legato = true },
{ .octave = e_O_3, .note = e_F, .length = e_L_1_8, .legato = false }, { .octave = e_O_3, .note = e_F, .length = e_L_1_8, .legato = false },
{ .octave = e_O_3, .note = e_Gis, .length = e_L_1_8, .legato = false }, { .octave = e_O_3, .note = e_As, .length = e_L_1_8, .legato = false },
{ .octave = e_O_4, .note = e_C, .length = e_L_1_4, .legato = false }, { .octave = e_O_4, .note = e_C, .length = e_L_1_4, .legato = false },
{ .octave = e_O_3, .note = e_Ais, .length = e_L_1_8, .legato = false }, { .octave = e_O_3, .note = e_B, .length = e_L_1_8, .legato = false },
{ .octave = e_O_3, .note = e_Gis, .length = e_L_1_8, .legato = false }, { .octave = e_O_3, .note = e_As, .length = e_L_1_8, .legato = false },
{ .octave = e_O_3, .note = e_G, .length = e_L_1_4, .legato = true }, { .octave = e_O_3, .note = e_G, .length = e_L_1_4, .legato = true },
{ .octave = e_O_3, .note = e_G, .length = e_L_1_8, .legato = false }, { .octave = e_O_3, .note = e_G, .length = e_L_1_8, .legato = false },
{ .octave = e_O_3, .note = e_Dis, .length = e_L_1_8, .legato = false }, { .octave = e_O_3, .note = e_Es, .length = e_L_1_8, .legato = false },
{ .octave = e_O_3, .note = e_G, .length = e_L_1_4, .legato = false }, { .octave = e_O_3, .note = e_G, .length = e_L_1_4, .legato = false },
{ .octave = e_O_3, .note = e_F, .length = e_L_1_8, .legato = false }, { .octave = e_O_3, .note = e_F, .length = e_L_1_8, .legato = false },
{ .octave = e_O_3, .note = e_Dis, .length = e_L_1_8, .legato = false }, { .octave = e_O_3, .note = e_Es, .length = e_L_1_8, .legato = false },
{ .octave = e_O_3, .note = e_D, .length = e_L_1_4, .legato = false }, { .octave = e_O_3, .note = e_D, .length = e_L_1_4, .legato = false },
{ .octave = e_O_3, .note = e_D, .length = e_L_1_8, .legato = false }, { .octave = e_O_3, .note = e_D, .length = e_L_1_8, .legato = false },
{ .octave = e_O_3, .note = e_Dis, .length = e_L_1_8, .legato = false }, { .octave = e_O_3, .note = e_Es, .length = e_L_1_8, .legato = false },
{ .octave = e_O_3, .note = e_F, .length = e_L_1_4, .legato = false }, { .octave = e_O_3, .note = e_F, .length = e_L_1_4, .legato = false },
{ .octave = e_O_3, .note = e_G, .length = e_L_1_4, .legato = false }, { .octave = e_O_3, .note = e_G, .length = e_L_1_4, .legato = false },
{ .octave = e_O_3, .note = e_Dis, .length = e_L_1_8, .legato = true }, // Staccato
{ .octave = e_O_3, .note = e_Dis, .length = e_L_1_16, .legato = false }, { .octave = e_O_3, .note = e_Es, .length = e_L_1_8, .legato = true },
{ .octave = e_O_3, .note = e_Es, .length = e_L_1_16, .legato = false },
{ .octave = e_O_Null, .note = e_Pause, .length = e_L_1_16, .legato = false }, { .octave = e_O_Null, .note = e_Pause, .length = e_L_1_16, .legato = false },
{ .octave = e_O_3, .note = e_C, .length = e_L_1_8, .legato = true }, { .octave = e_O_3, .note = e_C, .length = e_L_1_8, .legato = true },
{ .octave = e_O_3, .note = e_C, .length = e_L_1_16, .legato = false }, { .octave = e_O_3, .note = e_C, .length = e_L_1_16, .legato = false },
@ -75,36 +77,15 @@ const t_tone notes[] = {
{ .octave = e_O_Null, .note = e_Null, .length = e_L_EndMark, .legato = false }, { .octave = e_O_Null, .note = e_Null, .length = e_L_EndMark, .legato = false },
}; };
/*
const t_tone ladder[16] = {
{ .octave = e_O_3, .note = e_C, .length = e_L_1_4 },
{ .octave = e_O_3, .note = e_D, .length = e_L_1_4 },
{ .octave = e_O_3, .note = e_E, .length = e_L_1_4 },
{ .octave = e_O_3, .note = e_F, .length = e_L_1_4 },
{ .octave = e_O_3, .note = e_G, .length = e_L_1_4 },
{ .octave = e_O_3, .note = e_A, .length = e_L_1_4 },
{ .octave = e_O_3, .note = e_H, .length = e_L_1_4 },
{ .octave = e_O_4, .note = e_C, .length = e_L_1_4 },
{ .octave = e_O_3, .note = e_H, .length = e_L_1_4 },
{ .octave = e_O_3, .note = e_A, .length = e_L_1_4 },
{ .octave = e_O_3, .note = e_G, .length = e_L_1_4 },
{ .octave = e_O_3, .note = e_F, .length = e_L_1_4 },
{ .octave = e_O_3, .note = e_E, .length = e_L_1_4 },
{ .octave = e_O_3, .note = e_D, .length = e_L_1_4 },
{ .octave = e_O_3, .note = e_H, .length = e_L_EndMark },
};
*/
t_melody melody= { t_melody melody= {
.idx = 0, .channel = 0,
.lengthCnt = 0,
.tones = notes .tones = notes
}; };
void melodyInit() { void melodyInit() {
psgWrite(07, 0b11111110); psgAmplitude(melody.channel, 3);
psgWrite(010, 03);
sequencerPlayMelody(&melody); sequencerPlayMelody(&melody);
} }

88
sound-driver/psg.c
View File

@ -8,14 +8,15 @@
const uint16_t frequencyCodes[8][12] = { const uint16_t frequencyCodes[8][12] = {
{ 06535, 06234, 05747, 05474, 05233, 05002, 04563, 04353, 04153, 03762, 03600, 03424 }, // C, Cis, D, Dis, E, F, Fis, G, Gis, A, Ais, H
{ 03256, 03116, 02764, 02636, 02515, 02401, 02271, 02165, 02065, 01771, 01700, 01612 }, { 06535, 06234, 05747, 05474, 05233, 05002, 04563, 04353, 04153, 03762, 03600, 03424 }, // Octave 1
{ 01527, 01447, 01372, 01317, 01247, 01201, 01135, 01073, 01033, 00774, 00740, 00705 }, { 03256, 03116, 02764, 02636, 02515, 02401, 02271, 02165, 02065, 01771, 01700, 01612 }, // Octave 2
{ 00654, 00624, 00575, 00550, 00523, 00500, 00456, 00435, 00415, 00376, 00360, 00342 }, { 01527, 01447, 01372, 01317, 01247, 01201, 01135, 01073, 01033, 00774, 00740, 00705 }, // Octave 3
{ 00326, 00312, 00276, 00264, 00252, 00240, 00227, 00217, 00207, 00177, 00170, 00161 }, { 00654, 00624, 00575, 00550, 00523, 00500, 00456, 00435, 00415, 00376, 00360, 00342 }, // Octave 4
{ 00153, 00145, 00137, 00132, 00125, 00120, 00114, 00107, 00103, 00100, 00074, 00071 }, { 00326, 00312, 00276, 00264, 00252, 00240, 00227, 00217, 00207, 00177, 00170, 00161 }, // Octave 5
{ 00065, 00062, 00060, 00055, 00052, 00050, 00046, 00044, 00042, 00040, 00036, 00034 }, { 00153, 00145, 00137, 00132, 00125, 00120, 00114, 00107, 00103, 00100, 00074, 00071 }, // Octave 6
{ 00033, 00031, 00030, 00026, 00025, 00024, 00023, 00022, 00021, 00020, 00017, 00016 } { 00065, 00062, 00060, 00055, 00052, 00050, 00046, 00044, 00042, 00040, 00036, 00034 }, // Octave 7
{ 00033, 00031, 00030, 00026, 00025, 00024, 00023, 00022, 00021, 00020, 00017, 00016 } // Octave 8
}; };
@ -108,26 +109,8 @@ void psgPlayTone(uint8_t channel, t_octave octave, t_note note) {
} }
} }
void playSomething(void *handle) { void psgAmplitude(uint8_t channel, uint8_t volume) {
static uint8_t state = 0; psgWrite(R10 + channel, volume);
switch (state) {
case 0:
psgWrite(R7, 0b11111110);
psgWrite(R10, 03);
state = 1;
// no break;
case 1:
psgPlayTone(0, e_O_5, e_C);
state = 2;
break;
case 2:
psgPlayTone(0, e_O_5, e_E);
state = 1;
break;
}
} }
void psgInit() { void psgInit() {
@ -160,52 +143,7 @@ void psgInit() {
delay(); delay();
delay(); delay();
// schAdd(playSomething, NULL, 0, 500); // disable everything
psgWrite(R7, 0xff);
} }
/*
// single tone
writePSG(R0, 0376);
writePSG(R1, 0);
writePSG(R7, 076);
writePSG(R10, 03);
*/
/*
// gun shot
writePSG(R6, 017);
writePSG(R7, 007);
writePSG(R10, 020);
writePSG(R11, 020);
writePSG(R12, 020);
writePSG(R14, 020);
writePSG(R15, 0);
*/
/*
// explosion
writePSG(R6, 0);
writePSG(R7, 007);
writePSG(R10, 020);
writePSG(R11, 020);
writePSG(R12, 020);
writePSG(R14, 070);
writePSG(R15, 0);
*/
/*
// Akkord
writeFrequency(0, C5);
writeFrequency(1, E5);
writeFrequency(2, G5);
writePSG(R7, 0b11111000);
writePSG(R10, 03);
writePSG(R11, 03);
writePSG(R12, 03);
*/

10
sound-driver/psg.h
View File

@ -32,10 +32,20 @@ typedef enum {
e_Null e_Null
} t_note; } t_note;
#define e_Es e_Dis
#define e_As e_Gis
#define e_B e_Ais
void psgInit(); void psgInit();
void psgPlayTone(uint8_t channel, t_octave octave, t_note note); void psgPlayTone(uint8_t channel, t_octave octave, t_note note);
void psgAmplitude(uint8_t channel, uint8_t volume);
// low level
void psgWriteFrequency(uint8_t channel, uint16_t frequencyCode); void psgWriteFrequency(uint8_t channel, uint16_t frequencyCode);
// very low level
void psgWrite(uint8_t address, uint8_t data); void psgWrite(uint8_t address, uint8_t data);
uint8_t psgReadShadow(uint8_t address); uint8_t psgReadShadow(uint8_t address);

15
sound-driver/sequencer.c
View File

@ -3,6 +3,7 @@
#include "psg.h" #include "psg.h"
void sequencerInit() { void sequencerInit() {
} }
@ -10,7 +11,7 @@ void sequencerExec(void *handle) {
t_melody *melody = (t_melody*) handle; t_melody *melody = (t_melody*) handle;
switch (melody->state) { switch (melody->state) {
case 0: case e_PlayTone:
if (melody->tones[melody->idx].length == e_L_EndMark) { if (melody->tones[melody->idx].length == e_L_EndMark) {
melody->idx = 0; melody->idx = 0;
} }
@ -18,20 +19,20 @@ void sequencerExec(void *handle) {
psgPlayTone(melody->channel, melody->tones[melody->idx].octave, melody->tones[melody->idx].note); psgPlayTone(melody->channel, melody->tones[melody->idx].octave, melody->tones[melody->idx].note);
melody->lengthCnt = melody->tones[melody->idx].length; melody->lengthCnt = melody->tones[melody->idx].length;
melody->state = 1; melody->state = e_HoldTone;
break; break;
case 1: case e_HoldTone:
melody->lengthCnt -= 1; melody->lengthCnt -= 1;
if (melody->lengthCnt == 0) { if (melody->lengthCnt == 0) {
melody->state = 2; melody->state = e_SeparateTone;
} }
break; break;
case 2: case e_SeparateTone:
if (! (melody->tones[melody->idx].legato)) { if (! (melody->tones[melody->idx].legato)) {
psgPlayTone(melody->channel, e_O_Null, e_Pause); psgPlayTone(melody->channel, e_O_Null, e_Pause);
} }
melody->idx += 1; melody->idx += 1;
melody->state = 0; melody->state = e_PlayTone;
break; break;
} }
} }
@ -39,7 +40,7 @@ void sequencerExec(void *handle) {
uint8_t sequencerPlayMelody(t_melody *melody) { uint8_t sequencerPlayMelody(t_melody *melody) {
melody->idx = 0; melody->idx = 0;
melody->lengthCnt = 0; melody->lengthCnt = 0;
melody->state = 0; melody->state = e_PlayTone;
schAdd(sequencerExec, (void*) melody, 0, 10); schAdd(sequencerExec, (void*) melody, 0, 10);
return 0; return 0;
} }

8
sound-driver/sequencer.h
View File

@ -22,10 +22,16 @@ typedef struct {
bool legato; bool legato;
} t_tone; } t_tone;
typedef enum {
e_PlayTone,
e_HoldTone,
e_SeparateTone
} t_sequencerState;
typedef struct { typedef struct {
uint16_t idx; uint16_t idx;
uint8_t lengthCnt; uint8_t lengthCnt;
uint8_t state; t_sequencerState state;
uint8_t channel; uint8_t channel;
const t_tone *tones; const t_tone *tones;
} t_melody; } t_melody;