chiark
/
gitweb
/
~ijackson
/
trains.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Send HELLO as a result of all slaves being online. Do not crash if slave is slow...
[trains.git]
/
detpic
/
i2clib.asm
diff --git
a/detpic/i2clib.asm
b/detpic/i2clib.asm
index ebbf62ddbe946edf1689328637bb1bcfc1c0c5b8..09d995dbe56fcf6b69827b98ec76c71701b68525 100644
(file)
--- a/
detpic/i2clib.asm
+++ b/
detpic/i2clib.asm
@@
-201,7
+201,7
@@
m_event_done_starting
;----------
m_event_done_addressing
bt_f_if1 sspcon2, ACKSTAT
;----------
m_event_done_addressing
bt_f_if1 sspcon2, ACKSTAT
- bra m_
bad
_address_ack
+ bra m_
no
_address_ack
; OK, we got ack.
bc_f st, st_addressing
; OK, we got ack.
bc_f st, st_addressing
@@
-224,8
+224,15
@@
m_event_done_stopping
goto i2cmu_done
;----------
goto i2cmu_done
;----------
-m_bad_address_ack
- i2cpanic morse_SK
+m_no_address_ack
+ bt_f_if0 st, st_reading
+ bra m_bad_no_address_ack_write
+ clr_f st
+ rcall m_stop
+ goto i2cmu_slave_no_ack
+
+m_bad_no_address_ack_write
+ panic morse_SW
;========================================
; MASTER - WRITING
;========================================
; MASTER - WRITING