# HG changeset patch
# User heinrichsweikamp
# Date 1274017130 -7200
# Node ID e01e6428d316f21dacb53a1e7cc84ad019b8f996
# Parent  29341afd2060b5d74ec4f134f08b48ab75b097a8
CHANGE: Change of color layout (OSTC Mk.2 Only)

diff -r 29341afd2060 -r e01e6428d316 code_part1/OSTC_code_asm_part1/MAIN_with_part2and3.HEX
--- a/code_part1/OSTC_code_asm_part1/MAIN_with_part2and3.HEX	Sat May 15 17:58:55 2010 +0200
+++ b/code_part1/OSTC_code_asm_part1/MAIN_with_part2and3.HEX	Sun May 16 15:38:50 2010 +0200
@@ -708,8 +708,8 @@
 :102C2000060E5FD8000E5DD8000E5BD80C0E59D88A
 :102C3000000E57D8140E55D8336B338F000E51D871
 :102C4000030E4FD80A0E4DD8000E4BD8010EAA6EB7
-:102C50007F0EA96E336B1E0E44D85A0E42D8DF0E7B
-:102C600040D8FF0E3ED8E00E3CD8E00E3AD8000E19
+:102C50007F0EA96E336B1E0E44D85A0E42D8C70E93
+:102C600040D8FF0E3ED83E0E3CD8E00E3AD8000EBB
 :102C700038D8000E36D8000E34D8000E32D8000EE8
 :102C800030D8320E336F338FC80E2BD8650E29D84B
 :102C9000650E27D8A10E25D80F0E23D8000E21D8F7
@@ -838,7 +838,7 @@
 :1034400080923DBF8082D8903D37808E0000000082
 :103450000000000000000000809E582FF0D71200EE
 :10346000230E77EC10F0E86601D0FF0E1FEC10F091
-:103470001200240E77EC10F0E86601D0E00E1FEC8D
+:103470001200240E77EC10F0E86601D03E0E1FEC2F
 :1034800010F01200250E77EC10F0E86601D0E00E87
 :103490001FEC10F01200DB6FDB4F08D0DB4F2DD09C
 :1034A000DB4F39D0DB4F45D0DB4F59D033C135F13D
diff -r 29341afd2060 -r e01e6428d316 code_part1/OSTC_code_asm_part1/changelog.txt
--- a/code_part1/OSTC_code_asm_part1/changelog.txt	Sat May 15 17:58:55 2010 +0200
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt	Sun May 16 15:38:50 2010 +0200
@@ -3,15 +3,16 @@
 CHANGE: "Better Gas" now blinks more eye catching
 CHANGE: Battery symbol range changed (OSTC Mk.2 Only)
 NEW: Added CF37: Color# Warnings (OSTC Mk.2 Only)
-NEW: Color# = 0 (Black) is ignored
+NEW: Color# = 0 (Black) is ignored  (OSTC Mk.2 Only)
 BUGFIX: History not updated in Simulator mode
 BUGFIX: Fixed-Setpoint (minimum) ppO2 limited to physically possible value
-NEW: Depth, CNS, GF, ppO2 and Velocity are Color-coded
-NEW: CF43: Depth [mBar] for color-code display
-NEW: CF44: CNS [%] for color-code display
-NEW: CF45: GF [%] for color-code display
-NEW: CF46: ppO2 [cBar] for color-code display
-NEW: CF47: Velocity [m/min] for color-code display
+NEW: Depth, CNS, GF, ppO2 and Velocity are Color-coded (OSTC Mk.2 Only)
+NEW: CF43: Depth [mBar] for color-code display (OSTC Mk.2 Only)
+NEW: CF44: CNS [%] for color-code display (OSTC Mk.2 Only)
+NEW: CF45: GF [%] for color-code display (OSTC Mk.2 Only)
+NEW: CF46: ppO2 [cBar] for color-code display (OSTC Mk.2 Only)
+NEW: CF47: Velocity [m/min] for color-code display (OSTC Mk.2 Only)
+CHANGE: Change of color layout (OSTC Mk.2 Only)
 
 New in 1.60 Stable:
 Stable release
diff -r 29341afd2060 -r e01e6428d316 code_part1/OSTC_code_asm_part1/menu_reset.asm
--- a/code_part1/OSTC_code_asm_part1/menu_reset.asm	Sat May 15 17:58:55 2010 +0200
+++ b/code_part1/OSTC_code_asm_part1/menu_reset.asm	Sun May 16 15:38:50 2010 +0200
@@ -251,9 +251,9 @@
 
 #DEFINE	GF_low_default				d'30'		; 8Bit		30%
 #DEFINE	GF_high_default				d'90'		; 8Bit		90%
-#DEFINE	color_battery_surface		d'223'		; 8Bit		Color Battery sign: Cyan
+#DEFINE	color_battery_surface		d'199'		; 8Bit		Color Battery sign: Deep blue
 #DEFINE	color_standard1				d'255'		; 8Bit		Color Standard: White
-#DEFINE	color_divemask				d'224'		; 8Bit		Color Divemask: Red
+#DEFINE	color_divemask				d'62'		; 8Bit		Color Divemask: Light green
 #DEFINE	color_warnings				d'224'		; 8Bit		Color Warnings: Red
 
 #DEFINE	show_seconds_divemode		d'0'		; 1Bit 		=1 Show the seconds in Divemode