# HG changeset patch
# User heinrichsweikamp
# Date 1343410338 -7200
# Node ID 85e8e1501fd8eb7504bdac0f3b94a98b246e4621
# Parent  6b9713b56bcada957f085d0eba38471c2483a57c
New CF66: Show GF in NDL (If GF > CF08)

diff -r 6b9713b56bca -r 85e8e1501fd8 code_part1/OSTC_code_asm_part1/changelog.txt
--- a/code_part1/OSTC_code_asm_part1/changelog.txt	Mon Jul 23 17:12:33 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt	Fri Jul 27 19:32:18 2012 +0200
@@ -1,3 +1,8 @@
+New in 2.29:
+INFO: This update will reset CFIII menu to defaults
+BETA Version - Do NOT use for diving!
+New CF66: Show GF in NDL (If GF > CF08)
+
 New in 2.28:
 BETA Version - Do NOT use for diving!
 BUGFIX: Blink better gas in bailout case (if CF42=1)
diff -r 6b9713b56bca -r 85e8e1501fd8 code_part1/OSTC_code_asm_part1/definitions.asm
--- a/code_part1/OSTC_code_asm_part1/definitions.asm	Mon Jul 23 17:12:33 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/definitions.asm	Fri Jul 27 19:32:18 2012 +0200
@@ -26,7 +26,7 @@
 
 #DEFINE softwareversion_beta 	1 			; (and 0 for release) 
 
-#DEFINE	max_custom_number		d'65'		; Number of last used custom function
+#DEFINE	max_custom_number		d'66'		; Number of last used custom function
 
 ; International extension. Selecting messages source:
 #DEFINE    ENGLISH                         ; Use english_text.asm
diff -r 6b9713b56bca -r 85e8e1501fd8 code_part1/OSTC_code_asm_part1/english_text.asm
--- a/code_part1/OSTC_code_asm_part1/english_text.asm	Mon Jul 23 17:12:33 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/english_text.asm	Fri Jul 27 19:32:18 2012 +0200
@@ -326,7 +326,7 @@
 ; 32 custom function descriptors III (FIXED LENGTH = 15 chars).
 	TCODE    .40,   .35,     "Color# inactive"           ;193 Color# inactive
     TCODE    .40,   .35,     "Use safety stop"           ;194 Use safety stop
-    TCODE    .40,   .35,     "unused         "           ;195 unused
+    TCODE    .40,   .35,     "Show GF in NDL "           ;195 Show GF in NDL	(If GF > CF08)
     TCODE    .40,   .35,     "unused         "           ;196 unused
     TCODE    .40,   .35,     "unused         "           ;197 unused
     TCODE    .40,   .35,     "unused         "           ;198 unused
diff -r 6b9713b56bca -r 85e8e1501fd8 code_part1/OSTC_code_asm_part1/french_text.asm
--- a/code_part1/OSTC_code_asm_part1/french_text.asm	Mon Jul 23 17:12:33 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/french_text.asm	Fri Jul 27 19:32:18 2012 +0200
@@ -327,7 +327,7 @@
 ; 32 custom function descriptors III (FIXED LENGTH = 15 chars).
     TCODE    .40,   .35,     "CouleurInactive"           ;193 Color# inactive
     TCODE    .40,   .35,     "Palier sécurité"           ;194 Use safety stop
-    TCODE    .40,   .35,     "unused         "           ;195 unused
+    TCODE    .40,   .35,     "Show GF in NDL "           ;195 Show GF in NDL	(If GF > CF08)
     TCODE    .40,   .35,     "unused         "           ;196 unused
     TCODE    .40,   .35,     "unused         "           ;197 unused
     TCODE    .40,   .35,     "unused         "           ;198 unused
diff -r 6b9713b56bca -r 85e8e1501fd8 code_part1/OSTC_code_asm_part1/german_text.asm
--- a/code_part1/OSTC_code_asm_part1/german_text.asm	Mon Jul 23 17:12:33 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/german_text.asm	Fri Jul 27 19:32:18 2012 +0200
@@ -326,7 +326,7 @@
 ; 32 custom function descriptors III (FIXED LENGTH = 15 chars).
 	TCODE    .40,   .35,     "Farbe# inaktiv "           ;193 Color# inactive
     TCODE    .40,   .35,     "Sicherheitsstop"           ;194 Use safety stop
