Mercurial > public > mk2
changeset 673:7e651625d4c0
no decoplan update when switching gf
| author | heinrichsweikamp |
|---|---|
| date | Mon, 10 Dec 2012 16:12:22 +0100 |
| parents | e2bb4f745f3a |
| children | 3927bc5019c9 |
| files | code_part1/OSTC_code_asm_part1/divemode_menu.asm |
| diffstat | 1 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/divemode_menu.asm Mon Dec 10 13:16:28 2012 +0100 +++ b/code_part1/OSTC_code_asm_part1/divemode_menu.asm Mon Dec 10 16:12:22 2012 +0100 @@ -798,9 +798,9 @@ call PLED_clear_divemode_menu; Clear dive mode menu btfsc FLAG_apnoe_mode ; Ignore in Apnoe mode - bra timeout_divemenu2a ; skip! + bra timeout_divemenu2b ; skip! btfsc gauge_mode ; Ignore in Gauge mode - bra timeout_divemenu2a ; skip! + bra timeout_divemenu2b ; skip! bcf menubit btfsc dekostop_active @@ -808,15 +808,19 @@ btfss dekostop_active call PLED_display_ndl_mask ; Clear deco data, display nostop time + btfss decoplan_invalid ; The decoplan needs to updated + bra timeout_divemenu2a ; Yes, skip update + btfsc dekostop_active call PLED_display_deko ; Update deco display at once btfss dekostop_active call PLED_display_ndl ; Update NDL display at once +timeout_divemenu2a: btfsc safety_stop_active bcf safety_stop_active ; Clear flag to rebuild the safety stop -timeout_divemenu2a: +timeout_divemenu2b: bcf menubit bcf premenu ; Yes, clear flags and menu, display dive time and mask again call PLED_active_gas_divemode; Display gas, if required