Mercurial > public > mk2
changeset 759:ae830d5e63ef
Start on new decogas display
| author | heinrichsweikamp |
|---|---|
| date | Sat, 30 Nov 2013 20:41:43 +0100 |
| parents | 3096294bb06e |
| children | e16e636def61 |
| files | code_part1/OSTC_code_asm_part1/customview.asm code_part1/OSTC_code_asm_part1/english_text.asm code_part1/OSTC_code_asm_part1/french_text.asm code_part1/OSTC_code_asm_part1/german_text.asm code_part1/OSTC_code_asm_part1/italian_text.asm code_part1/OSTC_code_asm_part1/outputs.asm code_part1/OSTC_code_asm_part1/russian_text.asm code_part1/OSTC_code_asm_part1/spanish_text.asm code_part1/OSTC_code_asm_part1/turkish_text.asm |
| diffstat | 9 files changed, 105 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/customview.asm Tue Nov 26 12:11:23 2013 +0100 +++ b/code_part1/OSTC_code_asm_part1/customview.asm Sat Nov 30 20:41:43 2013 +0100 @@ -103,6 +103,8 @@ bra customview_1sec_pSCR_ppO2 ; Show/Update pSCR ppO2 dcfsnz WREG,F bra customview_1sec_show_change_gf; Show and/or change GF values + dcfsnz WREG,F + bra customview_1sec_show_deco_gas ; Menupos3=0, do nothing return @@ -149,8 +151,11 @@ customview_1sec_pSCR_ppO2: goto DISP_show_pSCR_ppO2 ; Yes, compute and show value + +customview_1sec_show_deco_gas: + goto DISP_show_deco_gas1 ; Show the next decogas + - ;============================================================================= ; Do every-minute tasks for the custom view area @@ -178,6 +183,8 @@ bra customview_minute_pSCR_ppO2; Show pSCR ppO2 level dcfsnz WREG,F bra customview_minute_show_change_gf; Show and/or change GF values + dcfsnz WREG,F + bra customview_minute_show_deco_gas ; Show the next decogas ; Menupos3=0, do nothing return @@ -197,6 +204,7 @@ customview_minute_average: ; Do nothing extra customview_minute_graphs: ; Do nothing extra customview_minute_pSCR_ppO2: ; Do nothing extra +customview_minute_show_deco_gas: ; Do nothing extra return ;============================================================================= @@ -211,7 +219,7 @@ btfsc FLAG_apnoe_mode ; In Apnoe mode? bra customview_toggle_exit ; Yes, ignore custom view in divemode completely - movlw d'11' ; Max number + movlw d'12' ; Max number cpfsgt menupos3 ; Max reached? bra customview_mask ; No, show clrf menupos3 ; Reset to zero (Zero=no custom view) @@ -243,6 +251,8 @@ bra customview_init_pSCR_ppo2 ; 10: Show ppO2 for pSCR users dcfsnz WREG,F bra customview_init_show_change_gf ; 11: Show and/or change GF values + dcfsnz WREG,F + bra customview_init_show_deco_gas ; 12: Show deco gas customview_init_nocustomview: bra customview_toggle_exit @@ -386,6 +396,18 @@ call DISP_show_gf_customview ; Show info bra customview_toggle_exit +customview_init_show_deco_gas: + bra customview_toggle ; mH: Ignore now + + btfsc no_deco_customviews ; no-deco-mode-flag = 1 + bra customview_toggle ; Yes, use next Customview! + btfsc FLAG_const_ppO2_mode ; in ppO2 mode + bra surfcustomview_toggle ; Yes, use next Customview! + + call DISP_show_deco_gas ; Show the next decogas + + bra customview_toggle_exit + customview_toggle_exit: bcf toggle_customview ; Clear flag ostc_debug 'Y' ; Sends debug-information to screen in debugmode
--- a/code_part1/OSTC_code_asm_part1/english_text.asm Tue Nov 26 12:11:23 2013 +0100 +++ b/code_part1/OSTC_code_asm_part1/english_text.asm Sat Nov 30 20:41:43 2013 +0100 @@ -410,7 +410,7 @@ TCODE .0, .184, "Max." ;267 Max. TCODE .93, .170, "GF Values" ;268 GF Values TCODE .100, .50, "ToggleGF" ;269 ToggleGF (In Divemode Menu) - TCODE .0, .0, "" ;270 unused + TCODE .93, .170, "Decogas" ;270 Decogas ; New CFs Warning TCODE .24, .2, "New CF added!" ;271 New CF added!
--- a/code_part1/OSTC_code_asm_part1/french_text.asm Tue Nov 26 12:11:23 2013 +0100 +++ b/code_part1/OSTC_code_asm_part1/french_text.asm Sat Nov 30 20:41:43 2013 +0100 @@ -412,7 +412,7 @@ TCODE .0, .184, "Max." ;267 Max. TCODE .93, .170, "GF Values" ;268 GF Values TCODE .100, .50, "ToggleGF" ;269 ToggleGF (In Divemode Menu) - TCODE .0, .0, "" ;270 unused + TCODE .93, .170, "Decogas" ;270 Decogas ; New CFs Warning TCODE .3, .2, "Nouvelles CF ajoutées!" ;271 New CF added!
--- a/code_part1/OSTC_code_asm_part1/german_text.asm Tue Nov 26 12:11:23 2013 +0100 +++ b/code_part1/OSTC_code_asm_part1/german_text.asm Sat Nov 30 20:41:43 2013 +0100 @@ -411,7 +411,7 @@ TCODE .0, .184, "Max." ;267 Max. TCODE .93, .170, "GF Werte" ;268 GF Values TCODE .100, .50, "GF Wech." ;269 ToggleGF (In Divemode Menu) - TCODE .0, .0, "" ;270 unused + TCODE .93, .170, "Dekogas" ;270 Decogas ; New CFs Warning TCODE .10, .2, "Neue CF hinzugefügt!" ;271 New CF added!
--- a/code_part1/OSTC_code_asm_part1/italian_text.asm Tue Nov 26 12:11:23 2013 +0100 +++ b/code_part1/OSTC_code_asm_part1/italian_text.asm Sat Nov 30 20:41:43 2013 +0100 @@ -410,7 +410,7 @@ TCODE .0, .184, "Max." ;267 Max. TCODE .93, .170, "GF Values" ;268 GF Values TCODE .100, .50, "ToggleGF" ;269 ToggleGF (In Divemode Menu) - TCODE .0, .0, "" ;270 unused + TCODE .93, .170, "Decogas" ;270 Decogas ; New CFs Warning TCODE .24, .2, "Nuova CF aggiunta!" ;271 New CF added!
--- a/code_part1/OSTC_code_asm_part1/outputs.asm Tue Nov 26 12:11:23 2013 +0100 +++ b/code_part1/OSTC_code_asm_part1/outputs.asm Sat Nov 30 20:41:43 2013 +0100 @@ -890,6 +890,80 @@ STRCAT_PRINT " " return + +DISP_show_deco_gas: ; Show the next decogas + WIN_LEFT .90 + WIN_FONT FT_SMALL + WIN_INVERT .0 ; Init new Wordprocessor + call DISP_divemask_color ; Set Color for Divemode mask + DISPLAYTEXTH .270 ; Decogas + +DISP_show_deco_gas1: + WIN_LEFT .90 + WIN_FONT FT_SMALL + WIN_INVERT .0 ; Init new Wordprocessor + call DISP_standard_color + WIN_TOP .192 + movff char_O_deco_gas+0,lo + tstfsz lo ; =0? + bra $+4 ; No + bra DISP_show_deco_gas2 + incf lo,F ;+1 + STRCPY TXT_GAS1 ; "G" + bsf leftbind + output_8 + STRCAT TXT_AT4 ; " at " + movlw .27 ; 28=Gas 1 + addwf lo,W + movwf EEADR + clrf EEADRH ; Get Change depth + call read_eeprom + movff EEDATA,lo + tstfsz lo ; =0? + bra $+4 ; No + bra DISP_show_deco_gas2 + output_8 ; Change depth + bcf leftbind + STRCAT "m " + clrf WREG + movff WREG,letter+9 ; Limit to 8 chars + STRCAT_PRINT "" + + WIN_TOP .216 + movff char_O_deco_gas+1,lo + tstfsz lo ; =0? + bra $+4 ; No + bra DISP_show_deco_gas3 + incf lo,F ;+1 + STRCPY TXT_GAS1 ; "G" + bsf leftbind + output_8 + STRCAT TXT_AT4 ; " at " + movlw .27 ; 28=Gas 1 + addwf lo,W + movwf EEADR + clrf EEADRH ; Get Change depth + call read_eeprom + movff EEDATA,lo + tstfsz lo ; =0? + bra $+4 ; No + bra DISP_show_deco_gas3 + output_8 ; Change depth + bcf leftbind + STRCAT "m " + clrf WREG + movff WREG,letter+9 ; Limit to 8 chars + STRCAT_PRINT "" + return + +DISP_show_deco_gas2: + WIN_BOX_BLACK .192, .239, .90, .159 ;top, bottom, left, right + return + +DISP_show_deco_gas3: + WIN_BOX_BLACK .216, .239, .90, .159 ;top, bottom, left, right + return + DISP_show_gf_customview: WIN_LEFT .93 WIN_FONT FT_SMALL
--- a/code_part1/OSTC_code_asm_part1/russian_text.asm Tue Nov 26 12:11:23 2013 +0100 +++ b/code_part1/OSTC_code_asm_part1/russian_text.asm Sat Nov 30 20:41:43 2013 +0100 @@ -413,7 +413,7 @@ TCODE .0, .184, "Ìàêñ." ;267 Max. TCODE .93, .170, "Ïà®àì. ÃÔ" ;268 GF Values TCODE .100, .50, "Ñìåíà ÃÔ" ;269 ToggleGF (In Divemode Menu) - TCODE .0, .0, "" ;270 unused + TCODE .93, .170, "Decogas" ;270 Decogas ; New CFs Warning TCODE .24, .2, "Äîáàâëåíû ÄÏ!" ;271 New CF added!
--- a/code_part1/OSTC_code_asm_part1/spanish_text.asm Tue Nov 26 12:11:23 2013 +0100 +++ b/code_part1/OSTC_code_asm_part1/spanish_text.asm Sat Nov 30 20:41:43 2013 +0100 @@ -409,7 +409,7 @@ TCODE .0, .184, "Max." ;267 Max. TCODE .93, .170, "GF Values" ;268 GF Values TCODE .100, .50, "ToggleGF" ;269 ToggleGF (In Divemode Menu) - TCODE .0, .0, "" ;270 unused + TCODE .93, .170, "Decogas" ;270 Decogas ; New CFs Warning TCODE .0, .2, "¡Nuevo CF añadido!" ;271 New CF added!
--- a/code_part1/OSTC_code_asm_part1/turkish_text.asm Tue Nov 26 12:11:23 2013 +0100 +++ b/code_part1/OSTC_code_asm_part1/turkish_text.asm Sat Nov 30 20:41:43 2013 +0100 @@ -409,7 +409,7 @@ TCODE .0, .184, "Max" ;267 Max. TCODE .0, .0, "" ;268 unused TCODE .0, .0, "" ;269 unused - TCODE .0, .0, "" ;270 unused + TCODE .93, .170, "Decogas" ;270 Decogas ; New CFs Warning TCODE .10, .2, "Bilgilendirme : " ;271 New CF added!