Mercurial > public > mk2
changeset 138:dd4b899c56c1
1.75beta released
| author | heinrichsweikamp |
|---|---|
| date | Thu, 06 Jan 2011 09:31:34 +0100 |
| parents | e6aa4a74c3c2 |
| children | e09ecbae060e |
| files | code_part1/OSTC_code_asm_part1/changelog.txt code_part1/OSTC_code_asm_part1/menu_reset.asm code_part1/OSTC_code_asm_part1/pled_outputs.asm code_part1/OSTC_code_asm_part1/text_table.asm |
| diffstat | 4 files changed, 16 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/changelog.txt Wed Jan 05 20:44:10 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/changelog.txt Thu Jan 06 09:31:34 2011 +0100 @@ -6,12 +6,15 @@ BUGFIX: Timeout reset in Customview (OSTC MK.2 only) BUGFIX: Surface Interval NEW: Non-Resettable Average Depth (OSTC MK.2 only) -NEW: CF41: Mix Type Icons in Surfacemode -NEW: CF49: Show Altimeter in Surfacemode -NEW: CF50: Show LogMarker in Divemode/Customview -NEW: CF51: Show Stopwatch in Divemode/Customview -NEW: CF52: Show Tissue Graph in Divemode/Customview -NEW: CF53: Show Leading Tissue in Divemode/Customview +NEW: CF41: Mix Type Icons in Surfacemode (OSTC MK.2 only) +NEW: CF49: Show Altimeter in Surfacemode (OSTC MK.2 only) +NEW: CF50: Show LogMarker in Divemode/Customview (OSTC MK.2 only) +NEW: CF51: Show Stopwatch in Divemode/Customview (OSTC MK.2 only) +NEW: CF52: Show Tissue Graph in Divemode/Customview (OSTC MK.2 only) +NEW: CF53: Show Leading Tissue in Divemode/Customview (OSTC MK.2 only) +NEW: CF39: Adjust fixed SetPoint if Diluent ppO2 > SetPoint (OSTC MK.2 only) +BUGFIX: Custom view for Apnoe mode disabled +BUGFIX: Custom view for Gauge mode adjusted New in 1.74 Beta: BETA Version - Do NOT use for diving!
--- a/code_part1/OSTC_code_asm_part1/menu_reset.asm Wed Jan 05 20:44:10 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/menu_reset.asm Thu Jan 06 09:31:34 2011 +0100 @@ -152,7 +152,7 @@ CF_DEFAULT CF_COLOR, d'224', 0, 0 ; color_warnings Color Warnings: Red CF_DEFAULT CF_BOOL, d'0', 0, 0 ; show_seconds_divemode =1 Show the seconds in Divemode - CF_DEFAULT CF_INT15, 0, 0, 0 ; UNUSED + CF_DEFAULT CF_BOOL, 0, 0, 0 ; Adjust SetPoint if Diluent ppO2 > SetPoint CF_DEFAULT CF_BOOL, d'1', 0, 0 ; warn_ceiling_divemode =1 Warn ceiling violation in divemode CF_DEFAULT CF_BOOL, d'1', 0, 0 ; Show mix type is surfmode
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm Wed Jan 05 20:44:10 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm Thu Jan 06 09:31:34 2011 +0100 @@ -2862,10 +2862,13 @@ call div16x16 ;xA/xB=xC with xA as remainder movff xC+0,char_I_const_ppO2 ; No, Overwrite with actual value - bra PLED_const_ppO2_value1a + + GETCUSTOM8 d'39' ; Adjust fixed SP? + dcfsnz WREG,F + bra PLED_const_ppO2_value1a ; Yes! + ; Do not adjust -> restore original SetPoint PLED_const_ppO2_value11: - ; Setpoint in possible limits movff ppO2_setpoint_store,char_I_const_ppO2 ; Restore Setpoint
--- a/code_part1/OSTC_code_asm_part1/text_table.asm Wed Jan 05 20:44:10 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/text_table.asm Thu Jan 06 09:31:34 2011 +0100 @@ -576,7 +576,7 @@ DA "Color# Divemask}" ;158 DA "Color# Warnings}" ;159 DA "Divemode secs. }" ;160 - DA "not used }" ;161 + DA "Adjust fixed SP}" ;161 DA "Warn Ceiling }" ;162 DA "Mix type icons }" ;163 DA "Blink BetterGas}" ;164