# HG changeset patch
# User heinrichsweikamp
# Date 1269003478 -3600
# Node ID b7ace8994b292045c7d84bb0e7050524c8dcf400
# Parent  395230c280237c4556271494214e49c4d6a45c1f
1.52 beta

diff -r 395230c28023 -r b7ace8994b29 code_part1/OSTC_code_asm_part1/MAIN.COD
Binary file code_part1/OSTC_code_asm_part1/MAIN.COD has changed
diff -r 395230c28023 -r b7ace8994b29 code_part1/OSTC_code_asm_part1/MAIN.HEX
--- a/code_part1/OSTC_code_asm_part1/MAIN.HEX	Tue Mar 09 13:06:26 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/MAIN.HEX	Fri Mar 19 13:57:58 2010 +0100
@@ -131,8 +131,8 @@
 :1009B000207820205B255D7D4465736174757261CC
 :1009C000746520785B255D7D4E6F466C79205261A1
 :1009D00074696F205B255D7D474620616C61726D97
-:1009E000203120205B255D7D474620616C61726D62
-:1009F000203220205B255D7D4465636F204F666655
+:1009E000203120205B255D7D6E6F742075736564FA
+:1009F000202020202020207D4465636F204F6666E4
 :100A00007365745B646D5D7D70704F32206C6F77C1
 :100A1000205B634261725D7D70704F322068696750
 :100A2000685B634261725D7D73686F772070704FA1
@@ -140,7 +140,7 @@
 :100A4000207261746520207D44697669736F72201D
 :100A500054656D702020207D44697669736F722023
 :100A60004465636F6461747D44697669736F722055
-:100A70004E6F74557365307D44697669736F72206B
+:100A70004E6F74557365317D44697669736F72206A
 :100A800070704F322020207D44697669736F722028
 :100A9000446562756720207D44697669736F7220B2
 :100AA0004E6F74557365327D73686F7720434E5374
@@ -676,7 +676,7 @@
 :102BC0008AD8780E88D8050E86D8070E84D8040EC9
 :102BD000336F338F880E7FD8040E336F338F4C0ED4
 :102BE0007AD8140E78D8140E76D81E0E74D86E0EBD
-:102BF00072D85A0E70D83C0E6ED8640E6CD8780E0F
+:102BF00072D85A0E70D83C0E6ED8640E6CD8640E23
 :102C00006AD80A0E68D8130E66D8A00E64D8960E3D
 :102C100062D80A0E60D8060E5ED8060E5CD8000E8A
 :102C20005AD8000E58D80C0E56D8000E54D8140E90
diff -r 395230c28023 -r b7ace8994b29 code_part1/OSTC_code_asm_part1/MAIN_with_part2and3.HEX
--- a/code_part1/OSTC_code_asm_part1/MAIN_with_part2and3.HEX	Tue Mar 09 13:06:26 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/MAIN_with_part2and3.HEX	Fri Mar 19 13:57:58 2010 +0100
@@ -157,8 +157,8 @@
 :1009B000207820205B255D7D4465736174757261CC
 :1009C000746520785B255D7D4E6F466C79205261A1
 :1009D00074696F205B255D7D474620616C61726D97
-:1009E000203120205B255D7D474620616C61726D62
-:1009F000203220205B255D7D4465636F204F666655
+:1009E000203120205B255D7D6E6F742075736564FA
+:1009F000202020202020207D4465636F204F6666E4
 :100A00007365745B646D5D7D70704F32206C6F77C1
 :100A1000205B634261725D7D70704F322068696750
 :100A2000685B634261725D7D73686F772070704FA1
@@ -166,7 +166,7 @@
 :100A4000207261746520207D44697669736F72201D
 :100A500054656D702020207D44697669736F722023
 :100A60004465636F6461747D44697669736F722055
-:100A70004E6F74557365307D44697669736F72206B
+:100A70004E6F74557365317D44697669736F72206A
 :100A800070704F322020207D44697669736F722028
 :100A9000446562756720207D44697669736F7220B2
 :100AA0004E6F74557365327D73686F7720434E5374
