From eef4ec0e441db62ad7097cec54f58c11f24e54b9 Mon Sep 17 00:00:00 2001
From: twobit <twobit@lavabit.com>
Date: Wed, 8 Aug 2012 03:24:21 +0200
Subject: [PATCH] slow donw, put stuff into header

---
 firmware/main.c  |  4 ++--
 firmware/synth.c | 43 +++++++------------------------------------
 firmware/synth.h | 23 +++++++++++++++++++++++
 3 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/firmware/main.c b/firmware/main.c
index d241f46..74ce931 100644
--- a/firmware/main.c
+++ b/firmware/main.c
@@ -18,7 +18,7 @@ static void init_sampletimer(void)
 	TCCR0A = (1 << WGM01);
 	TCCR0B = (1 << CS00) | (1 << CS01);
 
-	OCR0A = 3; /* TOP */
+	OCR0A = 6; /* TOP */
 	TCNT0 = 0;
 	/*enable interrupt*/
 	TIMSK0 |=  (1<<OCIE0A);
@@ -36,7 +36,7 @@ static inline void init_pwm(void)
 	ICR1   =  0x00FF;
 
 	/* only b-chan , fastpwm (mode 14), no prescale */
-	TCCR1A = (1 << COM1B1) | (1 << WGM11);	
+	TCCR1A = (1 << COM1B1) | (1 << WGM11);
 	TCCR1B = (1 << WGM13 ) | (1 << WGM12) | (1 << CS10);
 
 	return;
diff --git a/firmware/synth.c b/firmware/synth.c
index 778bf65..0af06c5 100644
--- a/firmware/synth.c
+++ b/firmware/synth.c
@@ -1,36 +1,15 @@
 #include <inttypes.h>
+#include "synth.h"
 #include "freq_table.h"
 // sample rate is 8M / (3 * 64)
 
-
-enum {  WAVE_OFF, WAVE_PULSE, WAVE_SAW, WAVE_NOISE };
 enum {
 	channel_count = 3,
-	tick_length = 800,
+	tick_length = 400,
 	row_length = 4,
 	pattern_length = 16
 };
 
-typedef struct {
-	uint8_t	note;
-	uint8_t	inst_nr;
-	uint8_t pos;
-
-	uint16_t phase;
-	uint16_t pulse_width;
-
-	uint8_t	level;			// envelop level
-
-} synth_channel_t;
-
-
-typedef struct {
-	uint16_t	pulse_width;
-	uint8_t		pulse_sweep;
-	uint8_t		wave_table_pos;
-	uint8_t		decay;
-
-} synth_instrument_t;
 
 
 static const synth_instrument_t instruments[] = {
@@ -68,9 +47,9 @@ static const uint8_t patterns[][pattern_length][2] = {
 	{},
 	{
 		{   33 - 12, 0 },
+		{ 0, 0 },
 		{ 0xff, 1 },
-		{   33 - 12, 1 },
-		{ 0xff, 1 },
+		{ 0, 0 },
 		{   33, 1 },
 		{ 0xff, 1 },
 		{   33, 1 },
@@ -86,9 +65,9 @@ static const uint8_t patterns[][pattern_length][2] = {
 	},
 	{
 		{   28 - 12, 0 },
+		{ 0, 0 },
 		{ 0xff, 1 },
-		{   28 - 12, 1 },
-		{ 0xff, 1 },
+		{ 0, 0 },
 		{   28, 1 },
 		{ 0xff, 1 },
 		{   28, 1 },
@@ -202,14 +181,6 @@ void synth_init(void)
 	tick = 0;
 	row = 0;
 	seq = 0;
-
-/*
-	// some test values
-	channels[0].wave = WAVE_PULSE;
-	channels[0].pulse_width = 1 << 15;
-
-	channels[1].wave = WAVE_SAW;
-*/
 }
 
 uint16_t synth_mix(void)
@@ -239,7 +210,7 @@ uint16_t synth_mix(void)
 					if(note == 0xff) {
 						chan->level = 0;
 					} else {
-						chan->level = 100;
+						chan->level = 80; // TODO: less?
 						chan->note = note;
 						chan->inst_nr = patterns[pattern_nr][row][1];
 						inst = &instruments[chan->inst_nr];
diff --git a/firmware/synth.h b/firmware/synth.h
index 6b90c0f..24f0088 100644
--- a/firmware/synth.h
+++ b/firmware/synth.h
@@ -1,3 +1,26 @@
+enum {  WAVE_OFF, WAVE_PULSE, WAVE_SAW, WAVE_NOISE };
+
+typedef struct {
+	uint8_t	note;
+	uint8_t	inst_nr;
+	uint8_t pos;
+
+	uint16_t phase;
+	uint16_t pulse_width;
+
+	uint8_t	level;			// envelop level
+
+} synth_channel_t;
+
+
+typedef struct {
+	uint16_t	pulse_width;
+	uint8_t		pulse_sweep;
+	uint8_t		wave_table_pos;
+	uint8_t		decay;
+
+} synth_instrument_t;
+
 
 void synth_init(void);
 uint16_t synth_mix(void);