remove some xdebugs

diff --git a/detpic/i2clib.asm b/detpic/i2clib.asm
index eb1bcdac1c02a0d0c301255d6efd5fba3cfcd4f7..b09c0870612c71d8c1234a354c1d199bb42f75f2 100644 (file)
--- a/detpic/i2clib.asm
+++ b/detpic/i2clib.asm
@@ -170,13 +170,20 @@ m_start
 ;      slave                   any                     slave_number
 ; expects to return directly to main program (caller)
                mov_wf  slave
-               bra_z   m_improper_slave
                bs_f    SSPCON2, SEN
 m_start_or_restart
                and_lw  ~31
                bra_nz  m_improper_slave
                bs_f    st, st_starting
+               tst_f_ifnz slave
                return
+               ; oops:
+;...
+
+m_improper_slave
+;      slave                   slave number
+               i2cpanic morse_SN
+
 
 ;----------
 m_event_done_starting
@@ -220,11 +227,6 @@ m_event_done_stopping
 m_bad_address_ack
                i2cpanic morse_SK
 
-;----------
-m_improper_slave
-;      slave                   slave number
-               i2cpanic morse_SN
-
 ;========================================
 ; MASTER - WRITING
 
@@ -295,8 +297,9 @@ m_read_start_busy
 m_address_different
 ; Main program would like to address another slave for reading.
                mov_wf  slave_next
-               bra_z   m_improper_slave
+               tst_f_ifnz slave_next
                bra     i2cm_read_done
+               panic   morse_SO                
 
 ;----------
 m_event_done_addressing_read

diff --git a/detpic/program.asm b/detpic/program.asm
index 3549f404515effd03783cb84056e6a64bdf34e0f..0126bdf2773214892f8ab085e5b635f194b3776b 100644 (file)
--- a/detpic/program.asm
+++ b/detpic/program.asm
@@ -88,12 +88,6 @@ master_init
 ;----------------------------------------
 master_interrupt_low @
        enter_interrupt_low
- mov_ff INTCON, xdebug+0
- mov_ff INTCON2, xdebug+1
- mov_ff INTCON3, xdebug+2
- mov_ff PIR1, xdebug+3
- mov_ff PIR2, xdebug+4
- mov_ff PIR3, xdebug+5
        call    tick_intrl
        call    nmra_serialrx_intrl
        call    power_fault_intrl