working on making it compile

diff --git a/detpic/mascan.asm b/detpic/mascan.asm
index 23e80e2f9f1a846c238f663766f7e564ae144f5e..bfd57b93dc0143d9c6d2bf8c92eb4830a7ff076f 100644 (file)
--- a/detpic/mascan.asm
+++ b/detpic/mascan.asm
@@ -115,6 +115,12 @@ read_got_detectors_b2
 
 ;----------
 read_got_detectbyte_something
+; branched from read_prep_detectbyte
+;  b ->         ?d??ddddd
+;  W           ?C??CCCC
+;  t           adj.detbasel
+;  FSR1 ->     lastd<n>
+ fixme need to preserve CCC's for use by addmsg_<something>
        xor_wfw INDF1           ; lastd<n> =    ?d??dddd
        mov_lw  0x07
        ior_wff FSR1L           ; FSR1L ->      detmsgh
@@ -141,9 +147,9 @@ loopback_read_byte
 ;...
 ;  W           message
        xor_lw  0x00 ^ 0x20
-       bra_z   cdu_got_pointed
+       bra_z   got_pointed
        xor_lw  0x20 ^ 0xb0
-       bra_z   slave_got_aargh
+       bra_z   got_aargh
        panic   morse_MX
 
 ;----------
@@ -156,7 +162,8 @@ read_prep_detectbyte
 ;  NOS         return address for i2cmu_read_got_byte
        mov_wf  t               ; t =           adj.detbasel
        mov_fw  b               ; W =           ?d??dddd
-       xor_wfw INDF1           ; lastd<n> =    ?C??CCCC, Z iff same
+       xor_wfw INDF1           ; W =           ?C??CCCC, Z iff same
+                       ;  where C set iff change to that detection segment
        bra_nz  read_got_detectbyte_something
        xor_wfw INDF1           ; lastd<n> =    ?d??dddd
        ; there's nothing to do
@@ -178,7 +185,7 @@ i2c_arrange_something
 ; GENERATION OF DETECTION MESSAGES FOR HOST - MAD BT_F_IF1 TABLES
 
 addmsg_testbit macro bit
-       bt_f_if1 w, bit
+       bt_f_if1 w, bit   fixme need to test something other than w !
        rcall   addmsg
        endm
 
@@ -197,6 +204,10 @@ addmsg_padding macro dummy_bit
        mov_lw  dummy_bit
        endm
 
+fixme comment this better
+addmsg registers on entry
+strangeness with offsets etc.
+
 addmsgs_section code 0x2100 + 6*4
 
 addmsgs_dethead        addmsg_testbit  6

diff --git a/detpic/mascan.fin b/detpic/mascan.fin
index 6696f7f67d7331bbb1327d2c2973a1949a569cdb..ddd160a68ef02e5faa14708dbdb6da5b933d1c81 100644 (file)
--- a/detpic/mascan.fin
+++ b/detpic/mascan.fin
@@ -1 +1,2 @@
  extern i2cm_intrl
+ extern loopback_read_byte

diff --git a/detpic/morse.messages b/detpic/morse.messages
index 85c1c53f3c6fdebb61116d8831cc0fd71df7e526..584e45affebcf4c8b2020d09553a27112a377273 100644 (file)
--- a/detpic/morse.messages
+++ b/detpic/morse.messages
@@ -56,6 +56,8 @@ UC
 UI
 UG
 UX
+UCI
+UCP
 
 # Messages for i2clib, S*
 SM     i2clib:st,:sspstat,:sspcon1,:sspcon2 ; m.,i., ctrlr bad state

diff --git a/detpic/panic.fin b/detpic/panic.fin
index dfa3e9fec895e01a33892c4301667a647eab5cae..e5b139a0b37d0569a315ac477e6e493626e0de1f 100644 (file)
--- a/detpic/panic.fin
+++ b/detpic/panic.fin
@@ -6,3 +6,4 @@
  extern i2csu_read_begin_panicd
  extern i2csu_read_another_panicd
  extern command_crashed
+ extern got_aargh

diff --git a/detpic/points.asm b/detpic/points.asm
index f2c55e001aa0631fc4286bff00a02fd3b37d3128..cd9aedb6f391937a79fd97841c64c6a434b77e59 100644 (file)
--- a/detpic/points.asm
+++ b/detpic/points.asm
@@ -230,7 +230,10 @@ point_timer_init_endif_masterslave
        return
 
 ;======================================================================
-;cdu_init
+
+cdu_init       panic   morse_UCI
 ; For master pic only.  Sorts out the CDU's pin.
 
+cdu_got_pointed        panic   morse_UCP
+
  include final.inc

diff --git a/detpic/points.fin b/detpic/points.fin
index ee26d7596283d131b800c8a0843ca0fba5a5b629..cd4679c9aff7f35d14a87ce2ee29a20f355ca9d8 100644 (file)
--- a/detpic/points.fin
+++ b/detpic/points.fin
@@ -2,3 +2,5 @@
  extern point_local_do
  extern points_local_init
  extern points_local_intrl
+ extern cdu_init
+ extern got_pointed

diff --git a/detpic/serout.asm b/detpic/serout.asm
index cd5e845a8930ee586a7c18a577be30f598a00e63..325c6bbb1a0560467b228b29b1361e228772d700 100644 (file)
--- a/detpic/serout.asm
+++ b/detpic/serout.asm
@@ -1,5 +1,8 @@
 ;======================================================================
+; SERIAL PORT - TRANSMISSION TO HOST
 
+ include common.inc
+ code
 ;----------------------------------------
 serial_addbyte
 ;  W           byte for transmission to host   trashed
@@ -18,7 +21,7 @@ serial_addbyte_another
 ;  STATUS      any                             trashed
 ;  all others  any                             not interfered with
 ;
-       mov_wf  POSTIN0C
+       mov_wf  POSTINC0
        bc_f    FSR0L, 7
        mov_fw  FSR0L
        mov_wf  outmsg_end
@@ -28,3 +31,6 @@ serial_addbyte_another
 
 ;-----
 serial_addbyte_toomany panic morse_HB
+
+;======================================================================
+ include final.inc