From 465b0926f2b24bde1864e3246076e785d7d0f878 Mon Sep 17 00:00:00 2001
From: Olaf Rempel <razzor@kopf-tisch.de>
Date: Fri, 26 May 2006 17:35:21 +0200
Subject: [PATCH] Use Output Compare A for LED blinking

---
 Makefile  |  2 +-
 ispprog.c | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index d9c7c77..443c284 100644
--- a/Makefile
+++ b/Makefile
@@ -69,4 +69,4 @@ esrec: $(PRG)_eeprom.srec
 
 install: text
 #	uisp -dprog=stk200 --erase --upload if=$(PRG).srec --verify
-	avrdude -p m16 -c butterfly -b 115200 -U flash:w:$(PRG).srec
+	avrdude -p m16 -c butterfly -b 19200 -U flash:w:$(PRG).srec
diff --git a/ispprog.c b/ispprog.c
index 4c16aa4..94bc73c 100644
--- a/ispprog.c
+++ b/ispprog.c
@@ -51,7 +51,7 @@ uint8_t lastcmd = 0, lastval = 0, pollcode = 0xFF;
 
 uint8_t page_buf[256];
 
-ISR(SIG_INPUT_CAPTURE1)
+ISR(SIG_OUTPUT_COMPARE1A)
 {
 	// toggle LED
 	PORTB ^= (1<<PORTB3);
@@ -103,19 +103,17 @@ void led_mode(uint8_t mode)
 
 	} else if (mode == LED_FAST) {
 		// 100ms reload
-		ICR1H = 0x2D;
-		ICR1L = 0x00;
+		OCR1A = 0x2D00;
 
-		// timer1 prescaler 64, CTC mode via Input Capture
-		TCCR1B = (1<<WGM13) | (1<<WGM12) | (1<<CS11) | (1<<CS10);
+		// timer1 prescaler 64, CTC mode via OutputCompare A
+		TCCR1B = (1<<WGM12) | (1<<CS11) | (1<<CS10);
 
 	} else if (mode == LED_SLOW) {
 		// 250ms reload
-		ICR1H = 0x70;
-		ICR1L = 0x80;
+		OCR1A = 0x7080;
 
-		// timer1 prescaler 64, CTC mode via Input Capture
-		TCCR1B = (1<<WGM13) | (1<<WGM12) | (1<<CS11) | (1<<CS10);
+		// timer1 prescaler 64, CTC mode via OutputCompare A
+		TCCR1B = (1<<WGM12) | (1<<CS11) | (1<<CS10);
 	}
 	oldmode = mode;
 }
@@ -212,8 +210,8 @@ int main(void)
 	// SPI enabled, Master mode, F_OSC/4
 	SPCR = (1<<SPE) | (1<<MSTR);
 
-	// enable timer1 input capture interrupt (CTC hit)
-	TIMSK = (1<<TICIE1);
+	// enable timer1 OutputCompare A interrupt (CTC hit)
+	TIMSK = (1<<OCIE1A);
 	sei();
 
 	// disable reset