jay
/
tone-generator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

instruction improvements

This commit is contained in:
Jay Robson 2024-10-03 22:42:51 +10:00
parent ef747bad41
commit 015f8354ae
6 changed files with 101 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -24,8 +24,8 @@ This uses an AVR microcontroller (ATMega328P-PU).
|-|-|-|-| |-|-|-|-|
| 0 | stop | 1 | id (3), empty (5) | | 0 | stop | 1 | id (3), empty (5) |
| 1 | setup | 8 | id (3), us_per_tick (29), amplitude (8), size (24) | | 1 | setup | 8 | id (3), us_per_tick (29), amplitude (8), size (24) |
| 2 | set | 3 | id (3), index (5), frequency (12), mode (2), empty (2) | | 2 | set | 3 | id (3), index (5), frequency (12), mode (2), gain(2) |
| 3 | set-ts | 5 | id (3), index (5), ticks (18), frequency (12), mode (2) | | 3 | set-ts | 5 | id (3), index (5), ticks (16), frequency (12), mode (2), gain (2) |
| 4 | clear | 1 | id (3), index (5) | | 4 | clear | 1 | id (3), index (5) |
| 5 | clear-ts | 4 | id (3), index (5), ticks (18), empty (6) | | 5 | clear-ts | 3 | id (3), index (5), ticks (16) |

28
entry.hpp
View File

@ -15,14 +15,11 @@ namespace entry {
set_ts = 3, set_ts = 3,
clear = 4, clear = 4,
clear_ts = 5, clear_ts = 5,
set_saw = 6,
set_saw_ts = 7,
}; };
enum NextType { enum NextType {
nt_none, nt_none,
nt_tone, nt_tone,
nt_tempo,
}; };
struct Tone { struct Tone {
@ -32,26 +29,21 @@ namespace entry {
uint8_t mode; uint8_t mode;
}; };
struct Tempo {
uint32_t ticks;
uint32_t us_per_tick;
};
inline size_t get_size(Type type) { inline size_t get_size(Type type) {
switch(type) { switch(type) {
case Type::set:
return 3;
case Type::clear:
return 1;
case Type::set_ts:
return 5;
case Type::clear_ts:
return 4;
case Type::config:
return 8;
case Type::stop: case Type::stop:
default: default:
return 1; return 1;
case Type::config:
return 8;
case Type::set:
return 3;
case Type::set_ts:
return 5;
case Type::clear:
return 1;
case Type::clear_ts:
return 3;
} }
} }
}; };

18
scheduler.cpp
View File

