From: ianmdlvl Date: Sun, 26 Sep 2004 13:42:57 +0000 (+0000) Subject: Clone flasher rev 1.6 as copybits, before hack a bit. X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=07de1afb745074a656986283f9d636bd4ca3f114;p=trains.git Clone flasher rev 1.6 as copybits, before hack a bit. --- diff --git a/iwjpictest/copybits.asm b/iwjpictest/copybits.asm index 0d7d24b..1cfa1d3 100644 --- a/iwjpictest/copybits.asm +++ b/iwjpictest/copybits.asm @@ -17,77 +17,78 @@ __config _CONFIG7L, 0xff __config _CONFIG7H, 0xff -COUNTFAST equ 0x00 -COUNTMEDIUM equ 0x01 -COUNTSLOW equ 0x02 +ACCSFR equ 0x0f00 -SLOWEXP equ 2 ; 2^2 * 40ms = 160ms +COUNTINNER equ 0x00 +COUNTOUTER equ 0x02 + +OUTEREXP equ 7 ; 2^7 * 2.6ms = 332ms ; we always leave each loop when its counter has reached 0, so on ; entry we assume it's already 0. For the loops which want to ; count all the way (256 iterations) that's good. start -loop - call red - call green - call black - - call red - call green - call red - call green - call black - - call red - call green - call red - call green - call red - call green - call black - goto loop - -red - bcf TRISD, 2, 0 ; enable flasher output - bcf LATD, 2, 0 ; set to low - goto delay - -green - bcf TRISD, 2, 0 ; enable flasher output - bsf LATD, 2, 0 ; set to high - goto delay + bcf TRISA, 0, 0 ; enable flasher output + movlw 0x07 ; turn off A-to-D so we get + movwf ADCON1, 0 ; digital inputs on RA0-3 (AN0-3) + bcf TRISD, 4, 0 ; enable output D + movlw 0x1f ; enable outputs E,F,G + movwf TRISC, 0 ; (RC7,6,5) -black - bsf TRISD, 2, 0 ; disable flasher output - call delay - goto delay +loop + btg LATA, 0, 0 -delay ; set a bit which says how fast the led ; should flash and count down from 2^(that bit) - bsf COUNTSLOW, SLOWEXP, 0 -delayslow_loop - -delaymedium_loop - -delayfast_loop - decfsz COUNTFAST, 1, 0 ; 1 cycle - goto delayfast_loop ; 2 cycles (skipped or not) -; exited delayfast_loop ; total: 3 * 256 = 768 cycles - - - decfsz COUNTMEDIUM, 1, 0 ; 1 cycle - goto delaymedium_loop ; 2 cycles (skipped or not) -; exited delaymedium_loop ; total: ~198000 cycles + bsf COUNTOUTER, OUTEREXP, 0 +delayouter_loop + +delayinner_loop + +copybit_mi macro sourcereg, sourcebitno, destreg, destbitvals, xorinv + movf destreg, 0, 0 ; read output latch + andlw ~destbitvals ; mask out output bit + btfsc sourcereg, sourcebitno, 0 ; skip if input clear + iorlw destbitvals ; add output bit + xorlw xorinv ; invert? + movwf destreg, 0 ; write output latch + endm ; (6cy total) + +copybiti macro sreg, sbitno, dreg, dbitvals + copybit_mi sreg, sbitno, dreg, dbitvals, dbitvals + endm + +copybit macro sreg, sbitno, dreg, dbitvals + copybit_mi sreg, sbitno, dreg, dbitvals, 0 + endm + + copybiti PORTB, 5, TRISA, 0x06 ; C enable + copybit PORTB, 4, PORTA, 0x06 ; C data + copybiti PORTB, 3, TRISA, 0x18 ; B enable + copybit PORTB, 2, PORTA, 0x18 ; B data + copybiti PORTB, 1, TRISA, 0x20 ; A enable + copybiti PORTB, 1, TRISE, 0x01 ; A enable + copybit PORTB, 0, PORTA, 0x20 ; A data + copybit PORTB, 0, PORTE, 0x01 ; A data + + copybiti PORTA, 6, PORTD, 0x10 ; D + copybiti PORTC, 0, PORTC, 0x80 ; E + copybiti PORTC, 1, PORTC, 0x40 ; F + copybiti PORTC, 2, PORTC, 0x20 ; G + ; 12 x copybit @6 = 48cy + + decfsz COUNTINNER, 1, 0 ; 1 cycle + goto delayinner_loop ; 2 cycles (skipped or not) +; exited delayinner_loop ; total: 51cy * 256 = 13056cy ; each cycle 0.2us - ; so each medium loop is ~40ms + ; so each inner loop is ~2.6ms - decfsz COUNTSLOW, 1, 0 - goto delayslow_loop -; exited delayslow_loop + decfsz COUNTOUTER, 1, 0 + goto delayouter_loop +; exited delayouter_loop - return + goto loop end diff --git a/iwjpictest/serialloop.asm b/iwjpictest/serialloop.asm index 0d7d24b..1cfa1d3 100644 --- a/iwjpictest/serialloop.asm +++ b/iwjpictest/serialloop.asm @@ -17,77 +17,78 @@ __config _CONFIG7L, 0xff __config _CONFIG7H, 0xff -COUNTFAST equ 0x00 -COUNTMEDIUM equ 0x01 -COUNTSLOW equ 0x02 +ACCSFR equ 0x0f00 -SLOWEXP equ 2 ; 2^2 * 40ms = 160ms +COUNTINNER equ 0x00 +COUNTOUTER equ 0x02 + +OUTEREXP equ 7 ; 2^7 * 2.6ms = 332ms ; we always leave each loop when its counter has reached 0, so on ; entry we assume it's already 0. For the loops which want to ; count all the way (256 iterations) that's good. start -loop - call red - call green - call black - - call red - call green - call red - call green - call black - - call red - call green - call red - call green - call red - call green - call black - goto loop - -red - bcf TRISD, 2, 0 ; enable flasher output - bcf LATD, 2, 0 ; set to low - goto delay - -green - bcf TRISD, 2, 0 ; enable flasher output - bsf LATD, 2, 0 ; set to high - goto delay + bcf TRISA, 0, 0 ; enable flasher output + movlw 0x07 ; turn off A-to-D so we get + movwf ADCON1, 0 ; digital inputs on RA0-3 (AN0-3) + bcf TRISD, 4, 0 ; enable output D + movlw 0x1f ; enable outputs E,F,G + movwf TRISC, 0 ; (RC7,6,5) -black - bsf TRISD, 2, 0 ; disable flasher output - call delay - goto delay +loop + btg LATA, 0, 0 -delay ; set a bit which says how fast the led ; should flash and count down from 2^(that bit) - bsf COUNTSLOW, SLOWEXP, 0 -delayslow_loop - -delaymedium_loop - -delayfast_loop - decfsz COUNTFAST, 1, 0 ; 1 cycle - goto delayfast_loop ; 2 cycles (skipped or not) -; exited delayfast_loop ; total: 3 * 256 = 768 cycles - - - decfsz COUNTMEDIUM, 1, 0 ; 1 cycle - goto delaymedium_loop ; 2 cycles (skipped or not) -; exited delaymedium_loop ; total: ~198000 cycles + bsf COUNTOUTER, OUTEREXP, 0 +delayouter_loop + +delayinner_loop + +copybit_mi macro sourcereg, sourcebitno, destreg, destbitvals, xorinv + movf destreg, 0, 0 ; read output latch + andlw ~destbitvals ; mask out output bit + btfsc sourcereg, sourcebitno, 0 ; skip if input clear + iorlw destbitvals ; add output bit + xorlw xorinv ; invert? + movwf destreg, 0 ; write output latch + endm ; (6cy total) + +copybiti macro sreg, sbitno, dreg, dbitvals + copybit_mi sreg, sbitno, dreg, dbitvals, dbitvals + endm + +copybit macro sreg, sbitno, dreg, dbitvals + copybit_mi sreg, sbitno, dreg, dbitvals, 0 + endm + + copybiti PORTB, 5, TRISA, 0x06 ; C enable + copybit PORTB, 4, PORTA, 0x06 ; C data + copybiti PORTB, 3, TRISA, 0x18 ; B enable + copybit PORTB, 2, PORTA, 0x18 ; B data + copybiti PORTB, 1, TRISA, 0x20 ; A enable + copybiti PORTB, 1, TRISE, 0x01 ; A enable + copybit PORTB, 0, PORTA, 0x20 ; A data + copybit PORTB, 0, PORTE, 0x01 ; A data + + copybiti PORTA, 6, PORTD, 0x10 ; D + copybiti PORTC, 0, PORTC, 0x80 ; E + copybiti PORTC, 1, PORTC, 0x40 ; F + copybiti PORTC, 2, PORTC, 0x20 ; G + ; 12 x copybit @6 = 48cy + + decfsz COUNTINNER, 1, 0 ; 1 cycle + goto delayinner_loop ; 2 cycles (skipped or not) +; exited delayinner_loop ; total: 51cy * 256 = 13056cy ; each cycle 0.2us - ; so each medium loop is ~40ms + ; so each inner loop is ~2.6ms - decfsz COUNTSLOW, 1, 0 - goto delayslow_loop -; exited delayslow_loop + decfsz COUNTOUTER, 1, 0 + goto delayouter_loop +; exited delayouter_loop - return + goto loop end