#13 Mismatch with OSTC MK2 1.80 CFs

2.1
open
nobody
GUI (5)
5
2012-12-06
2011-03-21
No

Changes needed to keep in sync with current (v1.80) list of custom functions from OSTC MK2 as published on http://www.heinrichsweikamp.net/#/en/ostc_mk2/list_of_custom_functions/

### Eclipse Workspace Patch 1.0
#P JDiveLog
Index: src/net/sf/jdivelog/gui/resources/messages_en.properties
===================================================================
--- src/net/sf/jdivelog/gui/resources/messages_en.properties (revision 873)
+++ src/net/sf/jdivelog/gui/resources/messages_en.properties (working copy)
@@ -678,18 +678,18 @@
ostc_cf11=CF11: factor for saturation processes [%]
ostc_cf12=CF12: factor for desaturation processes [%]
ostc_cf13=CF13: ratio for NoFly-Time according to desaturation time [%]
-ostc_cf14=CF14: treshold for optical gradient factor alarm [%]
-ostc_cf15=CF15: treshold for acustic gradient factor alarm [%]
+ostc_cf14=CF14: threshold for optical gradient factor alarm [%]
+ostc_cf15=CF15: threshold for display of CNS in surfacemode [%]
ostc_cf16=CF16: estimated distance to decostop [dm]
-ostc_cf17=CF17: treshold for ppO2 LOW warning [0.01 bar]
-ostc_cf18=CF18: treshold for ppO2 HIGH warning [0.01 bar]
-ostc_cf19=CF19: upper treshold for ppO2 display in dive mode [0.01 bar]
+ostc_cf17=CF17: threshold for ppO2 LOW warning [0.01 bar]
+ostc_cf18=CF18: threshold for ppO2 HIGH warning [0.01 bar]
+ostc_cf19=CF19: upper threshold for ppO2 display in dive mode [0.01 bar]
ostc_cf20=CF20: Sampling Rate [s]
ostc_cf21=CF21: Sample-Divisor Temperature ... 0-15
ostc_cf22=CF22: Sample-Divisor Deco Information ... 0-15
-ostc_cf23=CF23: Sample-Divisor Tank pressure ... 0-15
+ostc_cf23=CF23: Sample-Divisor Not yet used 1 ... 0-15
ostc_cf24=CF24: Sample-Divisor ppO2 Sensors ... 0-15
-ostc_cf25=CF25: Sample-Divisor Not yet used 1 ... 0-15
+ostc_cf25=CF25: Sample-Divisor Debug ... 0-15
ostc_cf26=CF26: Sample-Divisor Not yet used 2 ... 0-15
ostc_cf27=CF27: threshold for display of CNS value [%]
ostc_cf28=CF28: logbook offset to display real dive number
@@ -832,21 +832,26 @@
ostc_cf42=Notify necessary Gas change
ostc_cf42_noblink=No
ostc_cf42_blink=Yes
-ostc_cf34mk2=Color Battery Symbol
-ostc_cf35mk2=Standard Color
-ostc_cf36mk2=Color Labels Divemode
-ostc_cf37mk2=Color Warnings
-ostc_cf43mk2=Depth Warning [mbar]
-ostc_cf44mk2=CNS Warning [%]
-ostc_cf45mk2=GF Warning [%]
-ostc_cf46mk2=ppO2 Warning [cbar]
-ostc_cf47mk2=Velocity Warning [m/min]
-ostc_cf48mk2=Time Offset [s]
-ostc_cf49mk2=Show altimeter in surface mode
-ostc_cf50mk2=Show Log-Marker
-ostc_cf51mk2=Show Stopwatch
-ostc_cf52mk2=Show Tissue Graph
-ostc_cf53mk2=Show leading tissue
+
+ostc_cf34mk2=CF34: Color Battery Symbol
+ostc_cf35mk2=CF35: Standard Color
+ostc_cf36mk2=CF36: Color Labels Divemode
+ostc_cf37mk2=CF37: Color Warnings
+ostc_cf39mk2=CF39: Adjust fixed SP
+ostc_cf40mk2=CF40: Warn Ceiling
+ostc_cf41mk2=CF41: Mix type icons
+ostc_cf43mk2=CF43: Depth Warning [mbar]
+ostc_cf44mk2=CF44: CNS Warning [%]
+ostc_cf45mk2=CF45: GF Warning [%]
+ostc_cf46mk2=CF46: ppO2 Warning [cbar]
+ostc_cf47mk2=CF47: Velocity Warning [m/min]
+ostc_cf48mk2=CF48: Time Offset [s]
+ostc_cf49mk2=CF49: Show altimeter in surface mode
+ostc_cf50mk2=CF50: Show Log-Marker
+ostc_cf51mk2=CF51: Show Stopwatch
+ostc_cf52mk2=CF52: Show Tissue Graph
+ostc_cf53mk2=CF53: Show leading tissue
+
aladin.comm_timeout=Transfer of Data failed (Comm-Timeout).
aladin.connectionspeed=Connection Speed
aladin.databits=Data Bits
Index: src/net/sf/jdivelog/gui/resources/messages.properties
===================================================================
--- src/net/sf/jdivelog/gui/resources/messages.properties (revision 873)
+++ src/net/sf/jdivelog/gui/resources/messages.properties (working copy)
@@ -697,18 +697,18 @@
ostc_cf11=CF11: factor for saturation processes [%]
ostc_cf12=CF12: factor for desaturation processes [%]
ostc_cf13=CF13: ratio for NoFly-Time according to desaturation time [%]
-ostc_cf14=CF14: treshold for optical gradient factor alarm [%]
-ostc_cf15=CF15: treshold for acustic gradient factor alarm [%]
+ostc_cf14=CF14: threshold for optical gradient factor alarm [%]
+ostc_cf15=CF15: threshold for display of CNS in surfacemode [%]
ostc_cf16=CF16: estimated distance to decostop [dm]
-ostc_cf17=CF17: treshold for ppO2 LOW warning [0.01 bar]
-ostc_cf18=CF18: treshold for ppO2 HIGH warning [0.01 bar]
-ostc_cf19=CF19: upper treshold for ppO2 display in dive mode [0.01 bar]
+ostc_cf17=CF17: threshold for ppO2 LOW warning [0.01 bar]
+ostc_cf18=CF18: threshold for ppO2 HIGH warning [0.01 bar]
+ostc_cf19=CF19: upper threshold for ppO2 display in dive mode [0.01 bar]
ostc_cf20=CF20: Sampling Rate [s]
ostc_cf21=CF21: Sample-Divisor Temperature ... 0-15
ostc_cf22=CF22: Sample-Divisor Deco Information ... 0-15
-ostc_cf23=CF23: Sample-Divisor Tank pressure ... 0-15
+ostc_cf23=CF23: Sample-Divisor Not yet used 1 ... 0-15
ostc_cf24=CF24: Sample-Divisor ppO2 Sensors ... 0-15
-ostc_cf25=CF25: Sample-Divisor Not yet used 1 ... 0-15
+ostc_cf25=CF25: Sample-Divisor Debug ... 0-15
ostc_cf26=CF26: Sample-Divisor Not yet used 2 ... 0-15
ostc_cf27=CF27: threshold for display of CNS value [%]
ostc_cf28=CF28: logbook offset to display real dive number
@@ -852,21 +852,25 @@
ostc_cf42=Notify necessary Gas change
ostc_cf42_noblink=No
ostc_cf42_blink=Yes
-ostc_cf34mk2=Color Battery Symbol
-ostc_cf35mk2=Standard Color
-ostc_cf36mk2=Color Labels Divemode
-ostc_cf37mk2=Color Warnings
-ostc_cf43mk2=Depth Warning [mbar]
-ostc_cf44mk2=CNS Warning [%]
-ostc_cf45mk2=GF Warning [%]
-ostc_cf46mk2=ppO2 Warning [cbar]
-ostc_cf47mk2=Velocity Warning [m/min]
-ostc_cf48mk2=Time Offset [s]
-ostc_cf49mk2=Show altimeter in surface mode
-ostc_cf50mk2=Show Log-Marker
-ostc_cf51mk2=Show Stopwatch
-ostc_cf52mk2=Show Tissue Graph
-ostc_cf53mk2=Show leading tissue
+
+ostc_cf34mk2=CF34: Color Battery Symbol
+ostc_cf35mk2=CF35: Standard Color
+ostc_cf36mk2=CF36: Color Labels Divemode
+ostc_cf37mk2=CF37: Color Warnings
+ostc_cf39mk2=CF39: Adjust fixed SP
+ostc_cf40mk2=CF40: Warn Ceiling
+ostc_cf41mk2=CF41: Mix type icons
+ostc_cf43mk2=CF43: Depth Warning [mbar]
+ostc_cf44mk2=CF44: CNS Warning [%]
+ostc_cf45mk2=CF45: GF Warning [%]
+ostc_cf46mk2=CF46: ppO2 Warning [cbar]
+ostc_cf47mk2=CF47: Velocity Warning [m/min]
+ostc_cf48mk2=CF48: Time Offset [s]
+ostc_cf49mk2=CF49: Show altimeter in surface mode
+ostc_cf50mk2=CF50: Show Log-Marker
+ostc_cf51mk2=CF51: Show Stopwatch
+ostc_cf52mk2=CF52: Show Tissue Graph
+ostc_cf53mk2=CF53: Show leading tissue
ostc_deco_const_ppo2_gf=ZH-L16 GF CC
ostc_deco_zhl16_gf=ZH-L16 GF OC
spot=Spot
Index: src/net/sf/jdivelog/ci/ostc/OSTCProtocol080121.java
===================================================================
--- src/net/sf/jdivelog/ci/ostc/OSTCProtocol080121.java (revision 873)
+++ src/net/sf/jdivelog/ci/ostc/OSTCProtocol080121.java (working copy)
@@ -268,7 +268,7 @@
offset += 4;
def = ParseUtil.parseCFValue(data, offset);
cur = ParseUtil.parseCFValue(data, offset+2);
- result.put(CF15, new EightBitCustomFunction(def, cur, 120));
+ result.put(CF15, new EightBitCustomFunction(def, cur, 10));

offset += 4;
def = ParseUtil.parseCFValue(data, offset);

Discussion