comparison code_part1/OSTC_code_asm_part1/divemode_menu.asm @ 673:7e651625d4c0

no decoplan update when switching gf
author heinrichsweikamp
date Mon, 10 Dec 2012 16:12:22 +0100
parents 3282581fe178
children 3927bc5019c9
comparison
equal deleted inserted replaced
672:e2bb4f745f3a 673:7e651625d4c0
796 ; Restore some outputs 796 ; Restore some outputs
797 clrf decoplan_page ; Page 0-1 of deco list 797 clrf decoplan_page ; Page 0-1 of deco list
798 call PLED_clear_divemode_menu; Clear dive mode menu 798 call PLED_clear_divemode_menu; Clear dive mode menu
799 799
800 btfsc FLAG_apnoe_mode ; Ignore in Apnoe mode 800 btfsc FLAG_apnoe_mode ; Ignore in Apnoe mode
801 bra timeout_divemenu2a ; skip! 801 bra timeout_divemenu2b ; skip!
802 btfsc gauge_mode ; Ignore in Gauge mode 802 btfsc gauge_mode ; Ignore in Gauge mode
803 bra timeout_divemenu2a ; skip! 803 bra timeout_divemenu2b ; skip!
804 804
805 bcf menubit 805 bcf menubit
806 btfsc dekostop_active 806 btfsc dekostop_active
807 call PLED_display_deko_mask ; clear nostop time, display decodata 807 call PLED_display_deko_mask ; clear nostop time, display decodata
808 btfss dekostop_active 808 btfss dekostop_active
809 call PLED_display_ndl_mask ; Clear deco data, display nostop time 809 call PLED_display_ndl_mask ; Clear deco data, display nostop time
810 810
811 btfss decoplan_invalid ; The decoplan needs to updated
812 bra timeout_divemenu2a ; Yes, skip update
813
811 btfsc dekostop_active 814 btfsc dekostop_active
812 call PLED_display_deko ; Update deco display at once 815 call PLED_display_deko ; Update deco display at once
813 btfss dekostop_active 816 btfss dekostop_active
814 call PLED_display_ndl ; Update NDL display at once 817 call PLED_display_ndl ; Update NDL display at once
815 818
819 timeout_divemenu2a:
816 btfsc safety_stop_active 820 btfsc safety_stop_active
817 bcf safety_stop_active ; Clear flag to rebuild the safety stop 821 bcf safety_stop_active ; Clear flag to rebuild the safety stop
818 822
819 timeout_divemenu2a: 823 timeout_divemenu2b:
820 bcf menubit 824 bcf menubit
821 bcf premenu ; Yes, clear flags and menu, display dive time and mask again 825 bcf premenu ; Yes, clear flags and menu, display dive time and mask again
822 call PLED_active_gas_divemode; Display gas, if required 826 call PLED_active_gas_divemode; Display gas, if required
823 call PLED_divemode_mask ; Display mask 827 call PLED_divemode_mask ; Display mask
824 call PLED_divemins ; Display (new) divetime! 828 call PLED_divemins ; Display (new) divetime!