comparison code_part1/OSTC_code_asm_part1/divemode.asm @ 131:03df42de03e1

Merge 129 with 130
author Heinrichsweikamp
date Wed, 05 Jan 2011 07:46:20 +0100
parents 06c4899ddb4b 4c588c3d1f12
children 622da16b768f
comparison
equal deleted inserted replaced
130:d721b49b8934 131:03df42de03e1
163 nop 163 nop
164 diveloop_loop4: 164 diveloop_loop4:
165 bra diveloop_loop ; Loop the divemode 165 bra diveloop_loop ; Loop the divemode
166 166
167 timeout_premenu_divemode: 167 timeout_premenu_divemode:
168 incf timeout_counter3,F ; Yes... 168 incf timeout_counter3,F ; Yes...
169 169
170 GETCUSTOM8 d'4' ; loads premenu_timeout into WREG 170 GETCUSTOM8 d'4' ; loads premenu_timeout into WREG
171 cpfsgt timeout_counter3 ; ... longer then premenu_timeout 171 cpfsgt timeout_counter3 ; ... longer then premenu_timeout
172 return ; No! 172 return ; No!
173 173
174 bcf premenu ; Yes, so clear "Menu?" and clear pre_menu bit 174 bcf premenu ; Yes, so clear "Menu?" and clear pre_menu bit
175 call PLED_menu_clear ; Remove "Menu?" 175 call PLED_menu_clear ; Remove "Menu?"
176 return 176 return
177 177
178 divemode_apnoe_tasks: ; 1 sec. Apnoe tasks 178 divemode_apnoe_tasks: ; 1 sec. Apnoe tasks
179 call PLED_display_apnoe_descent ; Show descent timer 179 call PLED_display_apnoe_descent ; Show descent timer
180 180
181 btfsc divemode2 ; Time running? 181 btfsc divemode2 ; Time running?
182 bra divemode_apnoe_tasks2 ; New descent, reset data if flag is set 182 bra divemode_apnoe_tasks2 ; New descent, reset data if flag is set
183 183