command_crashed works; no more panic_UC; rearrange sections to make it compile

diff --git a/detpic/morse.messages b/detpic/morse.messages
index 1c0d2bc72ce76729517b1a3cd033d3db4603f348..dac7d8feece77f04fe9e21e7ec2a6e2d17b81c75 100644 (file)
--- a/detpic/morse.messages
+++ b/detpic/morse.messages
@@ -56,7 +56,6 @@ UER
 UCT
 UCI
 UCP
-UC
 URM
 
 # Messages for i2clib, S*

diff --git a/detpic/panic.asm b/detpic/panic.asm
index 7f95f49dcc59b4b89220cca14a34223f04ad97dc..9582313bee7dc78e0322ea0b671dc9687447884d 100644 (file)
--- a/detpic/panic.asm
+++ b/detpic/panic.asm
@@ -422,11 +422,6 @@ panic_crashread_setpointer
        mov_wf  FSR1L
        return
 
-;----------
-panic_crashread_commanded
-       bs_f    panicst, panicst_acked ; since we were asked to
-       panic   morse_E
-
 ;======================================================================
 ; MASTER READOUT AND MASTER READOUT OF SLAVES
 
@@ -516,5 +511,12 @@ near_gots code
 got_aargh
        panic   morse_T
 
+near_serialrx_table_section code 0x2100
+;----------
+command_crashed
+panic_crashread_commanded
+       bs_f    panicst, panicst_acked ; since we were asked to
+       panic   morse_E
+
 ;***************************************************************************
        include final.inc

diff --git a/detpic/program.asm b/detpic/program.asm
index 4ef68cc9f2e4a2711674407937c342939acbf09f..18333e51c90bf7b8d8c59625184dcb4c40ebe018 100644 (file)
--- a/detpic/program.asm
+++ b/detpic/program.asm
@@ -161,10 +161,7 @@ command_ping
 
 command_ping_bad panic morse_HP
 
-;--------------------
-command_crashed
-       panic   morse_UC
-
+code2 code
 ;======================================================================
 ; SLAVE
 
@@ -210,7 +207,7 @@ i2csu_write_if_special
        bra     i2csu_write_if_bad
        goto    panic_crashread_commanded
 
-code2 code
+code3 code
 ;======================================================================
 ; MASTER/SLAVE deviations