Changeset 6390cc3 in avrstuff

Timestamp:

Sep 24, 2017, 7:39:05 PM (7 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

6c47e45

Parents:

9a9d5d0

git-author:

Adrien Destugues <pulkomandy@…> (24/09/2017 17:13:58)

git-committer:

Adrien Destugues <pulkomandy@…> (24/09/2017 19:39:05)

Message:

chiptest: Start to hack on ATmega128 and STK500 devboard.

• Set the proper clock for it (generated by the STK500 master MCU, did

not get crystal working reliably yet)

• Instead of just 'H', generate the whole alphabet for more action!
• Use ATmega128 since that's what happens to be seated on my board for

now.

Files:

• chiptest/Makefile (modified) (4 diffs)
• chiptest/blinkdel.hex (deleted)
• chiptest/main.c (modified) (3 diffs)
• chiptest/readme.md (moved) (moved from chiptest/readme.txt ) (1 diff)
• kbd/common.mk (modified) (1 diff)
• libs/usart/usart.c (modified) (2 diffs)

chiptest/Makefile

@@ +1 @@
+# STK500
+F_CPU=3800000
+MCU=atmega128
+
 # K4KUSB
-F_CPU=12000000
+#F_CPU=12000000
+#MCU=attiny2313
 
 # muSerial
 # F_CPU=20000000
+#MCU=attiny2313
 
 # Common
-MCU=attiny2313
 BAUD=9600
 
@@ -13 +18 @@
 include ../kbd/common.mk
 
-COMPILE = $(CC) -Wall -Os -std=c99 -mmcu=$(MCU) -DF_CPU=$(F_CPU) -DBAUD=$(BAUD) \
-        -I../libs/usart/
+COMPILE = $(CC) -Wall -std=c99 $(CFLAGS) -I../libs/usart/
 
 VPATH=../libs/usart/
@@ -20 +24 @@
 #Rules
 
-blinkdel.bin: main.o usart.o
+$(MCU).bin: main.o usart.o
         $(COMPILE) $^ -o $@
 
@@ -33 +37 @@
         $(COMPILE) -std=c99 -c $< -o $@
 
-flash:
-        avrdude -c usbasp -p $(MCU) -Uflash:w:blinkdel.hex
-

chiptest/main.c

@@ -12 +12 @@
 // muSerial: ATTiny2313 - LED = PD6
 // K4KUSB: ATTiny2313 - LED = PB2
-#define DDRLED DDRB
-#define PORTLED PORTB
-#define LEDBIT (1 << PB2)
-
-#define BAUD 9600 // Safe value even for low clocks. (used by setbaud.h)
+// STK500: anything, PORTD is convenient if available.
+#define DDRLED DDRC
+#define PORTLED PORTC
+#define LEDBIT (1 << PC2)
 
 int main() {
         wdt_enable(WDTO_2S);
     // configure timer 0 for a rate of FCPU/(256 * 256)
+#ifdef __AVR_ATtiny2313__
     TCCR0A = 0;          // timer 0 prescaler: 256
         TCCR0B = 4;
+#else
+        TCCR0 = 6; // timer 0 prescaler: 256
+#endif
 
         //debug LED - output
@@ -32 +35 @@
         // Let's rock!
         uint8_t counter = 0;
+        char c = 'a';
         for(;;) {
                 wdt_reset();
@@ -43 +47 @@
                         {
                                 PORTLED ^= LEDBIT; // Toggle the LED
-                                USARTWriteChar('H'); // Send a byte to the UART
+                                USARTWriteChar(c++); // Send a byte to the UART
+                                if (c > 'z')
+                                        c = 'a';
                         }
                 }

chiptest/readme.md

@@ -11 +11 @@
 Right now chiptest supports the following devices:
 * ATTiny2313.
+* ATmega128
 
 It tests the following features:

kbd/common.mk

@@ -20 +20 @@
 
 flash: $(MCU).hex
-        $(AVRDUDE) -c usbasp -p $(MCU) -Uflash:w:$^
+        $(AVRDUDE) -c stk500 -P /dev/ports/usb0 -p $(MCU) -Uflash:w:$^
 
 clean:

libs/usart/usart.c

@@ -6 +6 @@
 #ifndef BAUD
         #error You must define BAUD to use libuart.
+#endif
+
+#ifdef __AVR_ATmega128__
+// FIXME there are two USARTs in this case and we should be able to drive either
+#define UBRRH UBRR0H
+#define UBRRL UBRR0L
+#define UCSRA UCSR0A
+#define UCSRC UCSR0C
+#define UCSRB UCSR0B
+#define UDR   UDR0
 #endif
 
@@ -29 +39 @@
 #ifdef __AVR_ATtiny2313__
         UCSRC = (1 << UCSZ1) | (1 << UCSZ0);
+#elif defined __AVR_ATmega128__
+        UCSRC = (3 << UCSZ0);
 #else
         UCSRC = (1 << URSEL) | (3 << UCSZ0);