Mercurial > public > hwos_code
changeset 335:3d43da7acfe1 new_screen_layout
Always show ppO2 (warning position, standard color) option
| author | janos_kovacs <kovjanos@gmail.com> |
|---|---|
| date | Sun, 28 Jun 2015 05:02:45 +0200 |
| parents | 14b466f66a7f |
| children | 1318c6cad41b |
| files | src/comm.asm src/divemode.asm src/hwos.inc src/menu_tree.asm src/option_table.asm src/text_english.inc src/text_french.inc src/text_german.inc src/text_italian.inc |
| diffstat | 9 files changed, 21 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/comm.asm Sun Jun 28 03:30:03 2015 +0200 +++ b/src/comm.asm Sun Jun 28 05:02:45 2015 +0200 @@ -963,6 +963,8 @@ movff opt_vsigraph, TXREG1 ; RCREG1=0x40 dcfsnz WREG movff opt_extceiling, TXREG1 ; RCREG1=0x41 + dcfsnz WREG + movff opt_showppo2, TXREG1 ; RCREG1=0x42 comm_read_abort: @@ -1252,6 +1254,8 @@ movff RCREG1, opt_vsigraph ; RCREG1=0x40 dcfsnz WREG movff RCREG1, opt_extceiling ; RCREG1=0x41 + dcfsnz WREG + movff RCREG1, opt_showppo2 ; RCREG1=0x42 comm_write_abort:
--- a/src/divemode.asm Sun Jun 28 03:30:03 2015 +0200 +++ b/src/divemode.asm Sun Jun 28 05:02:45 2015 +0200 @@ -1547,6 +1547,8 @@ check_ppO2_0: ; Check if ppO2 should be displayed + movlw .0 + TSTOSS opt_showppo2 ; 0=no, 1=always show movlw ppo2_display_high mullw d'100' ; ppo2_display_high*100 movff PRODL,sub_a+0
--- a/src/hwos.inc Sun Jun 28 03:30:03 2015 +0200 +++ b/src/hwos.inc Sun Jun 28 05:02:45 2015 +0200 @@ -576,6 +576,7 @@ opt_vsitextv2 res 1 ; =1:use the depth dependent ascend rate limits opt_vsigraph res 1 ; =1:draw the graphical VSI bar opt_extceiling res 1 ; =1:print ppO2 and currentGF on the Ceiling Custom View +opt_showppo2 res 1 ; =1:always show the ppO2 value in the warning position ;-----------------------------EEPROM DATA ------------------------------------ ; Automatic reset of all options when this is changed:
--- a/src/menu_tree.asm Sun Jun 28 03:30:03 2015 +0200 +++ b/src/menu_tree.asm Sun Jun 28 05:02:45 2015 +0200 @@ -624,8 +624,15 @@ MENU_OPTION tFlip, oFlipScreen, 0 MENU_OPTION tMODwarning, oMODwarning, 0 MENU_CALL tDispSetVSI, do_dispsets_VSI_menu + MENU_CALL tMore, do_dispsets_menu_more + MENU_CALL tExit, do_return_settings + MENU_END + +do_dispsets_menu_more: + MENU_BEGIN tDispSets, .3 MENU_OPTION tExtCeiling, oExtCeiling, 0 - MENU_CALL tExit, do_return_settings + MENU_OPTION tShowppO2, oShowppO2, 0 + MENU_CALL tExit, do_dispsets_menu_3stack MENU_END do_dispsets_VSI_menu:
--- a/src/option_table.asm Sun Jun 28 03:30:03 2015 +0200 +++ b/src/option_table.asm Sun Jun 28 05:02:45 2015 +0200 @@ -203,6 +203,7 @@ OPTION_BOOL oVSItextv2, 0, .157, opt_vsitextv2 ; =1: use the dynamic (depends on depth) ascend rate limits OPTION_BOOL oVSIgraph, 0, .158, opt_vsigraph ; =1: draw the graphical VSI bar OPTION_BOOL oExtCeiling, 0, .159, opt_extceiling ; =1:print ppO2 and currentGF on the Ceiling Custom View + OPTION_BOOL oShowppO2, 0, .160, opt_showppo2 ; =1:always show the ppO2 value in the warning position ;============================================================================= ; Set Time/Set Date (RAM only)
--- a/src/text_english.inc Sun Jun 28 03:30:03 2015 +0200 +++ b/src/text_english.inc Sun Jun 28 05:02:45 2015 +0200 @@ -137,7 +137,8 @@ TCODE tFlip, "Rotate Screen:" ; Rotate Screen TCODE tMODwarning,"MOD warning:" ; MOD warning TCODE tDispSetVSI,"VSI Settings..." ; VSI Settings... - TCODE tExtCeiling,"Ext. Ceiling CV:" ; Ext Ceiling CV + TCODE tExtCeiling,"Ext. Ceiling CV:" ; Ext. Ceiling CV: + TCODE tShowppO2, "Always show ppO2:" ; Always show ppO2: ; VSI display Settings TCODE tDispSetVSItitle, "VSI Display Settings" ; VSI display Settings
--- a/src/text_french.inc Sun Jun 28 03:30:03 2015 +0200 +++ b/src/text_french.inc Sun Jun 28 05:02:45 2015 +0200 @@ -138,6 +138,7 @@ TCODE tMODwarning,"MOD warning:" ; MOD warning TCODE tDispSetVSI,"VSI Settings..." ; VSI Settings... TCODE tExtCeiling,"Ext. Ceiling CV:" ; Ext Ceiling CV + TCODE tShowppO2, "Always show ppO2:" ; Always show ppO2: ; VSI display Settings TCODE tDispSetVSItitle, "VSI Display Settings" ; VSI display Settings
--- a/src/text_german.inc Sun Jun 28 03:30:03 2015 +0200 +++ b/src/text_german.inc Sun Jun 28 05:02:45 2015 +0200 @@ -138,6 +138,7 @@ TCODE tMODwarning,"MOD Warnung:" ; MOD warning TCODE tDispSetVSI,"VSI Settings..." ; VSI Settings... TCODE tExtCeiling,"Ext. Ceiling CV:" ; Ext Ceiling CV + TCODE tShowppO2, "Always show ppO2:" ; Always show ppO2: ; VSI display Settings TCODE tDispSetVSItitle, "VSI Display Settings" ; VSI display Settings
--- a/src/text_italian.inc Sun Jun 28 03:30:03 2015 +0200 +++ b/src/text_italian.inc Sun Jun 28 05:02:45 2015 +0200 @@ -138,6 +138,7 @@ TCODE tMODwarning,"MOD warning:" ; MOD warning TCODE tDispSetVSI,"VSI Settings..." ; VSI Settings... TCODE tExtCeiling,"Ext. Ceiling CV:" ; Ext Ceiling CV + TCODE tShowppO2, "Always show ppO2:" ; Always show ppO2: ; VSI display Settings TCODE tDispSetVSItitle, "VSI Display Settings" ; VSI display Settings