# HG changeset patch
# User heinrichsweikamp
# Date 1344348875 -7200
# Node ID f87205426add043d11474d2db594e01f990b77c8
# Parent  e7b675c28896b8583947913e2185ac9f5ddce7c5
2.50 rc1

diff -r e7b675c28896 -r f87205426add code_part1/OSTC_code_asm_part1/adc_rtc.asm
--- a/code_part1/OSTC_code_asm_part1/adc_rtc.asm	Sun Aug 05 12:20:29 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/adc_rtc.asm	Tue Aug 07 16:14:35 2012 +0200
@@ -241,9 +241,9 @@
 	movwf	mins
 	movlw	.12
 	movwf	hours
-	movlw	.4
+	movlw	.8
 	movwf	day
-	movlw	.7
+	movlw	.8
 	movwf	month
 	movlw	.12
 	movwf	year
diff -r e7b675c28896 -r f87205426add code_part1/OSTC_code_asm_part1/changelog.txt
--- a/code_part1/OSTC_code_asm_part1/changelog.txt	Sun Aug 05 12:20:29 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt	Tue Aug 07 16:14:35 2012 +0200
@@ -1,3 +1,6 @@
+New in 2.50 Stable:
+INFO: This update will reset all Custom Functions and gases to defaults
+
 New in 2.29:
 INFO: This update will reset CFIII menu to defaults
 BETA Version - Do NOT use for diving!
diff -r e7b675c28896 -r f87205426add code_part1/OSTC_code_asm_part1/definitions.asm
--- a/code_part1/OSTC_code_asm_part1/definitions.asm	Sun Aug 05 12:20:29 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/definitions.asm	Tue Aug 07 16:14:35 2012 +0200
@@ -22,9 +22,9 @@
 ; ToDo:
 
 #DEFINE	softwareversion_x		d'2'		; Software version  XX.YY
-#DEFINE	softwareversion_y		d'30'		; Software version  XX.YY
+#DEFINE	softwareversion_y		d'50'		; Software version  XX.YY
 
-#DEFINE softwareversion_beta 	1 			; (and 0 for release) 
+#DEFINE softwareversion_beta 	0 			; (and 0 for release) 
 
 #DEFINE	max_custom_number		d'66'		; Number of last used custom function
 
diff -r e7b675c28896 -r f87205426add code_part1/OSTC_code_asm_part1/divemode.asm
--- a/code_part1/OSTC_code_asm_part1/divemode.asm	Sun Aug 05 12:20:29 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/divemode.asm	Tue Aug 07 16:14:35 2012 +0200
@@ -209,6 +209,7 @@
 	bcf		premenu                         ; Yes, so clear "Menu?" and clear pre_menu bit
 	call	PLED_menu_clear                 ; Remove "Menu?"
 	call	PLED_divemode_mask				; And redraw mask (Redraw missing "T" from "Tauchzeit" in german text version)
+	call	PLED_divemins					; Redraw divetime
 	return
 
 divemode_apnoe_tasks:                       ; 1 sec. Apnoe tasks
diff -r e7b675c28896 -r f87205426add code_part1/OSTC_code_asm_part1/start.asm
--- a/code_part1/OSTC_code_asm_part1/start.asm	Sun Aug 05 12:20:29 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/start.asm	Tue Aug 07 16:14:35 2012 +0200
@@ -245,10 +245,9 @@
 	bra		restart2				; No new CF, continue with boot
 
 restart1:
-; Reset Bank2 if required
-	movlw	max_custom_number
-	btfsc	WREG,6					; >63?
-	call	reset_all_cf_bank2
+; Reset all CF and Gases
+	call	reset_gases
+	call	reset_all_cf
 ; Show info screen
 	call	PLED_boot               ; PLED boot (Incl. Clear Screen!)
 	rcall	display_new_cf_installed; Show info screen