[stock] Issue 157 fixed

[gruvin9x] Issue 160 fixed
This commit is contained in:
bsongis
2012-11-20 22:33:26 +00:00
parent 6f2452afd0
commit 40ba5925fc
32 changed files with 369 additions and 398 deletions
+2 -5
View File
@@ -109,11 +109,6 @@ inline void board_init()
OCR4A = 0x7d;
TCCR4B = (1 << WGM42) | (3<<CS40); // CTC OCR1A, 16MHz / 64 (4us ticks)
/* Mixer interrupt */
OCR5A = 0x7d * 40; /* 20ms */
TCCR5B = (1 << WGM52) | (3<<CS50); // CTC OCR1A, 16MHz / 64 (4us ticks)
TIMSK5 |= (1<<OCIE5A);
#if defined(EXTRA_ROTARY_ENCODERS)
//configure uart1 here
DDRD &= ~(1 << 2);
@@ -301,3 +296,5 @@ void readKeysAndTrims()
++enuk;
}
}
uint16_t nextMixerTime = 0;