chiark
/
gitweb
/
~ijackson
/
trains.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b11ea0f
)
glue into ISR High - wip
author
ian
<ian>
Wed, 21 Dec 2005 13:23:32 +0000
(13:23 +0000)
committer
ian
<ian>
Wed, 21 Dec 2005 13:23:32 +0000
(13:23 +0000)
detpic/master.asm
patch
|
blob
|
history
detpic/nmra-stream.asm
patch
|
blob
|
history
diff --git
a/detpic/master.asm
b/detpic/master.asm
index ec52b3649249300a333fa560ec92f34357bdb0c1..ddd844e48c5863a0edfb05a956e5e60cfd0dc135 100644
(file)
--- a/
detpic/master.asm
+++ b/
detpic/master.asm
@@
-41,6
+41,10
@@
master_interrupt_low
call i2cm_intrl
panic morse_IL
+;----------
+master_interrupt_high_notnmra
+ fixme
+
serialrx_table_section code 0x2000
;--------------------
serialrx_generalmsg
diff --git
a/detpic/nmra-stream.asm
b/detpic/nmra-stream.asm
index dedc2996bcc1fb07a7338eaa905bf568fbc88d8a..101ec8dd609d93e3041f5adbe171b88ffb443e55 100644
(file)
--- a/
detpic/nmra-stream.asm
+++ b/
detpic/nmra-stream.asm
@@
-273,9
+273,9
@@
not_nmra_message
;****************************************************************************
fixme reviewed up to here for inclusion in bigger program
-nmra_interrupt_timer
+master_interrupt_high
bt_f_if0 INTCON,2,0 ; check whether timer0 interrupt set
- return
+ bra master_interrupt_high_notnmra
; timer0 interrupt
debug ',' ; write 'j' to serial port