bulb

@@ -1,5 +1,5 @@

 ; bulb - BlinkenArea ultimate logo board

-; version 1.0.0 date 2011-07-30

+; version 1.1.0 date 2012-06-10

 ; Copyright (C) 2011-2012 Stefan Schuermans <stefan@blinkenarea.org>

 ; Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

@@ -15,14 +15,14 @@

 ; PB4: column 4 output (output, low)

 ; PB5: column 5 output (output, low)

 ; PB6: column 6 output (output, low)

-; PB7: push button input (input, pull-up enabled)

+; PB7: unused (input, pull-up enabled)

 ; PD0: row 0 output (output, high)

 ; PD1: row 1 output (output, high)

 ; PD2: row 2 output (output, high)

 ; PD3: row 3 output (output, high)

 ; PD4: row 4 output (output, high)

 ; PD5: row 5 output (output, high)

-; PD6: unused (output, low)

+; PD6: mode switch (input, pull-up enabled)

@@ -33,8 +33,8 @@

 ; IO pins

 .equ    COL_PORT                =       PORTB   ; column outputs

 .equ    ROW_PORT                =       PORTD   ; row outputs

-.equ    BTN_PIN                 =       PINB

-.equ    BTN_BIT                 =       7

+.equ    MODE_SW_PIN             =       PIND

+.equ    MODE_SW_BIT             =       6

@@ -105,8 +105,8 @@ NE:

         PIXEL   @0                      ; pixel 5

         PIXEL   @0                      ; pixel 6

         subi    XL,7                    ;   XH not there on ATtiny2313

-        lsr     DATA                    ; ensure remaining bit stays

-                                        ;   high (pull-up for button)

+        lsr     DATA                    ; ensure remaining bit stays high

+                                        ;   (pull-up for unused pin)

         com     DATA

         out     COL_PORT,DATA

 .ENDM

@@ -151,13 +151,24 @@ NE:

 ROW_OFF_LOOP:

         dec     TMP

         brne    ROW_OFF_LOOP

-        ldi     TMP,0x80                ; ensure remaining bit stays

-                                        ;   high (pull-up for button)

+        ldi     TMP,0x80                ; ensure remaining bit stays high

+                                        ;   (pull-up for unused pin)

         out     COL_PORT,TMP

 .ENDM

+; play an animation N times (mode 0) or infinitely (mode 1)

+; parameters: animation function, N

+.MACRO PL_ANIM

+PL_ANIM_LOOP:

+        rcall_N @0, @1 - 1

+        sbic    MODE_SW_PIN,MODE_SW_BIT

+        rjmp    PL_ANIM_LOOP

+.ENDM

+

+

+

 .CSEG

 .ORG    0x000

         rjmp    ENTRY                   ; RESET

@@ -200,9 +211,9 @@ ENTRY:

         out     PORTB,TMP

         ldi     TMP,0x7F

         out     DDRB,TMP

-        ldi     TMP,0x3F                ; PD[0-5] to output, high - PD6 to output, low

+        ldi     TMP,0x7F                ; PD[0-5] to output, high - PD6 to input, pull-up enabled

         out     PORTD,TMP

-        ldi     TMP,0x7F

+        ldi     TMP,0x3F

         out     DDRD,TMP

 ; initialize stack pointer

         ldi     TMP,RAMEND

@@ -217,13 +228,6 @@ ENTRY:

 ; disable analog comparator

         ldi     TMP,1<<ACD

         out     ACSR,TMP

-; enable pin change interrupt for button

-;   to wake up from sleep

-        in      TMP,GIMSK

-        ori     TMP,1<<PCIE

-        out     GIMSK,TMP

-        ldi     TMP,1<<PCINT7

-        out     PCMSK,TMP

 ; jump to main program

         rjmp    MAIN

@@ -275,7 +279,7 @@ ROW_GRAY:

 ; input: FRAME = pixel data (0..15)

 ; output: -

 ; changes: TMP, CNT, DATA, X

-; cycles: 43676 (including rcall and ret)

+; cycles: 43682 (including rcall and ret)

 ; time: 5.5ms

 OUT_FRAME:

         wdr

@@ -286,6 +290,8 @@ OUT_FRAME_LOOP:

         mov     TMP,CNT                 ; select row

         com     TMP

         andi    TMP,0x3F

+        ori     TMP,0x40                ; ensure bit 6 stays high

+                                        ;   (pull-up for switch input)

         out     ROW_PORT,TMP

         rcall   ROW_GRAY                ; display row

         subi    XL,-7                   ; ptr to next row

