Mercurial > public > mk2
annotate code_part1/OSTC_code_asm_part1/isr.asm @ 377:be71e563ac09 64kByte Logbook
First gas can be reset to 0m, test for timer1 race condition
| author | heinrichsweikamp |
|---|---|
| date | Mon, 13 Jun 2011 07:45:59 +0200 |
| parents | 88660a400338 |
| children | 51baf8777b73 |
| rev | line source |
|---|---|
| 0 | 1 |
| 2 ; OSTC - diving computer code | |
| 3 ; Copyright (C) 2008 HeinrichsWeikamp GbR | |
| 4 | |
| 5 ; This program is free software: you can redistribute it and/or modify | |
| 6 ; it under the terms of the GNU General Public License as published by | |
| 7 ; the Free Software Foundation, either version 3 of the License, or | |
| 8 ; (at your option) any later version. | |
| 9 | |
| 10 ; This program is distributed in the hope that it will be useful, | |
| 11 ; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 ; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 13 ; GNU General Public License for more details. | |
| 14 | |
| 15 ; You should have received a copy of the GNU General Public License | |
| 16 ; along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 17 | |
| 18 | |
| 19 ; written by: Matthias Heinrichs, info@heinrichsweikamp.com | |
| 20 ; written: 10/30/05 | |
| 21 ; last updated: 05/16/08 | |
| 22 ; known bugs: | |
| 23 ; ToDo: | |
| 24 | |
| 25 ; the timer1 module interrupts every 62.5ms (16x/second) | |
| 26 ; temperature and pressure is averaged over 4 measurements | |
| 27 ; flag pressure_refresh is set every 500ms | |
| 28 ; and provides accurate pressure (+/-1mBar stable) and temperature (0.1C stable) | |
| 29 | |
|
340
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
30 ;============================================================================= |
|
341
2144f19fa1eb
BUGFIX protect against ISR changing pressure/temperature while reading it.
JeanDo
parents:
340
diff
changeset
|
31 ; Copy a 16bit value from ISR modified registers to main registers. |
|
2144f19fa1eb
BUGFIX protect against ISR changing pressure/temperature while reading it.
JeanDo
parents:
340
diff
changeset
|
32 ; |
|
2144f19fa1eb
BUGFIX protect against ISR changing pressure/temperature while reading it.
JeanDo
parents:
340
diff
changeset
|
33 ; Because the ISR can happend at any time, the read should be redone if bytes |
|
2144f19fa1eb
BUGFIX protect against ISR changing pressure/temperature while reading it.
JeanDo
parents:
340
diff
changeset
|
34 ; changed inbetween. |
|
2144f19fa1eb
BUGFIX protect against ISR changing pressure/temperature while reading it.
JeanDo
parents:
340
diff
changeset
|
35 ; |
|
343
d5240792be51
BUGFIX Altimeter random value (SAFE_2BYTE_COPY was not bank safe).
JeanDo
parents:
341
diff
changeset
|
36 ; Trashes: WREG and TABLAT |
|
d5240792be51
BUGFIX Altimeter random value (SAFE_2BYTE_COPY was not bank safe).
JeanDo
parents:
341
diff
changeset
|
37 ; NOTE: Destination might be in any bank, so be BANK SAFE. |
|
d5240792be51
BUGFIX Altimeter random value (SAFE_2BYTE_COPY was not bank safe).
JeanDo
parents:
341
diff
changeset
|
38 ; |
|
d5240792be51
BUGFIX Altimeter random value (SAFE_2BYTE_COPY was not bank safe).
JeanDo
parents:
341
diff
changeset
|
39 SAFE_2BYTE_COPY MACRO from, to |
|
341
2144f19fa1eb
BUGFIX protect against ISR changing pressure/temperature while reading it.
JeanDo
parents:
340
diff
changeset
|
40 local retry |
|
2144f19fa1eb
BUGFIX protect against ISR changing pressure/temperature while reading it.
JeanDo
parents:
340
diff
changeset
|
41 retry: |
|
343
d5240792be51
BUGFIX Altimeter random value (SAFE_2BYTE_COPY was not bank safe).
JeanDo
parents:
341
diff
changeset
|
42 movff from+1,WREG ; High byte in W. |
|
d5240792be51
BUGFIX Altimeter random value (SAFE_2BYTE_COPY was not bank safe).
JeanDo
parents:
341
diff
changeset
|
43 movff WREG,to+1 ; and destination. |
|
d5240792be51
BUGFIX Altimeter random value (SAFE_2BYTE_COPY was not bank safe).
JeanDo
parents:
341
diff
changeset
|
44 movff from+0,to+0 ; Copy low byte. |
|
d5240792be51
BUGFIX Altimeter random value (SAFE_2BYTE_COPY was not bank safe).
JeanDo
parents:
341
diff
changeset
|
45 movff from+1,TABLAT ; another bank-safe read. |
|
d5240792be51
BUGFIX Altimeter random value (SAFE_2BYTE_COPY was not bank safe).
JeanDo
parents:
341
diff
changeset
|
46 xorwf TABLAT,W ; High byte changed ? |
|
341
2144f19fa1eb
BUGFIX protect against ISR changing pressure/temperature while reading it.
JeanDo
parents:
340
diff
changeset
|
47 bnz retry |
|
2144f19fa1eb
BUGFIX protect against ISR changing pressure/temperature while reading it.
JeanDo
parents:
340
diff
changeset
|
48 ENDM |
|
2144f19fa1eb
BUGFIX protect against ISR changing pressure/temperature while reading it.
JeanDo
parents:
340
diff
changeset
|
49 |
|
2144f19fa1eb
BUGFIX protect against ISR changing pressure/temperature while reading it.
JeanDo
parents:
340
diff
changeset
|
50 ;============================================================================= |
| 0 | 51 uartint: |
| 52 btfsc simulatormode_active ; are we in simulatormode? | |
| 53 bra simulator_int ; Yes, reading is depth in m! | |
| 54 | |
| 55 movff RCREG,uart1_temp | |
| 56 movlw d'96' | |
| 57 subwf uart1_temp,F | |
| 58 dcfsnz uart1_temp,F ; "a" | |
| 59 bsf dump_external_eeprom ; set flag | |
| 60 dcfsnz uart1_temp,F ; "b" | |
| 61 bsf uart_settime ; set flag | |
| 62 dcfsnz uart1_temp,F ; "c" | |
| 63 bsf simulatormode_active ; set flag | |
| 64 dcfsnz uart1_temp,F ; "d" | |
| 65 bsf internal_eeprom_write ; set flag | |
| 66 dcfsnz uart1_temp,F ; "e" | |
| 67 bsf uart_send_hash ; set flag | |
| 68 dcfsnz uart1_temp,F ; "f" | |
|
297
ceedf078b2d8
Gas Setup page 2 reworked, Texts 107, 108, 109,150, 149, 168, 42, 43, 53,54,55, 165 need update in french, spanish and german
Heinrichsweikamp
parents:
283
diff
changeset
|
69 bsf uart_reset_battery_stats ; set flag |
| 0 | 70 dcfsnz uart1_temp,F ; "g" |
| 71 bsf uart_send_int_eeprom ; set flag | |
| 72 dcfsnz uart1_temp,F ; "h" | |
| 73 bsf uart_reset_decodata ; set flag | |
| 74 dcfsnz uart1_temp,F ; "i" | |
| 75 bsf internal_eeprom_write2 ; set flag | |
| 76 dcfsnz uart1_temp,F ; "j" | |
| 77 bsf uart_send_int_eeprom2 ; set flag | |
| 78 dcfsnz uart1_temp,F ; "k" | |
| 79 bsf uart_store_tissue_data ; set flag | |
| 330 | 80 dcfsnz uart1_temp,F ; "l" |
| 81 bsf uart_dump_screen ; set flag | |
|
283
4ec488f046f4
Battery sign color coded, work on new uart-started 115200Baud bootloader (Do NOT use yet!)
heinrichsweikamp
parents:
266
diff
changeset
|
82 |
|
4ec488f046f4
Battery sign color coded, work on new uart-started 115200Baud bootloader (Do NOT use yet!)
heinrichsweikamp
parents:
266
diff
changeset
|
83 movlw 0xC1 |
|
4ec488f046f4
Battery sign color coded, work on new uart-started 115200Baud bootloader (Do NOT use yet!)
heinrichsweikamp
parents:
266
diff
changeset
|
84 cpfseq RCREG ; 115200Baud Bootloader request? |
|
4ec488f046f4
Battery sign color coded, work on new uart-started 115200Baud bootloader (Do NOT use yet!)
heinrichsweikamp
parents:
266
diff
changeset
|
85 bra uartint1 ; No |
|
4ec488f046f4
Battery sign color coded, work on new uart-started 115200Baud bootloader (Do NOT use yet!)
heinrichsweikamp
parents:
266
diff
changeset
|
86 bsf uart_115200_bootloader ; Yes, set Flag |
| 0 | 87 |
| 88 uartint1: | |
| 89 movf RCREG,w ; unload RCREG in stand-alone simulator mode | |
| 90 bcf PIR1,RCIF ; Clear flag | |
| 91 bcf RCSTA,CREN ; Clear receiver status | |
| 92 bsf RCSTA,CREN | |
| 93 return | |
| 94 | |
| 95 simulator_int: | |
| 345 | 96 movlw 'l' ; Received 'l' dump-screen command ? |
| 97 xorwf RCREG,W | |
| 98 bnz simulator_int2 ; NO: skip | |
| 99 bsf uart_dump_screen ; YES: set flag | |
| 100 bra uartint1 ; and this is not a depth... | |
| 101 | |
| 102 simulator_int2: | |
| 0 | 103 btfsc standalone_simulator ; ignore in standalone simulator mode |
| 104 bra uartint1 | |
| 105 | |
| 21 | 106 bsf LED_blue |
| 0 | 107 tstfsz RCREG ; =0x00? |
| 108 bra simulator_int1 ; No | |
| 109 incf RCREG,F ; Yes, so force RCREG=1 | |
| 110 | |
| 111 simulator_int1: | |
| 112 movf RCREG,w ; depth in m | |
| 347 | 113 movwf PRODL ; Copy |
| 114 | |
| 115 movlw d'140' ; Limit to 130m | |
| 116 cpfslt PRODL ; compare with value in UART | |
| 117 movwf PRODL ; Overwrite reading | |
| 118 | |
| 119 movf PRODL,w ; depth in m | |
| 0 | 120 mullw d'100' ; result will be mbar |
| 121 movff PRODL,sim_pressure+0 ; stored for pressure overwrite | |
| 122 movff PRODH,sim_pressure+1 | |
| 123 bra uartint1 ; exit uart int | |
| 124 | |
|
340
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
125 ;============================================================================= |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
126 |
| 238 | 127 switch_left_int: |
| 0 | 128 bcf INTCON,INT0IF ; Clear flag |
| 129 | |
| 130 btfsc T0CON,TMR0ON ; Timer0 running? | |
| 131 bra timer0_restart ; Yes, restart | |
| 132 | |
| 266 | 133 ; OSTC 2N has flipped screen and exchanged switches... |
| 134 movff win_flags,WREG ; Get into Bank0 | |
| 135 btfss WREG,0 | |
| 0 | 136 bsf switch_left ; Set flag, button press is OK |
| 266 | 137 btfsc WREG,0 |
| 138 bsf switch_right ; Set flag, button press is OK | |
| 0 | 139 |
| 140 bsf T0CON,TMR0ON ; Start Timer 0 | |
| 141 return | |
| 142 | |
| 143 | |
| 238 | 144 switch_right_int: |
| 0 | 145 bcf INTCON3,INT1IF ; Clear flag |
| 146 | |
| 147 btfsc T0CON,TMR0ON ; Timer0 running? | |
| 148 bra timer0_restart ; Yes, restart | |
| 149 | |
| 266 | 150 ; OSTC 2N has flipped screen and exchanged switches... |
| 151 movff win_flags,WREG ; Get into Bank0 | |
| 152 btfsc WREG,0 | |
| 153 bsf switch_left ; Set flag, button press is OK | |
| 154 btfss WREG,0 | |
| 0 | 155 bsf switch_right ; Set flag, button press is OK |
| 156 | |
| 157 bsf T0CON,TMR0ON ; Start Timer 0 | |
| 158 return | |
| 159 | |
| 160 timer0_restart: | |
| 161 bcf INTCON,TMR0IF ; Clear flag | |
| 162 clrf T0CON ; Timer0 | |
| 163 clrf TMR0H | |
| 164 clrf TMR0L | |
| 165 bsf T0CON,TMR0ON ; Start Timer 0 | |
| 166 return | |
| 167 | |
| 168 timer0int: | |
| 169 bcf INTCON,TMR0IF ; Clear flag | |
| 170 bcf T0CON,TMR0ON ; Stop Timer 0 | |
| 171 clrf TMR0H | |
| 172 clrf TMR0L | |
| 173 return | |
|
340
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
174 |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
175 ;============================================================================= |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
176 ; |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
177 |
| 0 | 178 timer1int: |
| 179 bcf PIR1,TMR1IF ; Clear flag | |
| 180 | |
| 181 timer1int_debug: | |
| 21 | 182 bcf LED_red ; LEDr off (For charge indicator) |
| 0 | 183 |
| 184 movlw 0x08 ; Timer1 int after 62.5ms (=16/second) | |
| 185 cpfslt TMR1H ; Did we miss a 1/16 second? | |
| 186 incf timer1int_counter1,F ; Yes, add extra 1/16 second | |
| 187 | |
| 188 movlw 0x08 ; Timer1 int after 62.5ms (=16/second) | |
| 189 subwf TMR1H,F | |
| 190 | |
| 238 | 191 incf timer1int_counter1,F ; Increase timer1 counter |
| 192 | |
| 0 | 193 movlw d'15' ; One second 16 |
| 194 cpfsgt timer1int_counter1 | |
| 195 bra sensor_int_pre ; only pressure sensor | |
| 238 | 196 rcall RTCisr ; adjust time, then query pressure sensor |
| 0 | 197 |
| 198 sensor_int_pre: | |
| 238 | 199 btfsc sleepmode ; In sleepmode? |
| 200 return ; Yes | |
| 0 | 201 |
|
340
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
202 ; Sensor interput do poll the presure/temperature sensor, download results, |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
203 ; compute compensations, and store results in various shared variables. |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
204 ; |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
205 ; Input: interupt (every 62.5msec == 16Hz), sensor, |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
206 ; last_surfpressure:2. |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
207 ; |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
208 ; Output: amb_pressure:2, |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
209 ; temperature:2, |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
210 ; rel_pressure:2, |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
211 ; and the pressure_refresh flag. |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
212 ; |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
213 ; NOTE: averaging (4 successive value, as recommended in the MS5535 datasheet) |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
214 ; is done on private variables, to avoid trashing data while reading it |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
215 ; from the main code. |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
216 ; |
|
341
2144f19fa1eb
BUGFIX protect against ISR changing pressure/temperature while reading it.
JeanDo
parents:
340
diff
changeset
|
217 ; NOTE: Because there is no atomic 16bits load/stores, we need to check twice |
|
2144f19fa1eb
BUGFIX protect against ISR changing pressure/temperature while reading it.
JeanDo
parents:
340
diff
changeset
|
218 ; the read data is correct. Ie. SAFE_2BYTE_COPY is mandatory to get |
| 344 | 219 ; amb_pressure, temperature or rel_pressure |
|
341
2144f19fa1eb
BUGFIX protect against ISR changing pressure/temperature while reading it.
JeanDo
parents:
340
diff
changeset
|
220 ; |
| 0 | 221 sensor_int: |
| 222 btfsc no_sensor_int ; No sensor interrupt (because it's addressed during sleep) | |
| 223 return | |
| 224 | |
| 238 | 225 incf timer1int_counter2,F ; counts to eight for state maschine |
| 0 | 226 |
| 238 | 227 ; State 1: Clear flags and average registers, get temperature (51us) and start pressure integration (73,5us) |
| 228 ; State 2: Get pressure (51us), start temperature integration (73,5us) and calculate temperature compensated pressure (233us) | |
| 229 ; State 3: Get temperature (51us) and start pressure integration (73,5us) | |
| 230 ; State 4: Get pressure (51us), start temperature integration (73,5us) and calculate temperature compensated pressure (233us) | |
| 231 ; State 5: Get temperature (51us) and start pressure integration (73,5us) | |
| 232 ; State 6: Get pressure (51us), start temperature integration (73,5us) and calculate temperature compensated pressure (233us) | |
| 233 ; State 7: Get temperature (51us) and start pressure integration (73,5us) | |
| 234 ; State 8: Get pressure (51us), start temperature integration (73,5us), calculate temperature compensated pressure (233us) and build average for half-second update of tempperature and pressure | |
| 235 | |
| 236 movff timer1int_counter2,isr_divB ; isr_divB used as temp here... | |
| 237 dcfsnz isr_divB,F | |
| 238 bra sensor_int_state1_plus_restart ; Do State 1 | |
| 239 dcfsnz isr_divB,F | |
| 240 bra sensor_int_state2 ; Do State 2 | |
| 241 dcfsnz isr_divB,F | |
| 242 bra sensor_int_state1 ; Do State 3 | |
| 243 dcfsnz isr_divB,F | |
| 244 bra sensor_int_state2 ; Do State 4 | |
| 245 dcfsnz isr_divB,F | |
| 246 bra sensor_int_state1 ; Do State 5 | |
| 247 dcfsnz isr_divB,F | |
| 248 bra sensor_int_state2 ; Do State 6 | |
| 249 dcfsnz isr_divB,F | |
| 250 bra sensor_int_state1 ; Do State 7 | |
| 251 ; bra sensor_int2_plus_average ; Do State 8 | |
| 252 | |
| 253 ;sensor_int2_plus_average: | |
| 254 rcall sensor_int_state2 | |
| 255 sensor_int2_plus_average2: | |
|
340
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
256 bcf STATUS,C ; clear carry bit. |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
257 rrcf amb_pressure_avg+1 ; amb_pressure sum / 2 |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
258 rrcf amb_pressure_avg+0 |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
259 bcf STATUS,C ; clear carry bit, twice. |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
260 rrcf amb_pressure_avg+1 ; amb_pressure sum / 4 |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
261 rrcf amb_pressure_avg+0 |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
262 |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
263 movff amb_pressure_avg+1,amb_pressure+1 ; copy into actual register |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
264 movff amb_pressure_avg+0,amb_pressure+0 |
| 238 | 265 |
|
340
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
266 bcf STATUS,C |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
267 btfsc temperature_avg+1,7 ; Copy sign bit to carry |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
268 bsf STATUS,C |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
269 rrcf temperature_avg+1 ; Signed temperature /2 |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
270 rrcf temperature_avg+0 |
| 0 | 271 |
|
340
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
272 bcf STATUS,C |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
273 btfsc temperature_avg+1,7 ; Copy sign bit to carry |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
274 bsf STATUS,C |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
275 rrcf temperature_avg+1 ; Signed temperature /4 |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
276 rrcf temperature_avg+0 |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
277 |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
278 movff temperature_avg+1,temperature+1 |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
279 movff temperature_avg+0,temperature+0 |
| 0 | 280 |
| 281 bsf pressure_refresh ; Set flag! Temp and pressure were updated! | |
| 238 | 282 clrf timer1int_counter2 ; Then reset State counter |
| 0 | 283 |
| 284 btfss simulatormode_active ; are we in simulator mode? | |
| 285 bra comp_air_pressure ; no | |
| 286 | |
| 287 comp_air_pressure0: | |
| 288 movlw LOW d'1000' ; yes, so simulate 1Bar surface pressure | |
| 289 movwf last_surfpressure+0 | |
| 290 movlw HIGH d'1000' | |
| 291 movwf last_surfpressure+1 | |
| 292 | |
| 293 comp_air_pressure: | |
| 294 movf last_surfpressure+0,W ; compensate airpressure | |
| 295 subwf amb_pressure+0,W | |
| 238 | 296 movwf rel_pressure+0 ; rel_pressure stores depth! |
| 0 | 297 |
| 298 movf last_surfpressure+1,W | |
| 299 subwfb amb_pressure+1,W | |
| 300 movwf rel_pressure+1 | |
| 238 | 301 btfss STATUS,N ; result is below zero? |
| 302 return | |
| 303 clrf rel_pressure+0 ; Yes, do not display negative depths | |
| 304 clrf rel_pressure+1 ; e.g. when surface air pressure dropped during the dive | |
| 0 | 305 return |
| 238 | 306 |
| 307 sensor_int_state1_plus_restart: | |
|
340
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
308 ;;; bcf pressure_refresh ; clear flags |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
309 clrf amb_pressure_avg+0 ; pressure average registers |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
310 clrf amb_pressure_avg+1 |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
311 clrf temperature_avg+0 |
|
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
312 clrf temperature_avg+1 |
| 238 | 313 |
| 314 sensor_int_state1: | |
| 315 call get_temperature_value ; State 1: Get temperature | |
| 316 call get_pressure_start ; and start pressure integration. | |
| 317 return ; Done. | |
| 318 | |
| 319 sensor_int_state2: | |
| 320 call get_pressure_value ; State2: Get pressure (51us) | |
| 321 call get_temperature_start ; and start temperature integration (73,5us) | |
|
340
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
322 goto calculate_compensation ; calculate temperature compensated pressure (233us) |
| 238 | 323 |
|
340
ecbbbd423e86
BUGFIX save negativ temperatures in logbook (bbbug #6)
JeanDo
parents:
297
diff
changeset
|
324 ;============================================================================= |
| 0 | 325 |
| 326 RTCisr: | |
| 327 clrf timer1int_counter1 ; counts to 16 (one second / 62.5ms) | |
| 328 bsf onesecupdate ; we have a new second! | |
| 329 | |
| 330 bcf STATUS,Z ; are we in dive mode? | |
| 331 btfss divemode | |
| 238 | 332 bra RTCisr2 ; No, must be surface or sleepmode |
| 0 | 333 |
| 334 incf samplesecs,F ; CF20 diving seconds done | |
| 335 decf samplesecs_value,W ; holds CF20 value (minus 1 into WREG) | |
| 336 cpfsgt samplesecs | |
| 238 | 337 bra RTCisr1 ; no |
| 0 | 338 |
| 339 clrf samplesecs ; clear counter... | |
| 340 bsf store_sample ; ...and set bit for profile storage | |
| 238 | 341 |
| 0 | 342 RTCisr1: |
| 343 ; Increase re-setable average depth divetime counter | |
| 111 | 344 incf average_divesecs+0,F ; increase stopwatch registers |
| 0 | 345 btfsc STATUS,Z |
|
357
562f1bc79f3c
Bugfix: Wake-up into divemode with 1.91alpha
Heinrichsweikamp
parents:
347
diff
changeset
|
346 incf average_divesecs+1,F ; increase stopwatch registers |
|
562f1bc79f3c
Bugfix: Wake-up into divemode with 1.91alpha
Heinrichsweikamp
parents:
347
diff
changeset
|
347 ; Increase total divetime (Regardless of CF01) |
|
562f1bc79f3c
Bugfix: Wake-up into divemode with 1.91alpha
Heinrichsweikamp
parents:
347
diff
changeset
|
348 incf total_divetime_seconds+0,F ; increase stopwatch registers |
|
562f1bc79f3c
Bugfix: Wake-up into divemode with 1.91alpha
Heinrichsweikamp
parents:
347
diff
changeset
|
349 btfsc STATUS,Z |
|
562f1bc79f3c
Bugfix: Wake-up into divemode with 1.91alpha
Heinrichsweikamp
parents:
347
diff
changeset
|
350 incf total_divetime_seconds+1,F ; increase stopwatch registers |
|
562f1bc79f3c
Bugfix: Wake-up into divemode with 1.91alpha
Heinrichsweikamp
parents:
347
diff
changeset
|
351 |
| 0 | 352 btfss divemode2 ; displayed divetime is running? |
| 353 bra RTCisr2 ; No (e.g. too shallow) | |
| 354 | |
|
357
562f1bc79f3c
Bugfix: Wake-up into divemode with 1.91alpha
Heinrichsweikamp
parents:
347
diff
changeset
|
355 ; increase divetime registers (Displayed dive time) |
|
562f1bc79f3c
Bugfix: Wake-up into divemode with 1.91alpha
Heinrichsweikamp
parents:
347
diff
changeset
|
356 incf divesecs,F |
| 0 | 357 movlw d'59' |
| 358 cpfsgt divesecs | |
| 359 bra RTCisr1a | |
| 238 | 360 |
| 0 | 361 clrf divesecs |
| 362 bsf realdive ; this bit is always set (again) if the dive is longer then one minute | |
| 363 | |
| 364 incf divemins+0,F ; increase divemins | |
| 365 btfsc STATUS,Z | |
| 366 incf divemins+1,F ; and now do the realtime clock routine anyway | |
| 367 | |
| 368 RTCisr1a: | |
| 369 btfss FLAG_apnoe_mode ; Are we in Apnoe mode? | |
| 370 bra RTCisr2 ; No, skip the following | |
| 371 | |
| 372 incf apnoe_secs,F ; increase descent registers | |
| 373 movlw d'59' | |
| 374 cpfsgt apnoe_secs | |
| 375 bra RTCisr2 | |
| 376 clrf apnoe_secs | |
| 377 | |
| 378 incf apnoe_mins,F ; increase descent mins | |
| 379 ; Now, do the RTC routine.... | |
| 380 RTCisr2: | |
| 381 incf secs,F ; adjusts seconds, minutes, hours, day, month and year. Checks for a leap year and works until 2099! | |
| 356 | 382 movlw d'60' |
| 359 | 383 cpfseq secs ; Secs == 60 ? |
| 384 return ; NO : done. | |
| 385 clrf secs ; YES: increment minutes instead... | |
| 0 | 386 bsf oneminupdate |
| 387 incf mins,F | |
| 388 movlw d'59' | |
| 389 cpfsgt mins | |
| 390 return | |
| 391 clrf mins | |
| 392 incf hours,F | |
| 393 movlw d'23' | |
| 394 cpfsgt hours | |
| 395 return | |
| 396 clrf hours | |
| 13 | 397 incf day,F |
|
377
be71e563ac09
First gas can be reset to 0m, test for timer1 race condition
heinrichsweikamp
parents:
361
diff
changeset
|
398 ; Test for race condition |
|
be71e563ac09
First gas can be reset to 0m, test for timer1 race condition
heinrichsweikamp
parents:
361
diff
changeset
|
399 ; movff time_correction_value,secs ; Correct too slow clock |
| 13 | 400 |
| 0 | 401 check_date: |
| 402 movff month,isr_divB ; new month? | |
| 403 dcfsnz isr_divB,F | |
| 404 movlw .31 | |
| 405 dcfsnz isr_divB,F | |
| 406 movlw .28 | |
| 407 dcfsnz isr_divB,F | |
| 408 movlw .31 | |
| 409 dcfsnz isr_divB,F | |
| 410 movlw .30 | |
| 411 dcfsnz isr_divB,F | |
| 412 movlw .31 | |
| 413 dcfsnz isr_divB,F | |
| 414 movlw .30 | |
| 415 dcfsnz isr_divB,F | |
| 416 movlw .31 | |
| 417 dcfsnz isr_divB,F | |
| 418 movlw .31 | |
| 419 dcfsnz isr_divB,F | |
| 420 movlw .30 | |
| 421 dcfsnz isr_divB,F | |
| 422 movlw .31 | |
| 423 dcfsnz isr_divB,F | |
| 424 movlw .30 | |
| 425 dcfsnz isr_divB,F | |
| 426 movlw .31 | |
| 427 cpfsgt day,1 | |
| 428 return | |
| 429 movlw .1 | |
| 430 movwf day | |
| 431 incf month,F | |
| 432 movlw .12 | |
| 433 cpfsgt month,1 | |
| 434 return | |
| 435 movlw .1 | |
| 436 movwf month | |
| 437 incf year,F | |
| 438 return |