From 86836cef12752f0be51db8e6b6302bd08fe66dd5 Mon Sep 17 00:00:00 2001 From: ian Date: Wed, 28 Dec 2005 03:03:52 +0000 Subject: [PATCH] make new energy code compile --- detpic/energy.asm | 6 +++--- detpic/energy.fin | 3 ++- detpic/nmra-stream.fin | 1 + detpic/reverse.asm | 2 +- detpic/tick.asm | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/detpic/energy.asm b/detpic/energy.asm index 78c2ea3..59aa76b 100644 --- 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 3a1c020..0855246 100644 --- 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 6253733..968faed 100644 --- 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 8dde2f4..b607b0b 100644 --- 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 f2ba9e6..a039eb6 100644 --- 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 _tick - dec_f_ifz tickdivcount + dec_f_ifz tickdiv_count bra tickdiv_do intrl_handled_nostack -- 2.30.2