From: ian Date: Sat, 17 May 2008 13:59:28 +0000 (+0000) Subject: add _ to end of p0_booster_userfault_ to indicate inverted polarity X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=873a44c49a1fb6b6b84ddea7eabca13893bb62ae;p=trains.git add _ to end of p0_booster_userfault_ to indicate inverted polarity --- diff --git a/detpic/common.inc b/detpic/common.inc index bcae285..fe05c92 100644 --- a/detpic/common.inc +++ b/detpic/common.inc @@ -326,7 +326,7 @@ p0_cdu_enable equ 5b p0_rs232_fcin equ 4b p0_booster_shutdown equ 2b p0_booster_overload equ 1b -p0_booster_userfault equ 0b +p0_booster_userfault_ equ 0b p0_spare2 equ 6d p0_spare1 equ 5d p0_rs232_fcout equ 5c diff --git a/detpic/panic.asm b/detpic/panic.asm index d083b20..5eae0fa 100644 --- a/detpic/panic.asm +++ b/detpic/panic.asm @@ -128,7 +128,7 @@ panic_setup_if_master movlw morse_master_t0initl movwf t0l_count - pin_l p0_booster_userfault + pin_l p0_booster_userfault_ mov_lw 0x0b ; AAARGH bt_f_if1 TXSTA, TXEN @@ -326,7 +326,7 @@ waiting ; waits for a fixed interval, depending on the configuration of TMR0 bt_f_if1 idloc1,idloc1_master - pin_z p0_booster_userfault + pin_z p0_booster_userfault_ bc_f INTCON,2 ; clear timer0 interrupt bit (p109) ; Interrupt happens on overflow. So start at 65535-morse_t0cycles: @@ -398,7 +398,7 @@ panicd_serialrx_err_loop ;... ;---------- panicd_serialrx - pin_nz p0_booster_userfault + pin_nz p0_booster_userfault_ bt_f_if1 RCSTA,FERR bra panicd_serialrx_err bt_f_if1 RCSTA,OERR