diff --git a/demo/Makefile b/demo/Makefile index df29bb2..a5d1d82 100644 --- a/demo/Makefile +++ b/demo/Makefile @@ -3,7 +3,7 @@ BUILD_DIR?=../build/ include $(BUILD_DIR)/software/include/generated/variables.mak include $(SOC_DIRECTORY)/software/common.mak -OBJECTS = can.o crt0.o donut.o led.o main.o note.o +OBJECTS = audio.o can.o crt0.o donut.o led.o main.o CFLAGS += -DWITH_CXX diff --git a/demo/audio b/demo/audio new file mode 100644 index 0000000..70fd996 --- /dev/null +++ b/demo/audio @@ -0,0 +1,146 @@ +#include +#include + +#pragma once + +#ifdef CSR_AUDIO_BASE +// Function Definition + +void reset_audio(void); + +void set_wave(uint32_t osc, uint32_t wave); + +void set_freq(uint32_t osc, uint32_t freq); + +void audio(uint32_t osc, uint32_t wave, uint32_t freq); + +void timed_freq(uint32_t osc, uint32_t freq, unsigned int duration_ms); + +// Waves +enum wave_t { + WAVE_SAWTOOTH, + WAVE_SQUARE, + WAVE_TRIANGLE, + WAVE_SINE +}; + +// Notes +#define NOTE_NONE 0 + +#define NOTE_C0 16.35f +#define NOTE_C0S 17.32f +#define NOTE_D0 18.35f +#define NOTE_D0S 19.45f +#define NOTE_E0 20.60f +#define NOTE_F0 21.83f +#define NOTE_F0S 23.12f +#define NOTE_G0 24.50f +#define NOTE_G0S 25.96f +#define NOTE_A0 27.50f +#define NOTE_A0S 29.14f +#define NOTE_B0 30.87f + +#define NOTE_C1 32.70f +#define NOTE_C1S 34.65f +#define NOTE_D1 36.71f +#define NOTE_D1S 38.89f +#define NOTE_E1 41.20f +#define NOTE_F1 43.65f +#define NOTE_F1S 46.25f +#define NOTE_G1 49.00f +#define NOTE_G1S 51.91f +#define NOTE_A1 55.00f +#define NOTE_A1S 58.27f +#define NOTE_B1 61.74f + +#define NOTE_C2 65.41f +#define NOTE_C2S 69.30f +#define NOTE_D2 73.42f +#define NOTE_D2S 77.78f +#define NOTE_E2 82.41f +#define NOTE_F2 87.31f +#define NOTE_F2S 92.50f +#define NOTE_G2 98.00f +#define NOTE_G2S 103.83f +#define NOTE_A2 110.00f +#define NOTE_A2S 116.54f +#define NOTE_B2 123.47f + +#define NOTE_C3 130.81f +#define NOTE_C3S 138.59f +#define NOTE_D3 146.83f +#define NOTE_D3S 155.56f +#define NOTE_E3 164.81f +#define NOTE_F3 174.61f +#define NOTE_F3S 185.00f +#define NOTE_G3 196.00f +#define NOTE_G3S 207.65f +#define NOTE_A3 220.00f +#define NOTE_A3S 233.08f +#define NOTE_B3 246.94f + +#define NOTE_C4 261.63f +#define NOTE_C4S 277.18f +#define NOTE_D4 293.66f +#define NOTE_D4S 311.13f +#define NOTE_E4 329.63f +#define NOTE_F4 349.23f +#define NOTE_F4S 369.99f +#define NOTE_G4 392.00f +#define NOTE_G4S 415.30f +#define NOTE_A4 440.00f +#define NOTE_A4S 466.16f +#define NOTE_B4 493.88f + +#define NOTE_C5 523.25f +#define NOTE_C5S 554.37f +#define NOTE_D5 587.33f +#define NOTE_D5S 622.25f +#define NOTE_E5 659.25f +#define NOTE_F5 698.46f +#define NOTE_F5S 739.99f +#define NOTE_G5 783.99f +#define NOTE_G5S 830.61f +#define NOTE_A5 880.00f +#define NOTE_A5S 932.33f +#define NOTE_B5 987.77f + +#define NOTE_C6 1046.50f +#define NOTE_C6S 1108.73f +#define NOTE_D6 1174.66f +#define NOTE_D6S 1244.51f +#define NOTE_E6 1318.51f +#define NOTE_F6 1396.91f +#define NOTE_F6S 1479.98f +#define NOTE_G6 1567.98f +#define NOTE_G6S 1661.22f +#define NOTE_A6 1760.00f +#define NOTE_A6S 1864.66f +#define NOTE_B6 1975.53f + +#define NOTE_C7 2093.00f +#define NOTE_C7S 2217.46f +#define NOTE_D7 2349.32f +#define NOTE_D7S 2489.02f +#define NOTE_E7 2637.02f +#define NOTE_F7 2793.83f +#define NOTE_F7S 2959.96f +#define NOTE_G7 3135.96f +#define NOTE_G7S 3322.44f +#define NOTE_A7 3520.00f +#define NOTE_A7S 3729.31f +#define NOTE_B7 3951.07f + +#define NOTE_C8 4186.01f +#define NOTE_C8S 4434.92f +#define NOTE_D8 4698.63f +#define NOTE_D8S 4978.03f +#define NOTE_E8 5274.04f +#define NOTE_F8 5587.65f +#define NOTE_F8S 5919.91f +#define NOTE_G8 6271.93f +#define NOTE_G8S 6644.88f +#define NOTE_A8 7040.00f +#define NOTE_A8S 7458.62f +#define NOTE_B8 7902.13f +#endif diff --git a/demo/audio.cpp b/demo/audio.cpp new file mode 100644 index 0000000..a445cfa --- /dev/null +++ b/demo/audio.cpp @@ -0,0 +1,46 @@ +#include "audio" +#include +#include + +#ifdef CSR_AUDIO_BASE +// Normalise target frequency from float to (24.4 bit) fixed point +static inline uint32_t n_tf(float freq) { + return static_cast(freq * 16.0f); +} + +// Set all oscillators to (0Hz, sawtooth) +void reset_audio(void) { + for (int i = 0; i < 64; i++) { + audio_osc_write(i); + audio_tf_write(0); + audio_wav_write(0); + } +} + +// Set oscillator `osc` to waveform `wave` +void set_wave(uint32_t osc, wave_t wave) { + audio_osc_write(osc); + audio_wav_write(wave); +} + +// Set oscillator `osc` to frequency `freq`Hz +void set_freq(uint32_t osc, float freq) { + audio_osc_write(osc); + audio_tf_write(n_tf(freq)); +} + +// Set oscillator `osc` to waveform `wave` at frequency `freq`Hz +void audio(uint32_t osc, wave_t wave, float freq) { + audio_osc_write(osc); + audio_wav_write(wave); + audio_tf_write(n_tf(freq)); +} + +// Set oscillator `osc` to waveform `wave` at frequency `freq`Hz for `ms` milliseconds +void timed_freq(uint32_t osc, float freq, unsigned int ms) { + audio_osc_write(osc); + audio_tf_write(n_tf(freq)); + busy_wait(ms); + audio_tf_write(0); +} +#endif diff --git a/demo/main.cpp b/demo/main.cpp index dc5e8ad..b5adc59 100644 --- a/demo/main.cpp +++ b/demo/main.cpp @@ -10,8 +10,9 @@ #include #include +#include "audio" #include "can" -#include "note" +#include /*-----------------------------------------------------------------------*/ /* Uart */ @@ -90,10 +91,10 @@ static void help(void) { puts("leds - Led set demo"); #endif #ifdef CSR_AUDIO_BASE - puts("saw - Sawtooth Wave demo"); - puts("square - Square Wave demo"); - puts("triangle - Triangle Wave demo"); - puts("sine - Sine Wave demo"); + puts("saw - Sawtooth Wave (osc, freq)"); + puts("square - Square Wave (osc, freq)"); + puts("triangle - Triangle Wave (osc, freq)"); + puts("sine - Sine Wave (osc, freq)"); puts("imperial - Imperial March demo"); puts("roll - Music demo"); #endif @@ -134,90 +135,90 @@ static void leds_cmd(char **val) { #endif #ifdef CSR_AUDIO_BASE static void saw_cmd(char **val) { - int value = (int)strtol(get_token(val), NULL, 0); - printf("Setting Oscillator 0 to Sawtooth: %dHz\n", value); - wave(WAVE_SAW); - audio_targ0_write(value); + uint32_t osc = static_cast(strtol(get_token(val), NULL, 10)); + float freq = strtof(get_token(val), NULL); + printf("Setting Oscillator %d to Sawtooth: %.2fHz\n", osc, freq); + audio(osc, WAVE_SAWTOOTH, freq); } static void square_cmd(char **val) { - int value = (int)strtol(get_token(val), NULL, 0); - printf("Setting Oscillator 0 to Square: %dHz\n", value); - wave(WAVE_SQUARE); - audio_targ0_write(value); + uint32_t osc = static_cast(strtol(get_token(val), NULL, 10)); + float freq = strtof(get_token(val), NULL); + printf("Setting Oscillator %d to Square: %.2fHz\n", osc, freq); + audio(osc, WAVE_SQUARE, freq); } static void triangle_cmd(char **val) { - int value = (int)strtol(get_token(val), NULL, 0); - printf("Setting Oscillator 0 to Triangle: %dHz\n", value); - wave(WAVE_TRIANGLE); - audio_targ0_write(value); + uint32_t osc = static_cast(strtol(get_token(val), NULL, 10)); + float freq = strtof(get_token(val), NULL); + printf("Setting Oscillator %d to Triangle: %.2fHz\n", osc, freq); + audio(osc, WAVE_TRIANGLE, freq); } static void sine_cmd(char **val) { - int value = (int)strtol(get_token(val), NULL, 0); - printf("Setting Oscillator 0 to Sine: %dHz\n", value); - wave(WAVE_SINE); - audio_targ0_write(value); + uint32_t osc = static_cast(strtol(get_token(val), NULL, 10)); + float freq = strtof(get_token(val), NULL); + printf("Setting Oscillator %d to Sine: %.2fHz\n", osc, freq); + audio(osc, WAVE_SINE, freq); } static void imperial_cmd() { - note(NOTE_G4, 400); - note(NOTE_NONE, 400); - note(NOTE_G4, 400); - note(NOTE_NONE, 400); - note(NOTE_G4, 600); - note(NOTE_NONE, 600); - note(NOTE_D4S, 200); - note(NOTE_A4S, 200); - note(NOTE_G4, 600); - note(NOTE_NONE, 200); - note(NOTE_D4S, 400); - note(NOTE_NONE, 200); - note(NOTE_A4S, 200); - note(NOTE_G4, 1000); - note(NOTE_D4S, 600); - note(NOTE_NONE, 200); - note(NOTE_D5, 600); - note(NOTE_NONE, 200); - note(NOTE_D5, 600); - note(NOTE_NONE, 200); - note(NOTE_D5, 600); - note(NOTE_NONE, 200); - note(NOTE_D5S, 400); - note(NOTE_NONE, 200); - note(NOTE_A4S, 200); - note(NOTE_F4S, 600); - note(NOTE_NONE, 200); - note(NOTE_D4S, 400); - note(NOTE_NONE, 200); - note(NOTE_A4S, 200); - note(NOTE_G4, 800); + timed_freq(0, NOTE_G4, 400); + timed_freq(0, NOTE_NONE, 400); + timed_freq(0, NOTE_G4, 400); + timed_freq(0, NOTE_NONE, 400); + timed_freq(0, NOTE_G4, 600); + timed_freq(0, NOTE_NONE, 600); + timed_freq(0, NOTE_D4S, 200); + timed_freq(0, NOTE_A4S, 200); + timed_freq(0, NOTE_G4, 600); + timed_freq(0, NOTE_NONE, 200); + timed_freq(0, NOTE_D4S, 400); + timed_freq(0, NOTE_NONE, 200); + timed_freq(0, NOTE_A4S, 200); + timed_freq(0, NOTE_G4, 1000); + timed_freq(0, NOTE_D4S, 600); + timed_freq(0, NOTE_NONE, 200); + timed_freq(0, NOTE_D5, 600); + timed_freq(0, NOTE_NONE, 200); + timed_freq(0, NOTE_D5, 600); + timed_freq(0, NOTE_NONE, 200); + timed_freq(0, NOTE_D5, 600); + timed_freq(0, NOTE_NONE, 200); + timed_freq(0, NOTE_D5S, 400); + timed_freq(0, NOTE_NONE, 200); + timed_freq(0, NOTE_A4S, 200); + timed_freq(0, NOTE_F4S, 600); + timed_freq(0, NOTE_NONE, 200); + timed_freq(0, NOTE_D4S, 400); + timed_freq(0, NOTE_NONE, 200); + timed_freq(0, NOTE_A4S, 200); + timed_freq(0, NOTE_G4, 800); } static void roll_cmd() { - note(NOTE_C4S, 450); - note(NOTE_D4S, 600); - note(NOTE_G3S, 150); - note(NOTE_D4S, 450); - note(NOTE_F4, 450); - note(NOTE_G4S, 90); - note(NOTE_F4S, 90); - note(NOTE_F4, 90); - note(NOTE_C4S, 510); - note(NOTE_D4S, 600); - note(NOTE_G3S, 1500); - note(NOTE_C4S, 450); - note(NOTE_D4S, 600); - note(NOTE_G3S, 150); - note(NOTE_D4S, 450); - note(NOTE_F4, 450); - note(NOTE_G4S, 90); - note(NOTE_F4S, 90); - note(NOTE_F4, 90); - note(NOTE_C4S, 510); - note(NOTE_D4S, 600); - note(NOTE_G3S, 1500); + timed_freq(0, NOTE_C4S, 450); + timed_freq(0, NOTE_D4S, 600); + timed_freq(0, NOTE_G3S, 150); + timed_freq(0, NOTE_D4S, 450); + timed_freq(0, NOTE_F4, 450); + timed_freq(0, NOTE_G4S, 90); + timed_freq(0, NOTE_F4S, 90); + timed_freq(0, NOTE_F4, 90); + timed_freq(0, NOTE_C4S, 510); + timed_freq(0, NOTE_D4S, 600); + timed_freq(0, NOTE_G3S, 1500); + timed_freq(0, NOTE_C4S, 450); + timed_freq(0, NOTE_D4S, 600); + timed_freq(0, NOTE_G3S, 150); + timed_freq(0, NOTE_D4S, 450); + timed_freq(0, NOTE_F4, 450); + timed_freq(0, NOTE_G4S, 90); + timed_freq(0, NOTE_F4S, 90); + timed_freq(0, NOTE_F4, 90); + timed_freq(0, NOTE_C4S, 510); + timed_freq(0, NOTE_D4S, 600); + timed_freq(0, NOTE_G3S, 1500); } #endif #ifdef CSR_DAC_VOL_BASE @@ -300,9 +301,9 @@ static void can_watch_cmd() { #ifdef CSR_AUDIO_BASE const char *notes[85] = {"None", "C1", "C1#", "D1", "D1#", "E1", "F1", "F1#", "G1", "G1#", "A1", "A1#", "B1", "C2", "C2#", "D2", "D2#", "E2", "F2", "F2#", "G2", "G2#", "A2", "A2#", "B2", "C3", "C3#", "D3", "D3#", "E3", "F3", "F3#", "G3", "G3#", "A3", "A3#", "B3", "C4", "C4#", "D4", "D4#", "E4", "F4", "F4#", "G4", "G4#", "A4", "A4#", "B4", "C5", "C5#", "D5", "D5#", "E5", "F5", "F5#", "G5", "G5#", "A5", "A5#", "B5", "C6", "C6#", "D6", "D6#", "E6", "F6", "F6#", "G6", "G6#", "A6", "A6#", "B6", "C7", "C7#", "D7", "D7#", "E7", "F7", "F7#", "G7", "G7#", "A7", "A7#", "B7"}; -const int freqs[85] = {0, 33, 35, 37, 39, 41, 44, 46, 49, 52, 55, 58, 62, 65, 69, 73, 78, 82, 87, 93, 98, 104, 110, 117, 123, 131, 139, 147, 156, 165, 175, 185, 196, 208, 220, 233, 247, 262, 277, 294, 311, 330, 349, 370, 392, 415, 440, 466, 494, 523, 554, 587, 622, 659, 698, 740, 784, 831, 880, 932, 988, 1047, 1109, 1175, 1245, 1319, 1397, 1480, 1568, 1661, 1760, 1865, 1976, 2093, 2217, 2349, 2489, 2637, 2794, 2960, 3136, 3322, 3520, 3729, 3951}; +const float freqs[85] = {0.00f, 32.70f, 34.65f, 36.71f, 38.89f, 41.20f, 43.65f, 46.25f, 49.00f, 51.91f, 55.00f, 58.27f, 61.74f, 65.41f, 69.30f, 73.42f, 77.78f, 82.41f, 87.31f, 92.50f, 98.00f, 103.83f, 110.00f, 116.54f, 123.47f, 130.81f, 138.59f, 146.83f, 155.56f, 164.81f, 174.61f, 185.00f, 196.00f, 207.65f, 220.00f, 233.08f, 246.94f, 261.63f, 277.18f, 293.66f, 311.13f, 329.63f, 349.23f, 369.99f, 392.00f, 415.30f, 440.00f, 466.16f, 493.88f, 523.25f, 554.37f, 587.33f, 622.25f, 659.25f, 698.46f, 739.99f, 783.99f, 830.61f, 880.00f, 932.33f, 987.77f, 1046.50f, 1108.73f, 1174.66f, 1244.51f, 1318.51f, 1396.91f, 1479.98f, 1567.98f, 1661.22f, 1760.00f, 1864.66f, 1975.53f, 2093.00f, 2217.46f, 2349.32f, 2489.02f, 2637.02f, 2793.83f, 2959.96f, 3135.96f, 3322.44f, 3520.00f, 3729.31f, 3951.07f}; static void can_listen_cmd() { - wave(WAVE_SINE); + set_wave(0, WAVE_SINE); int old_note = 0; while (true) { can_frame frame = can_read(); @@ -310,7 +311,7 @@ static void can_listen_cmd() { case 'P': { int note = (frame.data[1] - 1) * 12 + frame.data[2]; if (note != old_note) { - audio_targ0_write(freqs[note]); + set_freq(0, freqs[note]); printf("Playing note %s\n", notes[note]); old_note = note; } @@ -321,7 +322,7 @@ static void can_listen_cmd() { if (old_note != 0) { printf("Stopping notes\n"); old_note = 0; - audio_targ0_write(0); + set_freq(0, 0); } break; }