make points work; timings are odd; need new 10ms beat

diff --git a/detpic/points.asm b/detpic/points.asm
index c52bd16c79a03f324366e60b1c731d68604ac47d..f2c55e001aa0631fc4286bff00a02fd3b37d3128 100644 (file)
--- a/detpic/points.asm
+++ b/detpic/points.asm
@@ -41,7 +41,6 @@ point_local_do
        intrh_fsr0_save         ; point_set_pin uses FSR0, see below
        rcall   point_set_pin
        intrh_fsr0_restore
- panic morse_UP
 
        clr_f   TMR3L           ; also copies TMR3H into actual timer register
        bs_f    T3CON, TMR3ON
@@ -72,14 +71,13 @@ point_spurious_intr
 
 ;----------
 point_set_pin
-; Sets the pin appropriately:
+; Toggles the pin.  The effect is:
 ;      If we were idle, sets it H (to fire) unless pt0 in which case L
-;      If we were firing, sets it L (to stop) unless pt0 in which case
+;      If we were firing, sets it L (to stop) unless pt0 in which case H
 ;
 ; Called in various contexts, including both High and Low ISR.
 ;
 ;  pointmsg    point to start or stop firing   preserved
-;  Timer 3     enabled iff should stop now     not interfered with
 ;  W,STATUS    any                             undefined
 ;  FSR0                any                             undefined
 ;  all other   any                             not interfered with
@@ -88,39 +86,13 @@ point_set_pin
        mov_wf  FSR0H           ; FSR0H -> table
        rl_fw   pointmsg        ; W = point addr, Z iff pt0
        mov_wf  FSR0L           ; FSR0 -> &bit   [Z still iff pt0]
-       bt_f_if1 T3CON, TMR3ON  ; Were we firing ?   [Z still iff pt0]
-       btg_f   STATUS, Z       ; Z iff (pt0 xor were_firing)
-       bra_z   point_set_pin_l
-
-point_set_pin_h
        mov_fw  POSTDEC0        ; W = bit, FSR0 -> &LAT*
        bra_z   point_nonexistent
        mov_ff  INDF0, FSR0L    ; W = bit, FSR0L -> LAT*
        set_f   FSR0H           ; FSR0 -> LAT*, W = bit (still)
-       ior_wff INDF0           ; pin = H
+       xor_wff INDF0           ; pin = !pin
        return
 
-;----------
-point_set_pin_l
-       com_fw  POSTDEC0        ; W = ~bit, FSR0 -> &LAT*
-       mov_ff  INDF0, FSR0L    ; W = ~bit, FSR0L -> LAT*
-       set_f   FSR0H           ; FSR0 -> LAT*, W = bit (still)
-       and_wff INDF0           ; pin = H
-point_set_pin_hl
-       tst_f_ifnz FSR0L        ; err, did we just write to 0xf00 ?
-       return                  ; no; good.
-       ; oops, we did:
- if 0xf00 == RXF0SIDH
-       ; This is actually OK; it's a `receive acceptance filter'
-       ; for the CAN controller, writing to which has no side
-       ; effects.  And anyway the register starts at xxxx xxxx
-       ; so if we don't care about CAN that's fine, and we're about
-       ; to panic, of course.
-       ; See DS p212 (register summary), p228 (description),
-       ; p48 (location, 0xf00), p53 (POR value).
- else
-  error "must check what 0xf00 is on this processor"
- endif
 point_nonexistent
        panic   morse_PU
 

diff --git a/detpic/program.clocks b/detpic/program.clocks
index e7d4143afe4c8e10e9f94ada84be4da0ccdd68fb..88373fa0d1a81e5faa56181b160b77e0670783d0 100644 (file)
--- a/detpic/program.clocks
+++ b/detpic/program.clocks
@@ -10,4 +10,5 @@
 
 #morse         MS      T0ov16          66ms
 points         S       T3ov            200ms
-points         M       T3ov            20ms
+#points                S       T3ov            350ms
+points         M       T3ov            50ms