Send HELLO as a result of all slaves being online. Do not crash if slave is slow...

[trains.git] / detpic / panic.asm

diff --git a/detpic/panic.asm b/detpic/panic.asm
index 550aa4c707003ff62ccecb3f48143808bfd38e50..663d7fe443fe2b33109e52aba34b013fe1d5e871 100644 (file)
--- a/detpic/panic.asm
+++ b/detpic/panic.asm
@@ -20,7 +20,8 @@ panicst_restart_i2c           equ     7
 panicst_acked                  equ     5
 panicst_ferroerr               equ     4
 panicst_writeslave             equ     3
-panicst_onlyourwrite           equ     2
+panicst_i2cmours               equ     2
+panicst_i2cmenable             equ     1
 
 panic_valcount                 res     1
 
@@ -366,6 +367,9 @@ waiting_master
        bra     waiting_loop
        ; master, i2c enabled:
 
+       bt_f_if0 panicst, panicst_i2cmenable
+       bra     waiting_loop
+
        bt_f_if1 PIR1, SSPIF
        rcall   pan_i2cm_interrupt
 
@@ -373,7 +377,10 @@ waiting_master
 
 ;----------
 panicst_oerrferr
-       dec_fw  RCREG
+       mov_fw  RCREG
+       xor_lw  0x11
+       bra_z   panic_reset
+       xor_lw  0x10 ^ 0x11
        bra_nz  panicd_serialrx_err_loop
        ; yay! host ack'd ferr/oerr
        bc_f    panicst, panicst_ferroerr
@@ -386,7 +393,7 @@ panicd_serialrx_err
        mov_fw  RCREG           ; read RCREG    } (see PIC18FXX8 DS p182)
        bs_f    RCSTA, RCEN     ; reenable      }
 panicd_serialrx_err_loop
-       bt_f_if0 PIR1, RCIF ; wait for a byte 0x01 to ack the overrun/error
+       bt_f_if0 PIR1, RCIF ; wait for a byte 0x10 to ack the overrun/error
        bra     panicd_serialrx_err_loop
 ;...
 ;----------
@@ -421,7 +428,7 @@ panicd_process_input_byte
 ;----------
 write_ifnot_00
        bt_f_if0 panicst, panicst_acked ; well, ignore that !
-       return
+       bra     write_only_tellmode
        ; OK, we have an instruction:
 
        bt_w_if1 7 ; huh?
@@ -429,13 +436,26 @@ write_ifnot_00
        bt_w_if1 6
        bra     panic_crashread_setpointer
        bt_f_if0 idloc1,idloc1_master
-       return ; all the remaining options are for master only
+       bra     write_ifnot0_ifnotmaster
+       ; the next few options are for master only:
+
        bt_w_if1 5
        bra     write_if_master_slaveselect
        bt_w_if1 4
        bra     write_if_master_masterread
+       bt_w_if0 3
        bra     write_if_master_slaveread
-       return ; huh ?
+;...
+write_ifnot0_ifnotmaster
+       xor_lw  0x09
+       bra_z   panic_reset
+       xor_lw  0x09
+;...
+write_only_tellmode
+       xor_lw  0x0a
+       bra_z   panic_tellmode
+       ; nope, well, we ignore it
+       return
 
 ;----------
 panic_crashread_setpointer
@@ -451,8 +471,24 @@ panic_crashread_setpointer
        and_lw  0x3f
        ior_wfw PRODL
        mov_wf  FSR1L
+panic_noop
        return
 
+;======================================================================#
+; SPECIAL COMMANDS 0x08..0x0f
+
+;----------
+panic_reset
+       reset
+
+;----------
+panic_tellmode
+       bt_f_if0 idloc1,idloc1_master
+       return
+       mov_lw  0x0b
+       bc_f    panicst, panicst_acked
+       goto    serial_write_char
+
 ;======================================================================
 ; MASTER READOUT AND MASTER READOUT OF SLAVES
 
@@ -464,7 +500,7 @@ write_if_setbytetowrite
        bc_w    7
        mov_wf  panic_valcount
        bs_f    panicst, panicst_writeslave
-       bs_f    panicst, panicst_onlyourwrite
+       bs_f    panicst, panicst_i2cmenable
        return
 
 ;----------
@@ -477,6 +513,7 @@ write_if_master_slaveread
 write_if_master_slaveselect
        bc_w    5
        btg_w   4
+       bs_f    panicst, panicst_i2cmours
        bt_f_if1 panicst, panicst_writeslave
        bra     pan_i2cm_write_start
        bra     pan_i2cm_read_start
@@ -494,6 +531,8 @@ write_if_master_masterread_loop
 
 ;----------
 pan_i2cmu_read_got_byte
+       bt_f_if0 panicst, panicst_i2cmours
+       return
        call    serial_write_char
        dec_f_ifnz panic_valcount
        bra     pan_i2cm_read_another
@@ -503,7 +542,7 @@ pan_i2cmu_read_got_byte
 pan_i2cmu_write_next_byte
        mov_fw  panic_valcount
        bc_f    STATUS, Z
-       bt_f_if0 panicst, panicst_onlyourwrite
+       bt_f_if0 panicst, panicst_i2cmours
        retlw   0x00
        bt_f_if0 panicst, panicst_writeslave
        bs_f    STATUS, Z
@@ -515,6 +554,10 @@ pan_i2cmu_done
        mov_lw  ' '
        goto    serial_write_char
 
+;----------
+pan_i2cmu_slave_no_ack
+       i2cpanic morse_SP
+
 ;======================================================================
 ; SLAVE I2C