-    TCODE    .40,   .35,     "unbenutzt      "           ;195 unused
+    TCODE    .40,   .35,     "Zeige GF in NZ "           ;195 Show GF in NDL	(If GF > CF08)
     TCODE    .40,   .35,     "unbenutzt      "           ;196 unused
     TCODE    .40,   .35,     "unbenutzt      "           ;197 unused
     TCODE    .40,   .35,     "unbenutzt      "           ;198 unused
diff -r 6b9713b56bca -r 85e8e1501fd8 code_part1/OSTC_code_asm_part1/italian_text.asm
--- a/code_part1/OSTC_code_asm_part1/italian_text.asm	Mon Jul 23 17:12:33 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/italian_text.asm	Fri Jul 27 19:32:18 2012 +0200
@@ -325,7 +325,7 @@
 ; 32 custom function descriptors III (FIXED LENGTH = 15 chars).
     TCODE    .40,   .35,     "Color# inattivo"           ;193 Color# inactive
     TCODE    .40,   .35,     "Usa tappa sicur"           ;194 Use safety stop
-    TCODE    .40,   .35,     "unused         "           ;195 unused
+    TCODE    .40,   .35,     "Show GF in NDL "           ;195 Show GF in NDL	(If GF > CF08)
     TCODE    .40,   .35,     "unused         "           ;196 unused
     TCODE    .40,   .35,     "unused         "           ;197 unused
     TCODE    .40,   .35,     "unused         "           ;198 unused
diff -r 6b9713b56bca -r 85e8e1501fd8 code_part1/OSTC_code_asm_part1/menu_reset.asm
--- a/code_part1/OSTC_code_asm_part1/menu_reset.asm	Mon Jul 23 17:12:33 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/menu_reset.asm	Fri Jul 27 19:32:18 2012 +0200
@@ -193,7 +193,7 @@
 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
-	CF_DEFAULT    CF_INT8,      d'0',   d'0',   d'0'    ; CF66 unused
+	CF_DEFAULT    CF_BOOL,      0,   	0,      0 		; CF66 Show GF in NDL (If GF > CF08)
 	CF_DEFAULT    CF_INT8,      d'0',   d'0',   d'0'    ; CF67 unused
 	CF_DEFAULT    CF_INT8,      d'0',   d'0',   d'0'    ; CF68 unused
 
diff -r 6b9713b56bca -r 85e8e1501fd8 code_part1/OSTC_code_asm_part1/pled_outputs.asm
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Mon Jul 23 17:12:33 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Fri Jul 27 19:32:18 2012 +0200
@@ -407,6 +407,13 @@
 	return
 
 PLED_display_ndl_mask:
+	; Clears Gradient Factor
+	movlw	d'8'
+	movwf	temp1
+	WIN_TOP		.145
+	WIN_LEFT	.0
+	call	PLED_display_clear_common_y1	
+
 	btfsc	menubit					; Divemode menu active?
 	return							; Yes, return
 
@@ -415,17 +422,15 @@
 	call	PLED_divemask_color	; Set Color for Divemode mask
 	DISPLAYTEXT		d'84'			; NoStop
 	call	PLED_standard_color
-
-PLED_display_ndl_mask2:
-	; Clears Gradient Factor
-	movlw	d'8'
-	movwf	temp1
-	WIN_TOP		.145
-	WIN_LEFT	.0
-	call	PLED_display_clear_common_y1	
 	return
 
 PLED_display_ndl:
+	GETCUSTOM8	d'66'				; Always show GF?
+	decfsz		WREG,F				; WREG=1?	
+	bra		PLED_display_ndl2		; No
+	rcall	PLED_display_gf			; Show GF (If GF > CF08)
+
+PLED_display_ndl2:
 	btfsc	menubit					; Divemode menu active?
 	return							; Yes, return
 
@@ -477,7 +482,6 @@
 	STRCAT_PRINT "'"
 	WIN_FONT 	FT_SMALL
 	
-;PLED_display_deko1:
 	ostc_debug	'x'		; Sends debug-information to screen if debugmode active
 	
 	WIN_TOP		.136
