# HG changeset patch
# User Tero Marttila <terom@fixme.fi>
# Date 1311709480 -10800
# Node ID e6571a8040aed49c99e4c95ed3d3fad707f11264
# Parent  a0a003083d4c41a15a24820c86ae1c05067ed737# Parent  fe9f354dddd43f7987dce7102b4e89bf74bd0071
merge

diff -r fe9f354dddd4 -r e6571a8040ae Makefile
--- a/Makefile	Tue Jul 26 22:43:59 2011 +0300
+++ b/Makefile	Tue Jul 26 22:44:40 2011 +0300
@@ -4,12 +4,12 @@
 AD_PART = m328p
 AD_PROG = arduino
 AD_BAUD = 57600
-AD_PORT = /dev/ttyUSB1
+AD_PORT = /dev/arduino
 
 AD = avrdude
 ADFLAGS = -p $(AD_PART) -c $(AD_PROG) -b $(AD_BAUD) -P $(AD_PORT)
 
-PROG = matrix
+PROG = console
 
 all: $(PROG).hex
 
diff -r fe9f354dddd4 -r e6571a8040ae matrix.inc
--- a/matrix.inc	Tue Jul 26 22:43:59 2011 +0300
+++ b/matrix.inc	Tue Jul 26 22:44:40 2011 +0300
@@ -39,7 +39,6 @@
 ; this determines the starting offset for the visible viewport's left edge from the start of the framebuffer in columns
 matrix_colshift:    .byte 1                 ; viewport left column offset
 
-
 ;; Text
 ; Maximum length of message
 .set TEXT_MAXLENGTH = 64
@@ -419,5 +418,44 @@
         pop         XH
         pop         XL
 
+
+    ; Clear second frame
+        ldi         YL, low(matrix_colbuf + 16)
+        ldi         YH, high(matrix_colbuf + 16)
+        ldi         r16, MATRIX_COLS
+        ldi         r17, 0
+
+text_shows_end2:        
+        st          -Y, r17
+
+        dec         r16
+        brne        text_shows_end2
+
+    ; Blink
+text_shows_end3:        
+        ; on
+        ldi         r16, 0
+        rcall       Matrix_ShiftSet
+
+        ; sleep
+        ldi         XH, high(TEXT_SPEED * 6 * 1024)
+        ldi         XL, low(TEXT_SPEED * 6 * 1024)
+
+        rcall       Timer_Sleep
+
+        ; off        
+        ldi         r16, 8
+        rcall       Matrix_ShiftSet
+
+        ; sleep
+        ldi         XH, high(TEXT_SPEED * 6 * 1024)
+        ldi         XL, low(TEXT_SPEED * 6 * 1024)
+
+        rcall       Timer_Sleep
+
+        ; loop
+        rjmp        text_shows_end3
+
+    ; XXX: end
         ret