arrrrgh!

[my-code/atmel.git] / monolyzer / main.asm

diff --git a/monolyzer/main.asm b/monolyzer/main.asm
index b41f3b3..c2482c7 100644 (file)
--- a/monolyzer/main.asm
+++ b/monolyzer/main.asm
@@ -14,6 +14,12 @@
 .def   uart_rxtx       = r18
 .def   count           = r19
 .def   state           = r20
+.def   scount          = r21
+.def   input           = r22
+.def   save            = r23
+
+;.define FLOODME
+;.define S_FLOODME
 
 ;
 ; interrupts
@@ -87,7 +93,7 @@ INIT:
        rcall PORT_INIT
 
        ; timer1 init
-       rcall TIMER1_INIT
+       rcall TIMER1_INIT_64
 
        ; uart init
        rcall UART_INIT
@@ -110,12 +116,51 @@ INIT:
        ldi ZL,low(STORAGE)
        ldi ZH,high(STORAGE)
 
+       ldi scount,0
+       ldi tmp1,0x23
+INIT_STORAGE:
+       ; init storage
+       st Z+,tmp1
+       st Z+,tmp1
+       add scount,one
+       cpi scount,55
+       brne INIT_STORAGE
+
+       ; storage pointer again
+       ldi ZL,low(STORAGE)
+       ldi ZH,high(STORAGE)
+
        ; signal ready output
        ldi uart_rxtx,0x72
        rcall UART_TX
 
-       ; external interrupt enable
-       rcall INT0_IR_CONF_INIT
+.ifdef FLOODME
+DEBUG_PORT:
+       ;rcall UART_RX
+       ldi scount,0
+DEBUG_PORT_LOOP:
+       lsl uart_rxtx
+       in tmp1,PIND
+       sbrc tmp1,2
+       add uart_rxtx,one
+       add scount,one
+       cpi scount,8
+       brne DEBUG_PORT_LOOP
+       rcall UART_TX
+       rjmp DEBUG_PORT
+.endif
+
+.ifdef S_FLOODME
+DEBUG_PORT:
+       ldi uart_rxtx,0x30
+       in tmp1,PIND
+       sbrc tmp1,2
+       add uart_rxtx,one
+       rcall UART_TX
+       rjmp DEBUG_PORT
+.endif
+       ; enable interrupts
+       rcall INT0_IR_CONF_R
        rcall INT0_IR_ENABLE
 
        ; global interrupt enable
@@ -126,13 +171,9 @@ MAIN:
 SAMPLE:
 
        ; sample as long as there is storage capacity and signal
-       cpi state,2
+       cpi state,10
        brne SAMPLE
 
-       ; disable interrupts
-       rcall INT0_IR_DISABLE
-       rcall TIMER1_INT_DISABLE
-
        ; signal finish
        ldi uart_rxtx,0x66
        rcall UART_TX
@@ -143,11 +184,23 @@ IDLE:
        rcall UART_RX
 
        ; decode instruction
-       cpi uart_rxtx,0x52
+       cpi uart_rxtx,0x72
        breq RESET
-       cpi uart_rxtx,0x54
+       cpi uart_rxtx,0x74
        breq TRANSFER
+       cpi uart_rxtx,0x73
+       breq SINGLE_SAMPLE
+
+       rjmp IDLE
 
+SINGLE_SAMPLE:
+
+       ; sample port d pin 2 and output via uart
+       ldi uart_rxtx,0x30
+       in tmp2,PIND
+       sbrc tmp2,2
+       ldi uart_rxtx,0x31
+       rcall UART_TX
        rjmp IDLE
 
 TRANSFER:
@@ -155,7 +208,7 @@ TRANSFER:
        ; reset storage pointer
        ldi ZL,low(STORAGE)
        ldi ZH,high(STORAGE)
-       ldi tmp1,0
+       ldi scount,1
 
        ; transmit number of sampled words
        mov uart_rxtx,count
@@ -163,18 +216,18 @@ TRANSFER:
 
 TRANSFER_LOOP:
 
-       ; check amount of sent data
-       cp tmp1,count
-       breq IDLE
-
-       ; transmit storage
+       ; send data and counter
        ld uart_rxtx,Z+
        rcall UART_TX
        ld uart_rxtx,Z+
        rcall UART_TX
 
        ; count sent data
-       add tmp1,one
+       add scount,one
+
+       ; check amount of data
+       cpi scount,56
+       breq IDLE
 
        rjmp TRANSFER_LOOP
 
@@ -189,28 +242,29 @@ TRANSFER_LOOP:
 
 INT0_IR:
 
-       ; debug output
-       ; cbi PORTD,3
+       in save,SREG
+
+       cli
 
        ; get timer value
        in tmp1,TCNT1L
        in tmp2,TCNT1H
 
-       ; check for initial or running state
-       cpi state,0
-       brne INT0_RUN
-
-       ; configure interrupt for running state
-       rcall INT0_IR_CONF_RUN
-       ldi state,1
-
-       ; reset timer and start ovf interrupt
+       ; reset timer
        ldi tmp1,0
        out TCNT1H,tmp1
        out TCNT1L,tmp1
+
+       ; check for running state
+       cpi state,5
+       breq INT0_RUN
+
+       ; reconfigure int0
+       rcall INT0_IR_CONF_FR
+       ldi state,5
        rcall TIMER1_INT_ENABLE
 
-       rjmp EXIT_IR
+       rjmp LEAVE_INT0_IR
 
 INT0_RUN:
 
@@ -220,36 +274,47 @@ INT0_RUN:
 
        ; inc counter
        add count,one
-
+       
        ; check for left capacity
        cpi count,55
-       brne EXIT_IR
+       brne LEAVE_INT0_IR
 
        ; indicate end of 'c'apacity
        ldi uart_rxtx,0x63
        rcall UART_TX
 
        ; exit sampling
-       ldi state,2
+       ldi state,10
+
+       ; leave all interrupts cleared
+       rjmp EXIT_INT0_IR
+
+LEAVE_INT0_IR:
+
+       sei
 
-EXIT_IR:
+EXIT_INT0_IR:
 
-       ; debug output
-       ; sbi PORTD,3
+       out SREG,save
 
        reti
 
 T1_OVF_IR:
 
+       in save,SREG
+
+       cli
+
        ; indicate 'o'verflow end
        ldi uart_rxtx,0x6f
        rcall UART_TX
 
        ; exit sampling
-       ldi state,2
+       ldi state,10
 
-       reti
+       out SREG,save
 
+       reti
 
 ;
 ; sram