Changeset 6d8c366 in avrstuff

Timestamp:

Jul 29, 2014, 10:37:32 PM (10 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

d31c2f5

Parents:

cd3a9ac

Message:

Chiptest: use libusart.

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

Location:

chiptest

Files:

• Makefile (modified) (2 diffs)
• blinkdel.hex (modified) (1 diff)
• main.c (modified) (4 diffs)

chiptest/Makefile

@@ -7 +7 @@
 # Common
 MCU=attiny2313
+BAUD=9600
 
 all: blinkdel.hex
@@ -12 +13 @@
 include ../kbd/common.mk
 
-COMPILE = $(CC) -Wall -Os -std=c99 -mmcu=$(MCU) -DF_CPU=$(F_CPU)
+COMPILE = $(CC) -Wall -Os -std=c99 -mmcu=$(MCU) -DF_CPU=$(F_CPU) -DBAUD=$(BAUD) \
+        -I../libs/usart/
+
+VPATH=../libs/usart/
 
 #Rules
 
-blinkdel.bin: main.o
-        $(COMPILE) main.o -o blinkdel.bin
+blinkdel.bin: main.o usart.o
+        $(COMPILE) $^ -o $@
 
 main.o: main.c
-        $(COMPILE) -c main.c -o main.o
+        $(COMPILE) -c $^ -o $@
 
 #Generic rules

chiptest/blinkdel.hex

@@ -1 +1 @@
 :1000000012C017C016C015C014C013C012C011C052
 :1000100010C00FC00EC00DC00CC00BC00AC009C07C
-:1000200008C007C006C011241FBECFEDCDBF02D04F
-:100030002AC0E6CF2FE088E190E00FB6F894A895AB
-:1000400081BD0FBE21BD10BE84E083BF87B38FEF9B
-:1000500087BB18BA12B88DE489B9599888E18AB972
-:1000600086E083B990E042E034E028E4A89508B641
-:1000700001FE02C048BF9F5F9111F8CF88B383276C
-:0A00800088BB2CB9F3CFF894FFCF32
+:1000200008C007C006C011241FBECFEDCDBF28D029
+:1000300046C0E6CF12B88DE489B9599886E083B9F5
+:1000400088E18AB908955D9BFECF8CB908955F9BC6
+:10005000FECF8CB10895CF93C82F982F92959F70A3
+:100060009A3010F480E301C087E3890FECDF8C2F16
+:100070008F708A3010F4805D01C0895CCF91E3CF2E
+:100080002FE088E190E00FB6F894A89581BD0FBEEF
+:1000900021BD10BE84E083BFBA9AC298CBDFC0E016
+:1000A00012E0D4E0A89508B601FEFCCF18BFCF5FE0
+:1000B000C9F788B38D2788BB88E4C5DFF3CFF894F0
+:0200C000FFCF70
 :00000001FF

chiptest/main.c

@@ +1 @@
+#include <usart.h>
+
 #include <avr/io.h>
 #include <avr/interrupt.h>
@@ -12 +14 @@
 #define DDRLED DDRB
 #define PORTLED PORTB
-#define LEDBIT 1 << PB2
+#define LEDBIT (1 << PB2)
 
 #define BAUD 9600 // Safe value even for low clocks. (used by setbaud.h)
@@ -23 +25 @@
 
         //debug LED - output
-        DDRLED |= 255;
+        DDRLED |= LEDBIT;
+        PORTLED &= ~LEDBIT;
 
-        PORTLED = 0;
-
-        // Serial baudrate - use avrlibc magic to compute the baudrate register
-        // values.
-        #include <util/setbaud.h>
-        UBRRH = UBRRH_VALUE;
-        UBRRL = UBRRL_VALUE;
-        #if USE_2X
-                UCSRA |= (1 << U2X);
-        #else
-                UCSRA &= ~(1 << U2X);
-        #endif
-
-        // Enable the serial port.
-        UCSRB = (1<<RXEN) |(1<<TXEN);
-        UCSRC = (1 << UCSZ1) | (1 << UCSZ0);
+        USARTInit();
 
         // Let's rock!
@@ -55 +43 @@
                         {
                                 PORTLED ^= LEDBIT; // Toggle the LED
-                                UDR = 'H'; // Send a byte to the UART
+                                USARTWriteChar('H'); // Send a byte to the UART
                         }
                 }