Mercurial > public > mk2
diff code_part1/OSTC_code_asm_part1/divemode.asm @ 83:3e351e25f5d1
adding anti-aliased fonts frame and merging some patches from Jeando
| author | heinrichsweikamp |
|---|---|
| date | Tue, 07 Dec 2010 22:36:19 +0100 |
| parents | 35d947d7a6e7 |
| children | 6f8e3a08011e |
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/divemode.asm Tue Dec 07 13:22:17 2010 +0100 +++ b/code_part1/OSTC_code_asm_part1/divemode.asm Tue Dec 07 22:36:19 2010 +0100 @@ -1054,10 +1054,7 @@ btfsc simulatormode_active ; Are we in simulator mode? goto end_dive_common ; Yes, discard everything - ; Dive finished (and longer then one minute or Apnoe timeout occured and no simulated dive) -;new 1.73beta: - clrf surface_interval+0 - clrf surface_interval+1 ; Clear surface interval timer + ; Dive finished (and longer then one minute or Apnoe timeout occured) btfsc FLAG_apnoe_mode ; Calc max. depth (again) for very short apnoe dives rcall apnoe_calc_maxdepth @@ -1315,6 +1312,11 @@ call deco_main_gradient_array movlb b'00000001' ; select ram bank 1 + btfss restore_deco_data ; Restore decodata? + goto surfloop ; and return to surfaceloop +;new 1.71beta: + clrf surface_interval+0 + clrf surface_interval+1 ; Clear surface interval timer goto surfloop ; and return to surfaceloop timeout_divemode: