[9x 2561] AUDIO fixes
This commit is contained in:
@@ -122,7 +122,9 @@ inline void boardInit()
|
|||||||
|
|
||||||
#if defined(AUDIO) || defined(VOICE)
|
#if defined(AUDIO) || defined(VOICE)
|
||||||
SET_TIMER_AUDIO_CTRL();
|
SET_TIMER_AUDIO_CTRL();
|
||||||
#if !defined(CPUM2561)
|
#if defined(CPUM2561)
|
||||||
|
RESUME_AUDIO_INTERRUPT();
|
||||||
|
#else
|
||||||
TIMSK |= (1<<OCIE0) | (1<<TOIE0) | (1<<TOIE2); // Enable Output-Compare and Overflow interrrupts
|
TIMSK |= (1<<OCIE0) | (1<<TOIE0) | (1<<TOIE2); // Enable Output-Compare and Overflow interrrupts
|
||||||
#endif
|
#endif
|
||||||
#elif defined(PWM_BACKLIGHT)
|
#elif defined(PWM_BACKLIGHT)
|
||||||
|
|||||||
@@ -76,10 +76,10 @@
|
|||||||
#define RESUME_10MS_INTERRUPT() TIMSK2 |= (1<<OCIE2A)
|
#define RESUME_10MS_INTERRUPT() TIMSK2 |= (1<<OCIE2A)
|
||||||
#define PAUSE_PPMIN_INTERRUPT() TIMSK3 &= ~(1<<ICIE3)
|
#define PAUSE_PPMIN_INTERRUPT() TIMSK3 &= ~(1<<ICIE3)
|
||||||
#define RESUME_PPMIN_INTERRUPT() TIMSK3 |= (1<<ICIE3)
|
#define RESUME_PPMIN_INTERRUPT() TIMSK3 |= (1<<ICIE3)
|
||||||
#define TIMER_AUDIO_VECT TIMER4_OVF_vect
|
#define TIMER_AUDIO_VECT TIMER4_COMPA_vect
|
||||||
#define SET_TIMER_AUDIO_CTRL() TCCR4B = (0b111 << CS20)
|
#define SET_TIMER_AUDIO_CTRL() TCCR4B = (1 << WGM42) | (0b010 << CS40)
|
||||||
#define PAUSE_AUDIO_INTERRUPT() TIMSK4 &= ~(1<<TOIE4)
|
#define PAUSE_AUDIO_INTERRUPT() TIMSK4 &= ~(1<<OCIE4A)
|
||||||
#define RESUME_AUDIO_INTERRUPT() TIMSK4 |= (1<<TOIE4)
|
#define RESUME_AUDIO_INTERRUPT() TIMSK4 |= (1<<OCIE4A)
|
||||||
#else
|
#else
|
||||||
#define TIMER_16KHZ_VECT TIMER0_OVF_vect
|
#define TIMER_16KHZ_VECT TIMER0_OVF_vect
|
||||||
#define COUNTER_16KHZ TCNT0
|
#define COUNTER_16KHZ TCNT0
|
||||||
|
|||||||
Reference in New Issue
Block a user