Changeset 6f22754 in avrstuff

Timestamp:

Sep 7, 2019, 6:17:17 PM (5 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

e5dd493

Parents:

bbcd1f8

Message:

blinkled: cleanup a bit

I get bored of editing too much things in there after a while...

Location:

blinkled

Files:

• .gitignore (added)
• Makefile (modified) (2 diffs)
• README.md (added)
• atmega8.hex (added)
• blinkdel.hex (deleted)
• main.c (modified) (3 diffs)

blinkled/Makefile

@@ -1 @@
-#Set vars
-MCU=atmega48p
+# User configurable variables
+MCU=atmega8
 FCPU=16000000
-COMPILE = avr-gcc -Wall -Os -std=c99 -mmcu=$(MCU) -DF_CPU=20000000
+PROG=stk500 -P /dev/ports/usb0
+
+# You should not need to change anything below
+# -----------------------------------------------------------------------------
+COMPILE = avr-gcc -Wall -Wextra -Werror -Os -std=c99 -mmcu=$(MCU) -DF_CPU=$(FCPU)
 
 #Rules
@@ -18 +22 @@
         $(COMPILE) -mmcu=$(MCU) -std=c99 -c $< -o $@
 
-flash:
-        avrdude -c usbasp -p $(MCU) -Uflash:w:$(MCU).hex
+flash: $(MCU).hex
+        avrdude -c $(PROG) -p $(MCU) -Uflash:w:$(MCU).hex
 
 clean:

blinkled/main.c

@@ -8 +8 @@
 #include <stdbool.h>
 
-#ifdef __AVR_ATmega48P__
-#define TIFR TIFR0
+#if defined(__AVR_ATmega8__)
+#define _TCCA TCCR1A
+#define _TCCB TCCR1B
+#define _TIFR TIFR
+#define _TOV  TOV1
+#elif defined(__AVR_ATmega48P__)
+#define _TCCA TCCR0A
+#define _TCCB TCCR0B
+#define _TIFR TIFR0
+#define _TOV  TOV0
+#else
+#error Unknown device! Add it to main.c and set the timer properly
 #endif
 
@@ -15 +25 @@
         wdt_enable(WDTO_2S);
     // configure timer 0 for a rate of 16M/(256 * 256) = ~244Hz
-    TCCR0A = 0;          // timer 0 prescaler: 256
-        TCCR0B = 4;
+    _TCCA = 0;          // timer 0 prescaler: 256
+        _TCCB = 4;
 
         //debug LED - output
@@ -28 +38 @@
 
                 // check timer if we need periodic reports
-                if (TIFR & (1 << TOV0)) {
-                        TIFR = (1 << TOV0); // reset flag
+                if (_TIFR & (1 << _TOV)) {
+                        _TIFR = (1 << _TOV); // reset flag
                         PORTD ^= (1<<PD6);
                 }