@ -70,6 +70,7 @@ static void do_next() {
break; break;
} }
case entry::Type::set: { case entry::Type::set: {
next.tone.amplitude = config.amplitude * ((v & bm(2)) + 1);
v >>= 2; v >>= 2;
next.tone.mode = v & bm(2); next.tone.mode = v & bm(2);
v >>= 2; v >>= 2;
@ -77,20 +78,20 @@ static void do_next() {
next.tone.frequency = v & bm(12); next.tone.frequency = v & bm(12);
v >>= 12; v >>= 12;
next.tone.index = v & bm(5); next.tone.index = v & bm(5);
next.tone.amplitude = config.amplitude;
break; break;
} }
case entry::Type::set_ts: { case entry::Type::set_ts: {
next.type = entry::nt_tone; next.type = entry::nt_tone;
next.tone.amplitude = config.amplitude * ((v & bm(2)) + 1);
v >>= 2;
next.tone.mode = v & bm(2); next.tone.mode = v & bm(2);
v >>= 2; v >>= 2;
next.tone.frequency = v & bm(12); next.tone.frequency = v & bm(12);
v >>= 12; v >>= 12;
uint32_t ticks = (v & bm(18)) - tick_offset; tick_offset += v & bm(16);
v >>= 18; v >>= 16;
next.tone.index = v & bm(5); next.tone.index = v & bm(5);
next.tone.amplitude = config.amplitude; timestamp = tick_offset * config.us_per_tick + ts_init;
timestamp = ticks * config.us_per_tick + ts_init;
break; break;
} }
case entry::Type::clear: { case entry::Type::clear: {
@ -101,14 +102,13 @@ static void do_next() {
break; break;
} }
case entry::Type::clear_ts: { case entry::Type::clear_ts: {
v >>= 6; tick_offset += v & bm(16);
uint32_t ticks = (v & bm(18)) - tick_offset; v >>= 16;
v >>= 18;
next.type = entry::nt_tone; next.type = entry::nt_tone;
next.tone.index = v & bm(5); next.tone.index = v & bm(5);
next.tone.frequency = 0; next.tone.frequency = 0;
next.tone.amplitude = 0; next.tone.amplitude = 0;
timestamp = ticks * config.us_per_tick + ts_init; timestamp = config.us_per_tick * tick_offset + ts_init;
break; break;
} }
default: { default: {

1
tone-generator.ino
View File

@ -22,7 +22,6 @@ inline unsigned long micros_diff() {
} }
void setup() { void setup() {
Tone::init();
dac::init(); dac::init();
serial::init(); serial::init();
tones::init(); tones::init();

84
tone.cpp
View File

@ -1,14 +1,78 @@
#include <math.h>
#include "tone.hpp" #include "tone.hpp"
static int8_t abs(int8_t v) { const PROGMEM int8_t TONE_LOOKUP[4][256] = {
return v >= 0 ? v : -v; {
} 0, 3, 6, 9, 12, 16, 19, 22, 25, 28, 31, 34, 37, 40, 43, 46,
49, 51, 54, 57, 60, 63, 65, 68, 71, 73, 76, 78, 81, 83, 85, 88,
void Tone::init() { 90, 92, 94, 96, 98, 100, 102, 104, 106, 107, 109, 111, 112, 113, 115, 116,
for(unsigned i = 0; i < sizeof(sin_lookup); i++) { 117, 118, 120, 121, 122, 122, 123, 124, 125, 125, 126, 126, 126, 127, 127, 127,
sin_lookup[i] = round(sin((float)i / sizeof(sin_lookup) * M_PI * 2) * 127); 127, 127, 127, 127, 126, 126, 126, 125, 125, 124, 123, 122, 122, 121, 120, 118,
} 117, 116, 115, 113, 112, 111, 109, 107, 106, 104, 102, 100, 98, 96, 94, 92,
} 90, 88, 85, 83, 81, 78, 76, 73, 71, 68, 65, 63, 60, 57, 54, 51,
49, 46, 43, 40, 37, 34, 31, 28, 25, 22, 19, 16, 12, 9, 6, 3,
0, -3, -6, -9, -12, -16, -19, -22, -25, -28, -31, -34, -37, -40, -43, -46,
-49, -51, -54, -57, -60, -63, -65, -68, -71, -73, -76, -78, -81, -83, -85, -88,
-90, -92, -94, -96, -98, -100, -102, -104, -106, -107, -109, -111, -112, -113, -115, -116,
-117, -118, -120, -121, -122, -122, -123, -124, -125, -125, -126, -126, -126, -127, -127, -127,
-127, -127, -127, -127, -126, -126, -126, -125, -125, -124, -123, -122, -122, -121, -120, -118,
-117, -116, -115, -113, -112, -111, -109, -107, -106, -104, -102, -100, -98, -96, -94, -92,
-90, -88, -85, -83, -81, -78, -76, -73, -71, -68, -65, -63, -60, -57, -54, -51,
-49, -46, -43, -40, -37, -34, -31, -28, -25, -22, -19, -16, -12, -9, -6, -3,
},
{
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-128, -127, -126, -125, -124, -123, -122, -121, -120, -119, -118, -117, -116, -115, -114, -113,
-112, -111, -110, -109, -108, -107, -106, -105, -104, -103, -102, -101, -100, -99, -98, -97,
-96, -95, -94, -93, -92, -91, -90, -89, -88, -87, -86, -85, -84, -83, -82, -81,
-80, -79, -78, -77, -76, -75, -74, -73, -72, -71, -70, -69, -68, -67, -66, -65,
-64, -63, -62, -61, -60, -59, -58, -57, -56, -55, -54, -53, -52, -51, -50, -49,
-48, -47, -46, -45, -44, -43, -42, -41, -40, -39, -38, -37, -36, -35, -34, -33,
-32, -31, -30, -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17,
-16, -15, -14, -13, -12, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1,
},
{
-127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127,
-127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127,
-127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127,
-127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127,
-127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127,
-127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127,
-127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127,
-127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127,
127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
},
{
0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30,
32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62,
65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 89, 91, 93, 95,
97, 99, 101, 103, 105, 107, 109, 111, 113, 115, 117, 119, 121, 123, 125, 127,
127, 127, 125, 123, 121, 119, 117, 115, 113, 111, 109, 107, 105, 103, 101, 99,
97, 95, 93, 91, 89, 87, 85, 83, 81, 79, 77, 75, 73, 71, 69, 67,
65, 62, 60, 58, 56, 54, 52, 50, 48, 46, 44, 42, 40, 38, 36, 34,
32, 30, 28, 26, 24, 22, 20, 18, 16, 14, 12, 10, 8, 6, 4, 2,
0, -2, -4, -6, -8, -10, -12, -14, -16, -18, -20, -22, -24, -26, -28, -30,
-32, -34, -36, -38, -40, -42, -44, -46, -48, -50, -52, -54, -56, -58, -60, -62,
-65, -67, -69, -71, -73, -75, -77, -79, -81, -83, -85, -87, -89, -91, -93, -95,
-97, -99, -101, -103, -105, -107, -109, -111, -113, -115, -117, -119, -121, -123, -125, -127,
-127, -127, -125, -123, -121, -119, -117, -115, -113, -111, -109, -107, -105, -103, -101, -99,
-97, -95, -93, -91, -89, -87, -85, -83, -81, -79, -77, -75, -73, -71, -69, -67,
-65, -62, -60, -58, -56, -54, -52, -50, -48, -46, -44, -42, -40, -38, -36, -34,
-32, -30, -28, -26, -24, -22, -20, -18, -16, -14, -12, -10, -8, -6, -4, -2,
},
};

25
tone.hpp
View File

@ -2,8 +2,11 @@
#pragma once #pragma once
#include <inttypes.h> #include <inttypes.h>
#include <avr/pgmspace.h>
#include "util.hpp" #include "util.hpp"
extern const PROGMEM int8_t TONE_LOOKUP[4][256];
struct Tone { struct Tone {
enum Type { enum Type {
@ -18,9 +21,6 @@ struct Tone {
uint8_t amplitude; uint8_t amplitude;
Type mode; Type mode;
inline static int8_t sin_lookup[256];
static void init();
inline bool active() const AW_IN { inline bool active() const AW_IN {
return amplitude > 0; return amplitude > 0;
@ -31,23 +31,8 @@ struct Tone {
} }
inline int get() const AW_IN { inline int get() const AW_IN {
int v; int8_t v = pgm_read_byte_near(&TONE_LOOKUP[mode][(uint8_t)(phase >> 12)]);
switch(mode) { return (int)v * amplitude;
case tt_sine:
v = sin_lookup[(phase >> 12) & 255];
break;
case tt_saw:
v = (int8_t)((phase >> 12) & 255);
break;
case tt_square:
v = phase & 0x80000 ? -127 : 127;
break;
case tt_triangle:
v = (phase >> 11) & 0x1ff;
v = (v > 0xff ? 1 : -1) * (int8_t)phase;
break;
}
return v * amplitude;
} }
}; };