just commited to continue work on hackstation ;)

diff --git a/beginners/season_junior.asm b/beginners/season_junior.asm
index 9c02191..540c152 100644 (file)
--- a/beginners/season_junior.asm
+++ b/beginners/season_junior.asm
@@ -6,11 +6,15 @@
 
 ; at90s2313
 ; setup:
 
 ; at90s2313
 ; setup:

-; vcc card --- vcc cam
-; rst card --- rst cam --- atmel t0 (pd4)
-; clk card --- clk cam --- atmel t1 (pd5)
+; vcc card --- atmel vcc
+; vcc cam  --- 
+; rst cam  --- atmel int0 (pd2)
+; rst card --- atmel (pb4)
+; clk card -\ 
+;            -  atmel t1 (pd5)
+; clk cam  -/

 ; gnd card --- gnd cam --- atmel gnd
 ; gnd card --- gnd cam --- atmel gnd

-; i/o card --- atmel int0 (pd2)
+; i/o card --- atmel icp (pd6)

 ; i/o cam  --- atmel int1 (pd3)
 
 .include "../include/2313def.inc"
 ; i/o cam  --- atmel int1 (pd3)
 
 .include "../include/2313def.inc"


@@ -37,19 +41,19 @@
 rjmp INIT
 
 ; int0
 rjmp INIT
 
 ; int0

-rjmp REC_CARD
+rjmp RST_CAM

 
 ; int1
 rjmp REC_CAM
 
 ; timer/counter capt 1
 
 ; int1
 rjmp REC_CAM
 
 ; timer/counter capt 1

-reti
+rjmp REC_CARD

 
 ; timer/counter compare
 reti
 
 ; timer/counter overflow 1
 
 ; timer/counter compare
 reti
 
 ; timer/counter overflow 1

-rjmp T1_OVERFLOW
+rjmp CLK_OVERFLOW

 
 ; timer/counter overflow 0
 reti
 
 ; timer/counter overflow 0
 reti


@@ -58,7 +62,7 @@ reti
 reti
 
 ; uart data register empty
 reti
 
 ; uart data register empty

-reti
+rjmp UART_OUT

 
 ; uart tx complete
 reti
 
 ; uart tx complete
 reti


@@ -70,12 +74,19 @@ reti
 ; init routine
 ;
 
 ; init routine
 ;
 

+MAIN:
+rjmp MAIN
+

 INIT:
 
 ; set stackpointer
 ldi r16,low(RAMEND)
 out SPL,r16
 
 INIT:
 
 ; set stackpointer
 ldi r16,low(RAMEND)
 out SPL,r16
 

+;
+; hier weiter ....
+;
+

 ; enable interrupts int0,int1
 ldi r16,((1<<INT0)|(1<<INT1))
 out GIMSK,r16
 ; enable interrupts int0,int1
 ldi r16,((1<<INT0)|(1<<INT1))
 out GIMSK,r16