Mercurial > public > hwos_code
changeset 35:eca4a201d8cf
change apnea timeout, do no longer store apnea dives in logbook
| author | heinrichsweikamp |
|---|---|
| date | Sun, 04 Aug 2013 18:04:37 +0200 |
| parents | d7e6dfd5b498 |
| children | 527c35f17a66 |
| files | src/divemode.asm src/ghostwriter.asm src/ostc3.inc |
| diffstat | 3 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/divemode.asm Sun Aug 04 17:52:44 2013 +0200 +++ b/src/divemode.asm Sun Aug 04 18:04:37 2013 +0200 @@ -470,7 +470,7 @@ return btfsc FLAG_apnoe_mode ; In Apnoe mode? - bra timeout_divemode2 ; Yes, use CF30 [min] for timeout + bra timeout_divemode2 ; Yes, use apnoe_timeout [min] for timeout ifndef __DEBUG btfsc simulatormode_active ; In Simulator mode?
--- a/src/ghostwriter.asm Sun Aug 04 17:52:44 2013 +0200 +++ b/src/ghostwriter.asm Sun Aug 04 18:04:37 2013 +0200 @@ -30,11 +30,14 @@ return ; Yes, discard everything endif + btfsc FLAG_apnoe_mode ; In Apnoe mode? + return ; Yes, discard everything + SAFE_2BYTE_COPY rel_pressure, lo movf lo,W ; store depth with every sample - rcall ghostwrite_byte_profile ; WREG -> Profile in ext. Flash + rcall ghostwrite_byte_profile ; WREG -> Profile in ext. Flash movf hi,W - rcall ghostwrite_byte_profile ; WREG -> Profile in ext. Flash + rcall ghostwrite_byte_profile ; WREG -> Profile in ext. Flash ;First, find out how many bytes will append to this sample.... clrf ProfileFlagByte ; clear number of bytes to append @@ -299,7 +302,10 @@ goto ghostwriter_end_dive_common ; Yes, discard everything endif - ; Dive finished (and longer then one minute or Apnoe timeout occured) + btfsc FLAG_apnoe_mode ; In Apnoe mode? + goto ghostwriter_end_dive_common ; Yes, discard everything + + ; Dive finished (and longer then one minute) btfsc FLAG_apnoe_mode ; Calc max. depth (again) for very short apnoe dives call apnoe_calc_maxdepth
--- a/src/ostc3.inc Sun Aug 04 17:52:44 2013 +0200 +++ b/src/ostc3.inc Sun Aug 04 18:04:37 2013 +0200 @@ -101,7 +101,7 @@ ; Dive mode limits and thresholds #DEFINE start_dive_threshold .100 ; [cm] #DEFINE high_altitude_dive_threshold .300;[cm] -#DEFINE apnoe_timeout .30 ; [min] +#DEFINE apnoe_timeout .15 ; [min] #DEFINE divemode_menuview_timeout .10 ; [s] #DEFINE divemode_timeout .300 ; [s] #DEFINE divemode_menu_timeout .30 ; [s]