Mercurial > public > mk2
diff code_part1/OSTC_code_asm_part1/divemode.asm @ 169:e26f49674956
Merge decoplan display for both GF and Buhlmann models.
+ Add CF(54) to reverse deco plan display order.
+ Clean state machine to faster redisplay in divemode.
Fix don't flip screen for soft emulation.
| author | JeanDo |
|---|---|
| date | Wed, 26 Jan 2011 19:19:02 +0100 |
| parents | cb055a7d75f3 |
| children | 7f3e1bf588bc |
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/divemode.asm Tue Jan 25 01:02:35 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/divemode.asm Wed Jan 26 19:19:02 2011 +0100 @@ -433,11 +433,7 @@ movlb b'00000001' ; rambank 1 selected ostc_debug 'C' ; Sends debug-information to screen if debugmode active - movff char_O_deco_status,WREG - tstfsz WREG ; deco_status=0 if decompression calculation done - return ; calculation not yet finished! - - movff char_O_array_decodepth+0,wait_temp ; copy ceiling to temp register + movff char_O_first_deco_depth,wait_temp ; copy ceiling to temp register tstfsz wait_temp ; Ceiling<0m? bra calc_deko_divemode3 ; Yes! @@ -476,8 +472,8 @@ call PLED_display_deko_mask ; clear nostop time, display decodata bsf dekostop_active ; Set flag - movff char_O_array_decodepth+0,decodata+0 ; ceiling - movff char_O_array_decotime,decodata+1 ; length of first stop in minues + movff char_O_first_deco_depth,decodata+0 ; ceiling + movff char_O_first_deco_time,decodata+1 ; length of first stop in minues call PLED_display_deko ; display decodata return @@ -1682,5 +1678,4 @@ subfwb EEDATA,F ; minus O2 movff EEDATA, char_I_N2_ratio ; = N2! - bcf multi_gf_display ; Do not display the multi-gf table screen return