make it build, so far

diff --git a/detpic/.cvsignore b/detpic/.cvsignore
index f9c4ae6f11e8bbf4a66b2588ee037b8e0584ae2e..2f0b0422277e357ec9a973186ba9ab12fb88722e 100644 (file)
--- a/detpic/.cvsignore
+++ b/detpic/.cvsignore
@@ -15,3 +15,4 @@ ours+pindata.asm
 syncwrite.asm
 t.*
 t
+*.new

diff --git a/detpic/Makefile b/detpic/Makefile
index 4fe35b424aa5e17c3bdd0f0e0736e9c207a13a7b..04dc7d554869fb565b2ee0d09874a8dcbf16b1cd 100644 (file)
--- a/detpic/Makefile
+++ b/detpic/Makefile
@@ -5,9 +5,9 @@ PICNOS=         0 1 2
 PROGRAMS=              program
 OBJS_program=          vectors.o panic.o routines-led.o i2clib.o       \
                        misc.o detect.o variables.o points.o            \
-                       syncwrite.o reverse.o nmra-stream.o
+                       syncwrite.o reverse.o nmra-stream.o mascan.o
 XCODEN_program=        morse
-XCODE1_program=        blank2 ours+pindata
+XCODE1_program=        ours+pindata
 
 INCLUDES=                                      \
                ../iwjpictest/clockvaries.inc   \
@@ -17,6 +17,7 @@ INCLUDES=                                     \
                i2clib.inc                      \
                i2clib.incm                     \
                misc.fin                        \
+               mascan.fin                      \
                nmra-stream.fin                 \
                panic.fin                       \
                panic.inc                       \

diff --git a/detpic/mascan.asm b/detpic/mascan.asm
index 21388aea996164f6d4076b92c3191363df2c8263..b80e1075f7e3a11ad1e80d94b3366cc8ded208a3 100644 (file)
--- a/detpic/mascan.asm
+++ b/detpic/mascan.asm
@@ -1,7 +1,12 @@
 ;======================================================================
 ; MASTER - SCANNING ETC.
 
-;----------
+ include common.inc
+ code
+
+;======================================================================
+
+;----------------------------------------
 i2cm_intrl
 ; handles i2c interrupt using i2cm_interrupt[_definite],
 ; according to the rules for <something>_intrl.
@@ -10,8 +15,11 @@ i2cm_intrl
        call    i2cm_interrupt_definite
        intrl_handled_nostack
 
-;--------------------
+;----------------------------------------
 i2cmu_done
 i2cmu_read_got_byte
 i2cmu_write_next_byte
        panic   morse_UI
+
+;======================================================================
+ include final.inc

diff --git a/detpic/morse.messages b/detpic/morse.messages
index 56db090688e0f501c4604407b37a62184a0a92ef..82083a3a7a7a779d3a5512309fafbc40da3644c6 100644 (file)
--- a/detpic/morse.messages
+++ b/detpic/morse.messages
@@ -41,7 +41,6 @@ TI3                           ; for iwj
 TI4                            ; for iwj
 TI5                            ; for iwj
 ZM     i2clib:st,:sspstat,:sspcon1,:sspcon2 ; for testing
-X      test-sofar:ch           ; bad character received from host
 
 # Unimplemented things
 UL