Commit a0e6e8ef authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

atmega2650 timer: Use 16-bit Timer 4, fix setup_hz / setup_khz

parent c6ba3983

include/arch/atmega2560/driver/timer.h

+13 −13
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#include <avr/io.h>

#include <avr/interrupt.h>



#define ON_TIMER_INTERRUPT_head ISR(TIMER0_COMPA_vect) {

#define ON_TIMER_INTERRUPT_head ISR(TIMER4_COMPA_vect) {

#define ON_TIMER_INTERRUPT_tail }



class Timer {
@@ -17,24 +17,24 @@ class Timer { 
	public:

		Timer() {}



		inline void setup_khz(uint16_t const frequency) {

			OCR0A = frequency ? 255 / frequency : 1;

			TCCR0A = _BV(WGM01);

			prescaler = _BV(CS01) | _BV(CS00);

		inline void setup_khz(uint16_t const frequency) { // 16 MHz base

			OCR4A = frequency ? 16000 / frequency : 65535;

			TCCR4A = _BV(WGM42);

			prescaler = _BV(CS40);

		}

		inline void setup_hz(uint16_t const frequency) {

			OCR0A = frequency ? 255 / frequency : 1;

			TCCR0A = _BV(WGM01);

			prescaler = _BV(CS02) | _BV(CS00);

		inline void setup_hz(uint16_t const frequency) { // 16 MHz / 256 == 62.5 kHz base

			OCR4A = frequency ? 62500 / frequency : 65535;

			TCCR4A = _BV(WGM42);

			prescaler = _BV(CS42);

		}

		inline void start(unsigned char const interrupt) {

			TCNT0 = 0;

			TCCR0B = prescaler;

			TCNT4 = 0;

			TCCR4B = prescaler;

			if (interrupt) {

				TIMSK0 = _BV(OCIE0A);

				TIMSK4 = _BV(OCIE4A);

			}

		}

		inline void stop() { TCCR0B = 0; TIMSK0 = 0; }

		inline void stop() { TCCR4B = 0; TIMSK4 = 0; }

};



extern Timer timer;