# HG changeset patch
# User heinrichsweikamp
# Date 1310548363 -7200
# Node ID b2c9cc018671a44cb6bc25741abe1ddb528771bd
# Parent  e6e1b89b7c3edf189d48e2cf2ef82609ad935664
small cleanup

diff -r e6e1b89b7c3e -r b2c9cc018671 code_part1/OSTC_code_asm_part1/changelog.txt
--- a/code_part1/OSTC_code_asm_part1/changelog.txt	Tue Jul 12 20:21:57 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt	Wed Jul 13 11:12:43 2011 +0200
@@ -1,3 +1,8 @@
+New in 1.94 beta:
+BETA Version - Do NOT use for diving!
+BUGFIX: CNS was not cleared with a "Reset Deco"
+
+
 New in 1.93 beta:
 BETA Version - Do NOT use for diving!
 BUGFIX: blinking fixed setpoint if actual setpoint lower then physically possible
@@ -5,7 +10,6 @@
 BUGFIX: Divetime seconds synced with stopwatch start
 NEW: End-of-Dive countdown displayed after surfacing
 
-
 New in 1.92 beta:
 BETA Version - Do NOT use for diving!
 BUGFIX: warning color for ppO2>3,3bar and ppO2<6,55bar fixed
diff -r e6e1b89b7c3e -r b2c9cc018671 code_part1/OSTC_code_asm_part1/menu_reset.asm
--- a/code_part1/OSTC_code_asm_part1/menu_reset.asm	Tue Jul 12 20:21:57 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/menu_reset.asm	Wed Jul 13 11:12:43 2011 +0200
@@ -293,11 +293,12 @@
 
     SAFE_2BYTE_COPY amb_pressure,int_I_pres_respiration	; copy surface air pressure to deco routine
 	call		deco_clear_tissue			; Reset Decodata
-	movlb		b'00000001'						; select ram bank 1
 	call		deco_calc_desaturation_time	; calculate desaturation time
-	movlb		b'00000001'						; select ram bank 1
 	call		deco_clear_CNS_fraction			; clear CNS
 	movlb		b'00000001'						; select ram bank 1
+  	clrf		nofly_time+0        	      	; Reset NoFly
+  	clrf		nofly_time+1            	  	; Reset NoFly
+	bcf			nofly_active                	; Clear flag
 	goto	restart					; done. quit to surfmode
 
 do_menu_reset_all:
@@ -315,11 +316,11 @@
 ; reset deco data
     SAFE_2BYTE_COPY amb_pressure,int_I_pres_respiration	; copy surface air pressure to deco routine
 	call		deco_clear_tissue			; Reset Decodata
-	movlb		b'00000001'						; select ram bank 1
 	call		deco_calc_desaturation_time	; calculate desaturation time
-	movlb		b'00000001'						; select ram bank 1
 	call		deco_clear_CNS_fraction			; clear CNS
-	movlb		b'00000001'						; select ram bank 1
+  	clrf		nofly_time+0    	          	; Reset NoFly
+  	clrf		nofly_time+1	              	; Reset NoFly
+	bcf			nofly_active                	; Clear flag
 
 ; reset gases
 	clrf	EEADRH					; EEPROM BANK 0 !
diff -r e6e1b89b7c3e -r b2c9cc018671 code_part1/OSTC_code_asm_part1/pled_outputs.asm
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Tue Jul 12 20:21:57 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Wed Jul 13 11:12:43 2011 +0200
@@ -3140,9 +3140,9 @@
 	;xA/xB=xC with xA as remainder 	
 	call		div16x16				; xC+0=p_amb/10
 
-;	; char_I_const_ppO2 > p_amb/10 -> Not physically possible! -> Display actual value!
-;	tstfsz	xC+1				; xC>255
-;	setf	xC+0				; Yes, set xC+0 to 2,55bar ppO2
+	; char_I_const_ppO2 > p_amb/10 -> Not physically possible! -> Display actual value!
+	tstfsz	xC+1				; xC>255
+	setf	xC+0				; Yes, set xC+0 to 2,55bar ppO2
 
 	movff		ppO2_setpoint_store,WREG
 	cpfslt		xC+0							; Setpoint value possible?
diff -r e6e1b89b7c3e -r b2c9cc018671 code_part1/OSTC_code_asm_part1/start.asm
--- a/code_part1/OSTC_code_asm_part1/start.asm	Tue Jul 12 20:21:57 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/start.asm	Wed Jul 13 11:12:43 2011 +0200
@@ -93,6 +93,9 @@
 	call	calc_deko_surfmode				; calculate desaturation every minute
 	call	deco_calc_wo_deco_step_1_min	; calculate deco in surface mode 
 	movlb	b'00000001'									; select ram bank 1
+  	clrf	nofly_time+0	              	; Reset NoFly
+  	clrf	nofly_time+1    	          	; Reset NoFly
+	bcf		nofly_active                	; Clear flag
 
 ; check firmware and reset Custom Functions after an update
 	movlw	d'1'