make new energy code compile

diff --git a/detpic/energy.asm b/detpic/energy.asm
index 78c2ea3918b63fc920bc890220eac07fe7696c00..59aa76bbc9455ebebd0f5d71902b7f928cfdea14 100644 (file)
--- a/detpic/energy.asm
+++ b/detpic/energy.asm
@@ -99,7 +99,7 @@ power_fault_init
        bs_f    INTCON3, INT1IE
        clr_f   stop_wait
        clr_f   retry_wait
-       pin_h   booster_shutdown
+       pin_h   p0_booster_shutdown
        pin_vl  p0_booster_userfault
        pin_z   p0_booster_userfault
        ; now we are Off
@@ -142,8 +142,8 @@ power_fault_intrl
        return
        ; we have a fault:
 
-       tst_f_ifz retry_wait
-       bra     power_stop ; we were Off or On, goto Stopping
+       mov_fw  retry_wait
+       bra_z   power_stop ; we were Off or On, goto Stopping
        ; must be Stopping, Retry or Persists:
 
        tst_f_ifnz stop_wait

diff --git a/detpic/energy.fin b/detpic/energy.fin
index 3a1c0207cba9e1e10c09208dba1d9ce87fd9144c..0855246bc55bd781e1881cbbaf9560fbaf84c5c3 100644 (file)
--- a/detpic/energy.fin
+++ b/detpic/energy.fin
@@ -1,7 +1,8 @@
  extern command_power
- extern power_polarising
  extern power_polarising_init
  extern power_polarising_tick
+ extern power_polarising_begin
+ extern power_polarising_settling
  extern power_fault_init
  extern power_fault_intrl
  extern power_fault_tick

diff --git a/detpic/nmra-stream.fin b/detpic/nmra-stream.fin
index 6253733e69ef7e64db80bbf02d5782801de02f9c..968faedf622a0ba7d0fb1aabe761309a8ffd441e 100644 (file)
--- a/detpic/nmra-stream.fin
+++ b/detpic/nmra-stream.fin
@@ -2,3 +2,4 @@
  extern serial_init
  extern serial_interrupts_init
  extern nmra_serialrx_intrl
+ extern nmra_restartmessage

diff --git a/detpic/reverse.asm b/detpic/reverse.asm
index 8dde2f4eb0bdbb9a765667061b60e072be5fecf4..b607b0bf1ae9bd50966efea2d6dc649a880c6242 100644 (file)
--- a/detpic/reverse.asm
+++ b/detpic/reverse.asm
@@ -233,7 +233,7 @@ polarity_needwrite_loop
 
        bt_f_if0 flags, flags_polarising
        return
-       goto    power_polarising_alldone
+       goto    power_polarising_settling
 
 polarity_needwrite_found
        mov_fw  FSR1L

diff --git a/detpic/tick.asm b/detpic/tick.asm
index f2ba9e6771926ba264fd1e4c098757f9da52ca76..a039eb6d21c27a06e83297ffa96aa78673e541b8 100644 (file)
--- a/detpic/tick.asm
+++ b/detpic/tick.asm
@@ -6,7 +6,7 @@
 
  include common.inc
 
-udata_acs
+ udata_acs
 tickdiv_count  res     1
 
  code
@@ -38,7 +38,7 @@ tick_intrl
        call    power_polarising_tick
        ; end of list of calls to <foo>_tick
 
-       dec_f_ifz tickdivcount
+       dec_f_ifz tickdiv_count
        bra     tickdiv_do
 
        intrl_handled_nostack