handle slave writes, and tidy morse up a bit

diff --git a/detpic/morse.messages b/detpic/morse.messages
index c738b9b026913a8a45b9f2a5e0d3ffe61a86b2b5..2111b5bdf80896d0626fa0ddeee7b92772d9a933 100644 (file)
--- a/detpic/morse.messages
+++ b/detpic/morse.messages
@@ -16,11 +16,17 @@
 # remembered.
 
 # Main message listing.  Kept sorted by morse for easy reference.
+# ---------------------------------------------------------------
+
+# Miscellaneous
+E                              ; `expected'; we were told to panic
+
+# Problematic interrupts
 IH     INTCON,INTCON3,PIR1,PIR2,PIR3 ; Interrupt source not found (high pri.)
 IL     INTCON,INTCON3,PIR1,PIR2,PIR3 ; Interrupt source not found (low pri.)
 IP     INTCON                  ; Interrupt of priority supposedly disabled
 
-# Messages starting with T are temporary entries for testing and development
+# Temporary entries for testing and development
 TM     PIE1,SSPSTAT,SSPCON1,SSPCON2 ; Master got I2C interrupt
 TS     PIE1,SSPSTAT,SSPCON1,SSPCON2 ; Slave got I2C interrupt
 TI1                            ; for iwj
@@ -28,6 +34,8 @@ TI2                           ; for iwj
 TI3                            ; for iwj
 TI4                            ; for iwj
 TI5                            ; for iwj
+ZM     i2clib:st,:sspstat,:sspcon1,:sspcon2 ; for testing
+ZS     i2clib:st,:sspstat,:sspcon1,:st_orig ; for testing
 X      test-sofar:ch           ; bad character received from host
 
 # Unimplemented things
@@ -36,9 +44,6 @@ UL
 UM
 UE
 
-ZM     i2clib:st,:sspstat,:sspcon1,:sspcon2 ; for testing
-ZS     i2clib:st,:sspstat,:sspcon1,:st_orig ; for testing
-
 # Messages for i2clib, S*
 SM     i2clib:st,:sspstat,:sspcon1,:sspcon2 ; m.,i., ctrlr bad state
 SS     i2clib:st,SSPSTAT,SSPCON1,:st_orig ; s.,i., controller bad state
@@ -54,6 +59,7 @@ SD    i2clib:st                       ; impr. i2cm_read_done/i2cs_read_data
 DW                                     ; slave write (nyi)
 DQ     FSR2L,::outmsg_end              ; previous slave read incomplete
 DR     FSR2L,::outmsg_end              ; slave read overrun
+DX     ::t                             ; slave received wrong message byte
 
 # Messages for specific peripherals
 RS     FSR0L                           ; POLARITY message too short