uart changes for tiny2313, hc595 set routine, touch timer.asm, mods to main in order...

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

diff --git a/led_plex/main.asm b/led_plex/main.asm
index 32f1e7d..ef66821 100644 (file)
--- a/led_plex/main.asm
+++ b/led_plex/main.asm
@@ -10,6 +10,8 @@
 .def   tmp1            = r16
 .def   tmp2            = r17
 .def   uart_rxtx       = r18
+.def   hc595_sink      = r19
+.def   hc595_source    = r20
 
 ;
 ; interrupts
@@ -37,7 +39,7 @@ rjmp T1_OVF
 rjmp T0_OVF
 
 ; UART RX
-rjmp UART_RX
+rjmp UART_RECEIVE
 
 ; UART UDRE
 reti
@@ -72,9 +74,9 @@ reti
 ; WDT OVF
 reti
 
-
-; include control defines
-.include "ctrl.def"
+;
+; init and main code
+;
 
 RESET:
 INIT:
@@ -83,7 +85,7 @@ INIT:
        rcall PORT_INIT
 
        ; timer init
-       rcall TIMER_INIT
+       ;rcall TIMER_INIT
 
        ; uart init
        rcall UART_INIT
@@ -99,7 +101,14 @@ INIT:
        ;sei 
 
        ; signal ready output
-       ldi uart_rxtx,0x23
+       ldi uart_rxtx,0x68
+       rcall UART_TX
+
+       ; testing ... DO NOT CONNECT LEDS BY NOW !!!
+       ldi hc595_sink,0xff
+       ldi hc595_source,0xff
+       rcall SET_HC595
+       ldi uart_rxtx,0x61
        rcall UART_TX
 
 MAIN:
@@ -124,6 +133,6 @@ T1_OVF:
 T0_OVF:
        reti
 
-UART_RX:
+UART_RECEIVE:
        reti