Mercurial > public > hwos_code

diff src/ms5541.asm @ 630:4cd81bdbf15c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
3.08 stable release
author heinrichsweikamp
date Fri, 21 Feb 2020 10:51:36 +0100
parents c40025d8e750
children 185ba2f91f59
line wrap: on
line diff
--- a/src/ms5541.asm	Fri Nov 29 18:48:11 2019 +0100
+++ b/src/ms5541.asm	Fri Feb 21 10:51:36 2020 +0100
@@ -116,7 +116,8 @@
 	movf	isr_xC+2,W
 	addwfc	SENS+1,F
 
-	; calculate absolute pressure = (sens * (d1-off))/2^12 + 1000
+	; calculate absolute pressure = (sens * (d1-off))/2^12 + 1000 (For MS5541C)
+	; calculate absolute pressure = (sens * (d1-off))/2^11 + 1000 (For MS5541C-30)
 	movf	OFF+0,W						; d1-off --> a
 	subwf	D1+0,W
 	movwf	isr_xA+0
@@ -126,9 +127,18 @@
 
 	MOVII	SENS,isr_xB					; sens --> b
 	call	isr_signed_mult16x16
+	movlw	.13
+	cpfslt	C1+1		; C1 > 3328 (Must be MS5541-30)
+	bra	isr_shift_ms5541_30
+	; MS5541
 	movlw	.12-.8						; a 12 bit shift = 1 byte + 4 bits
 	call	isr_shift_C31
-
+	bra	isr_shift_ms5541_all
+isr_shift_ms5541_30:
+	; MS5541-30
+    	movlw	.11-.8						; a 11 bit shift = 1 byte + 3 bits
+	call	isr_shift_C31
+isr_shift_ms5541_all:
 	movlw	LOW  .1000					; add 1000
 	addwf	isr_xC+1,F
 	movlw	HIGH .1000