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

[trains.git] / detpic / morse.messages

diff --git a/detpic/morse.messages b/detpic/morse.messages
index a1a81e5ea3208199f36d391958302f3a4f6dbb5b..d9eeb0e3b5f80a9d847baf858a691df4c1fbe60d 100644 (file)
--- a/detpic/morse.messages
+++ b/detpic/morse.messages
@@ -17,11 +17,16 @@
 
 # Temporary entries for testing and development
 TM     PIE1,SSPSTAT,SSPCON1,SSPCON2 ; Master got I2C interrupt
+TI0                            ; for iwj
 TI1                            ; for iwj
 TI2                            ; for iwj
 TI3                            ; for iwj
 TI4                            ; for iwj
 TI5                            ; for iwj
+TI6                            ; for iwj
+TI7                            ; for iwj
+TI8                            ; for iwj
+TI9                            ; for iwj
 
 # Main message listing.  Kept sorted by section for easy reference.
 # -----------------------------------------------------------------
@@ -55,13 +60,17 @@ WX                                  ; bad watchdog command
 # Messages for i2clib, S*
 SM     i2clib+panic:st,:sspstat,:sspcon1,:sspcon2 ; m.,i., ctrlr bad state
 SS     SSPSTAT,SSPCON1                 ; s.,i., controller bad state
-SK     i2clib+panic:slave              ; m. couldn't address slave (no ack)
+SW     i2clib+panic:slave              ; m.: slave didn't ack addr for write
 SN     i2clib+panic:slave              ; improper slave number
 SO     i2clib+panic:slave              ; improper next slave number
 SB     i2clib+panic:st                 ; improper i2cm_{read,write}_start
 SF     i2clib+panic:st                 ; improper i2cmu_write_next_byte Z
 SA     i2clib+panic:st                 ; improper i2cm_read_another
 SD     i2clib+panic:st                 ; impr. i2cm_read_done/i2cs_read_data
+# used in mascan.asm
+SC     i2clib+panic:slave              ; slave didn't ack read: crashed
+ST     i2clib+panic:slave              ; slave didn't ack read: didn't start
+SP     i2clib+panic:slave              ; slave didn't ack read: in panic read
 
 # Messages for slave detection/i2c
 DQ     FSR2L,::outmsg_end              ; previous slave read incomplete
@@ -70,6 +79,7 @@ DX    ::t                             ; slave received wrong message byte
 DB     detect:message_buffer           ; slave_add_short_message overrun
 DF     ::t                             ; slave pic2detinfo[0] invalid bits
 DG     ::t                             ; too many slaves in pic2detinfo
+DJ     mascan:cslot,mascan:cbyte,::v   ; det msg 2nd byte has top bit set
 DM     detect:buf0                     ; master has MM bit set in buf0
 
 # Messages for specific peripherals: