no need for length of play_notes array with macro
This commit is contained in:
commit
e7b9959819
7 changed files with 54 additions and 61 deletions
|
@ -181,7 +181,7 @@ void init_notes() {
|
|||
DDRC |= _BV(PORTC6);
|
||||
|
||||
TIMSK3 &= ~_BV(OCIE3A); // Turn off 3A interputs
|
||||
|
||||
|
||||
TCCR3A = 0x0; // Options not needed
|
||||
TCCR3B = _BV(CS31) | _BV(CS30) | _BV(WGM32); // 64th prescaling and CTC
|
||||
OCR3A = SAMPLE_DIVIDER - 1; // Correct count/compare, related to sample playback
|
||||
|
@ -202,14 +202,14 @@ ISR(TIMER3_COMPA_vect) {
|
|||
if (voices == 1) {
|
||||
// SINE
|
||||
OCR4A = pgm_read_byte(&sinewave[(uint16_t)place]) >> 2;
|
||||
|
||||
|
||||
// SQUARE
|
||||
// if (((int)place) >= 1024){
|
||||
// OCR4A = 0xFF >> 2;
|
||||
// } else {
|
||||
// OCR4A = 0x00;
|
||||
// }
|
||||
|
||||
|
||||
// SAWTOOTH
|
||||
// OCR4A = (int)place / 4;
|
||||
|
||||
|
@ -298,9 +298,9 @@ ISR(TIMER3_COMPA_vect) {
|
|||
|
||||
note_position++;
|
||||
bool end_of_note = false;
|
||||
if (ICR3 > 0)
|
||||
if (ICR3 > 0)
|
||||
end_of_note = (note_position >= (note_length / ICR3 * 0xFFFF));
|
||||
else
|
||||
else
|
||||
end_of_note = (note_position >= (note_length * 0x7FF));
|
||||
if (end_of_note) {
|
||||
current_note++;
|
||||
|
@ -412,7 +412,7 @@ if (audio_config.enable && voices < 8) {
|
|||
if (frequency != 0) {
|
||||
double starting_f = frequency;
|
||||
if (frequency < freq) {
|
||||
for (double f = starting_f; f <= freq; f += ((freq - starting_f) / 2000.0)) {
|
||||
for (double f = starting_f; f <= freq; f += ((freq - starting_f) / 2000.0)) {
|
||||
frequency = f;
|
||||
}
|
||||
} else if (frequency > freq) {
|
||||
|
|
|
@ -4,6 +4,9 @@
|
|||
#include <util/delay.h>
|
||||
#include "musical_notes.h"
|
||||
|
||||
#ifndef AUDIO_H
|
||||
#define AUDIO_H
|
||||
|
||||
typedef union {
|
||||
uint8_t raw;
|
||||
struct {
|
||||
|
@ -19,6 +22,22 @@ void audio_off(void);
|
|||
void play_sample(uint8_t * s, uint16_t l, bool r);
|
||||
void play_note(double freq, int vol);
|
||||
void stop_note(double freq);
|
||||
void stop_all_notes();
|
||||
void init_notes();
|
||||
void stop_all_notes(void);
|
||||
void init_notes(void);
|
||||
void play_notes(float (*np)[][2], uint8_t n_length, bool n_repeat, float n_rest);
|
||||
|
||||
|
||||
#define SCALE (int []){ 0 + (12*0), 2 + (12*0), 4 + (12*0), 5 + (12*0), 7 + (12*0), 9 + (12*0), 11 + (12*0), \
|
||||
0 + (12*1), 2 + (12*1), 4 + (12*1), 5 + (12*1), 7 + (12*1), 9 + (12*1), 11 + (12*1), \
|
||||
0 + (12*2), 2 + (12*2), 4 + (12*2), 5 + (12*2), 7 + (12*2), 9 + (12*2), 11 + (12*2), \
|
||||
0 + (12*3), 2 + (12*3), 4 + (12*3), 5 + (12*3), 7 + (12*3), 9 + (12*3), 11 + (12*3), \
|
||||
0 + (12*4), 2 + (12*4), 4 + (12*4), 5 + (12*4), 7 + (12*4), 9 + (12*4), 11 + (12*4), }
|
||||
|
||||
// These macros are used to allow play_notes to play an array of indeterminate
|
||||
// length. This works around the limitation of C's sizeof operation on pointers.
|
||||
// The global float array for the song must be used here.
|
||||
#define NOTE_ARRAY_SIZE(x) ((int)(sizeof(x) / (sizeof(x[0]))))
|
||||
#define PLAY_NOTE_ARRAY(note_array, note_repeat, note_rest_style) play_notes(¬e_array, NOTE_ARRAY_SIZE((note_array)), (note_repeat), (note_rest_style));
|
||||
|
||||
|
||||
#endif
|
|
@ -191,7 +191,7 @@ static action_t keycode_to_action(uint16_t keycode)
|
|||
case RESET: ; // RESET is 0x5000, which is why this is here
|
||||
clear_keyboard();
|
||||
#ifdef AUDIO_ENABLE
|
||||
play_notes(&goodbye_tune, false, 0);
|
||||
PLAY_NOTE_ARRAY(goodbye_tune, false, 0);
|
||||
#endif
|
||||
_delay_ms(250);
|
||||
#ifdef ATREUS_ASTAR
|
||||
|
@ -204,7 +204,7 @@ static action_t keycode_to_action(uint16_t keycode)
|
|||
debug_enable = true;
|
||||
break;
|
||||
case 0x5002 ... 0x50FF:
|
||||
// MAGIC actions (BOOTMAGIC without the boot)
|
||||
// MAGIC actions (BOOTMAGIC without the boot)
|
||||
if (!eeconfig_is_enabled()) {
|
||||
eeconfig_init();
|
||||
}
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#define WHOLE_NOTE(note) {(NOTE##note), 64}
|
||||
#define HALF_NOTE(note) {(NOTE##note), 32}
|
||||
#define QUARTER_NOTE(note) {(NOTE##note), 16}
|
||||
#define EIGTH_NOTE(note) {(NOTE##note), 8}
|
||||
#define EIGHTH_NOTE(note) {(NOTE##note), 8}
|
||||
#define SIXTEENTH_NOTE(note) {(NOTE##note), 4}
|
||||
|
||||
// Note Types Short
|
||||
|
@ -19,6 +19,11 @@
|
|||
#define E_NOTE(n) EIGTH_NOTE(n)
|
||||
#define S_NOTE(n) SIXTEENTH_NOTE(n)
|
||||
|
||||
// Note Styles
|
||||
// Staccato makes sure there is a rest between each note. Think: TA TA TA
|
||||
// Legato makes notes flow together. Think: TAAA
|
||||
#define STACCATO 0.01
|
||||
#define LEGATO 0
|
||||
|
||||
// Notes - # = Octave
|
||||
#define NOTE_REST 0.00
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue