summaryrefslogtreecommitdiff
path: root/software
diff options
context:
space:
mode:
authorChristian Pointner <equinox@mur.at>2013-08-12 12:59:48 +0000
committerChristian Pointner <equinox@mur.at>2013-08-12 12:59:48 +0000
commit29764c84522bab8bb9dae3224d277016ce6b3641 (patch)
tree47604ae28d03c74a579fc3f27710ae14143180e5 /software
parentdisabled HSI oscillator (diff)
updated pic bootloader
git-svn-id: https://svn.spreadspace.org/mur.sat@828 7de4ea59-55d0-425e-a1af-a3118ea81d4c
Diffstat (limited to 'software')
-rw-r--r--software/pic.bootloader/com-16f1847-spi.inc6
-rw-r--r--software/pic.bootloader/com-16f887-spi.inc4
2 files changed, 4 insertions, 6 deletions
diff --git a/software/pic.bootloader/com-16f1847-spi.inc b/software/pic.bootloader/com-16f1847-spi.inc
index e7ae182..02ef87d 100644
--- a/software/pic.bootloader/com-16f1847-spi.inc
+++ b/software/pic.bootloader/com-16f1847-spi.inc
@@ -31,14 +31,12 @@ com_tx_byte
com_tx_byte_wait1
btfss SSPSTAT,BF
goto com_tx_byte_wait1
+ movf SSP1BUF,w
movlb .0
+ bsf INTPIN
com_tx_byte_wait2 ; also wait for SS to go up again
btfss PORTB,5 ; this lowers the risk for raise conditions
goto com_tx_byte_wait2 ; with next byte (INT pin)
- movlb .4
- movf SSP1BUF,w
- movlb .0
- bsf INTPIN
return
;; ---- wait for byte to be received
diff --git a/software/pic.bootloader/com-16f887-spi.inc b/software/pic.bootloader/com-16f887-spi.inc
index 800b1da..051c275 100644
--- a/software/pic.bootloader/com-16f887-spi.inc
+++ b/software/pic.bootloader/com-16f887-spi.inc
@@ -30,11 +30,11 @@ com_tx_byte_wait1
btfss SSPSTAT,BF
goto com_tx_byte_wait1
bcf STATUS,RP0
+ movf SSPBUF,w
+ bsf INTPIN
com_tx_byte_wait2 ; also wait for SS to go up again
btfss PORTA,5 ; this lowers the risk for raise conditions
goto com_tx_byte_wait2 ; with next byte (INT pin)
- movf SSPBUF,w
- bsf INTPIN
return
;; ---- wait for byte to be received