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 bf5dc69879f46177c3cb57b641eedab661c44ca0..d9eeb0e3b5f80a9d847baf858a691df4c1fbe60d 100644 (file)
--- a/detpic/morse.messages
+++ b/detpic/morse.messages
@@ -15,8 +15,21 @@
 # buffer space somewhere so that each one is read once and that value
 # remembered.
 
-# Main message listing.  Kept sorted by morse for easy reference.
-# ---------------------------------------------------------------
+# 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.
+# -----------------------------------------------------------------
 
 # Miscellaneous
 E                              ; `expected'; we were told to panic
@@ -41,27 +54,23 @@ MD                          ; i2cmu_done !
 IH     INTCON,INTCON3,PIR1,PIR2,PIR3 ; Interrupt source not found (high pri.)
 IL     INTCON,INTCON3,PIR1,PIR2,PIR3 ; Interrupt source not found (low pri.)
 
-# Temporary entries for testing and development
-TM     PIE1,SSPSTAT,SSPCON1,SSPCON2 ; Master got I2C interrupt
-TI1                            ; for iwj
-TI2                            ; for iwj
-TI3                            ; for iwj
-TI4                            ; for iwj
-TI5                            ; for iwj
-
-# Unimplemented things
-UEC
-UER
+# W - watchdog
+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:
@@ -83,10 +93,10 @@ RG                                  ; too many reversers boards
 PB     points:pointmsg                 ; Firing point when already busy
 PI     points:pointmsg,T3CON           ; Unexpected Timer 3 interrupt
 PU     points:pointmsg                 ; Firing nonexistent point
+PC                                     ; Firing point when CDU empty
 PS     points:pointslave,points:pointmsg ; Firing point on nonexistent board
 PF     ::t                             ; Flash mentions point not on board
 PX                                     ; Host sent >2-byte POINT command
 PM                                     ; Firing point when master/CDU busy
-PC                                     ; POINTED when already charging
+PQ                                     ; POINTED when already charging
 PA                                     ; POINTED when already firing
-PQ                                     ; we're confused about CDU charged