Mercurial > public > mk2
changeset 762:cc997dde80cf
BUGFIX: ppO2 display in PSCR Mode
author | heinrichsweikamp |
---|---|
date | Wed, 04 Dec 2013 17:12:53 +0100 (2013-12-04) |
parents | ff2b4f5fad9c |
children | 4a15cd7c534e |
files | code_part1/OSTC_code_asm_part1/changelog.txt code_part1/OSTC_code_asm_part1/outputs.asm |
diffstat | 2 files changed, 17 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/changelog.txt Sun Dec 01 10:45:51 2013 +0100 +++ b/code_part1/OSTC_code_asm_part1/changelog.txt Wed Dec 04 17:12:53 2013 +0100 @@ -1,3 +1,7 @@ +New in 2.75: +BETA Version - Do NOT use for diving +BUGFIX: ppO2 display in PSCR Mode + New in 2.74: BETA Version - Do NOT use for diving BUGFIX: remove ghost image (On 2C only) during first second in sleep mode
--- a/code_part1/OSTC_code_asm_part1/outputs.asm Sun Dec 01 10:45:51 2013 +0100 +++ b/code_part1/OSTC_code_asm_part1/outputs.asm Wed Dec 04 17:12:53 2013 +0100 @@ -3801,16 +3801,14 @@ call DISP_divemask_color ; Set Color for Divemode mask lfsr FSR2,letter OUTPUTTEXTH .266 ; "pSCR Info" - call word_processor ; pCCR - - rcall compute_pscr_ppo2 ; pSCR ppO2 into sub_c:2 + call word_processor WIN_FONT FT_SMALL WIN_LEFT .95 WIN_TOP .192 lfsr FSR2,letter STRCPY_PRINT TXT_PPO2_5 ; ppO2: - + rcall compute_pscr_ppo2 ; pSCR ppO2 into sub_c:2 movff sub_c+0,xC+0 movff sub_c+1,xC+1 clrf xC+2 @@ -3818,13 +3816,16 @@ DISP_color_code warn_ppo2 ; Color-code output (ppO2 stored in xC) WIN_LEFT .130 WIN_TOP .192 - lfsr FSR2,letter - movff xC+0,lo - movff xC+1,hi + lfsr FSR2,letter + movff xC+0,lo + movff xC+1,hi bsf ignore_digit4 output_16dp d'1' bcf ignore_digit4 - STRCAT_PRINT " " + PUTC " " + movlw .0 + movff WREG,letter+.4 ; Limit to 4chars + STRCAT_PRINT "" call DISP_standard_color ; Back to white. ; Show O2 drop and counter lung ration in second row WIN_LEFT .98 @@ -3839,7 +3840,10 @@ movwf lo output_8 bcf leftbind - STRCAT_PRINT " " ; Trailing space needed when changing the O2 drop + PUTC " " + movlw .0 + movff WREG,letter+.9 ; Limit to 9chars + STRCAT_PRINT "" return ;=============================================================================