@@ -493,12 +497,22 @@
 	STRCAT_PRINT    "'"
 
 PLED_display_deko1:
-	movff	char_O_gradient_factor,lo		; gradient factor
-	GETCUSTOM8	d'8'		; threshold for display
-	cpfslt	lo				; show value?
-	bra		PLED_display_deko2	; Yes
+	rcall	PLED_display_gf				; Show GF (If GF > CF08)
+	return								; Done.
+
+PLED_display_gf:
+	movff	char_O_gradient_factor,lo	; gradient factor
+	GETCUSTOM8	d'8'					; threshold for display
+	cpfslt	lo							; show value?
+	bra		PLED_display_deko2			; Yes
 	; No
-	bra		PLED_display_ndl_mask2	; Clear gradient factor
+	; Clears Gradient Factor
+	movlw	d'8'
+	movwf	temp1
+	WIN_TOP		.145
+	WIN_LEFT	.0
+	call	PLED_display_clear_common_y1	
+	return
 
 PLED_display_deko2:
 	ostc_debug	'w'		; Sends debug-information to screen if debugmode active
diff -r 6b9713b56bca -r 85e8e1501fd8 code_part1/OSTC_code_asm_part1/russian_text.asm
--- a/code_part1/OSTC_code_asm_part1/russian_text.asm	Mon Jul 23 17:12:33 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/russian_text.asm	Fri Jul 27 19:32:18 2012 +0200
@@ -329,7 +329,7 @@
 ; 32 custom function descriptors III (FIXED LENGTH = 15 chars).
     TCODE    .40,   .35,     "Color# inactive"           ;193 Color# inactive
     TCODE    .40,   .35,     "Use safety stop"           ;194 Use safety stop
-    TCODE    .40,   .35,     "unused         "           ;195 unused
+    TCODE    .40,   .35,     "Show GF in NDL "           ;195 Show GF in NDL	(If GF > CF08)
     TCODE    .40,   .35,     "unused         "           ;196 unused
     TCODE    .40,   .35,     "unused         "           ;197 unused
     TCODE    .40,   .35,     "unused         "           ;198 unused
diff -r 6b9713b56bca -r 85e8e1501fd8 code_part1/OSTC_code_asm_part1/spanish_text.asm
--- a/code_part1/OSTC_code_asm_part1/spanish_text.asm	Mon Jul 23 17:12:33 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/spanish_text.asm	Fri Jul 27 19:32:18 2012 +0200
@@ -325,7 +325,7 @@
 ; 32 custom function descriptors III (FIXED LENGTH = 15 chars).
     TCODE    .40,   .35,     "Color# inactive"           ;193 Color# inactive
     TCODE    .40,   .35,     "Use safety stop"           ;194 Use safety stop
-    TCODE    .40,   .35,     "unused         "           ;195 unused
+    TCODE    .40,   .35,     "Show GF in NDL "           ;195 Show GF in NDL	(If GF > CF08)
     TCODE    .40,   .35,     "unused         "           ;196 unused
     TCODE    .40,   .35,     "unused         "           ;197 unused
     TCODE    .40,   .35,     "unused         "           ;198 unused
diff -r 6b9713b56bca -r 85e8e1501fd8 code_part1/OSTC_code_asm_part1/turkish_text.asm
--- a/code_part1/OSTC_code_asm_part1/turkish_text.asm	Mon Jul 23 17:12:33 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/turkish_text.asm	Fri Jul 27 19:32:18 2012 +0200
@@ -328,7 +328,7 @@
 ; 32 custom function descriptors III (FIXED LENGTH = 15 chars).
     TCODE    .40,   .35,     "Color# inactive"           ;193 Color# inactive
     TCODE    .40,   .35,     "Use safety stop"           ;194 Use safety stop
-    TCODE    .40,   .35,     "unused         "           ;195 unused
+    TCODE    .40,   .35,     "Show GF in NDL "           ;195 Show GF in NDL	(If GF > CF08)
     TCODE    .40,   .35,     "unused         "           ;196 unused
     TCODE    .40,   .35,     "unused         "           ;197 unused
     TCODE    .40,   .35,     "unused         "           ;198 unused