Mercurial > public > mk2
diff 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 |
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/divemode.asm Tue Jan 04 17:41:13 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/divemode.asm Wed Jan 05 07:46:20 2011 +0100 @@ -165,17 +165,17 @@ bra diveloop_loop ; Loop the divemode timeout_premenu_divemode: - incf timeout_counter3,F ; Yes... + incf timeout_counter3,F ; Yes... - GETCUSTOM8 d'4' ; loads premenu_timeout into WREG - cpfsgt timeout_counter3 ; ... longer then premenu_timeout - return ; No! + GETCUSTOM8 d'4' ; loads premenu_timeout into WREG + cpfsgt timeout_counter3 ; ... longer then premenu_timeout + return ; No! - bcf premenu ; Yes, so clear "Menu?" and clear pre_menu bit - call PLED_menu_clear ; Remove "Menu?" + bcf premenu ; Yes, so clear "Menu?" and clear pre_menu bit + call PLED_menu_clear ; Remove "Menu?" return -divemode_apnoe_tasks: ; 1 sec. Apnoe tasks +divemode_apnoe_tasks: ; 1 sec. Apnoe tasks call PLED_display_apnoe_descent ; Show descent timer btfsc divemode2 ; Time running?