# HG changeset patch
# User heinrichsweikamp
# Date 1342341896 -7200
# Node ID 99c601c24065188a1a2ad916c39f6fbb36a029c3
# Parent  9eb535f2834d817972cf0c16d669ddc6c49aad43# Parent  b919b8f0b789621e2c30f21831c6d123415fb25f
Merge 608 and 610

diff -r b919b8f0b789 -r 99c601c24065 code_part1/OSTC_code_asm_part1/changelog.txt
--- a/code_part1/OSTC_code_asm_part1/changelog.txt	Fri Jul 13 11:16:21 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt	Sun Jul 15 10:44:56 2012 +0200
@@ -1,3 +1,10 @@
+New in 2.28:
+BETA Version - Do NOT use for diving!
+
+New in 2.27:
+BETA Version - Do NOT use for diving!
+BUGFIX: Reset CFIII on update
+
 New in 2.26:
 BETA Version - Do NOT use for diving!
 CHANGE: Safety stop behaviour
diff -r b919b8f0b789 -r 99c601c24065 code_part1/OSTC_code_asm_part1/definitions.asm
--- a/code_part1/OSTC_code_asm_part1/definitions.asm	Fri Jul 13 11:16:21 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/definitions.asm	Sun Jul 15 10:44:56 2012 +0200
@@ -22,7 +22,7 @@
 ; ToDo:
 
 #DEFINE	softwareversion_x		d'2'		; Software version  XX.YY
-#DEFINE	softwareversion_y		d'27'		; Software version  XX.YY
+#DEFINE	softwareversion_y		d'28'		; Software version  XX.YY
 
 #DEFINE softwareversion_beta 	1 			; (and 0 for release) 
 
diff -r b919b8f0b789 -r 99c601c24065 code_part1/OSTC_code_asm_part1/menu_reset.asm
--- a/code_part1/OSTC_code_asm_part1/menu_reset.asm	Fri Jul 13 11:16:21 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/menu_reset.asm	Sun Jul 15 10:44:56 2012 +0200
@@ -188,6 +188,8 @@
 	                
 	CF_DEFAULT    CF_PERCENT,   .4,     .0,     .100	; CF62 pSCR O2 Drop
 	CF_DEFAULT    CF_INT8,      .10,    .0,     .100 	; CF63 pSCR counterlung ratio
+    
+	;---- BANK2 custom function defaults -------------------------------------
 cf_default_table2:
 	CF_DEFAULT    CF_COLOR,     d'74',  0,      0 		; CF64 color_inactive	Color inactive: grey
 	CF_DEFAULT    CF_BOOL,     	0,   	0,      0 		; CF65 Show safety stop
@@ -433,6 +435,14 @@
 	movwf	EEADRH					; EEPROM BANK 1
 	movlw	d'127'					; address of low byte of first custom function
 	movwf	EEADR
+
+    movlw   LOW cf_default_table1    ; Load PROM pointer.
+    movwf   TBLPTRL,A
+    movlw   HIGH cf_default_table1
+    movwf   TBLPTRH,A
+    movlw   UPPER cf_default_table1
+    movwf   TBLPTRU,A
+
 	
 cf_bank1_loop:
 	; Did we already read another 32 (decimal) words or double-words ?
@@ -447,6 +457,13 @@
 	movwf	EEADRH					; EEPROM BANK 2
 	movlw	d'127'					; address of low byte of first custom function
 	movwf	EEADR
+
+    movlw   LOW cf_default_table2    ; Load PROM pointer.
+    movwf   TBLPTRL,A
+    movlw   HIGH cf_default_table2
+    movwf   TBLPTRH,A
+    movlw   UPPER cf_default_table2
+    movwf   TBLPTRU,A
 	
 cf_bank2_loop:
 	; Did we already read another 32 (decimal) words or double-words ?