# HG changeset patch # User Heinrichsweikamp # Date 1304009508 -7200 # Node ID 2986e7cdb68c843785f2f7954563786eb7ed944b # Parent 1a15d75702f7c93a4987c42c84e153ee051626c4 Apply salinity for ceiling warning diff -r 1a15d75702f7 -r 2986e7cdb68c code_part1/OSTC_code_asm_part1/changelog.txt --- a/code_part1/OSTC_code_asm_part1/changelog.txt Thu Apr 28 18:14:02 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/changelog.txt Thu Apr 28 18:51:48 2011 +0200 @@ -6,6 +6,7 @@ NEW: Colored stops in decoplan (CF55 > 0) NEW: 115kbauds bootloader. NEW: Colored battery sign when charging (yellow) or charged (green). +BUGFIX: Apply salinity for ceiling warning New in 1.86 beta: BETA Version - Do NOT use for diving! diff -r 1a15d75702f7 -r 2986e7cdb68c code_part1/OSTC_code_asm_part1/pled_outputs.asm --- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm Thu Apr 28 18:14:02 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm Thu Apr 28 18:51:48 2011 +0200 @@ -143,10 +143,13 @@ cpfseq lo ; =1? bra PLED_color_code_ceiling1 ; No, Set to default color + movff rel_pressure+1,hi + movff rel_pressure+0,lo + call adjust_depth_with_salinity ; computes salinity setting into lo:hi [mBar] + movff hi,xA+1 + movff lo,xA+0 movff char_O_first_deco_depth,lo ; Ceiling in m decf lo,F ; -1 - movff rel_pressure+1,xA+1 - movff rel_pressure+0,xA+0 movlw LOW d'100' movwf xB+0 clrf xB+1 ; Devide/100 -> xC+0 = Depth in m