From: ian <ian>
Date: Thu, 29 Dec 2005 17:04:58 +0000 (+0000)
Subject: use NMRA timing parameters from program.clocks
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=64649e5aabf48b14b216628e01a8d0b35e22285f;p=trains.git

use NMRA timing parameters from program.clocks
---

diff --git a/detpic/nmra-stream.asm b/detpic/nmra-stream.asm
index 2a13bd1..7e68bdf 100644
--- a/detpic/nmra-stream.asm
+++ b/detpic/nmra-stream.asm
@@ -136,15 +136,17 @@ nmra_init @
 	endif
 
         bc_fa     T0CON,5         ; timer0 use internal clock
-        bc_fa     T0CON,3         ; use prescaler
 
 	ifndef	SLOW_VERSION
-        bc_fa     T0CON,2         ; }
-        bc_fa     T0CON,1         ; } prescale value 1:2
-        bc_fa     T0CON,0         ; } (not-testing)
+	mov_fw	T0CON
+	and_lw	~((1<<PSA)|(1<<T0PS2)|(1<<T0PS1)|(1<<T0PS0))
+	ior_lw	nmra_master_t0scale
+	mov_wf	T0CON		; prescale value calculated from
+				;  program.clocks (not-testing)
 	endif
 
 	ifdef	SLOW_VERSION
+        bc_fa     T0CON,3         ; use prescaler
         bs_fa     T0CON,2         ; }
         bc_fa     T0CON,1         ; } prescale value 1:16
         bc_fa     T0CON,0         ; } (testing)
@@ -304,7 +306,7 @@ master_interrupt_high @
 	endif
 
 	ifndef	SLOW_VERSION
-	mov_lw	0x73	; (not-testing)
+	mov_lw	nmra_master_t0init
 	endif
 
 	mov_wfa	TMR0L  		; set timer0 to appropriate value (so interrupt takes 58us)
diff --git a/detpic/program.clocks b/detpic/program.clocks
index ae0066e..f4d1ea4 100644
--- a/detpic/program.clocks
+++ b/detpic/program.clocks
@@ -10,6 +10,7 @@
 
 points		MS	T3ov		10ms
 tick		MS	T2period	1ms
+nmra		M	T0ov8		58us-8cy
 
 ; we do morse at 18wpm according to the PARIS standard
 ; (ie a unit time of 66ms) using timer0 (DS p108)