annotate src/isr.asm @ 67:7815bf21d353

second debug mode page
author heinrichsweikamp
date Sat, 11 Jan 2014 22:36:17 +0100
parents ec4d8503ec45
children f3062a611eef
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
heinrichsweikamp
parents:
diff changeset
1 ;=============================================================================
heinrichsweikamp
parents:
diff changeset
2 ;
heinrichsweikamp
parents:
diff changeset
3 ; File isr.asm
heinrichsweikamp
parents:
diff changeset
4 ;
heinrichsweikamp
parents:
diff changeset
5 ; INTERUPT subroutines
heinrichsweikamp
parents:
diff changeset
6 ;
heinrichsweikamp
parents:
diff changeset
7 ; Copyright (c) 2011, JD Gascuel, HeinrichsWeikamp, all right reserved.
heinrichsweikamp
parents:
diff changeset
8 ;=============================================================================
heinrichsweikamp
parents:
diff changeset
9 ; HISTORY
heinrichsweikamp
parents:
diff changeset
10 ; 2011-05-24 : [jDG] Cleanups from initial Matthias code.
heinrichsweikamp
parents:
diff changeset
11
heinrichsweikamp
parents:
diff changeset
12 #include "ostc3.inc"
heinrichsweikamp
parents:
diff changeset
13 #include "shared_definitions.h" ; Mailbox from/to p2_deco.c
heinrichsweikamp
parents:
diff changeset
14 #include "ms5541.inc"
heinrichsweikamp
parents:
diff changeset
15 #include "adc_lightsensor.inc"
heinrichsweikamp
parents:
diff changeset
16
heinrichsweikamp
parents:
diff changeset
17 ;=============================================================================
heinrichsweikamp
parents:
diff changeset
18
heinrichsweikamp
parents:
diff changeset
19 extern start
heinrichsweikamp
parents:
diff changeset
20
heinrichsweikamp
parents:
diff changeset
21 isr_high CODE 0x0008 ;High Priority Interrups
heinrichsweikamp
parents:
diff changeset
22 bra HighInt
heinrichsweikamp
parents:
diff changeset
23 nop
heinrichsweikamp
parents:
diff changeset
24 nop
heinrichsweikamp
parents:
diff changeset
25 nop
heinrichsweikamp
parents:
diff changeset
26 nop
heinrichsweikamp
parents:
diff changeset
27 nop
heinrichsweikamp
parents:
diff changeset
28 nop
heinrichsweikamp
parents:
diff changeset
29 bra HighInt
heinrichsweikamp
parents:
diff changeset
30
heinrichsweikamp
parents:
diff changeset
31 isr_low CODE 0x00018 ;Low Priority Interrups
heinrichsweikamp
parents:
diff changeset
32 ; *** low priority interrupts not used
heinrichsweikamp
parents:
diff changeset
33 retfie FAST ; Restores BSR, STATUS and WREG
heinrichsweikamp
parents:
diff changeset
34
heinrichsweikamp
parents:
diff changeset
35 HighInt:
heinrichsweikamp
parents:
diff changeset
36 movff PRODL,isr_prod+0
heinrichsweikamp
parents:
diff changeset
37 movff PRODH,isr_prod+1
heinrichsweikamp
parents:
diff changeset
38
heinrichsweikamp
parents:
diff changeset
39 ; Pressure sensor and others
heinrichsweikamp
parents:
diff changeset
40 btfsc PIR5,TMR7IF ; Timer 7
heinrichsweikamp
parents:
diff changeset
41 rcall isr_tmr7 ; Every 62,5ms
heinrichsweikamp
parents:
diff changeset
42
heinrichsweikamp
parents:
diff changeset
43 ; Buttons
heinrichsweikamp
parents:
diff changeset
44 btfsc PIR1,TMR1IF ; Timer1 INT (Button hold-down Timer)
heinrichsweikamp
parents:
diff changeset
45 rcall timer1int
heinrichsweikamp
parents:
diff changeset
46 btfsc INTCON,INT0IF ; Buttons
heinrichsweikamp
parents:
diff changeset
47 rcall isr_switch_right
heinrichsweikamp
parents:
diff changeset
48 btfsc INTCON3,INT1IF ; Buttons
heinrichsweikamp
parents:
diff changeset
49 rcall isr_switch_left
heinrichsweikamp
parents:
diff changeset
50
heinrichsweikamp
parents:
diff changeset
51 ; IR-Link
heinrichsweikamp
parents:
diff changeset
52 btfsc PIR2,TMR3IF ; Timer 3
heinrichsweikamp
parents:
diff changeset
53 rcall isr_timer3 ; IR-Link Timeout
heinrichsweikamp
parents:
diff changeset
54 btfsc PIR3,RC2IF ; UART2
heinrichsweikamp
parents:
diff changeset
55 rcall isr_uart2 ; IR-Link
heinrichsweikamp
parents:
diff changeset
56
heinrichsweikamp
parents:
diff changeset
57 ; RTCC
heinrichsweikamp
parents:
diff changeset
58 btfsc PIR3,RTCCIF ; Real-time-clock interrupt
heinrichsweikamp
parents:
diff changeset
59 rcall isr_rtcc ; May return in bank common!
heinrichsweikamp
parents:
diff changeset
60
heinrichsweikamp
parents:
diff changeset
61 movff isr_prod+1,PRODH
heinrichsweikamp
parents:
diff changeset
62 movff isr_prod+0,PRODL
heinrichsweikamp
parents:
diff changeset
63 retfie FAST ; Restores BSR, STATUS and WREG
heinrichsweikamp
parents:
diff changeset
64
heinrichsweikamp
parents:
diff changeset
65 ;=============================================================================
heinrichsweikamp
parents:
diff changeset
66
heinrichsweikamp
parents:
diff changeset
67 isr_uart2: ; IR-Link
heinrichsweikamp
parents:
diff changeset
68 banksel RCREG2
heinrichsweikamp
parents:
diff changeset
69 movf RCREG2,W
heinrichsweikamp
parents:
diff changeset
70 bcf RCSTA2,CREN ; Clear receiver status
heinrichsweikamp
parents:
diff changeset
71 bsf RCSTA2,CREN
heinrichsweikamp
parents:
diff changeset
72 banksel isr_backup
heinrichsweikamp
parents:
diff changeset
73 bcf PIR3,RC2IF ; Clear flag
heinrichsweikamp
parents:
diff changeset
74 incf ir_counter,F ; Increase counter
heinrichsweikamp
parents:
diff changeset
75 movff ir_counter,isr1_temp ; Copy
heinrichsweikamp
parents:
diff changeset
76 dcfsnz isr1_temp,F
heinrichsweikamp
parents:
diff changeset
77 movwf ir_buffer+.0
heinrichsweikamp
parents:
diff changeset
78 dcfsnz isr1_temp,F
heinrichsweikamp
parents:
diff changeset
79 movwf ir_buffer+.1
heinrichsweikamp
parents:
diff changeset
80 dcfsnz isr1_temp,F
heinrichsweikamp
parents:
diff changeset
81 movwf ir_buffer+.2
heinrichsweikamp
parents:
diff changeset
82 dcfsnz isr1_temp,F
heinrichsweikamp
parents:
diff changeset
83 movwf ir_buffer+.3
heinrichsweikamp
parents:
diff changeset
84 dcfsnz isr1_temp,F
heinrichsweikamp
parents:
diff changeset
85 movwf ir_buffer+.4
heinrichsweikamp
parents:
diff changeset
86 dcfsnz isr1_temp,F
heinrichsweikamp
parents:
diff changeset
87 movwf ir_buffer+.5
heinrichsweikamp
parents:
diff changeset
88 dcfsnz isr1_temp,F
heinrichsweikamp
parents:
diff changeset
89 movwf ir_buffer+.6
heinrichsweikamp
parents:
diff changeset
90 dcfsnz isr1_temp,F
heinrichsweikamp
parents:
diff changeset
91 movwf ir_buffer+.7
heinrichsweikamp
parents:
diff changeset
92 dcfsnz isr1_temp,F
heinrichsweikamp
parents:
diff changeset
93 movwf ir_buffer+.8
heinrichsweikamp
parents:
diff changeset
94 dcfsnz isr1_temp,F
heinrichsweikamp
parents:
diff changeset
95 movwf ir_buffer+.9
heinrichsweikamp
parents:
diff changeset
96 dcfsnz isr1_temp,F
heinrichsweikamp
parents:
diff changeset
97 movwf ir_buffer+.10
heinrichsweikamp
parents:
diff changeset
98 dcfsnz isr1_temp,F
heinrichsweikamp
parents:
diff changeset
99 movwf ir_buffer+.11
heinrichsweikamp
parents:
diff changeset
100 dcfsnz isr1_temp,F
heinrichsweikamp
parents:
diff changeset
101 movwf ir_buffer+.12
heinrichsweikamp
parents:
diff changeset
102 dcfsnz isr1_temp,F
heinrichsweikamp
parents:
diff changeset
103 movwf ir_buffer+.13
heinrichsweikamp
parents:
diff changeset
104 dcfsnz isr1_temp,F
heinrichsweikamp
parents:
diff changeset
105 movwf ir_buffer+.14
heinrichsweikamp
parents:
diff changeset
106 dcfsnz isr1_temp,F
heinrichsweikamp
parents:
diff changeset
107 movwf ir_buffer+.15
heinrichsweikamp
parents:
diff changeset
108 clrf TMR3L ; Preload timer
heinrichsweikamp
parents:
diff changeset
109 movlw .253
heinrichsweikamp
parents:
diff changeset
110 movwf TMR3H
heinrichsweikamp
parents:
diff changeset
111 bsf T3CON,TMR3ON ; (Re)Start Timeout counter
heinrichsweikamp
parents:
diff changeset
112 return
heinrichsweikamp
parents:
diff changeset
113
heinrichsweikamp
parents:
diff changeset
114 isr_timer3: ; IR-Link Timeout
heinrichsweikamp
parents:
diff changeset
115 bcf T3CON,TMR3ON ; Stop Timer3
heinrichsweikamp
parents:
diff changeset
116 banksel isr_backup ; Select Bank0 for ISR data.
heinrichsweikamp
parents:
diff changeset
117 movlw .15
heinrichsweikamp
parents:
diff changeset
118 cpfseq ir_counter ; Got exact 15bytes?
heinrichsweikamp
parents:
diff changeset
119 bra isr_timer3_1 ; No, test for 16bytes
heinrichsweikamp
parents:
diff changeset
120 bra isr_timer3_2 ; Got 15 bytes, compute local checksum
heinrichsweikamp
parents:
diff changeset
121 isr_timer3_1:
heinrichsweikamp
parents:
diff changeset
122 movlw .16
heinrichsweikamp
parents:
diff changeset
123 cpfseq ir_counter ; Got exact 16bytes?
heinrichsweikamp
parents:
diff changeset
124 bra isr_timer3_exit ; No, exit
heinrichsweikamp
parents:
diff changeset
125 tstfsz ir_buffer+.15 ; Last byte=0x00
heinrichsweikamp
parents:
diff changeset
126 bra isr_timer3_exit ; No, exit
heinrichsweikamp
parents:
diff changeset
127
heinrichsweikamp
parents:
diff changeset
128 isr_timer3_2:
heinrichsweikamp
parents:
diff changeset
129 movff ir_buffer+.0,PRODL
heinrichsweikamp
parents:
diff changeset
130 clrf PRODH
heinrichsweikamp
parents:
diff changeset
131 movf ir_buffer+.1,W
heinrichsweikamp
parents:
diff changeset
132 rcall isr_timer3_checksum
heinrichsweikamp
parents:
diff changeset
133 movf ir_buffer+.2,W
heinrichsweikamp
parents:
diff changeset
134 rcall isr_timer3_checksum
heinrichsweikamp
parents:
diff changeset
135 movf ir_buffer+.3,W
heinrichsweikamp
parents:
diff changeset
136 rcall isr_timer3_checksum
heinrichsweikamp
parents:
diff changeset
137 movf ir_buffer+.4,W
heinrichsweikamp
parents:
diff changeset
138 rcall isr_timer3_checksum
heinrichsweikamp
parents:
diff changeset
139 movf ir_buffer+.5,W
heinrichsweikamp
parents:
diff changeset
140 rcall isr_timer3_checksum
heinrichsweikamp
parents:
diff changeset
141 movf ir_buffer+.6,W
heinrichsweikamp
parents:
diff changeset
142 rcall isr_timer3_checksum
heinrichsweikamp
parents:
diff changeset
143 movf ir_buffer+.7,W
heinrichsweikamp
parents:
diff changeset
144 rcall isr_timer3_checksum
heinrichsweikamp
parents:
diff changeset
145 movf ir_buffer+.8,W
heinrichsweikamp
parents:
diff changeset
146 rcall isr_timer3_checksum
heinrichsweikamp
parents:
diff changeset
147 movf ir_buffer+.9,W
heinrichsweikamp
parents:
diff changeset
148 rcall isr_timer3_checksum
heinrichsweikamp
parents:
diff changeset
149 movf ir_buffer+.10,W
heinrichsweikamp
parents:
diff changeset
150 rcall isr_timer3_checksum
heinrichsweikamp
parents:
diff changeset
151 movf ir_buffer+.11,W
heinrichsweikamp
parents:
diff changeset
152 rcall isr_timer3_checksum
heinrichsweikamp
parents:
diff changeset
153 movf ir_buffer+.12,W
heinrichsweikamp
parents:
diff changeset
154 rcall isr_timer3_checksum
heinrichsweikamp
parents:
diff changeset
155
heinrichsweikamp
parents:
diff changeset
156 ; Compare checksum
heinrichsweikamp
parents:
diff changeset
157 movf ir_buffer+.13,W
heinrichsweikamp
parents:
diff changeset
158 cpfseq PRODL ; Checksum ok?
heinrichsweikamp
parents:
diff changeset
159 bra isr_timer3_exit ; No, exit
heinrichsweikamp
parents:
diff changeset
160 movf ir_buffer+.14,W
heinrichsweikamp
parents:
diff changeset
161 cpfseq PRODH ; Checksum ok?
heinrichsweikamp
parents:
diff changeset
162 bra isr_timer3_exit ; No, exit
heinrichsweikamp
parents:
diff changeset
163
heinrichsweikamp
parents:
diff changeset
164 ; Checksum OK, copy results
heinrichsweikamp
parents:
diff changeset
165 movff ir_buffer+.1,hud_status_byte
heinrichsweikamp
parents:
diff changeset
166 movff ir_buffer+.2,o2_mv_sensor1+0
heinrichsweikamp
parents:
diff changeset
167 movff ir_buffer+.3,o2_mv_sensor1+1
heinrichsweikamp
parents:
diff changeset
168 movff ir_buffer+.4,o2_mv_sensor2+0
heinrichsweikamp
parents:
diff changeset
169 movff ir_buffer+.5,o2_mv_sensor2+1
heinrichsweikamp
parents:
diff changeset
170 movff ir_buffer+.6,o2_mv_sensor3+0
heinrichsweikamp
parents:
diff changeset
171 movff ir_buffer+.7,o2_mv_sensor3+1
heinrichsweikamp
parents:
diff changeset
172 movff ir_buffer+.8,o2_ppo2_sensor1
heinrichsweikamp
parents:
diff changeset
173 movff ir_buffer+.9,o2_ppo2_sensor2
heinrichsweikamp
parents:
diff changeset
174 movff ir_buffer+.10,o2_ppo2_sensor3
heinrichsweikamp
parents:
diff changeset
175 movff ir_buffer+.11,hud_battery_mv+0
heinrichsweikamp
parents:
diff changeset
176 movff ir_buffer+.12,hud_battery_mv+1
heinrichsweikamp
parents:
diff changeset
177
heinrichsweikamp
parents:
diff changeset
178 movlw ir_timeout_value ; multiples of 62,5ms
heinrichsweikamp
parents:
diff changeset
179 movwf ir_timeout ; Reload timeout
heinrichsweikamp
parents:
diff changeset
180
heinrichsweikamp
parents:
diff changeset
181 isr_timer3_exit:
heinrichsweikamp
parents:
diff changeset
182 clrf ir_counter ; Clear pointer
heinrichsweikamp
parents:
diff changeset
183 bcf PIR2,TMR3IF ; Clear flag
heinrichsweikamp
parents:
diff changeset
184 return
heinrichsweikamp
parents:
diff changeset
185
heinrichsweikamp
parents:
diff changeset
186 isr_timer3_checksum:
heinrichsweikamp
parents:
diff changeset
187 addwf PRODL,F
heinrichsweikamp
parents:
diff changeset
188 movlw .0
heinrichsweikamp
parents:
diff changeset
189 addwfc PRODH,F
heinrichsweikamp
parents:
diff changeset
190 return
heinrichsweikamp
parents:
diff changeset
191
heinrichsweikamp
parents:
diff changeset
192 ;=============================================================================
heinrichsweikamp
parents:
diff changeset
193
heinrichsweikamp
parents:
diff changeset
194 isr_tmr7: ; each 62,5ms
heinrichsweikamp
parents:
diff changeset
195 bcf PIR5,TMR7IF ; clear flag
heinrichsweikamp
parents:
diff changeset
196 banksel 0xF16 ; Addresses, F16h through F5Fh, are also used by SFRs, but are not part of the Access RAM.
heinrichsweikamp
parents:
diff changeset
197 movlw .248
heinrichsweikamp
parents:
diff changeset
198 movwf TMR7H ; -> Rollover after 2048 cycles -> 62,5ms
heinrichsweikamp
parents:
diff changeset
199
heinrichsweikamp
parents:
diff changeset
200 banksel isr_backup
heinrichsweikamp
parents:
diff changeset
201 movf max_CCPR1L,W ; Dimm value
heinrichsweikamp
parents:
diff changeset
202 cpfseq CCPR1L ; = current PWM value?
heinrichsweikamp
parents:
diff changeset
203 rcall isr_dimm_tft ; No, adjust until max_CCPR1L=CCPR1L !
heinrichsweikamp
parents:
diff changeset
204
heinrichsweikamp
parents:
diff changeset
205 banksel isr_backup
heinrichsweikamp
parents:
diff changeset
206 decfsz ir_timeout,F ; IR Data still valid?
heinrichsweikamp
parents:
diff changeset
207 bra isr_tmr7_2 ; Yes, continue
heinrichsweikamp
parents:
diff changeset
208 ; timeout, clear IR-Data
heinrichsweikamp
parents:
diff changeset
209
heinrichsweikamp
parents:
diff changeset
210 movlw ir_timeout_value ; multiples of 62,5ms
heinrichsweikamp
parents:
diff changeset
211 movwf ir_timeout ; Reload timeout
heinrichsweikamp
parents:
diff changeset
212
heinrichsweikamp
parents:
diff changeset
213 banksel common
heinrichsweikamp
parents:
diff changeset
214 clrf o2_mv_sensor1+0
heinrichsweikamp
parents:
diff changeset
215 clrf o2_mv_sensor1+1
heinrichsweikamp
parents:
diff changeset
216 clrf o2_mv_sensor2+0
heinrichsweikamp
parents:
diff changeset
217 clrf o2_mv_sensor2+1
heinrichsweikamp
parents:
diff changeset
218 clrf o2_mv_sensor3+0
heinrichsweikamp
parents:
diff changeset
219 clrf o2_mv_sensor3+1
heinrichsweikamp
parents:
diff changeset
220 clrf hud_battery_mv+0
heinrichsweikamp
parents:
diff changeset
221 clrf hud_battery_mv+1
heinrichsweikamp
parents:
diff changeset
222 clrf hud_status_byte
heinrichsweikamp
parents:
diff changeset
223 clrf o2_ppo2_sensor1
heinrichsweikamp
parents:
diff changeset
224 clrf o2_ppo2_sensor2
heinrichsweikamp
parents:
diff changeset
225 clrf o2_ppo2_sensor3
heinrichsweikamp
parents:
diff changeset
226
heinrichsweikamp
parents:
diff changeset
227 isr_tmr7_2:
heinrichsweikamp
parents:
diff changeset
228 banksel common
heinrichsweikamp
parents:
diff changeset
229 btfss no_sensor_int ; No sensor interrupt (because it's addressed during sleep)
heinrichsweikamp
parents:
diff changeset
230 bra isr_sensor_state2 ; No, continue
heinrichsweikamp
parents:
diff changeset
231 banksel isr_backup ; Back to Bank0 ISR data
heinrichsweikamp
parents:
diff changeset
232 return
heinrichsweikamp
parents:
diff changeset
233
heinrichsweikamp
parents:
diff changeset
234 isr_set_speed_to_normal:
heinrichsweikamp
parents:
diff changeset
235 ; Set Speed to normal
heinrichsweikamp
parents:
diff changeset
236 movlw b'01110010'
heinrichsweikamp
parents:
diff changeset
237 movwf OSCCON ; 16MHz INTOSC
heinrichsweikamp
parents:
diff changeset
238 movlw b'00000000'
heinrichsweikamp
parents:
diff changeset
239 movwf OSCTUNE ; 4x PLL Disable (Bit6) - only works with 8 or 16MHz (=32 or 64MHz)
heinrichsweikamp
parents:
diff changeset
240 movlw b'00001101' ; 1:2 Postscaler, 1:4 Prescaler, Timer 2 start -> 1960Hz (no-flicker)
heinrichsweikamp
parents:
diff changeset
241 movwf T2CON
heinrichsweikamp
parents:
diff changeset
242 btfss OSCCON,HFIOFS
heinrichsweikamp
parents:
diff changeset
243 bra $-2 ; Wait until clock is stable
heinrichsweikamp
parents:
diff changeset
244 return
heinrichsweikamp
parents:
diff changeset
245
heinrichsweikamp
parents:
diff changeset
246 isr_sensor_state2:
heinrichsweikamp
parents:
diff changeset
247 banksel common
heinrichsweikamp
parents:
diff changeset
248 movff sensor_state_counter,WREG
heinrichsweikamp
parents:
diff changeset
249 btfss WREG,0 ; every 1/4 second
heinrichsweikamp
parents:
diff changeset
250 bsf quarter_second_update ; Set flag
heinrichsweikamp
parents:
diff changeset
251 movlw d'2'
heinrichsweikamp
parents:
diff changeset
252 cpfseq speed_setting ; Set to normal in case it's not already in normal speed mode
heinrichsweikamp
parents:
diff changeset
253 rcall isr_set_speed_to_normal
heinrichsweikamp
parents:
diff changeset
254 banksel isr_backup ; Back to Bank0 ISR data
heinrichsweikamp
parents:
diff changeset
255
heinrichsweikamp
parents:
diff changeset
256 incf sensor_state_counter,F ; counts to eight for state maschine
heinrichsweikamp
parents:
diff changeset
257
heinrichsweikamp
parents:
diff changeset
258 ; State 1: Clear flags and average registers, get temperature (51us) and start pressure integration (73,5us)
heinrichsweikamp
parents:
diff changeset
259 ; State 2: Get pressure (51us), start temperature integration (73,5us) and calculate temperature compensated pressure (233us)
heinrichsweikamp
parents:
diff changeset
260 ; State 3: Get temperature (51us) and start pressure integration (73,5us)
heinrichsweikamp
parents:
diff changeset
261 ; State 4: Get pressure (51us), start temperature integration (73,5us) and calculate temperature compensated pressure (233us)
heinrichsweikamp
parents:
diff changeset
262 ; State 5: Get temperature (51us) and start pressure integration (73,5us)
heinrichsweikamp
parents:
diff changeset
263 ; State 6: Get pressure (51us), start temperature integration (73,5us) and calculate temperature compensated pressure (233us)
heinrichsweikamp
parents:
diff changeset
264 ; State 7: Get temperature (51us) and start pressure integration (73,5us)
heinrichsweikamp
parents:
diff changeset
265 ; 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
heinrichsweikamp
parents:
diff changeset
266
heinrichsweikamp
parents:
diff changeset
267 movff sensor_state_counter,WREG ; WREG used as temp here...
heinrichsweikamp
parents:
diff changeset
268 dcfsnz WREG,F
heinrichsweikamp
parents:
diff changeset
269 bra sensor_int_state1_plus_restart ; Do State 1
heinrichsweikamp
parents:
diff changeset
270 dcfsnz WREG,F
heinrichsweikamp
parents:
diff changeset
271 bra sensor_int_state2 ; Do State 2
heinrichsweikamp
parents:
diff changeset
272 dcfsnz WREG,F
heinrichsweikamp
parents:
diff changeset
273 bra sensor_int_state1 ; Do State 3
heinrichsweikamp
parents:
diff changeset
274 dcfsnz WREG,F
heinrichsweikamp
parents:
diff changeset
275 bra sensor_int_state2 ; Do State 4
heinrichsweikamp
parents:
diff changeset
276 dcfsnz WREG,F
heinrichsweikamp
parents:
diff changeset
277 bra sensor_int_state1 ; Do State 5
heinrichsweikamp
parents:
diff changeset
278 dcfsnz WREG,F
heinrichsweikamp
parents:
diff changeset
279 bra sensor_int_state2 ; Do State 6
heinrichsweikamp
parents:
diff changeset
280 dcfsnz WREG,F
heinrichsweikamp
parents:
diff changeset
281 bra sensor_int_state1 ; Do State 7
heinrichsweikamp
parents:
diff changeset
282 ; bra sensor_int2_plus_average ; Do State 8
heinrichsweikamp
parents:
diff changeset
283 ;sensor_int2_plus_average:
heinrichsweikamp
parents:
diff changeset
284 ; First, do state2:
heinrichsweikamp
parents:
diff changeset
285 call get_pressure_value ; State2: Get pressure (51us)
heinrichsweikamp
parents:
diff changeset
286 call get_temperature_start ; and start temperature integration (73,5us)
heinrichsweikamp
parents:
diff changeset
287 call calculate_compensation ; calculate temperature compensated pressure (27us)
heinrichsweikamp
parents:
diff changeset
288 ; Build average
heinrichsweikamp
parents:
diff changeset
289 bcf STATUS,C ; clear carry bit.
heinrichsweikamp
parents:
diff changeset
290 rrcf amb_pressure_avg+1 ; amb_pressure sum / 2
heinrichsweikamp
parents:
diff changeset
291 rrcf amb_pressure_avg+0
heinrichsweikamp
parents:
diff changeset
292 bcf STATUS,C ; clear carry bit, twice.
heinrichsweikamp
parents:
diff changeset
293 rrcf amb_pressure_avg+1 ; amb_pressure sum / 4
heinrichsweikamp
parents:
diff changeset
294 rrcf amb_pressure_avg+0
heinrichsweikamp
parents:
diff changeset
295
heinrichsweikamp
parents:
diff changeset
296 ; ; Even more averaging
heinrichsweikamp
parents:
diff changeset
297 ; movf amb_pressure_avg+0,W
heinrichsweikamp
parents:
diff changeset
298 ; addwf amb_pressure+0
heinrichsweikamp
parents:
diff changeset
299 ; movf amb_pressure_avg+1,W
heinrichsweikamp
parents:
diff changeset
300 ; addwfc amb_pressure+1
heinrichsweikamp
parents:
diff changeset
301 ; bcf STATUS,C ; clear carry bit
heinrichsweikamp
parents:
diff changeset
302 ; rrcf amb_pressure+1 ; amb_pressure sum / 2
heinrichsweikamp
parents:
diff changeset
303 ; rrcf amb_pressure+0
heinrichsweikamp
parents:
diff changeset
304
heinrichsweikamp
parents:
diff changeset
305 movff amb_pressure_avg+1,amb_pressure+1 ; copy into actual register
heinrichsweikamp
parents:
diff changeset
306 movff amb_pressure_avg+0,amb_pressure+0
heinrichsweikamp
parents:
diff changeset
307
heinrichsweikamp
parents:
diff changeset
308 bcf STATUS,C
heinrichsweikamp
parents:
diff changeset
309 btfsc temperature_avg+1,7 ; Copy sign bit to carry
heinrichsweikamp
parents:
diff changeset
310 bsf STATUS,C
heinrichsweikamp
parents:
diff changeset
311 rrcf temperature_avg+1 ; Signed temperature /2
heinrichsweikamp
parents:
diff changeset
312 rrcf temperature_avg+0
heinrichsweikamp
parents:
diff changeset
313 bcf STATUS,C
heinrichsweikamp
parents:
diff changeset
314 btfsc temperature_avg+1,7 ; Copy sign bit to carry
heinrichsweikamp
parents:
diff changeset
315 bsf STATUS,C
heinrichsweikamp
parents:
diff changeset
316 rrcf temperature_avg+1 ; Signed temperature /4
heinrichsweikamp
parents:
diff changeset
317 rrcf temperature_avg+0
heinrichsweikamp
parents:
diff changeset
318
heinrichsweikamp
parents:
diff changeset
319 movff temperature_avg+1,temperature+1 ; copy into actual register
heinrichsweikamp
parents:
diff changeset
320 movff temperature_avg+0,temperature+0
heinrichsweikamp
parents:
diff changeset
321
heinrichsweikamp
parents:
diff changeset
322 banksel common ; flag1 is in Bank1
heinrichsweikamp
parents:
diff changeset
323 bcf temp_changed ; Clear flag for temperature update
heinrichsweikamp
parents:
diff changeset
324 bcf pressure_refresh ; Clear flag for pressure update
heinrichsweikamp
parents:
diff changeset
325 banksel isr_backup ; Back to Bank0 ISR data
heinrichsweikamp
parents:
diff changeset
326
heinrichsweikamp
parents:
diff changeset
327 ; Temp changed?
heinrichsweikamp
parents:
diff changeset
328 movf temperature+0,W
heinrichsweikamp
parents:
diff changeset
329 cpfseq last_temperature+0
heinrichsweikamp
parents:
diff changeset
330 bra isr_sensor_state2_2 ; Yes
heinrichsweikamp
parents:
diff changeset
331 movf temperature+1,W
heinrichsweikamp
parents:
diff changeset
332 cpfseq last_temperature+1
heinrichsweikamp
parents:
diff changeset
333 bra isr_sensor_state2_2 ; Yes
heinrichsweikamp
parents:
diff changeset
334
heinrichsweikamp
parents:
diff changeset
335 bra isr_sensor_state2_3 ; no change
heinrichsweikamp
parents:
diff changeset
336
heinrichsweikamp
parents:
diff changeset
337 isr_sensor_state2_2:
heinrichsweikamp
parents:
diff changeset
338 banksel common ; flag1 is in Bank1
heinrichsweikamp
parents:
diff changeset
339 bsf temp_changed ; Yes
heinrichsweikamp
parents:
diff changeset
340 banksel isr_backup ; Back to Bank0 ISR data
heinrichsweikamp
parents:
diff changeset
341 isr_sensor_state2_3:
heinrichsweikamp
parents:
diff changeset
342 movff temperature+0,last_temperature+0 ; Copy for compare
heinrichsweikamp
parents:
diff changeset
343 movff temperature+1,last_temperature+1
heinrichsweikamp
parents:
diff changeset
344
heinrichsweikamp
parents:
diff changeset
345 movf amb_pressure+0,W
heinrichsweikamp
parents:
diff changeset
346 cpfseq last_pressure+0
heinrichsweikamp
parents:
diff changeset
347 bra isr_sensor_state2_4 ; Yes
heinrichsweikamp
parents:
diff changeset
348 movf amb_pressure+1,W
heinrichsweikamp
parents:
diff changeset
349 cpfseq last_pressure+1
heinrichsweikamp
parents:
diff changeset
350 bra isr_sensor_state2_4 ; Yes
heinrichsweikamp
parents:
diff changeset
351
heinrichsweikamp
parents:
diff changeset
352 bra isr_sensor_state2_5 ; No change
heinrichsweikamp
parents:
diff changeset
353 isr_sensor_state2_4:
heinrichsweikamp
parents:
diff changeset
354 banksel common ; flag1 is in Bank1
heinrichsweikamp
parents:
diff changeset
355 bsf pressure_refresh ; Yes
heinrichsweikamp
parents:
diff changeset
356 banksel isr_backup ; Back to Bank0 ISR data
heinrichsweikamp
parents:
diff changeset
357 isr_sensor_state2_5:
heinrichsweikamp
parents:
diff changeset
358 movff amb_pressure+0,last_pressure+0 ; Copy for compare
heinrichsweikamp
parents:
diff changeset
359 movff amb_pressure+1,last_pressure+1
heinrichsweikamp
parents:
diff changeset
360
heinrichsweikamp
parents:
diff changeset
361 clrf sensor_state_counter ; Then reset State counter
heinrichsweikamp
parents:
diff changeset
362 btfss simulatormode_active ; are we in simulator mode?
heinrichsweikamp
parents:
diff changeset
363 bra comp_air_pressure ; no
heinrichsweikamp
parents:
diff changeset
364 comp_air_pressure0:
heinrichsweikamp
parents:
diff changeset
365 movlw LOW d'1000' ; yes, so simulate 1000mbar surface pressure
heinrichsweikamp
parents:
diff changeset
366 movwf last_surfpressure+0
heinrichsweikamp
parents:
diff changeset
367 movlw HIGH d'1000'
heinrichsweikamp
parents:
diff changeset
368 movwf last_surfpressure+1
heinrichsweikamp
parents:
diff changeset
369 ; Always set pressure_refresh flag in simulator mode
heinrichsweikamp
parents:
diff changeset
370 banksel common ; flag1 is in Bank1
heinrichsweikamp
parents:
diff changeset
371 bsf pressure_refresh ; Yes
heinrichsweikamp
parents:
diff changeset
372 banksel isr_backup ; Back to Bank0 ISR data
heinrichsweikamp
parents:
diff changeset
373
heinrichsweikamp
parents:
diff changeset
374 comp_air_pressure:
heinrichsweikamp
parents:
diff changeset
375 movf last_surfpressure+0,W ; compensate airpressure
heinrichsweikamp
parents:
diff changeset
376 subwf amb_pressure+0,W
heinrichsweikamp
parents:
diff changeset
377 movwf rel_pressure+0 ; rel_pressure stores depth!
heinrichsweikamp
parents:
diff changeset
378
heinrichsweikamp
parents:
diff changeset
379 movf last_surfpressure+1,W
heinrichsweikamp
parents:
diff changeset
380 subwfb amb_pressure+1,W
heinrichsweikamp
parents:
diff changeset
381 movwf rel_pressure+1
heinrichsweikamp
parents:
diff changeset
382 btfss STATUS,N ; result is below zero?
heinrichsweikamp
parents:
diff changeset
383 bra sensor_int_state_exit
heinrichsweikamp
parents:
diff changeset
384 clrf rel_pressure+0 ; Yes, do not display negative depths
heinrichsweikamp
parents:
diff changeset
385 clrf rel_pressure+1 ; e.g. when surface air pressure dropped during the dive
heinrichsweikamp
parents:
diff changeset
386 bra sensor_int_state_exit
heinrichsweikamp
parents:
diff changeset
387
heinrichsweikamp
parents:
diff changeset
388 sensor_int_state1_plus_restart:
heinrichsweikamp
parents:
diff changeset
389 clrf amb_pressure_avg+0 ; pressure average registers
heinrichsweikamp
parents:
diff changeset
390 clrf amb_pressure_avg+1
heinrichsweikamp
parents:
diff changeset
391 clrf temperature_avg+0
heinrichsweikamp
parents:
diff changeset
392 clrf temperature_avg+1
heinrichsweikamp
parents:
diff changeset
393
heinrichsweikamp
parents:
diff changeset
394 sensor_int_state1:
heinrichsweikamp
parents:
diff changeset
395 call get_temperature_value ; State 1: Get temperature
heinrichsweikamp
parents:
diff changeset
396 call get_pressure_start ; and start pressure integration.
heinrichsweikamp
parents:
diff changeset
397 bra sensor_int_state_exit
heinrichsweikamp
parents:
diff changeset
398
heinrichsweikamp
parents:
diff changeset
399 sensor_int_state2:
heinrichsweikamp
parents:
diff changeset
400 call get_pressure_value ; State2: Get pressure (51us)
heinrichsweikamp
parents:
diff changeset
401 call get_temperature_start ; and start temperature integration (73,5us)
heinrichsweikamp
parents:
diff changeset
402 call calculate_compensation ; calculate temperature compensated pressure (233us)
heinrichsweikamp
parents:
diff changeset
403 ; bra sensor_int_state_exit
heinrichsweikamp
parents:
diff changeset
404 sensor_int_state_exit:
heinrichsweikamp
parents:
diff changeset
405 rcall isr_restore_clock ; Restore clock
heinrichsweikamp
parents:
diff changeset
406 return
heinrichsweikamp
parents:
diff changeset
407 ;=============================================================================
heinrichsweikamp
parents:
diff changeset
408
heinrichsweikamp
parents:
diff changeset
409 isr_dimm_tft: ; Adjust until max_CCPR1L=CCPR1L !
heinrichsweikamp
parents:
diff changeset
410 banksel common
heinrichsweikamp
parents:
diff changeset
411 btfsc tft_is_dimming ; Ignore while dimming
heinrichsweikamp
parents:
diff changeset
412 return
heinrichsweikamp
parents:
diff changeset
413 banksel isr_backup
heinrichsweikamp
parents:
diff changeset
414 movf max_CCPR1L,W
heinrichsweikamp
parents:
diff changeset
415 cpfsgt CCPR1L ; CCPR1L>max_CCPR1L?
heinrichsweikamp
parents:
diff changeset
416 bra isr_dimm_tft2 ; No, dimm up
heinrichsweikamp
parents:
diff changeset
417 ; dimm down
heinrichsweikamp
parents:
diff changeset
418 decf CCPR1L,F ; -1
heinrichsweikamp
parents:
diff changeset
419 return
heinrichsweikamp
parents:
diff changeset
420 isr_dimm_tft2:
heinrichsweikamp
parents:
diff changeset
421 movf max_CCPR1L,W
31
53a09c1b7410 BUGFIX: alternating brightness at very low ambient light
heinrichsweikamp
parents: 30
diff changeset
422 sublw ambient_light_min_eco
53a09c1b7410 BUGFIX: alternating brightness at very low ambient light
heinrichsweikamp
parents: 30
diff changeset
423 cpfsgt CCPR1L ; CCPR1L>max_CCPR1L-ambient_light_min_eco?
0
heinrichsweikamp
parents:
diff changeset
424 bra isr_dimm_tft3 ; No, dimm up slow
heinrichsweikamp
parents:
diff changeset
425 ; dimm up faster
heinrichsweikamp
parents:
diff changeset
426 movlw .5
heinrichsweikamp
parents:
diff changeset
427 addwf CCPR1L,F
heinrichsweikamp
parents:
diff changeset
428 isr_dimm_tft3:
heinrichsweikamp
parents:
diff changeset
429 incf CCPR1L,F ; +1
heinrichsweikamp
parents:
diff changeset
430 return
heinrichsweikamp
parents:
diff changeset
431
heinrichsweikamp
parents:
diff changeset
432
heinrichsweikamp
parents:
diff changeset
433 isr_rtcc: ; each second
heinrichsweikamp
parents:
diff changeset
434 bcf PIR3,RTCCIF ; clear flag
heinrichsweikamp
parents:
diff changeset
435 banksel 0xF16 ; Addresses, F16h through F5Fh, are also used by SFRs, but are not part of the Access RAM.
heinrichsweikamp
parents:
diff changeset
436 bsf RTCCFG,RTCPTR1
heinrichsweikamp
parents:
diff changeset
437 bsf RTCCFG,RTCPTR0 ; year
heinrichsweikamp
parents:
diff changeset
438 movff RTCVALL,year ; format is BCD!
heinrichsweikamp
parents:
diff changeset
439 movff RTCVALH,day ; dummy read
heinrichsweikamp
parents:
diff changeset
440 movff RTCVALL,day ; format is BCD!
heinrichsweikamp
parents:
diff changeset
441 movff RTCVALH,month ; format is BCD!
heinrichsweikamp
parents:
diff changeset
442 movff RTCVALL,hours ; format is BCD!
heinrichsweikamp
parents:
diff changeset
443 movff RTCVALH,secs ; format is BCD!
heinrichsweikamp
parents:
diff changeset
444 movff RTCVALL,secs ; format is BCD!
heinrichsweikamp
parents:
diff changeset
445 movff RTCVALH,mins ; format is BCD!
heinrichsweikamp
parents:
diff changeset
446 banksel isr_backup ; Back to Bank0 ISR data
heinrichsweikamp
parents:
diff changeset
447
heinrichsweikamp
parents:
diff changeset
448 ; Convert BCD to DEC and set registers
heinrichsweikamp
parents:
diff changeset
449 movff mins, isr1_temp
heinrichsweikamp
parents:
diff changeset
450 rcall isr_rtcc_convert ; Converts to dec with result in WREG
heinrichsweikamp
parents:
diff changeset
451 movff WREG,mins
heinrichsweikamp
parents:
diff changeset
452 movff secs, isr1_temp
heinrichsweikamp
parents:
diff changeset
453 rcall isr_rtcc_convert ; Converts to dec with result in WREG
heinrichsweikamp
parents:
diff changeset
454 movff WREG,secs
heinrichsweikamp
parents:
diff changeset
455 movff hours, isr1_temp
heinrichsweikamp
parents:
diff changeset
456 rcall isr_rtcc_convert ; Converts to dec with result in WREG
heinrichsweikamp
parents:
diff changeset
457 movff WREG,hours
heinrichsweikamp
parents:
diff changeset
458 movff month, isr1_temp
heinrichsweikamp
parents:
diff changeset
459 rcall isr_rtcc_convert ; Converts to dec with result in WREG
heinrichsweikamp
parents:
diff changeset
460 movff WREG,month
heinrichsweikamp
parents:
diff changeset
461 movff day, isr1_temp
heinrichsweikamp
parents:
diff changeset
462 rcall isr_rtcc_convert ; Converts to dec with result in WREG
heinrichsweikamp
parents:
diff changeset
463 movff WREG,day
heinrichsweikamp
parents:
diff changeset
464 movff year, isr1_temp
heinrichsweikamp
parents:
diff changeset
465 rcall isr_rtcc_convert ; Converts to dec with result in WREG
heinrichsweikamp
parents:
diff changeset
466 movff WREG,year
heinrichsweikamp
parents:
diff changeset
467
heinrichsweikamp
parents:
diff changeset
468 ; Place once/second tasks for ISR here (Be sure of the right bank!)
heinrichsweikamp
parents:
diff changeset
469 banksel common ; flag1 is in Bank1
heinrichsweikamp
parents:
diff changeset
470 btfss sleepmode ; in Sleepmode?
heinrichsweikamp
parents:
diff changeset
471 call get_ambient_level ; No, get ambient light level and set max_CCPR1L
heinrichsweikamp
parents:
diff changeset
472
heinrichsweikamp
parents:
diff changeset
473 rcall isr_battery_gauge ; Add amount of battery consumption to battery_gauge:6
heinrichsweikamp
parents:
diff changeset
474
heinrichsweikamp
parents:
diff changeset
475 banksel common ; flag1 is in Bank1
heinrichsweikamp
parents:
diff changeset
476 bsf onesecupdate ; A new second has begun
heinrichsweikamp
parents:
diff changeset
477 btfsc divemode ; in divemode?
heinrichsweikamp
parents:
diff changeset
478 rcall isr_divemode_1sec ; Yes, do some divemode stuff in bank common
heinrichsweikamp
parents:
diff changeset
479
heinrichsweikamp
parents:
diff changeset
480 tstfsz secs ; Secs == 0 ?
heinrichsweikamp
parents:
diff changeset
481 return ; No, Done.
heinrichsweikamp
parents:
diff changeset
482
heinrichsweikamp
parents:
diff changeset
483 ; banksel isr_backup ; Back to Bank0 ISR data
heinrichsweikamp
parents:
diff changeset
484 ; movff secs,isr1_temp ; Copy to Bank0
heinrichsweikamp
parents:
diff changeset
485 ; movlw d'0'
heinrichsweikamp
parents:
diff changeset
486 ; cpfseq isr1_temp ; Secs == 0 ?
heinrichsweikamp
parents:
diff changeset
487 ; return ; Done.
heinrichsweikamp
parents:
diff changeset
488
heinrichsweikamp
parents:
diff changeset
489 ; banksel common ; flag1 is in Bank1
heinrichsweikamp
parents:
diff changeset
490 bsf oneminupdate ; A new minute has begun
heinrichsweikamp
parents:
diff changeset
491
heinrichsweikamp
parents:
diff changeset
492 btfss divemode ; In Divemode?
heinrichsweikamp
parents:
diff changeset
493 rcall check_nofly_desat_time ; No, so reduce NoFly and Desat and increase interval
heinrichsweikamp
parents:
diff changeset
494
heinrichsweikamp
parents:
diff changeset
495 ; Check if a new hour has just begun
heinrichsweikamp
parents:
diff changeset
496 ; banksel common ; flag1 is in Bank1
heinrichsweikamp
parents:
diff changeset
497 tstfsz mins ; mins=0?
heinrichsweikamp
parents:
diff changeset
498 bra isr_rtcc2 ; No
heinrichsweikamp
parents:
diff changeset
499 bsf onehourupdate ; Yes, set flag
heinrichsweikamp
parents:
diff changeset
500
heinrichsweikamp
parents:
diff changeset
501 isr_rtcc2:
heinrichsweikamp
parents:
diff changeset
502 banksel isr_backup ; Back to Bank0 ISR data
heinrichsweikamp
parents:
diff changeset
503 return ; Done.
heinrichsweikamp
parents:
diff changeset
504
heinrichsweikamp
parents:
diff changeset
505 isr_battery_gauge:
heinrichsweikamp
parents:
diff changeset
506 banksel isr_backup ; Bank0 ISR data
heinrichsweikamp
parents:
diff changeset
507 movlw current_sleepmode ; 100µA/3600 -> nAs (Sleepmode current)
heinrichsweikamp
parents:
diff changeset
508 movwf isr1_temp ; Store value (low byte)
heinrichsweikamp
parents:
diff changeset
509 clrf isr2_temp ; High byte
heinrichsweikamp
parents:
diff changeset
510
heinrichsweikamp
parents:
diff changeset
511 banksel common ; flag1 is in Bank1
heinrichsweikamp
parents:
diff changeset
512 btfss sleepmode ; in Sleepmode?
heinrichsweikamp
parents:
diff changeset
513 rcall isr_battery_gauge2 ; No, compute current consumtion value into isr1_temp and isr2_temp
heinrichsweikamp
parents:
diff changeset
514
heinrichsweikamp
parents:
diff changeset
515 banksel isr_backup ; Bank0 ISR data
heinrichsweikamp
parents:
diff changeset
516 movf isr1_temp,W ; 48Bit add of isr1_temp and isr2_temp into battery_gauge:6
heinrichsweikamp
parents:
diff changeset
517 addwf battery_gauge+0,F
heinrichsweikamp
parents:
diff changeset
518 movf isr2_temp,W
heinrichsweikamp
parents:
diff changeset
519 addwfc battery_gauge+1,F
heinrichsweikamp
parents:
diff changeset
520 movlw .0
heinrichsweikamp
parents:
diff changeset
521 addwfc battery_gauge+2,F
heinrichsweikamp
parents:
diff changeset
522 movlw .0
heinrichsweikamp
parents:
diff changeset
523 addwfc battery_gauge+3,F
heinrichsweikamp
parents:
diff changeset
524 movlw .0
heinrichsweikamp
parents:
diff changeset
525 addwfc battery_gauge+4,F
heinrichsweikamp
parents:
diff changeset
526 movlw .0
heinrichsweikamp
parents:
diff changeset
527 addwfc battery_gauge+5,F
heinrichsweikamp
parents:
diff changeset
528 return
heinrichsweikamp
parents:
diff changeset
529
heinrichsweikamp
parents:
diff changeset
530 isr_battery_gauge2:
heinrichsweikamp
parents:
diff changeset
531 ; set consumtion rate in nAs for an one second interval
heinrichsweikamp
parents:
diff changeset
532 ; Example:
heinrichsweikamp
parents:
diff changeset
533 ; movlw LOW .55556 ; 0,2A/3600*1e9s = nAs
heinrichsweikamp
parents:
diff changeset
534 ; movwf isr1_temp ; Low byte
heinrichsweikamp
parents:
diff changeset
535 ; movlw HIGH .55556 ; 0,2A/3600*1e9s = nAs
heinrichsweikamp
parents:
diff changeset
536 ; movwf isr2_temp ; High byte
heinrichsweikamp
parents:
diff changeset
537
heinrichsweikamp
parents:
diff changeset
538 ; Current consumption for LED backlight is 47*CCPR1L+272
heinrichsweikamp
parents:
diff changeset
539 movf CCPR1L,W
heinrichsweikamp
parents:
diff changeset
540 mullw current_backlight_multi
heinrichsweikamp
parents:
diff changeset
541 movlw LOW current_backlight_offset
heinrichsweikamp
parents:
diff changeset
542 addwf PRODL,F
heinrichsweikamp
parents:
diff changeset
543 movlw HIGH current_backlight_offset
heinrichsweikamp
parents:
diff changeset
544 addwfc PRODH,F
heinrichsweikamp
parents:
diff changeset
545 movff PRODL,isr1_temp
heinrichsweikamp
parents:
diff changeset
546 movff PRODH,isr2_temp ; isr1_temp and isr2_temp hold value for backlight
heinrichsweikamp
parents:
diff changeset
547
heinrichsweikamp
parents:
diff changeset
548 ; Add current for CPU and GPU
heinrichsweikamp
parents:
diff changeset
549 ; speed_setting=1: ECO (3,1mA -> 861nAs), =2: NORMAL (5,50mA -> 1528nAs) or =3: FASTEST (8,04mA -> 2233nAs)
heinrichsweikamp
parents:
diff changeset
550 movlw .1
heinrichsweikamp
parents:
diff changeset
551 cpfseq speed_setting
heinrichsweikamp
parents:
diff changeset
552 bra isr_battery_gauge3
heinrichsweikamp
parents:
diff changeset
553 banksel isr_backup ; Bank0 ISR data
heinrichsweikamp
parents:
diff changeset
554 movlw LOW current_speed_eco
heinrichsweikamp
parents:
diff changeset
555 addwf isr1_temp,F
heinrichsweikamp
parents:
diff changeset
556 movlw HIGH current_speed_eco
heinrichsweikamp
parents:
diff changeset
557 addwfc isr2_temp,F
heinrichsweikamp
parents:
diff changeset
558 bra isr_battery_gauge5
heinrichsweikamp
parents:
diff changeset
559 isr_battery_gauge3:
heinrichsweikamp
parents:
diff changeset
560 movlw .2
heinrichsweikamp
parents:
diff changeset
561 cpfseq speed_setting
heinrichsweikamp
parents:
diff changeset
562 bra isr_battery_gauge4
heinrichsweikamp
parents:
diff changeset
563 banksel isr_backup ; Bank0 ISR data
heinrichsweikamp
parents:
diff changeset
564 movlw LOW current_speed_normal
heinrichsweikamp
parents:
diff changeset
565 addwf isr1_temp,F
heinrichsweikamp
parents:
diff changeset
566 movlw HIGH current_speed_normal
heinrichsweikamp
parents:
diff changeset
567 addwfc isr2_temp,F
heinrichsweikamp
parents:
diff changeset
568 bra isr_battery_gauge5
heinrichsweikamp
parents:
diff changeset
569 isr_battery_gauge4:
heinrichsweikamp
parents:
diff changeset
570 ; movlw .3
heinrichsweikamp
parents:
diff changeset
571 ; cpfseq speed_setting
heinrichsweikamp
parents:
diff changeset
572 ; bra isr_battery_gauge5
heinrichsweikamp
parents:
diff changeset
573 banksel isr_backup ; Bank0 ISR data
heinrichsweikamp
parents:
diff changeset
574 movlw LOW current_speed_fastest
heinrichsweikamp
parents:
diff changeset
575 addwf isr1_temp,F
heinrichsweikamp
parents:
diff changeset
576 movlw HIGH current_speed_fastest
heinrichsweikamp
parents:
diff changeset
577 addwfc isr2_temp,F
heinrichsweikamp
parents:
diff changeset
578 isr_battery_gauge5:
heinrichsweikamp
parents:
diff changeset
579 ; Add current if IR reciever is on
heinrichsweikamp
parents:
diff changeset
580 btfss ir_power ; IR enabled?
heinrichsweikamp
parents:
diff changeset
581 bra isr_battery_gauge6 ; no
heinrichsweikamp
parents:
diff changeset
582 movlw LOW current_ir_reciever
heinrichsweikamp
parents:
diff changeset
583 addwf isr1_temp,F
heinrichsweikamp
parents:
diff changeset
584 movlw HIGH current_ir_reciever
heinrichsweikamp
parents:
diff changeset
585 addwfc isr2_temp,F
heinrichsweikamp
parents:
diff changeset
586 isr_battery_gauge6:
heinrichsweikamp
parents:
diff changeset
587 ; Add current for compass/accelerometer
heinrichsweikamp
parents:
diff changeset
588 btfss compass_enabled ; compass active?
heinrichsweikamp
parents:
diff changeset
589 bra isr_battery_gauge7 ; no
heinrichsweikamp
parents:
diff changeset
590 movlw LOW current_compass
heinrichsweikamp
parents:
diff changeset
591 addwf isr1_temp,F
heinrichsweikamp
parents:
diff changeset
592 movlw HIGH current_compass
heinrichsweikamp
parents:
diff changeset
593 addwfc isr2_temp,F
heinrichsweikamp
parents:
diff changeset
594 isr_battery_gauge7:
heinrichsweikamp
parents:
diff changeset
595 return
heinrichsweikamp
parents:
diff changeset
596
heinrichsweikamp
parents:
diff changeset
597 isr_divemode_1sec:
heinrichsweikamp
parents:
diff changeset
598 incf samplesecs,F ; "samplingrate" diving seconds done
heinrichsweikamp
parents:
diff changeset
599 decf samplesecs_value,W ; holds "samplingrate" value (minus 1 into WREG)
heinrichsweikamp
parents:
diff changeset
600 cpfsgt samplesecs ; Done?
heinrichsweikamp
parents:
diff changeset
601 bra isr_divemode_1sec2 ; no
heinrichsweikamp
parents:
diff changeset
602
heinrichsweikamp
parents:
diff changeset
603 clrf samplesecs ; clear counter...
heinrichsweikamp
parents:
diff changeset
604 bsf store_sample ; ...and set bit for profile storage
heinrichsweikamp
parents:
diff changeset
605 isr_divemode_1sec2:
heinrichsweikamp
parents:
diff changeset
606 ; Increase re-setable average depth divetime counter
heinrichsweikamp
parents:
diff changeset
607 incf average_divesecs+0,F ; increase stopwatch registers
heinrichsweikamp
parents:
diff changeset
608 btfsc STATUS,Z
heinrichsweikamp
parents:
diff changeset
609 incf average_divesecs+1,F ; increase stopwatch registers
heinrichsweikamp
parents:
diff changeset
610 ; Increase total divetime (Regardless of start_dive_threshold)
heinrichsweikamp
parents:
diff changeset
611 incf total_divetime_seconds+0,F
heinrichsweikamp
parents:
diff changeset
612 movlw .0
heinrichsweikamp
parents:
diff changeset
613 addwfc total_divetime_seconds+1,F ; Total dive time (Regardless of start_dive_threshold)
heinrichsweikamp
parents:
diff changeset
614
heinrichsweikamp
parents:
diff changeset
615 btfss divemode2 ; displayed divetime is running?
heinrichsweikamp
parents:
diff changeset
616 return ; No (e.g. too shallow)
heinrichsweikamp
parents:
diff changeset
617
heinrichsweikamp
parents:
diff changeset
618 ; increase divetime registers (Displayed dive time)
heinrichsweikamp
parents:
diff changeset
619 incf divesecs,F
heinrichsweikamp
parents:
diff changeset
620 movlw d'59'
heinrichsweikamp
parents:
diff changeset
621 cpfsgt divesecs
heinrichsweikamp
parents:
diff changeset
622 bra isr_divemode_1sec2a
heinrichsweikamp
parents:
diff changeset
623
heinrichsweikamp
parents:
diff changeset
624 clrf divesecs
heinrichsweikamp
parents:
diff changeset
625 bsf realdive ; this bit is always set (again) if the dive is longer then one minute
heinrichsweikamp
parents:
diff changeset
626 incf divemins+0,F
heinrichsweikamp
parents:
diff changeset
627 movlw .0
heinrichsweikamp
parents:
diff changeset
628 addwfc divemins+1,F ; increase divemins
heinrichsweikamp
parents:
diff changeset
629
heinrichsweikamp
parents:
diff changeset
630 isr_divemode_1sec2a:
heinrichsweikamp
parents:
diff changeset
631 btfss FLAG_apnoe_mode ; Are we in Apnoe mode?
heinrichsweikamp
parents:
diff changeset
632 return ; No
heinrichsweikamp
parents:
diff changeset
633
heinrichsweikamp
parents:
diff changeset
634 incf apnoe_secs,F ; increase descent registers
heinrichsweikamp
parents:
diff changeset
635 movlw d'59'
heinrichsweikamp
parents:
diff changeset
636 cpfsgt apnoe_secs ; full minute?
heinrichsweikamp
parents:
diff changeset
637 return ; No
heinrichsweikamp
parents:
diff changeset
638 clrf apnoe_secs
heinrichsweikamp
parents:
diff changeset
639 incf apnoe_mins,F ; increase descent mins
heinrichsweikamp
parents:
diff changeset
640 return
heinrichsweikamp
parents:
diff changeset
641
heinrichsweikamp
parents:
diff changeset
642 ;=============================================================================
heinrichsweikamp
parents:
diff changeset
643 ; BCD to Binary convertion.
heinrichsweikamp
parents:
diff changeset
644 ; Input: isr1_temp = Value in BCD
heinrichsweikamp
parents:
diff changeset
645 ; Output WREG = value in binary.
heinrichsweikamp
parents:
diff changeset
646 isr_rtcc_convert:
heinrichsweikamp
parents:
diff changeset
647 swapf isr1_temp, W
heinrichsweikamp
parents:
diff changeset
648 andlw 0x0F ; W= tens
heinrichsweikamp
parents:
diff changeset
649 rlncf WREG, W ; W= 2*tens
heinrichsweikamp
parents:
diff changeset
650 subwf isr1_temp, F ; 16*tens + ones - 2*tens
heinrichsweikamp
parents:
diff changeset
651 subwf isr1_temp, F ; 14*tens + ones - 2*tens
heinrichsweikamp
parents:
diff changeset
652 subwf isr1_temp, W ; 12*tens + ones - 2*tens
heinrichsweikamp
parents:
diff changeset
653 return
heinrichsweikamp
parents:
diff changeset
654
heinrichsweikamp
parents:
diff changeset
655 ;=============================================================================
heinrichsweikamp
parents:
diff changeset
656
heinrichsweikamp
parents:
diff changeset
657 isr_switch_right: ;
heinrichsweikamp
parents:
diff changeset
658 bcf INTCON,INT0IE ; Disable INT0
heinrichsweikamp
parents:
diff changeset
659 ; bcf power_sw2 ; Power-down switch circuity
heinrichsweikamp
parents:
diff changeset
660 banksel common ; flag1 is in Bank1
heinrichsweikamp
parents:
diff changeset
661 bsf switch_right ; Set flag, button press is OK
heinrichsweikamp
parents:
diff changeset
662 bra isr_switch_common ; Continue...
heinrichsweikamp
parents:
diff changeset
663
heinrichsweikamp
parents:
diff changeset
664 isr_switch_left: ;
heinrichsweikamp
parents:
diff changeset
665 bcf INTCON3,INT1IE ; Disable INT1
heinrichsweikamp
parents:
diff changeset
666 ; bcf power_sw1 ; Power-down switch circuity
heinrichsweikamp
parents:
diff changeset
667 banksel common ; flag1 is in Bank1
heinrichsweikamp
parents:
diff changeset
668 bsf switch_left ; Set flag, button press is OK
heinrichsweikamp
parents:
diff changeset
669
heinrichsweikamp
parents:
diff changeset
670 isr_switch_common:
heinrichsweikamp
parents:
diff changeset
671 ; load timer1 for first press
heinrichsweikamp
parents:
diff changeset
672 clrf TMR1L
heinrichsweikamp
parents:
diff changeset
673 movlw TMR1H_VALUE_FIRST ; in steps of 7,8125ms
heinrichsweikamp
parents:
diff changeset
674 movwf TMR1H
heinrichsweikamp
parents:
diff changeset
675 bsf T1CON,TMR1ON ; Start Timer 1
heinrichsweikamp
parents:
diff changeset
676 ; nop
heinrichsweikamp
parents:
diff changeset
677 ; nop
heinrichsweikamp
parents:
diff changeset
678 ; nop
heinrichsweikamp
parents:
diff changeset
679 ; nop
heinrichsweikamp
parents:
diff changeset
680 ; nop
heinrichsweikamp
parents:
diff changeset
681 ; nop
heinrichsweikamp
parents:
diff changeset
682 ; nop
heinrichsweikamp
parents:
diff changeset
683 ; nop
heinrichsweikamp
parents:
diff changeset
684 ; nop
heinrichsweikamp
parents:
diff changeset
685 ; nop
heinrichsweikamp
parents:
diff changeset
686 ; nop
heinrichsweikamp
parents:
diff changeset
687 ; nop
heinrichsweikamp
parents:
diff changeset
688 ; nop
heinrichsweikamp
parents:
diff changeset
689 ; nop
heinrichsweikamp
parents:
diff changeset
690 ; nop
heinrichsweikamp
parents:
diff changeset
691 ; nop
heinrichsweikamp
parents:
diff changeset
692 ; nop
heinrichsweikamp
parents:
diff changeset
693 ; nop
heinrichsweikamp
parents:
diff changeset
694 ; nop
heinrichsweikamp
parents:
diff changeset
695 ; nop
heinrichsweikamp
parents:
diff changeset
696 ; nop
heinrichsweikamp
parents:
diff changeset
697 ; nop
heinrichsweikamp
parents:
diff changeset
698 ; nop
heinrichsweikamp
parents:
diff changeset
699 ; nop
heinrichsweikamp
parents:
diff changeset
700
heinrichsweikamp
parents:
diff changeset
701 banksel isr_backup ; Select Bank0 for ISR data.
heinrichsweikamp
parents:
diff changeset
702 ; bsf power_sw1
heinrichsweikamp
parents:
diff changeset
703 bcf INTCON3,INT1IF ; Clear flag
heinrichsweikamp
parents:
diff changeset
704 ; bsf power_sw2 ; Power-up switch circuity
heinrichsweikamp
parents:
diff changeset
705 bcf INTCON,INT0IF ; Clear flag
heinrichsweikamp
parents:
diff changeset
706 return
heinrichsweikamp
parents:
diff changeset
707
heinrichsweikamp
parents:
diff changeset
708 timer1int:
heinrichsweikamp
parents:
diff changeset
709 bcf PIR1,TMR1IF ; Clear flag
heinrichsweikamp
parents:
diff changeset
710 banksel common ; flag1 is in Bank1
heinrichsweikamp
parents:
diff changeset
711 btfss switch_left1 ; Left button hold-down?
heinrichsweikamp
parents:
diff changeset
712 bra timer1int_left ; Yes
heinrichsweikamp
parents:
diff changeset
713 btfss switch_right2 ; Right button hold-down?
heinrichsweikamp
parents:
diff changeset
714 bra timer1int_right ; Yes
heinrichsweikamp
parents:
diff changeset
715
heinrichsweikamp
parents:
diff changeset
716 ; No button hold-down, stop Timer 1
heinrichsweikamp
parents:
diff changeset
717 bcf T1CON,TMR1ON ; Stop Timer 1
heinrichsweikamp
parents:
diff changeset
718 bsf INTCON,INT0IE ; Enable INT0
heinrichsweikamp
parents:
diff changeset
719 bsf INTCON3,INT1IE ; Enable INT1
heinrichsweikamp
parents:
diff changeset
720 bcf INTCON,INT0IF ; Clear flag
heinrichsweikamp
parents:
diff changeset
721 bcf INTCON3,INT1IF ; Clear flag
heinrichsweikamp
parents:
diff changeset
722 ; bcf switch_left
heinrichsweikamp
parents:
diff changeset
723 ; bcf switch_right
heinrichsweikamp
parents:
diff changeset
724 return
heinrichsweikamp
parents:
diff changeset
725
heinrichsweikamp
parents:
diff changeset
726 timer1int_left:
heinrichsweikamp
parents:
diff changeset
727 ; bcf power_sw1 ; Power-down switch circuity
heinrichsweikamp
parents:
diff changeset
728 bsf switch_left ; (Re-)Set flag
heinrichsweikamp
parents:
diff changeset
729 bra timer1int_common ; Continue
heinrichsweikamp
parents:
diff changeset
730 timer1int_right:
heinrichsweikamp
parents:
diff changeset
731 ; bcf power_sw2 ; Power-down switch circuity
heinrichsweikamp
parents:
diff changeset
732 bsf switch_right ; (Re-)Set flag
heinrichsweikamp
parents:
diff changeset
733 timer1int_common:
heinrichsweikamp
parents:
diff changeset
734 ; load timer1 for next press
heinrichsweikamp
parents:
diff changeset
735 clrf TMR1L
heinrichsweikamp
parents:
diff changeset
736 movlw TMR1H_VALUE_CONT ; Surface mode
heinrichsweikamp
parents:
diff changeset
737 btfsc divemode
heinrichsweikamp
parents:
diff changeset
738 movlw TMR1H_VALUE_CONT_DIVE ; Dive mode
heinrichsweikamp
parents:
diff changeset
739 movwf TMR1H
heinrichsweikamp
parents:
diff changeset
740 ; nop
heinrichsweikamp
parents:
diff changeset
741 ; nop
heinrichsweikamp
parents:
diff changeset
742 ; nop
heinrichsweikamp
parents:
diff changeset
743 ; nop
heinrichsweikamp
parents:
diff changeset
744 ; nop
heinrichsweikamp
parents:
diff changeset
745 ; nop
heinrichsweikamp
parents:
diff changeset
746 ; nop
heinrichsweikamp
parents:
diff changeset
747 ; nop
heinrichsweikamp
parents:
diff changeset
748 ; nop
heinrichsweikamp
parents:
diff changeset
749 ; nop
heinrichsweikamp
parents:
diff changeset
750 ; nop
heinrichsweikamp
parents:
diff changeset
751 ; nop
heinrichsweikamp
parents:
diff changeset
752 ; nop
heinrichsweikamp
parents:
diff changeset
753 ; nop
heinrichsweikamp
parents:
diff changeset
754 ; nop
heinrichsweikamp
parents:
diff changeset
755 ; nop
heinrichsweikamp
parents:
diff changeset
756 ;
heinrichsweikamp
parents:
diff changeset
757 ; nop
heinrichsweikamp
parents:
diff changeset
758 ; nop
heinrichsweikamp
parents:
diff changeset
759 ; nop
heinrichsweikamp
parents:
diff changeset
760 ; nop
heinrichsweikamp
parents:
diff changeset
761 ; nop
heinrichsweikamp
parents:
diff changeset
762 ; nop
heinrichsweikamp
parents:
diff changeset
763 ; nop
heinrichsweikamp
parents:
diff changeset
764 ; nop
heinrichsweikamp
parents:
diff changeset
765 ; bsf power_sw1
heinrichsweikamp
parents:
diff changeset
766 bcf INTCON3,INT1IF ; Clear flag
heinrichsweikamp
parents:
diff changeset
767 ; bsf power_sw2 ; Power-up switch circuity
heinrichsweikamp
parents:
diff changeset
768 bcf INTCON,INT0IF ; Clear flag
heinrichsweikamp
parents:
diff changeset
769 return ; Return from timer1int with timer1 kept running
heinrichsweikamp
parents:
diff changeset
770
heinrichsweikamp
parents:
diff changeset
771 ;=============================================================================
heinrichsweikamp
parents:
diff changeset
772
heinrichsweikamp
parents:
diff changeset
773 check_nofly_desat_time:
heinrichsweikamp
parents:
diff changeset
774 movf nofly_time+0,W ; Is nofly null ?
heinrichsweikamp
parents:
diff changeset
775 iorwf nofly_time+1,W
heinrichsweikamp
parents:
diff changeset
776 bz check_nofly_desat_time2 ; yes...
heinrichsweikamp
parents:
diff changeset
777
heinrichsweikamp
parents:
diff changeset
778 movlw d'1'
heinrichsweikamp
parents:
diff changeset
779 subwf nofly_time+0,F
heinrichsweikamp
parents:
diff changeset
780 movlw d'0'
heinrichsweikamp
parents:
diff changeset
781 subwfb nofly_time+1,F ; reduce by one
heinrichsweikamp
parents:
diff changeset
782
heinrichsweikamp
parents:
diff changeset
783 check_nofly_desat_time2:
heinrichsweikamp
parents:
diff changeset
784 movf desaturation_time+0,W ; Is Desat null ?
heinrichsweikamp
parents:
diff changeset
785 iorwf desaturation_time+1,W
heinrichsweikamp
parents:
diff changeset
786 bz check_nofly_desat_time3 ; yes...
heinrichsweikamp
parents:
diff changeset
787
heinrichsweikamp
parents:
diff changeset
788 movlw d'1'
heinrichsweikamp
parents:
diff changeset
789 subwf desaturation_time+0,F
heinrichsweikamp
parents:
diff changeset
790 movlw d'0'
heinrichsweikamp
parents:
diff changeset
791 subwfb desaturation_time+1,F ; reduce by one...
heinrichsweikamp
parents:
diff changeset
792
heinrichsweikamp
parents:
diff changeset
793 ; Increase surface interval timer
heinrichsweikamp
parents:
diff changeset
794 movlw d'1'
heinrichsweikamp
parents:
diff changeset
795 addwf surface_interval+0,F
heinrichsweikamp
parents:
diff changeset
796 movlw d'0'
heinrichsweikamp
parents:
diff changeset
797 addwfc surface_interval+1,F
heinrichsweikamp
parents:
diff changeset
798 return ; Done
heinrichsweikamp
parents:
diff changeset
799
heinrichsweikamp
parents:
diff changeset
800 check_nofly_desat_time3:
heinrichsweikamp
parents:
diff changeset
801 clrf surface_interval+0
heinrichsweikamp
parents:
diff changeset
802 clrf surface_interval+1 ; Clear surface interval timer
heinrichsweikamp
parents:
diff changeset
803 return ; Done.
heinrichsweikamp
parents:
diff changeset
804
heinrichsweikamp
parents:
diff changeset
805 ;=============================================================================
heinrichsweikamp
parents:
diff changeset
806
heinrichsweikamp
parents:
diff changeset
807 isr_restore_clock:
heinrichsweikamp
parents:
diff changeset
808 banksel isr_backup
heinrichsweikamp
parents:
diff changeset
809 movff speed_setting,isr1_temp ; Copy to Bank0
heinrichsweikamp
parents:
diff changeset
810 movlw d'1'
heinrichsweikamp
parents:
diff changeset
811 cpfseq isr1_temp
heinrichsweikamp
parents:
diff changeset
812 bra isr_restore_speed2
heinrichsweikamp
parents:
diff changeset
813 ; Reset to eco
heinrichsweikamp
parents:
diff changeset
814 movlw b'00000000'
heinrichsweikamp
parents:
diff changeset
815 movwf OSCTUNE ; 4x PLL Disable (Bit6) - only works with 8 or 16MHz (=32 or 64MHz)
heinrichsweikamp
parents:
diff changeset
816 movlw b'00110010'
heinrichsweikamp
parents:
diff changeset
817 movwf OSCCON ; 1MHz INTOSC
heinrichsweikamp
parents:
diff changeset
818 movlw T2CON_ECO
heinrichsweikamp
parents:
diff changeset
819 movwf T2CON
heinrichsweikamp
parents:
diff changeset
820 bra isr_restore_exit
heinrichsweikamp
parents:
diff changeset
821 isr_restore_speed2:
heinrichsweikamp
parents:
diff changeset
822 movlw d'2'
heinrichsweikamp
parents:
diff changeset
823 cpfseq isr1_temp
heinrichsweikamp
parents:
diff changeset
824 bra isr_restore_speed3
heinrichsweikamp
parents:
diff changeset
825 ; Reset to normal
heinrichsweikamp
parents:
diff changeset
826 movlw b'01110010'
heinrichsweikamp
parents:
diff changeset
827 movwf OSCCON ; 16MHz INTOSC
heinrichsweikamp
parents:
diff changeset
828 movlw b'00000000'
heinrichsweikamp
parents:
diff changeset
829 movwf OSCTUNE ; 4x PLL Disable (Bit6) - only works with 8 or 16MHz (=32 or 64MHz)
heinrichsweikamp
parents:
diff changeset
830 movlw T2CON_NORMAL
heinrichsweikamp
parents:
diff changeset
831 movwf T2CON
heinrichsweikamp
parents:
diff changeset
832 bra isr_restore_exit
heinrichsweikamp
parents:
diff changeset
833
heinrichsweikamp
parents:
diff changeset
834 isr_restore_speed3:
heinrichsweikamp
parents:
diff changeset
835 ; Reset to fastest
heinrichsweikamp
parents:
diff changeset
836 movlw b'01110010' ; 16MHz INTOSC
heinrichsweikamp
parents:
diff changeset
837 movwf OSCCON
heinrichsweikamp
parents:
diff changeset
838 movlw b'01000000'
heinrichsweikamp
parents:
diff changeset
839 movwf OSCTUNE ; 4x PLL Enable (Bit6) - only works with 8 or 16MHz (=32 or 64MHz)
heinrichsweikamp
parents:
diff changeset
840 movlw T2CON_FASTEST
heinrichsweikamp
parents:
diff changeset
841 movwf T2CON
heinrichsweikamp
parents:
diff changeset
842 ; bra isr_restore_exit
heinrichsweikamp
parents:
diff changeset
843 isr_restore_exit:
heinrichsweikamp
parents:
diff changeset
844 btfss OSCCON,HFIOFS
heinrichsweikamp
parents:
diff changeset
845 bra isr_restore_exit ; loop until PLL is stable
heinrichsweikamp
parents:
diff changeset
846 return
heinrichsweikamp
parents:
diff changeset
847
heinrichsweikamp
parents:
diff changeset
848 END