Mercurial > public > mk2
annotate code_part1/OSTC_code_asm_part1/ms5535.asm @ 713:8c293e76a517
no flicker when powering on
author | heinrichsweikamp |
---|---|
date | Thu, 16 May 2013 13:57:32 +0200 |
parents | 422b9eeace4f |
children | b7f7184d800d |
rev | line source |
---|---|
0 | 1 ; OSTC - diving computer code |
2 ; Copyright (C) 2008 HeinrichsWeikamp GbR | |
3 | |
4 ; This program is free software: you can redistribute it and/or modify | |
5 ; it under the terms of the GNU General Public License as published by | |
6 ; the Free Software Foundation, either version 3 of the License, or | |
7 ; (at your option) any later version. | |
8 | |
9 ; This program is distributed in the hope that it will be useful, | |
10 ; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
11 ; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
12 ; GNU General Public License for more details. | |
13 | |
14 ; You should have received a copy of the GNU General Public License | |
15 ; along with this program. If not, see <http://www.gnu.org/licenses/>. | |
16 | |
17 | |
18 ; routines for Intersema MS5535A, MS5541B and MS5541C | |
161
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
19 ; history: |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
20 ; 2005-09-26: Written by Matthias Heinrichs, info@heinrichsweikamp.com |
169
e26f49674956
Merge decoplan display for both GF and Buhlmann models.
JeanDo
parents:
161
diff
changeset
|
21 ; 2008-08-21: MH last updated, with second order compensation. |
161
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
22 ; 2011-01-19: jDG Clean up using true signed arithmetics. |
341
2144f19fa1eb
BUGFIX protect against ISR changing pressure/temperature while reading it.
JeanDo
parents:
340
diff
changeset
|
23 ; 2011-05-19: jDG Avegaring temperature and amb_pressure in private variable, |
2144f19fa1eb
BUGFIX protect against ISR changing pressure/temperature while reading it.
JeanDo
parents:
340
diff
changeset
|
24 ; Use signed 16bit value for temperature (compat with avg !). |
2144f19fa1eb
BUGFIX protect against ISR changing pressure/temperature while reading it.
JeanDo
parents:
340
diff
changeset
|
25 ; |
0 | 26 ; known bugs: |
27 ; ToDo: | |
28 | |
169
e26f49674956
Merge decoplan display for both GF and Buhlmann models.
JeanDo
parents:
161
diff
changeset
|
29 ;============================================================================= |
e26f49674956
Merge decoplan display for both GF and Buhlmann models.
JeanDo
parents:
161
diff
changeset
|
30 ; Expose internal variables, to ease debug: |
e26f49674956
Merge decoplan display for both GF and Buhlmann models.
JeanDo
parents:
161
diff
changeset
|
31 global D1, D2 |
289 | 32 global C1, C2, C3, C4, C5, C6 |
340
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
289
diff
changeset
|
33 global xdT, xdT2, OFF, SENS, amb_pressure_avg, temperature_avg |
0 | 34 |
169
e26f49674956
Merge decoplan display for both GF and Buhlmann models.
JeanDo
parents:
161
diff
changeset
|
35 ;============================================================================= |
0 | 36 calculate_compensation: |
704 | 37 ; xdT = D2 - C5 (s16 range -11.400 .. +12.350) |
38 movf C5+0,W ; Get Value to be subtracted | |
161
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
39 subwf D2+0,W ; Do the Low Byte |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
40 movwf xdT+0 |
704 | 41 movf C5+1,W ; Then the high byte. |
161
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
42 subwfb D2+1,W |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
43 movwf xdT+1 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
44 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
45 ; Second order temperature calculation |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
46 ; xdT/128 is in range -89..+96, hence signed 8bit. dT/128 = (2*dT)/256 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
47 rlcf xdT+0,W ; put hit bit in carry. |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
48 rlcf xdT+1,W ; inject in high byte. |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
49 movwf isr_xA+0 ; and put result in low byte. |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
50 clrf isr_xA+1 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
51 btfsc xdT+1,7 ; If dT < 0 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
52 setf isr_xA+1 ; then signextend to -1 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
53 movff isr_xA+0,isr_xB+0 ; copy A to B |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
54 movff isr_xA+1,isr_xB+1 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
55 call isr_signed_mult16x16 ; dT*dT --> xC (32 bits) |
0 | 56 |
161
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
57 ; dT >= 0: divide by 8, ie. 3 shifts rights. |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
58 ; dT < 0: divide by 2, ie. 1 shifts rights. |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
59 movlw .3 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
60 btfss xdT+1,7 ; Was dT negatif ? |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
61 movlw .1 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
62 calc_loop_1: |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
63 bcf STATUS,C ;dT^2 is positiv, so injected zeros. |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
64 rrcf isr_xC+1,F |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
65 rrcf isr_xC+0,F |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
66 decfsz WREG |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
67 bra calc_loop_1 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
68 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
69 movf isr_xC+0,W ; dT2 = dT - (dT/128)*(dT/128)/(2 ...or... 8) |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
70 subwf xdT+0,W |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
71 movwf xdT2+0 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
72 movf isr_xC+1,W |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
73 subwfb xdT+1,W |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
74 movwf xdT2+1 |
0 | 75 |
161
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
76 ; Calculate OFF = C2 + ((C4-250)*dT2)/2^12 + 10000 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
77 ; (range +9.246 .. +18.887) |
704 | 78 movff C4+0,isr_xA+0 |
79 movff C4+1,isr_xA+1 | |
161
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
80 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
81 movff xdT2+0,isr_xB+0 ; dT2 --> B |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
82 movff xdT2+1,isr_xB+1 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
83 call isr_signed_mult16x16 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
84 movlw .12-.8 ; A 12bit shift = 1 byte + 4 bits. |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
85 call isr_shift_C31 |
0 | 86 |
161
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
87 movlw LOW(.10000) ; Add 10000 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
88 addwf isr_xC+1,F |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
89 movlw HIGH(.10000) |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
90 addwfc isr_xC+2,F |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
91 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
92 movf C2+0,W ; Add C2, and save into OFF |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
93 addwf isr_xC+1,W |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
94 movwf OFF+0 |
0 | 95 movf C2+1,W |
161
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
96 addwfc isr_xC+2,W |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
97 movwf OFF+1 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
98 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
99 ; Calculate SENS = C1/2 + ((C3+200)*dT)/2^13 + 3000 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
100 movlw LOW(.200) ; C3+200 --> A |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
101 addwf C3+0,W |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
102 movwf isr_xA+0 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
103 movlw HIGH(.200) |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
104 addwfc C3+1,W |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
105 movwf isr_xA+1 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
106 ; B still contains dT2 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
107 call isr_signed_mult16x16 ; A*B --> C |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
108 movlw .13-.8 ; A 13bit shift = 1 byte + 5 bits. |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
109 call isr_shift_C31 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
110 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
111 bcf STATUS,C ; SENS = C1 / 2 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
112 rrcf C1+1,W |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
113 movwf SENS+1 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
114 rrcf C1+0,W |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
115 movwf SENS+0 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
116 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
117 movlw LOW(.3000) ; Add 3000 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
118 addwf isr_xC+1,F |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
119 movlw HIGH(.3000) |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
120 addwfc isr_xC+2,F |
0 | 121 |
161
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
122 movf isr_xC+1,W ; And sum into SENS |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
123 addwf SENS+0,F |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
124 movf isr_xC+2,W |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
125 addwfc SENS+1,F |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
126 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
127 ; calculate amb_pressure = (sens * (d1-off))/2^12 + 1000 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
128 movf OFF+0,W ; d1-off --> a |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
129 subwf D1+0,W |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
130 movwf isr_xA+0 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
131 movf OFF+1,W |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
132 subwfb D1+1,W |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
133 movwf isr_xA+1 |
0 | 134 |
161
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
135 movff SENS+0,isr_xB+0 ; sens --> b |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
136 movff SENS+1,isr_xB+1 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
137 call isr_signed_mult16x16 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
138 movlw .12-.8 ; a 12bit shift = 1 byte + 4 bits. |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
139 call isr_shift_C31 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
140 |
340
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
289
diff
changeset
|
141 movlw LOW(.1000) ; add 1000 |
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
289
diff
changeset
|
142 addwf isr_xC+1,F |
161
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
143 movlw HIGH(.1000) |
340
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
289
diff
changeset
|
144 addwfc isr_xC+2,F |
0 | 145 |
146 btfss simulatormode_active ; are we in simulator mode? | |
340
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
289
diff
changeset
|
147 bra calc_compensation_2 ; no |
0 | 148 |
340
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
289
diff
changeset
|
149 movff sim_pressure+0,isr_xC+1 ; override readings with simulator values |
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
289
diff
changeset
|
150 movff sim_pressure+1,isr_xC+2 |
0 | 151 |
340
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
289
diff
changeset
|
152 calc_compensation_2: |
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
289
diff
changeset
|
153 movf isr_xC+1,W ; Then sum_up to pressure averaging buffer. |
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
289
diff
changeset
|
154 addwf amb_pressure_avg+0,F |
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
289
diff
changeset
|
155 movf isr_xC+2,W |
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
289
diff
changeset
|
156 addwfc amb_pressure_avg+1,F |
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
289
diff
changeset
|
157 |
161
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
158 ; calculate temp = 200 + dT*(C6+100)/2^11 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
159 movlw LOW(.100) ; C6 + 100 --> A |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
160 addwf C6+0,W |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
161 movwf isr_xA+0 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
162 movlw HIGH(.100) |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
163 addwfc C6+1,W |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
164 movwf isr_xA+1 |
0 | 165 |
161
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
166 movff xdT2+0,isr_xB+0 ; dT2 --> B |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
167 movff xdT2+1,isr_xB+1 |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
168 call isr_signed_mult16x16 ; A*B |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
169 movlw .11-.8 ; A 12bit shift = 1 byte + 3 bits. |
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
170 call isr_shift_C31 |
0 | 171 |
340
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
289
diff
changeset
|
172 movlw LOW(.200) ; Add 200 |
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
289
diff
changeset
|
173 addwf isr_xC+1,F |
161
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
174 movlw HIGH(.200) |
340
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
289
diff
changeset
|
175 addwfc isr_xC+2,F |
0 | 176 |
340
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
289
diff
changeset
|
177 movf isr_xC+1,W |
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
289
diff
changeset
|
178 addwf temperature_avg+0,F |
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
289
diff
changeset
|
179 movf isr_xC+2,W |
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
289
diff
changeset
|
180 addwfc temperature_avg+1,F |
0 | 181 |
161
8d6aca08f66b
Use signed arithmetic for pressure/temperature compensation.
JeanDo
parents:
83
diff
changeset
|
182 return ; Fertig mit allem |
0 | 183 |
169
e26f49674956
Merge decoplan display for both GF and Buhlmann models.
JeanDo
parents:
161
diff
changeset
|
184 ;============================================================================= |
0 | 185 get_pressure_start: |
186 rcall reset_MS5535A | |
187 movlw b'10100000' ;+3*high as start and 1+low as stop! | |
188 get_pressure_start2: | |
189 movwf isr1_temp | |
190 movlw d'12' | |
191 movwf clock_count | |
192 rcall send_data_MS55535A | |
193 return | |
194 | |
195 get_pressure_value: | |
81
31fa973a70fd
Kludges to emulate inexisting devices when debugged with the MPLAB software SIMulator.
JeanDo
parents:
4
diff
changeset
|
196 #ifndef TESTING |
31fa973a70fd
Kludges to emulate inexisting devices when debugged with the MPLAB software SIMulator.
JeanDo
parents:
4
diff
changeset
|
197 ; Use register injection instead when in MPLab Sim emulation... |
0 | 198 rcall get_2bytes_MS5535A |
199 movff dMSB,D1+1 | |
200 movff dLSB,D1+0 | |
81
31fa973a70fd
Kludges to emulate inexisting devices when debugged with the MPLAB software SIMulator.
JeanDo
parents:
4
diff
changeset
|
201 #endif |
0 | 202 return |
203 | |
169
e26f49674956
Merge decoplan display for both GF and Buhlmann models.
JeanDo
parents:
161
diff
changeset
|
204 ;============================================================================= |
0 | 205 get_temperature_start: |
206 rcall reset_MS5535A | |
207 movlw b'10010000' ;+3*high as start and 1+low as stop! | |
208 bra get_pressure_start2 ; continue in "get_pressure" | |
209 | |
210 get_temperature_value: | |
81
31fa973a70fd
Kludges to emulate inexisting devices when debugged with the MPLAB software SIMulator.
JeanDo
parents:
4
diff
changeset
|
211 #ifndef TESTING |
31fa973a70fd
Kludges to emulate inexisting devices when debugged with the MPLAB software SIMulator.
JeanDo
parents:
4
diff
changeset
|
212 ; Use register injection instead... |
0 | 213 rcall get_2bytes_MS5535A |
214 movff dMSB,D2+1 | |
215 movff dLSB,D2+0 | |
81
31fa973a70fd
Kludges to emulate inexisting devices when debugged with the MPLAB software SIMulator.
JeanDo
parents:
4
diff
changeset
|
216 #endif |
0 | 217 return |
218 | |
169
e26f49674956
Merge decoplan display for both GF and Buhlmann models.
JeanDo
parents:
161
diff
changeset
|
219 ;============================================================================= |
0 | 220 get_calibration_data: |
221 rcall reset_MS5535A | |
222 movlw d'13' | |
223 movwf clock_count | |
224 movlw b'01010100' ;+3*high as start and 1+low as stop! | |
225 movwf isr1_temp | |
226 rcall send_data_MS55535A | |
227 rcall get_2bytes_MS5535A | |
289 | 228 |
229 #ifdef TESTING | |
230 movlw LOW(.18556) | |
231 movff WREG,W1+0 | |
232 movlw HIGH(.18556) | |
233 movff WREG,W1+1 | |
234 #else | |
0 | 235 movff dMSB,W1+1 |
236 movff dLSB,W1+0 | |
289 | 237 #endif |
0 | 238 |
239 movlw d'13' | |
240 movwf clock_count | |
241 movlw b'01011000' ;+3*high as start and 1+low as stop! | |
242 movwf isr1_temp | |
243 rcall send_data_MS55535A | |
244 rcall get_2bytes_MS5535A | |
289 | 245 #ifdef TESTING |
246 movlw LOW(.49183) | |
247 movff WREG,W2+0 | |
248 movlw HIGH(.49183) | |
249 movff WREG,W2+1 | |
250 #else | |
0 | 251 movff dMSB,W2+1 |
252 movff dLSB,W2+0 | |
289 | 253 #endif |
0 | 254 |
255 movlw d'13' | |
256 movwf clock_count | |
257 movlw b'01100100' ;+3*high as start and 1+low as stop! | |
258 movwf isr1_temp | |
259 rcall send_data_MS55535A | |
260 rcall get_2bytes_MS5535A | |
289 | 261 #ifdef TESTING |
262 movlw LOW(.22354) | |
263 movff WREG,W3+0 | |
264 movlw HIGH(.22354) | |
265 movff WREG,W3+1 | |
266 #else | |
0 | 267 movff dMSB,W3+1 |
268 movff dLSB,W3+0 | |
289 | 269 #endif |
0 | 270 |
271 movlw d'13' | |
272 movwf clock_count | |
273 movlw b'01101000' ;+3*high as start and 1+low as stop! | |
274 movwf isr1_temp | |
275 rcall send_data_MS55535A | |
276 rcall get_2bytes_MS5535A | |
289 | 277 #ifdef TESTING |
278 movlw LOW(.28083) | |
279 movff WREG,W4+0 | |
280 movlw HIGH(.28083) | |
281 movff WREG,W4+1 | |
282 #else | |
0 | 283 movff dMSB,W4+1 |
284 movff dLSB,W4+0 | |
289 | 285 #endif |
0 | 286 |
287 ; calculate C1 (16Bit) | |
288 movff W1+1, C1+1 | |
289 bcf STATUS,C | |
290 rrcf C1+1 | |
291 bcf STATUS,C | |
292 rrcf C1+1 | |
293 bcf STATUS,C | |
294 rrcf C1+1 | |
295 movff W1+0, C1+0 | |
296 bsf STATUS,C | |
297 btfss W1+1,0 | |
298 bcf STATUS,C | |
299 rrcf C1+0 | |
300 bsf STATUS,C | |
301 btfss W1+1,1 | |
302 bcf STATUS,C | |
303 rrcf C1+0 | |
304 bsf STATUS,C | |
305 btfss W1+1,2 | |
306 bcf STATUS,C | |
307 rrcf C1+0 | |
308 | |
309 ; calculate C2 (16Bit) | |
310 movff W2+0, C2+0 | |
311 bsf STATUS,C | |
312 btfss W2+1,0 | |
313 bcf STATUS,C | |
314 rrcf C2+0 | |
315 bsf STATUS,C | |
316 btfss W2+1,1 | |
317 bcf STATUS,C | |
318 rrcf C2+0 | |
319 bsf STATUS,C | |
320 btfss W2+1,2 | |
321 bcf STATUS,C | |
322 rrcf C2+0 | |
323 bsf STATUS,C | |
324 btfss W2+1,3 | |
325 bcf STATUS,C | |
326 rrcf C2+0 | |
327 bsf STATUS,C | |
328 btfss W2+1,4 | |
329 bcf STATUS,C | |
330 rrcf C2+0 | |
331 bsf STATUS,C | |
332 btfss W2+1,5 | |
333 bcf STATUS,C | |
334 rrcf C2+0 | |
335 | |
336 movff W2+1, C2+1 | |
337 bsf STATUS,C | |
338 btfss W1+0,0 | |
339 bcf STATUS,C | |
340 rrcf C2+1 | |
341 bsf STATUS,C | |
342 btfss W1+0,1 | |
343 bcf STATUS,C | |
344 rrcf C2+1 | |
345 bsf STATUS,C | |
346 btfss W1+0,2 | |
347 bcf STATUS,C | |
348 rrcf C2+1 | |
349 bcf STATUS,C | |
350 rrcf C2+1 | |
351 bcf STATUS,C | |
352 rrcf C2+1 | |
353 bcf STATUS,C | |
354 rrcf C2+1 | |
355 | |
356 ; calculate C3 (16Bit) | |
357 movff W3+1,C3+0 | |
358 bsf STATUS,C | |
359 btfss W3+0,7 | |
360 bcf STATUS,C | |
361 rlcf C3+0 | |
362 bsf STATUS,C | |
363 btfss W3+0,6 | |
364 bcf STATUS,C | |
365 rlcf C3+0 | |
366 clrf C3+1 | |
367 btfsc W3+1,7 | |
368 bsf C3+1,1 | |
369 btfsc W3+1,6 | |
370 bsf C3+1,0 | |
371 | |
372 ; calculate C4 (16Bit) | |
373 movff W4+1,C4+0 | |
374 bsf STATUS,C | |
375 btfss W4+0,7 | |
376 bcf STATUS,C | |
377 rlcf C4+0 | |
378 clrf C4+1 | |
379 btfsc W4+1,7 | |
380 bsf C4+1,0 | |
704 | 381 |
382 ; C4=C4-250 | |
383 movlw LOW(-.250) ; C4 - 250 --> C4 | |
384 addwf C4+0,W | |
385 movwf C4+0 | |
386 movlw -1 ; HIGH(- .250) is not understood... | |
387 addwfc C4+1,W | |
388 movwf C4+1 | |
0 | 389 |
390 ; calculate C5 (16Bit) | |
391 movff W3+0,C5+0 | |
392 bcf C5+0,6 | |
393 btfsc W2+0,0 | |
394 bsf C5+0,6 | |
395 bcf C5+0,7 | |
396 btfsc W2+0,1 | |
397 bsf C5+0,7 | |
398 clrf C5+1 | |
399 btfsc W2+0,2 | |
400 bsf C5+1,0 | |
401 btfsc W2+0,3 | |
402 bsf C5+1,1 | |
403 btfsc W2+0,4 | |
404 bsf C5+1,2 | |
405 btfsc W2+0,5 | |
406 bsf C5+1,3 | |
407 | |
704 | 408 ; calculate C5 = UT1 |
409 ; C5 = 8*C5 + 10000 (u16 range 10.000 .. +42.760) | |
410 clrf isr_xA+1 | |
411 movlw d'8' | |
412 movwf isr_xA+0 | |
413 movff C5+0,isr_xB+0 | |
414 movff C5+1,isr_xB+1 | |
415 call isr_unsigned_mult16x16 ;isr_xA*isr_xB=isr_xC | |
416 movff isr_xC+0,C5+0 | |
417 movff isr_xC+1,C5+1 | |
418 movlw LOW d'10000' | |
419 addwf C5+0,F | |
420 movlw HIGH d'10000' | |
421 addwfc C5+1,F ; = 8*C5 + 10000 | |
422 | |
0 | 423 ; calculate C6 (16Bit) |
424 clrf C6+1 | |
425 movff W4+0,C6+0 | |
426 bcf C6+0,7 | |
427 | |
428 bcf no_sensor_int ; enable sensor interrupts | |
429 return | |
430 | |
169
e26f49674956
Merge decoplan display for both GF and Buhlmann models.
JeanDo
parents:
161
diff
changeset
|
431 ;============================================================================= |
0 | 432 reset_MS5535A_one: |
433 bsf sensor_SDO | |
434 nop | |
435 bsf sensor_CLK | |
436 nop | |
437 nop | |
438 nop | |
439 nop | |
469 | 440 btfsc OSCCON,4 ; 32MHz Mode? |
441 rcall MS5535A_extra_wait ; Yes | |
0 | 442 bcf sensor_CLK |
443 return | |
444 | |
445 reset_MS5535A_zero: | |
446 bcf sensor_SDO | |
447 nop | |
448 bsf sensor_CLK | |
449 nop | |
450 nop | |
451 nop | |
452 nop | |
469 | 453 btfsc OSCCON,4 ; 32MHz Mode? |
454 rcall MS5535A_extra_wait ; Yes | |
0 | 455 bcf sensor_CLK |
456 return | |
457 | |
469 | 458 MS5535A_extra_wait: |
459 nop | |
460 nop | |
461 nop | |
462 nop | |
463 nop | |
464 return | |
465 | |
0 | 466 reset_MS5535A: |
467 rcall reset_MS5535A_one ;0 | |
468 rcall reset_MS5535A_zero | |
469 rcall reset_MS5535A_one | |
470 rcall reset_MS5535A_zero | |
471 rcall reset_MS5535A_one | |
472 rcall reset_MS5535A_zero | |
473 rcall reset_MS5535A_one | |
474 rcall reset_MS5535A_zero | |
475 rcall reset_MS5535A_one | |
476 rcall reset_MS5535A_zero | |
477 rcall reset_MS5535A_one | |
478 rcall reset_MS5535A_zero | |
479 rcall reset_MS5535A_one | |
480 rcall reset_MS5535A_zero | |
481 rcall reset_MS5535A_one | |
482 rcall reset_MS5535A_zero ;15 | |
483 rcall reset_MS5535A_zero | |
484 rcall reset_MS5535A_zero | |
485 rcall reset_MS5535A_zero | |
486 rcall reset_MS5535A_zero | |
487 rcall reset_MS5535A_zero ;20 | |
488 return | |
489 | |
490 get_2bytes_MS5535A: | |
491 movlw d'8' | |
492 movwf clock_count | |
493 rcall recieve_loop | |
494 movff isr1_temp,dMSB | |
495 | |
496 movlw d'8' | |
497 movwf clock_count | |
498 rcall recieve_loop | |
499 movff isr1_temp,dLSB | |
500 bsf sensor_CLK | |
501 nop | |
502 nop | |
503 nop | |
504 nop | |
469 | 505 btfsc OSCCON,4 ; 32MHz Mode? |
506 rcall MS5535A_extra_wait ; Yes | |
0 | 507 bcf sensor_CLK |
508 return | |
509 | |
510 recieve_loop: | |
511 bsf sensor_CLK | |
512 nop | |
513 nop | |
514 nop | |
515 nop | |
469 | 516 btfsc OSCCON,4 ; 32MHz Mode? |
517 rcall MS5535A_extra_wait ; Yes | |
0 | 518 bcf sensor_CLK |
519 btfss sensor_SDI ;MSB first | |
520 bcf STATUS,C | |
521 btfsc sensor_SDI ;MSB first | |
522 bsf STATUS,C | |
523 rlcf isr1_temp,F | |
524 decfsz clock_count,F | |
525 bra recieve_loop | |
526 return | |
527 | |
528 send_data_MS55535A: | |
529 ; send three startbits first | |
530 bcf sensor_CLK | |
531 bsf sensor_SDO | |
532 movlw d'3' | |
533 subwf clock_count,F ; total bit counter | |
534 bsf sensor_CLK | |
535 nop | |
536 nop | |
537 nop | |
538 nop | |
469 | 539 btfsc OSCCON,4 ; 32MHz Mode? |
540 rcall MS5535A_extra_wait ; Yes | |
0 | 541 bcf sensor_CLK |
542 nop | |
543 nop | |
544 nop | |
545 nop | |
469 | 546 btfsc OSCCON,4 ; 32MHz Mode? |
547 rcall MS5535A_extra_wait ; Yes | |
0 | 548 bsf sensor_CLK |
549 nop | |
550 nop | |
551 nop | |
552 nop | |
469 | 553 btfsc OSCCON,4 ; 32MHz Mode? |
554 rcall MS5535A_extra_wait ; Yes | |
0 | 555 bcf sensor_CLK |
556 nop | |
557 nop | |
558 nop | |
559 nop | |
469 | 560 btfsc OSCCON,4 ; 32MHz Mode? |
561 rcall MS5535A_extra_wait ; Yes | |
0 | 562 bsf sensor_CLK |
563 nop | |
564 nop | |
565 nop | |
566 nop | |
469 | 567 btfsc OSCCON,4 ; 32MHz Mode? |
568 rcall MS5535A_extra_wait ; Yes | |
0 | 569 bcf sensor_CLK |
570 ; now send 8 bytes from isr_temp1 and fill-up with zeros | |
469 | 571 databits: |
0 | 572 btfss isr1_temp,7 ;MSB first |
573 bcf sensor_SDO | |
574 btfsc isr1_temp,7 ;MSB first | |
575 bsf sensor_SDO | |
576 bcf STATUS,C | |
577 rlcf isr1_temp | |
578 | |
579 bsf sensor_CLK | |
580 nop | |
581 nop | |
582 nop | |
583 nop | |
469 | 584 btfsc OSCCON,4 ; 32MHz Mode? |
585 rcall MS5535A_extra_wait ; Yes | |
0 | 586 bcf sensor_CLK |
587 | |
588 decfsz clock_count,F | |
469 | 589 bra databits |
0 | 590 return |