X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=beginners%2Fseason_junior.asm;h=8380e9215d7cdb6d4d04181f0ebe475d109c48e4;hb=c8b18c7c3560c9de4704291ca764cd1041228380;hp=94ba21c6ccf34330ea351fc4b7e798329e8d8213;hpb=448a02069232f473cbdde6b2aa698d062bd3876a;p=my-code%2Fatmel.git

diff --git a/beginners/season_junior.asm b/beginners/season_junior.asm
index 94ba21c..8380e92 100644
--- a/beginners/season_junior.asm
+++ b/beginners/season_junior.asm
@@ -6,15 +6,32 @@
 
 ; 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 (pd4)
+; clk card -\ 
+;            -  atmel t1 (pd5)
+; clk cam  -/
 ; 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"
+.include "../include/2313def.inc"
 
+; functions by now:
+;
+; stupid mode only by now. just see what cam/card do and redirect
+; this to card/cam.
+;
+; next implementation:
+; 
+; try to read one byte of card/cam communication and output via uart.
+; output time information in some way.
+;
+; future:
+;
+; buffer/parse whole strings and decide whether to send to card or not.
 
 ;
 ; interrupt vectors:
@@ -24,19 +41,19 @@ include "../include/2313def.inc"
 rjmp INIT
 
 ; int0
-rjmp REC_CARD
+rjmp RST_CAM
 
 ; int1
 rjmp REC_CAM
 
 ; timer/counter capt 1
-reti
+rjmp REC_CARD
 
 ; timer/counter compare
 reti
 
 ; timer/counter overflow 1
-rjmp T1_OVERFLOW
+rjmp CLK_OVERFLOW
 
 ; timer/counter overflow 0
 reti
@@ -45,7 +62,7 @@ reti
 reti
 
 ; uart data register empty
-reti
+rjmp UART_OUT
 
 ; uart tx complete
 reti
@@ -57,6 +74,9 @@ reti
 ; init routine
 ;
 
+MAIN:
+rjmp MAIN
+
 INIT:
 
 ; set stackpointer
@@ -67,27 +87,185 @@ out SPL,r16
 ldi r16,((1<<INT0)|(1<<INT1))
 out GIMSK,r16
 ; int0/1 setup
-ldi r16,((1<<ISC01)|(1<<ISC00)|(1<<ISC11)|(1<<ISC10))
+ldi r16,((1<<ISC01)|(1<<ISC00)|(1<<ISC10)|(1<<ISC11))
 out MCUCR,r16
-sbis PORTD,PORTD2
-cbi MCUCR,ISC00
-sbis PORTD,PORTD3
-cbi MCUCR,ISC10
-
-; enable t/c overflow interrupt
-sbi TIMSK,TOIE1
-; setup t/c
-ldi r16,((1<<CS12)|(1<<CS11)|(1<<CS10))
+
+; enable t/c overflow interrupt and icp
+ldi r16,((1<<TOIE1)|(1<<TICIE1))
+out TIMSK,r16
+; setup t/c and icp
+ldi r16,((1<<CS12)|(1<<CS11)|(1<<CS10)|(1<<ICNC1))
 out TCCR1B,r16
 
+; configure uart - interrupt enabled when i/o
+ldi r16,3
+out UBRR,r16
+sbi UCR,TXEN
+
+; init bitcounter and overflow counter
+ldi r20,0 ; bitcounter
+ldi r21,0 ; register for constructing the byte
+ldi r22,0 ; overflow counter
+ldi r23,0 ; temp reg
+
+; constant 1 in r1
+ldi r16,1
+mov r1,r16
+
 ; enable interrupts (global)
 sei
 
+; jump to mainloop
+rjmp MAIN
+
+;
+; main routine
+;
+
+MAIN:
+
+rjmp MAIN
+
 ;
-; rec_card routine
+; rec_card routines
 ;
 
 REC_CARD:
 
-; get port status
-in .... continue here .. :)
+; decide what to do
+sbic PORTD,PD6
+rjmp REC_CARD_HIGH
+rjmp REC_CARD_LOW
+
+REC_CARD_HIGH:
+
+; save counter
+in r24,ICR1L
+in r25,ICR1H
+
+; output high on port to cam
+sbi PORTD,PD3
+
+; toggle icp sense
+cbi TCCR1B,ICES1
+;in r16,TCCR1B
+;cbr r16,ICES1
+;out TCCR1B,r16
+
+; status tu submit
+ldi r26,1
+
+; enable uart dre interrupt
+sbi UCR,UDRIE
+
+reti
+
+REC_CARD_LOW:
+
+; save counter
+in r27,ICR1L
+in r28,ICR1H
+
+; output low on port to cam
+cbi PORTD,PD3
+
+; toggle icp sense
+sbi TCCR1B,ICES1
+
+; status to submit
+ldi r26,0
+
+; enable uart dre interrupt
+sbi UCR,UDRIE
+
+reti
+
+;
+; rec_cam routines
+;
+
+REC_CAM:
+
+; decide what to do
+sbic PORTD,PD3
+rjmp REC_CAM_HIGH
+rjmp REC_CAM_LOW
+
+REC_CAM_HIGH:
+
+; output high on port to card
+sbi PORTD,PD6
+
+; toggle int1 sense
+in r16,MCUCR
+cbr r16,ISC10
+out MCUCR,r16
+
+reti
+
+REC_CAM_LOW:
+
+; output low on port to card
+cbi PORTD,PD6
+
+; toggle int 1 sense
+in r16,MCUCR
+sbr r16,ISC10
+out MCUCR,r16
+
+reti
+
+;
+; t1_overflow routine
+;
+
+T1_OVERFLOW:
+
+add r22,r1 ; inc counter overflow register
+
+reti
+
+;
+; rst_cam routine
+;
+
+RST_CAM:
+
+; decide what to do
+sbic PORTD,PD2
+rjmp RST_CAM_HIGH
+rjmp RST_CAM_LOW
+
+RST_CAM_HIGH:
+
+; output high on rst port to card
+sbi PORTD,PD4
+
+; toggle int0 sense
+in r16,MCUCR
+cbr r16,ISC00
+out MCUCR,r16
+
+reti
+
+RST_CAM_LOW:
+
+; output low on rst port to cam
+cbi PORTD,PD4
+
+; toggle int0 sense
+in r16,MCUCR
+sbr r16,ISC00
+out MCUCR,r16
+
+reti
+
+;
+; uart_out routines
+;
+
+UART_OUT:
+
+;
+; hier weiter ...
+;