# HG changeset patch
# User heinrichsweikamp
# Date 1299316172 -3600
# Node ID 6d4e29d80ff3205bf242729380f41ba032d10d5f
# Parent 8dbcc26878d363c5b2d472d5b6a164f7625a4022
1.83beta release, 1.84beta start
diff -r 8dbcc26878d3 -r 6d4e29d80ff3 code_part1/OSTC_code_asm_part1/changelog.txt
--- a/code_part1/OSTC_code_asm_part1/changelog.txt Fri Mar 04 02:35:21 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt Sat Mar 05 10:09:32 2011 +0100
@@ -1,7 +1,14 @@
+New in 1.84 beta:
+BETA Version - Do NOT use for diving!
+
New in 1.83 beta:
BETA Version - Do NOT use for diving!
BUGFIX: gas switch
-NEW: De/Activate gases underwater (Gaslist -> Gas6.. -> Actve?)
+BUGFIX: NoFly time
+NEW: De/Activate gases underwater (Gaslist -> More -> Actve?)
+NEW: Gas Consumption caluculation in offline simulator (After Decoplan)
+NEW: CF56 Bottom gas usage (l/min or bar/min) (For Simulator)
+NEW: CF57 Ascent/deco gas usage (l/min or bar/min) (For Simulator)
New in 1.82 beta:
BETA Version - Do NOT use for diving!
diff -r 8dbcc26878d3 -r 6d4e29d80ff3 code_part1/OSTC_code_asm_part1/definitions.asm
--- a/code_part1/OSTC_code_asm_part1/definitions.asm Fri Mar 04 02:35:21 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/definitions.asm Sat Mar 05 10:09:32 2011 +0100
@@ -22,7 +22,7 @@
; ToDo:
#DEFINE softwareversion_x d'1' ; Software version XX.YY
-#DEFINE softwareversion_y d'83' ; Software version XX.YY
+#DEFINE softwareversion_y d'84' ; Software version XX.YY
#DEFINE softwareversion_beta 1 ; (and 0 for release)
diff -r 8dbcc26878d3 -r 6d4e29d80ff3 code_part1/OSTC_code_asm_part1/divemode.asm
--- a/code_part1/OSTC_code_asm_part1/divemode.asm Fri Mar 04 02:35:21 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/divemode.asm Sat Mar 05 10:09:32 2011 +0100
@@ -1518,7 +1518,7 @@
movf divesecs,W
addwf xC+0,F
movlw d'0'
- addwfc xC+1,F
+ addwfc xC+1,F ; xC:2 holds total dive seconds
movlw d'3' ; 2+1
btfss divesecs,0 ; divesecs even?
movlw d'2' ; Yes, do not add +1
diff -r 8dbcc26878d3 -r 6d4e29d80ff3 code_part1/OSTC_code_asm_part1/english_text.asm
--- a/code_part1/OSTC_code_asm_part1/english_text.asm Fri Mar 04 02:35:21 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/english_text.asm Sat Mar 05 10:09:32 2011 +0100
@@ -185,7 +185,7 @@
TCODE .0, .36, "Lowest at:" ;119 Lowest at:
TCODE .0, .45, "Tmin:" ;120 Tmin:
TCODE .0, .54, "Tmax:" ;121 Tmax:
- TCODE .100, .125, "Gas 6.." ;122 Gas 6..
+ TCODE .100, .125, "More" ;122 More (Gaslist)
TCODE .100, .25, "O2 +" ;123 O2 +
TCODE .100, .50, "O2 -" ;124 O2 -
TCODE .100, .75, "He +" ;125 He +
diff -r 8dbcc26878d3 -r 6d4e29d80ff3 code_part1/OSTC_code_asm_part1/french_text.asm
--- a/code_part1/OSTC_code_asm_part1/french_text.asm Fri Mar 04 02:35:21 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/french_text.asm Sat Mar 05 10:09:32 2011 +0100
@@ -186,7 +186,7 @@
TCODE .0, .36, "PlusBas le :" ;119 Lowest at:
TCODE .0, .45, "Tmin:" ;120 Tmin:
TCODE .0, .54, "Tmax:" ;121 Tmax:
- TCODE .100, .125, "Gaz 6.." ;122 Gas 6..
+ TCODE .100, .125, "Suite" ;122 More (Gaslist)
TCODE .100, .25, "O2 +" ;123 O2 +
TCODE .100, .50, "O2 -" ;124 O2 -
TCODE .100, .75, "He +" ;125 He +
diff -r 8dbcc26878d3 -r 6d4e29d80ff3 code_part1/OSTC_code_asm_part1/german_text.asm
--- a/code_part1/OSTC_code_asm_part1/german_text.asm Fri Mar 04 02:35:21 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/german_text.asm Sat Mar 05 10:09:32 2011 +0100
@@ -185,7 +185,7 @@
TCODE .0, .36, "Lowest at:" ;119 Lowest at:
TCODE .0, .45, "Tmin:" ;120 Tmin:
TCODE .0, .54, "Tmax:" ;121 Tmax:
- TCODE .100, .125, "Gas 6.." ;122 Gas 6..
+ TCODE .100, .125, "More" ;122 More (Gaslist)
TCODE .100, .25, "O2 +" ;123 O2 +
TCODE .100, .50, "O2 -" ;124 O2 -
TCODE .100, .75, "He +" ;125 He +
diff -r 8dbcc26878d3 -r 6d4e29d80ff3 code_part1/OSTC_code_asm_part1/pled_outputs.asm
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm Fri Mar 04 02:35:21 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm Sat Mar 05 10:09:32 2011 +0100
@@ -2290,7 +2290,7 @@
WIN_FONT FT_SMALL
call PLED_standard_color
- STRCPY "Sel"
+ STRCPY "G6:"
read_int_eeprom d'24' ; Get Gas6 %O2
movff EEDATA,lo
bcf leftbind
diff -r 8dbcc26878d3 -r 6d4e29d80ff3 code_part1/OSTC_code_asm_part1/spanish_text.asm
--- a/code_part1/OSTC_code_asm_part1/spanish_text.asm Fri Mar 04 02:35:21 2011 +0100
+++ b/code_part1/OSTC_code_asm_part1/spanish_text.asm Sat Mar 05 10:09:32 2011 +0100
@@ -185,7 +185,7 @@
TCODE .0, .36, "Mínimo el:" ;119 Lowest at:
TCODE .0, .45, "Tmín:" ;120 Tmin:
TCODE .0, .54, "Tmáx:" ;121 Tmax:
- TCODE .100, .125, "Gas 6.." ;122 Gas 6..
+ TCODE .100, .125, "Más" ;122 More (Gaslist)
TCODE .100, .25, "O2 +" ;123 O2 +
TCODE .100, .50, "O2 -" ;124 O2 -
TCODE .100, .75, "He +" ;125 He +