Changeset f51aacc in avrstuff

Timestamp:

Jul 29, 2014, 7:58:35 PM (10 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

0db7c37

Parents:

b83dc2a

Message:

Convert muserial test to common.mk.

git-svn-id: ​svn://pulkomandy.tk/avrstuff@104 c6672c3c-f6b6-47f9-9001-1fd6b12fecbe

Files:

• kbd/common.mk (modified) (1 diff)
• test_2313_muserial/Makefile (modified) (2 diffs)
• test_2313_muserial/main.c (modified) (4 diffs)

kbd/common.mk

@@ -7 +7 @@
 LIBS=../../../libs
 
-# Generic pattern-rules
+# Generic rules
 %.hex: %.bin
         $(OBJCOPY) -j .text -j .data -O ihex $^ $@
 
+clean:
+        rm *.bin *.o *.hex

test_2313_muserial/Makefile

@@ -1 @@
-#Set vars
+# K4KUSB
+F_CPU=12000000
+
+# muSerial
+# F_CPU=20000000
+
+# Common
 MCU=attiny2313
-COMPILE = avr-gcc -Wall -Os -std=c99 -mmcu=$(MCU) -DF_CPU=20000000
+
+all: blinkdel.hex
+
+include ../kbd/common.mk
+
+COMPILE = $(CC) -Wall -Os -std=c99 -mmcu=$(MCU) -DF_CPU=$(F_CPU)
 
 #Rules
-blinkdel.hex: blinkdel.bin
-        avr-objcopy -j .text -j .data -O ihex blinkdel.bin blinkdel.hex
 
 blinkdel.bin: main.o
@@ -23 +32 @@
         avrdude -c usbasp -p $(MCU) -Uflash:w:blinkdel.hex
 
-clean:
-        rm *.bin *.o *.hex

test_2313_muserial/main.c

@@ -8 +8 @@
 #include <stdbool.h>
 
+// muSerial: ATTiny2313 - LED = PD6
+// K4KUSB: ATTiny2313 - LED = PB2
+#define DDRLED DDRB
+#define PORTLED PORTB
+#define LEDBIT 1 << PB2
+
 int main() {
         wdt_enable(WDTO_2S);
@@ -15 +21 @@
 
         //debug LED - output
-        DDRD |= 255;
+        DDRLED |= 255;
 
-        PORTD = 0;
+        PORTLED = 0;
 
         // Serial PORT
@@ -24 +30 @@
 
         UCSRB = (1<<RXEN) |(1<<TXEN);
-        UCSRC = (1 << UCSZ1) | (1 << UCSZ0);  
+        UCSRC = (1 << UCSZ1) | (1 << UCSZ0);
 
         while(1) {
@@ -33 +39 @@
                 if (TIFR & (1 << TOV0)) {
                         TIFR = (1 << TOV0); // reset flag
-                        PORTD ^= (1<<PD6);
+                        PORTLED ^= LEDBIT;
 
                         UDR = 'H';