|
@@ -77,23 +77,48 @@ bool glissando = true;
|
|
|
#endif
|
|
|
float startup_song[][2] = STARTUP_SONG;
|
|
|
|
|
|
-static void gpt_cb6(GPTDriver *gptp);
|
|
|
-static void gpt_cb7(GPTDriver *gptp);
|
|
|
static void gpt_cb8(GPTDriver *gptp);
|
|
|
|
|
|
+#define DAC_BUFFER_SIZE 360
|
|
|
+
|
|
|
+#define START_CHANNEL_1() gptStart(&GPTD6, &gpt6cfg1); \
|
|
|
+ gptStartContinuous(&GPTD6, 2U)
|
|
|
+#define START_CHANNEL_2() gptStart(&GPTD7, &gpt7cfg1); \
|
|
|
+ gptStartContinuous(&GPTD7, 2U)
|
|
|
+#define STOP_CHANNEL_1() gptStopTimer(&GPTD6)
|
|
|
+#define STOP_CHANNEL_2() gptStopTimer(&GPTD7)
|
|
|
+#define RESTART_CHANNEL_1() STOP_CHANNEL_1(); \
|
|
|
+ START_CHANNEL_1()
|
|
|
+#define RESTART_CHANNEL_2() STOP_CHANNEL_2(); \
|
|
|
+ START_CHANNEL_2()
|
|
|
+#define UPDATE_CHANNEL_1_FREQ(freq) gpt6cfg1.frequency = freq * DAC_BUFFER_SIZE; \
|
|
|
+ RESTART_CHANNEL_1()
|
|
|
+#define UPDATE_CHANNEL_2_FREQ(freq) gpt7cfg1.frequency = freq * DAC_BUFFER_SIZE; \
|
|
|
+ RESTART_CHANNEL_2()
|
|
|
+#define GET_CHANNEL_1_FREQ gpt6cfg1.frequency
|
|
|
+#define GET_CHANNEL_2_FREQ gpt7cfg1.frequency
|
|
|
+
|
|
|
+
|
|
|
|
|
|
* GPT6 configuration.
|
|
|
*/
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
GPTConfig gpt6cfg1 = {
|
|
|
- .frequency = 440,
|
|
|
- .callback = gpt_cb6,
|
|
|
+ .frequency = 440U*DAC_BUFFER_SIZE,
|
|
|
+ .callback = NULL,
|
|
|
.cr2 = TIM_CR2_MMS_1,
|
|
|
.dier = 0U
|
|
|
};
|
|
|
|
|
|
GPTConfig gpt7cfg1 = {
|
|
|
- .frequency = 440,
|
|
|
- .callback = gpt_cb7,
|
|
|
+ .frequency = 440U*DAC_BUFFER_SIZE,
|
|
|
+ .callback = NULL,
|
|
|
.cr2 = TIM_CR2_MMS_1,
|
|
|
.dier = 0U
|
|
|
};
|
|
@@ -105,15 +130,169 @@ GPTConfig gpt8cfg1 = {
|
|
|
.dier = 0U
|
|
|
};
|
|
|
|
|
|
-static void gpt_cb6(GPTDriver *gptp) {
|
|
|
- palTogglePad(GPIOA, 4);
|
|
|
+
|
|
|
+
|
|
|
+ * DAC test buffer (sine wave).
|
|
|
+ */
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+static const dacsample_t dac_buffer[DAC_BUFFER_SIZE] = {
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
|
|
|
+};
|
|
|
+
|
|
|
+
|
|
|
+static const dacsample_t dac_buffer_2[DAC_BUFFER_SIZE] = {
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+ 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047,
|
|
|
+
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
|
|
|
+};
|
|
|
+
|
|
|
+
|
|
|
+ * DAC streaming callback.
|
|
|
+ */
|
|
|
+size_t nx = 0, ny = 0, nz = 0;
|
|
|
+static void end_cb1(DACDriver *dacp, dacsample_t *buffer, size_t n) {
|
|
|
+
|
|
|
+ (void)dacp;
|
|
|
+
|
|
|
+ nz++;
|
|
|
+ if (dac_buffer == buffer) {
|
|
|
+ nx += n;
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ ny += n;
|
|
|
+ }
|
|
|
+
|
|
|
+ if ((nz % 1000) == 0) {
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ * DAC error callback.
|
|
|
+ */
|
|
|
+static void error_cb1(DACDriver *dacp, dacerror_t err) {
|
|
|
+
|
|
|
+ (void)dacp;
|
|
|
+ (void)err;
|
|
|
|
|
|
-static void gpt_cb7(GPTDriver *gptp) {
|
|
|
- palTogglePad(GPIOA, 5);
|
|
|
+ chSysHalt("DAC failure");
|
|
|
}
|
|
|
|
|
|
+static const DACConfig dac1cfg1 = {
|
|
|
+ .init = 2047U,
|
|
|
+ .datamode = DAC_DHRM_12BIT_RIGHT
|
|
|
+};
|
|
|
+
|
|
|
+static const DACConversionGroup dacgrpcfg1 = {
|
|
|
+ .num_channels = 1U,
|
|
|
+ .end_cb = end_cb1,
|
|
|
+ .error_cb = error_cb1,
|
|
|
+ .trigger = DAC_TRG(0)
|
|
|
+};
|
|
|
+
|
|
|
+static const DACConfig dac1cfg2 = {
|
|
|
+ .init = 2047U,
|
|
|
+ .datamode = DAC_DHRM_12BIT_RIGHT
|
|
|
+};
|
|
|
+
|
|
|
+static const DACConversionGroup dacgrpcfg2 = {
|
|
|
+ .num_channels = 1U,
|
|
|
+ .end_cb = end_cb1,
|
|
|
+ .error_cb = error_cb1,
|
|
|
+ .trigger = DAC_TRG(0)
|
|
|
+};
|
|
|
+
|
|
|
void audio_init()
|
|
|
{
|
|
|
|
|
@@ -128,8 +307,30 @@ void audio_init()
|
|
|
|
|
|
audio_config.enable = true;
|
|
|
|
|
|
- palSetPadMode(GPIOA, 4, PAL_MODE_OUTPUT_PUSHPULL);
|
|
|
- palSetPadMode(GPIOA, 5, PAL_MODE_OUTPUT_PUSHPULL);
|
|
|
+
|
|
|
+ * Starting DAC1 driver, setting up the output pin as analog as suggested
|
|
|
+ * by the Reference Manual.
|
|
|
+ */
|
|
|
+ palSetPadMode(GPIOA, 4, PAL_MODE_INPUT_ANALOG);
|
|
|
+ palSetPadMode(GPIOA, 5, PAL_MODE_INPUT_ANALOG);
|
|
|
+ dacStart(&DACD1, &dac1cfg1);
|
|
|
+ dacStart(&DACD2, &dac1cfg2);
|
|
|
+
|
|
|
+
|
|
|
+ * Starting GPT6 driver, it is used for triggering the DAC.
|
|
|
+ */
|
|
|
+ START_CHANNEL_1();
|
|
|
+ START_CHANNEL_2();
|
|
|
+
|
|
|
+
|
|
|
+ * Starting a continuous conversion.
|
|
|
+ */
|
|
|
+ dacStartConversion(&DACD1, &dacgrpcfg1,
|
|
|
+ (dacsample_t *)dac_buffer, DAC_BUFFER_SIZE);
|
|
|
+ dacStartConversion(&DACD2, &dacgrpcfg2,
|
|
|
+ (dacsample_t *)dac_buffer_2, DAC_BUFFER_SIZE);
|
|
|
+
|
|
|
+
|
|
|
|
|
|
audio_initialized = true;
|
|
|
|
|
@@ -193,8 +394,8 @@ void stop_note(float freq)
|
|
|
voice_place = 0;
|
|
|
}
|
|
|
if (voices == 0) {
|
|
|
- gptStopTimer(&GPTD6);
|
|
|
- gptStopTimer(&GPTD7);
|
|
|
+ STOP_CHANNEL_1();
|
|
|
+ STOP_CHANNEL_2();
|
|
|
gptStopTimer(&GPTD8);
|
|
|
frequency = 0;
|
|
|
frequency_alt = 0;
|
|
@@ -224,20 +425,6 @@ float vibrato(float average_freq) {
|
|
|
|
|
|
#endif
|
|
|
|
|
|
-static void restart_gpt6(void) {
|
|
|
-
|
|
|
-
|
|
|
- gptStart(&GPTD6, &gpt6cfg1);
|
|
|
- gptStartContinuous(&GPTD6, 2U);
|
|
|
-}
|
|
|
-
|
|
|
-static void restart_gpt7(void) {
|
|
|
-
|
|
|
-
|
|
|
- gptStart(&GPTD7, &gpt7cfg1);
|
|
|
- gptStartContinuous(&GPTD7, 2U);
|
|
|
-}
|
|
|
-
|
|
|
static void gpt_cb8(GPTDriver *gptp) {
|
|
|
float freq;
|
|
|
|
|
@@ -280,13 +467,10 @@ static void gpt_cb8(GPTDriver *gptp) {
|
|
|
freq_alt = 30.52;
|
|
|
}
|
|
|
|
|
|
- if (gpt6cfg1.frequency != (uint16_t)freq_alt) {
|
|
|
- gpt6cfg1.frequency = freq_alt;
|
|
|
- restart_gpt6();
|
|
|
+ if (GET_CHANNEL_2_FREQ != (uint16_t)freq_alt) {
|
|
|
+ UPDATE_CHANNEL_2_FREQ(freq_alt);
|
|
|
}
|
|
|
|
|
|
- } else {
|
|
|
-
|
|
|
}
|
|
|
|
|
|
if (polyphony_rate > 0) {
|
|
@@ -342,13 +526,10 @@ static void gpt_cb8(GPTDriver *gptp) {
|
|
|
}
|
|
|
|
|
|
|
|
|
- if (gpt7cfg1.frequency != (uint16_t)freq) {
|
|
|
- gpt7cfg1.frequency = freq;
|
|
|
- restart_gpt7();
|
|
|
+ if (GET_CHANNEL_1_FREQ != (uint16_t)freq) {
|
|
|
+ UPDATE_CHANNEL_1_FREQ(freq);
|
|
|
}
|
|
|
|
|
|
- } else {
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -370,11 +551,9 @@ static void gpt_cb8(GPTDriver *gptp) {
|
|
|
freq = voice_envelope(freq);
|
|
|
|
|
|
|
|
|
- if (gpt6cfg1.frequency != (uint16_t)freq) {
|
|
|
- gpt6cfg1.frequency = freq;
|
|
|
- restart_gpt6();
|
|
|
- gpt7cfg1.frequency = freq;
|
|
|
- restart_gpt7();
|
|
|
+ if (GET_CHANNEL_1_FREQ != (uint16_t)freq) {
|
|
|
+ UPDATE_CHANNEL_1_FREQ(freq);
|
|
|
+ UPDATE_CHANNEL_2_FREQ(freq);
|
|
|
}
|
|
|
|
|
|
} else {
|
|
@@ -384,8 +563,8 @@ static void gpt_cb8(GPTDriver *gptp) {
|
|
|
|
|
|
note_position++;
|
|
|
bool end_of_note = false;
|
|
|
- if (gpt6cfg1.frequency > 0) {
|
|
|
- if (!note_resting)
|
|
|
+ if (GET_CHANNEL_1_FREQ > 0) {
|
|
|
+ if (!note_resting)
|
|
|
end_of_note = (note_position >= (note_length*16 - 1));
|
|
|
else
|
|
|
end_of_note = (note_position >= (note_length*16));
|
|
@@ -399,8 +578,8 @@ static void gpt_cb8(GPTDriver *gptp) {
|
|
|
if (notes_repeat) {
|
|
|
current_note = 0;
|
|
|
} else {
|
|
|
- gptStopTimer(&GPTD6);
|
|
|
- gptStopTimer(&GPTD7);
|
|
|
+ STOP_CHANNEL_1();
|
|
|
+ STOP_CHANNEL_2();
|
|
|
|
|
|
playing_notes = false;
|
|
|
return;
|
|
@@ -459,7 +638,8 @@ void play_note(float freq, int vol) {
|
|
|
|
|
|
gptStart(&GPTD8, &gpt8cfg1);
|
|
|
gptStartContinuous(&GPTD8, 2U);
|
|
|
-
|
|
|
+ RESTART_CHANNEL_1();
|
|
|
+ RESTART_CHANNEL_2();
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -492,8 +672,8 @@ void play_notes(float (*np)[][2], uint16_t n_count, bool n_repeat)
|
|
|
|
|
|
gptStart(&GPTD8, &gpt8cfg1);
|
|
|
gptStartContinuous(&GPTD8, 2U);
|
|
|
- restart_gpt6();
|
|
|
- restart_gpt7();
|
|
|
+ RESTART_CHANNEL_1();
|
|
|
+ RESTART_CHANNEL_2();
|
|
|
}
|
|
|
|
|
|
}
|