@@ -298,86 +304,7 @@ OUT_FRAME_LOOP:

-; handle on/off button

-; input: -

-; output: -

-; changes: TMP, CNT

-; time: usually very short, but may suspend execution

-BUTTON:

-; exit if button not pressed

-;   require stable press for about 50 ms

-        clr     CNT                     ; loop 65536 times

-        clr     TMP

-BUTTON_CHECK_PRESS_LOOP:

-        wdr

-        sbic    BTN_PIN,BTN_BIT         ; not pressed -> leave

-        ret

-        dec     TMP

-        brne    BUTTON_CHECK_PRESS_LOOP

-        dec     CNT

-        brne    BUTTON_CHECK_PRESS_LOOP

-; wait for button to be released

-;   require stable release for about 50 ms

-BUTTON_WAIT_RELEASE:

-        clr     CNT                     ; loop 65536 times

-        clr     TMP

-BUTTON_WAIT_RELEASE_LOOP:

-        wdr

-        sbis    BTN_PIN,BTN_BIT         ; pressed -> start over

-        rjmp    BUTTON_WAIT_RELEASE

-        dec     TMP

-        brne    BUTTON_WAIT_RELEASE_LOOP

-        dec     CNT

-        brne    BUTTON_WAIT_RELEASE_LOOP

-; disable watchdog

-        cli

-        wdr

-        in      TMP,WDTCR

-        ori     TMP,1<<WDCE|1<<WDE

-        out     WDTCR,TMP

-        andi    TMP,~(1<<WDCE|1<<WDE)

-        out     WDTCR,TMP

-        wdr

-        sei

-; sleep

-        in      TMP,MCUCR               ; configure power-down sleep

-        andi    TMP,~(1<<SM1)

-        ori     TMP,1<<SE|1<<SM0

-        out     MCUCR,TMP

-        sleep                           ; go to sleep

-        in      TMP,MCUCR               ; configure no sleep mode

-        andi    TMP,~(1<<SE)

-        out     MCUCR,TMP

-; enable watchdog

-        cli

-        wdr

-        in      TMP,WDTCR

-        ori     TMP,1<<WDCE|1<<WDE

-        out     WDTCR,TMP

-        andi    TMP,~(1<<WDCE)

-        out     WDTCR,TMP

-        wdr

-        sei

-; wait for button to be released

-;   require stable release for about 50 ms

-BUTTON_WAIT2_RELEASE:

-        clr     CNT                     ; loop 65536 times

-        clr     TMP

-BUTTON_WAIT2_RELEASE_LOOP:

-        wdr

-        sbis    BTN_PIN,BTN_BIT         ; pressed -> start over

-        rjmp    BUTTON_WAIT2_RELEASE

-        dec     TMP

-        brne    BUTTON_WAIT2_RELEASE_LOOP

-        dec     CNT

-        brne    BUTTON_WAIT2_RELEASE_LOOP

-; done

-        ret

-

-

-

 ; output a frame for some time

-;   also handles on/off button

 ; input: FRAME = pixel data (0..15)

 ;        TMP = time to show frame (1..255, in 5.5 ms steps)

 ; output: -

@@ -389,7 +316,6 @@ OUT_FRAME_TIME:

         push    CNT

         push    DATA

         rcall   OUT_FRAME               ; 5.5 ms

-        rcall   BUTTON

         pop     DATA

         pop     CNT

         pop     TMP

@@ -721,22 +647,19 @@ MAIN:

 ; initialization

-; enable interrupts

-        sei

-

 MAIN_LOOP:

         wdr

 ; main loop

-        rcall_N ANIM_BLINK,3

-        rcall_N ANIM_WORM,3

-        rcall_N ANIM_FLICKER,10

-        rcall_N ANIM_BW_RUN,3

-        rcall_N ANIM_FADE,2

-        rcall_N ANIM_BW_WORM,3

-        rcall_N ANIM_WOBBLE,5

-        rcall_N ANIM_RUN,3

+        PL_ANIM ANIM_BLINK,3

+        PL_ANIM ANIM_WORM,3

+        PL_ANIM ANIM_FLICKER,10

+        PL_ANIM ANIM_BW_RUN,3

+        PL_ANIM ANIM_FADE,2

+        PL_ANIM ANIM_BW_WORM,3

+        PL_ANIM ANIM_WOBBLE,5

+        PL_ANIM ANIM_RUN,3

 ; bottom of main loop