@@ -702,7 +702,7 @@
 :102BC0008AD8780E88D8050E86D8070E84D8040EC9
 :102BD000336F338F880E7FD8040E336F338F4C0ED4
 :102BE0007AD8140E78D8140E76D81E0E74D86E0EBD
-:102BF00072D85A0E70D83C0E6ED8640E6CD8780E0F
+:102BF00072D85A0E70D83C0E6ED8640E6CD8640E23
 :102C00006AD80A0E68D8130E66D8A00E64D8960E3D
 :102C100062D80A0E60D8060E5ED8060E5CD8000E8A
 :102C20005AD8000E58D80C0E56D8000E54D8140E90
diff -r 395230c28023 -r b7ace8994b29 code_part1/OSTC_code_asm_part1/changelog.txt
--- a/code_part1/OSTC_code_asm_part1/changelog.txt	Tue Mar 09 13:06:26 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt	Fri Mar 19 13:57:58 2010 +0100
@@ -6,6 +6,7 @@
 CHANGE: "Const.ppO2 Setup" renamed to "CCR SetPoint Menu"
 BUGFIX: CF35 now affects all items in surface and divemode
 NEW: CF36 sets Divemode mask color
+BUGFIX: CF15 removed (OSTC Mk.2 only)
 
 New in 1.51 Beta:
 BETA Version - Do NOT use for diving!
diff -r 395230c28023 -r b7ace8994b29 code_part1/OSTC_code_asm_part1/menu_reset.asm
--- a/code_part1/OSTC_code_asm_part1/menu_reset.asm	Tue Mar 09 13:06:26 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/menu_reset.asm	Fri Mar 19 13:57:58 2010 +0100
@@ -229,7 +229,7 @@
 #DEFINE	nofly_time_ratio			d'60'		; 8BIT		60%
 #DEFINE	gradient_factor_alarm1		d'100'		; 8Bit		100%
 
-#DEFINE	gradient_factor_alarm2		d'120'		; 8Bit		120%
+#DEFINE	not_used_CF15				d'100'		; 8Bit		
 #DEFINE	deco_distance_for_sim		d'10'		; 8Bit		1m
 #DEFINE	ppo2_warning_low			d'019'		; 8Bit		0.19 Bar
 #DEFINE	ppo2_warning_high			d'160'		; 8Bit		1.60 Bar
@@ -315,7 +315,7 @@
 	movlw	LOW		gradient_factor_alarm1
 	rcall	reset_customfunction	; saves default and current value
 
-	movlw	LOW		gradient_factor_alarm2
+	movlw	LOW		not_used_CF15
 	rcall	reset_customfunction	; saves default and current value
 	
 	movlw	LOW		deco_distance_for_sim
diff -r 395230c28023 -r b7ace8994b29 code_part1/OSTC_code_asm_part1/text_table.asm
--- a/code_part1/OSTC_code_asm_part1/text_table.asm	Tue Mar 09 13:06:26 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/text_table.asm	Fri Mar 19 13:57:58 2010 +0100
@@ -464,7 +464,7 @@
 	DA	"Desaturate x[%]}"		;48
 	DA	"NoFly Ratio [%]}"		;49
 	DA	"GF alarm 1  [%]}"		;50
-	DA	"GF alarm 2  [%]}"		;51
+	DA	"not used       }"		;51
 	DA	"Deco Offset[dm]}"		;52
 	DA	"ppO2 low [cBar]}"		;53
 	DA	"ppO2 high[cBar]}"		;54
@@ -472,7 +472,7 @@
 	DA	"sampling rate  }"		;56
 	DA	"Divisor Temp   }"		;57
 	DA	"Divisor Decodat}"		;58
-	DA	"Divisor NotUse0}"		;59
+	DA	"Divisor NotUse1}"		;59
 	DA	"Divisor ppO2	}"		;60
 	DA	"Divisor Debug  }"		;61
 	DA	"Divisor NotUse2}"		;62