Mercurial > public > mk2
changeset 675:0211d9b9f0ca
NEW: CF70: Safety Stop Duration [s]
NEW: CF71: Safety Stop Start Depth [m]
NEW: CF72: Safety Stop End Depth [m]
NEW: CF73: Safety Stop Reset Depth [m]
| author | heinrichsweikamp |
|---|---|
| date | Mon, 10 Dec 2012 22:00:37 +0100 |
| parents | 3927bc5019c9 |
| children | 91da4d5be44a |
| files | code_part1/OSTC_code_asm_part1/changelog.txt code_part1/OSTC_code_asm_part1/definitions.asm code_part1/OSTC_code_asm_part1/divemode.asm code_part1/OSTC_code_asm_part1/english_text.asm code_part1/OSTC_code_asm_part1/french_text.asm code_part1/OSTC_code_asm_part1/german_text.asm code_part1/OSTC_code_asm_part1/italian_text.asm code_part1/OSTC_code_asm_part1/menu_reset.asm code_part1/OSTC_code_asm_part1/russian_text.asm code_part1/OSTC_code_asm_part1/spanish_text.asm code_part1/OSTC_code_asm_part1/turkish_text.asm docu/ostc_interface_description.odt |
| diffstat | 12 files changed, 67 insertions(+), 64 deletions(-) [+] |
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/changelog.txt Mon Dec 10 16:55:18 2012 +0100 +++ b/code_part1/OSTC_code_asm_part1/changelog.txt Mon Dec 10 22:00:37 2012 +0100 @@ -1,3 +1,12 @@ +New in 2.58: +BETA Version - Do NOT use for diving! +NEW: Confirmation when marker is set +BUGFIX: Decoplan update after GF change +NEW: CF70: Safety Stop Duration [s] +NEW: CF71: Safety Stop Start Depth [m] +NEW: CF72: Safety Stop End Depth [m] +NEW: CF73: Safety Stop Reset Depth [m] + New in 2.57: BETA Version - Do NOT use for diving! CHANGE: GF_hi default now 85% (CF33) @@ -24,7 +33,7 @@ New in 2.53: BETA Version - Do NOT use for diving! NEW: 5 Gases extra for CC -TODO: Text 61,229,110,111,230,231,232 TXT_DIL_C, TXT_DIL5 update +TODO: Text 61,229,110,111,229,230,231,232 TXT_DIL_C, TXT_DIL5 update NEW: Divisor Decoplan (CF25) stores entire decoplan in logbook NEW: CF29 stored in divelog header (Byte 52) BUGFIX: Gas Setup when using "ERR" Gases (e.g. NX17)
--- a/code_part1/OSTC_code_asm_part1/definitions.asm Mon Dec 10 16:55:18 2012 +0100 +++ b/code_part1/OSTC_code_asm_part1/definitions.asm Mon Dec 10 22:00:37 2012 +0100 @@ -64,12 +64,6 @@ #DEFINE FT_MEDIUM .1 #DEFINE FT_LARGE .2 -; Safety stop parameters -#DEFINE safety_stop_length .180 ; [s] -#DEFINE safety_stop_start .510 ; [mbar] -#DEFINE safety_stop_end .290 ; [mbar] -#DEFINE safety_stop_reset .1010 ; [mbar] - ; "Better Gas" behavior ; better_gas_window <= minimum_change_depth ! ; minimum_change_depth >=5 !
--- a/code_part1/OSTC_code_asm_part1/divemode.asm Mon Dec 10 16:55:18 2012 +0100 +++ b/code_part1/OSTC_code_asm_part1/divemode.asm Mon Dec 10 22:00:37 2012 +0100 @@ -413,10 +413,10 @@ call adjust_depth_with_salinity ; computes salinity setting into lo:hi [mbar] movff lo,sub_a+0 movff hi,sub_a+1 - movlw LOW safety_stop_reset - movwf sub_b+0 - movlw HIGH safety_stop_reset - movwf sub_b+1 + GETCUSTOM8 .73 ; Safety Stop Reset Depth [dm] + mullw .10 + movff PRODL,sub_b+0 + movff PRODH,sub_b+1 call subU16 ; sub_c = sub_a - sub_b btfss neg_flag bra reset_safety_stop ; Below 10m, reset safety stop @@ -426,10 +426,10 @@ call adjust_depth_with_salinity ; computes salinity setting into lo:hi [mbar] movff lo,sub_a+0 movff hi,sub_a+1 - movlw LOW safety_stop_end - movwf sub_b+0 - movlw HIGH safety_stop_end - movwf sub_b+1 + GETCUSTOM8 .72 ; Safety Stop End Depth [dm] + mullw .10 + movff PRODL,sub_b+0 + movff PRODH,sub_b+1 call subU16 ; sub_c = sub_a - sub_b btfsc neg_flag bra delete_safety_stop ; Above 3m, remove safety stop @@ -439,10 +439,10 @@ call adjust_depth_with_salinity ; computes salinity setting into lo:hi [mbar] movff lo,sub_a+0 movff hi,sub_a+1 - movlw LOW safety_stop_start - movwf sub_b+0 - movlw HIGH safety_stop_start - movwf sub_b+1 + GETCUSTOM8 .71 ; Safety Stop Start Depth [dm] + mullw .10 + movff PRODL,sub_b+0 + movff PRODH,sub_b+1 call subU16 ; sub_c = sub_a - sub_b btfsc neg_flag bra acivate_safety_stop ; Above 5m, activate safety stop @@ -459,7 +459,7 @@ bra reset_safety_stop2 ; Remove saftestop from display reset_safety_stop: - movlw safety_stop_length ;[s] + GETCUSTOM8 .70 ; Safety Stop Duration [s] movwf safety_stop_countdown ; reset timer reset_safety_stop2: btfss safety_stop_active ; Safety stop shown
--- a/code_part1/OSTC_code_asm_part1/english_text.asm Mon Dec 10 16:55:18 2012 +0100 +++ b/code_part1/OSTC_code_asm_part1/english_text.asm Mon Dec 10 22:00:37 2012 +0100 @@ -333,10 +333,10 @@ TCODE .40, .35, "Alt. GF Low [%]" ;196 Alt. GF Low [%] TCODE .40, .35, "Alt. GF High[%]" ;197 Alt. GF High[%] TCODE .40, .35, "Allow GF change" ;198 Allow GF change - TCODE .40, .35, "unused " ;199 unused - TCODE .40, .35, "unused " ;200 unused - TCODE .40, .35, "unused " ;201 unused - TCODE .40, .35, "unused " ;202 unused + TCODE .40, .35, "S.StopLength[s]" ;199 S.StopLength[s] (CF70: Safety Stop Duration [s]) + TCODE .40, .35, "S.StopStart [m]" ;200 S.StopStart [m] (CF71: Safety Stop Start Depth [m]) + TCODE .40, .35, "S.StopEnd [m]" ;201 S.StopEnd [m] (CF72: Safety Stop End Depth [m]) + TCODE .40, .35, "S.StopReset [m]" ;202 S.StopReset [m] (CF73: Safety Stop Reset Depth [m]) TCODE .40, .35, "unused " ;203 unused TCODE .40, .35, "unused " ;204 unused TCODE .40, .35, "unused " ;205 unused
--- a/code_part1/OSTC_code_asm_part1/french_text.asm Mon Dec 10 16:55:18 2012 +0100 +++ b/code_part1/OSTC_code_asm_part1/french_text.asm Mon Dec 10 22:00:37 2012 +0100 @@ -334,10 +334,10 @@ TCODE .40, .35, "Alt. GF Low [%]" ;196 Alt. GF Low [%] TCODE .40, .35, "Alt. GF High[%]" ;197 Alt. GF High[%] TCODE .40, .35, "Allow GF change" ;198 Allow GF change - TCODE .40, .35, "unused " ;199 unused - TCODE .40, .35, "unused " ;200 unused - TCODE .40, .35, "unused " ;201 unused - TCODE .40, .35, "unused " ;202 unused + TCODE .40, .35, "S.StopLength[s]" ;199 S.StopLength[s] (CF70: Safety Stop Duration [s]) + TCODE .40, .35, "S.StopStart [m]" ;200 S.StopStart [m] (CF71: Safety Stop Start Depth [m]) + TCODE .40, .35, "S.StopEnd [m]" ;201 S.StopEnd [m] (CF72: Safety Stop End Depth [m]) + TCODE .40, .35, "S.StopReset [m]" ;202 S.StopReset [m] (CF73: Safety Stop Reset Depth [m]) TCODE .40, .35, "unused " ;203 unused TCODE .40, .35, "unused " ;204 unused TCODE .40, .35, "unused " ;205 unused @@ -365,10 +365,10 @@ TCODE .85, .125, "pSCR-GF " ;226 pSCR-GF TCODE .90, .54, "PalierSécu" ;227 SafetyStop TCODE .0, .0, "Plongées totales: " ;228 Total Dives: - TCODE .0, .0, "" ;229 unused - TCODE .0, .0, "" ;230 unused - TCODE .0, .0, "" ;231 unused - TCODE .0, .0, "" ;232 unused + TCODE .20, .35, "Diluent Setup" ;229 Diluent Setup + TCODE .20, .65, "Setpoint Setup" ;230 Setpoint Setup + TCODE .5, .2, "Dil. Setup - Gaslist" ;231 Dil. Setup - Gaslist + TCODE .100, .100, "Diluent" ;232 Diluent TCODE .0, .0, "" ;233 unused TCODE .0, .0, "" ;234 unused
--- a/code_part1/OSTC_code_asm_part1/german_text.asm Mon Dec 10 16:55:18 2012 +0100 +++ b/code_part1/OSTC_code_asm_part1/german_text.asm Mon Dec 10 22:00:37 2012 +0100 @@ -334,10 +334,10 @@ TCODE .40, .35, "Alt. GF Low [%]" ;196 Alt. GF Low [%] TCODE .40, .35, "Alt. GF High[%]" ;197 Alt. GF High[%] TCODE .40, .35, "GF Wechsel mögl" ;198 Allow GF change - TCODE .40, .35, "unbenutzt " ;199 unused - TCODE .40, .35, "unbenutzt " ;200 unused - TCODE .40, .35, "unbenutzt " ;201 unused - TCODE .40, .35, "unbenutzt " ;202 unused + TCODE .40, .35, "S.Stop Länge[s]" ;199 S.StopLength[s] (CF70: Safety Stop Duration [s]) + TCODE .40, .35, "S.Stop Start[m]" ;200 S.StopStart [m] (CF71: Safety Stop Start Depth [m]) + TCODE .40, .35, "S.Stop Ende [m]" ;201 S.StopEnd [m] (CF72: Safety Stop End Depth [m]) + TCODE .40, .35, "S.Stop Reset[m]" ;202 S.StopReset [m] (CF73: Safety Stop Reset Depth [m]) TCODE .40, .35, "unbenutzt " ;203 unused TCODE .40, .35, "unbenutzt " ;204 unused TCODE .40, .35, "unbenutzt " ;205 unused
--- a/code_part1/OSTC_code_asm_part1/italian_text.asm Mon Dec 10 16:55:18 2012 +0100 +++ b/code_part1/OSTC_code_asm_part1/italian_text.asm Mon Dec 10 22:00:37 2012 +0100 @@ -333,10 +333,10 @@ TCODE .40, .35, "Alt. GF Low [%]" ;196 Alt. GF Low [%] TCODE .40, .35, "Alt. GF High[%]" ;197 Alt. GF High[%] TCODE .40, .35, "Allow GF change" ;198 Allow GF change - TCODE .40, .35, "inutilizzato " ;199 unused - TCODE .40, .35, "inutilizzato " ;200 unused - TCODE .40, .35, "inutilizzato " ;201 unused - TCODE .40, .35, "inutilizzato " ;202 unused + TCODE .40, .35, "S.StopLength[s]" ;199 S.StopLength[s] (CF70: Safety Stop Duration [s]) + TCODE .40, .35, "S.StopStart [m]" ;200 S.StopStart [m] (CF71: Safety Stop Start Depth [m]) + TCODE .40, .35, "S.StopEnd [m]" ;201 S.StopEnd [m] (CF72: Safety Stop End Depth [m]) + TCODE .40, .35, "S.StopReset [m]" ;202 S.StopReset [m] (CF73: Safety Stop Reset Depth [m]) TCODE .40, .35, "inutilizzato " ;203 unused TCODE .40, .35, "inutilizzato " ;204 unused TCODE .40, .35, "inutilizzato " ;205 unused @@ -364,11 +364,11 @@ TCODE .85, .125, "pSCR-GF " ;226 pSCR-GF TCODE .76, .54, "Tappa Sicur." ;227 SafetyStop TCODE .0, .0, "Immersioni totali: " ;228 Total Dives: - TCODE .0, .0, "" ;229 unused - TCODE .0, .0, "" ;230 unused - TCODE .0, .0, "" ;231 unused - TCODE .0, .0, "" ;232 unused - TCODE .0, .0, "" ;233 unused + TCODE .20, .35, "Diluent Setup" ;229 Diluent Setup + TCODE .20, .65, "Setpoint Setup" ;230 Setpoint Setup + TCODE .5, .2, "Dil. Setup - Gaslist" ;231 Dil. Setup - Gaslist + TCODE .100, .100, "Diluent" ;232 Diluent + TCODE .0, .0, "" ;233 unused TCODE .0, .0, "" ;234 unused TCODE .10, .2, "Deco Cambiato!" ;235 Decomode changed!
--- a/code_part1/OSTC_code_asm_part1/menu_reset.asm Mon Dec 10 16:55:18 2012 +0100 +++ b/code_part1/OSTC_code_asm_part1/menu_reset.asm Mon Dec 10 22:00:37 2012 +0100 @@ -198,10 +198,10 @@ CF_DEFAULT CF_PERCENT, d'90', d'30', d'95' ; CF68 aGF_high_default 90% CF_DEFAULT CF_BOOL, 0, 0, 0 ; CF69 Allow GF change (Between GF and aGF) - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF70 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF71 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF72 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF73 unused + CF_DEFAULT CF_SEC, d'180', d'10', d'250' ; CF70 Safety Stop Duration [s] + CF_DEFAULT CF_DECI, d'51', d'30', d'65' ; CF71 Safety Stop Start Depth [dm] + CF_DEFAULT CF_DECI, d'29', d'25', d'50' ; CF72 Safety Stop End Depth [dm] + CF_DEFAULT CF_DECI, d'101', d'75', d'201' ; CF73 Safety Stop Reset Depth [dm] CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF74 unused CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF75 unused
--- a/code_part1/OSTC_code_asm_part1/russian_text.asm Mon Dec 10 16:55:18 2012 +0100 +++ b/code_part1/OSTC_code_asm_part1/russian_text.asm Mon Dec 10 22:00:37 2012 +0100 @@ -334,10 +334,10 @@ TCODE .40, .35, "Alt. GF Low [%]" ;196 Alt. GF Low [%] TCODE .40, .35, "Alt. GF High[%]" ;197 Alt. GF High[%] TCODE .40, .35, "Allow GF change" ;198 Allow GF change - TCODE .40, .35, "unused " ;199 unused - TCODE .40, .35, "unused " ;200 unused - TCODE .40, .35, "unused " ;201 unused - TCODE .40, .35, "unused " ;202 unused + TCODE .40, .35, "S.StopLength[s]" ;199 S.StopLength[s] (CF70: Safety Stop Duration [s]) + TCODE .40, .35, "S.StopStart [m]" ;200 S.StopStart [m] (CF71: Safety Stop Start Depth [m]) + TCODE .40, .35, "S.StopEnd [m]" ;201 S.StopEnd [m] (CF72: Safety Stop End Depth [m]) + TCODE .40, .35, "S.StopReset [m]" ;202 S.StopReset [m] (CF73: Safety Stop Reset Depth [m]) TCODE .40, .35, "unused " ;203 unused TCODE .40, .35, "unused " ;204 unused TCODE .40, .35, "unused " ;205 unused
--- a/code_part1/OSTC_code_asm_part1/spanish_text.asm Mon Dec 10 16:55:18 2012 +0100 +++ b/code_part1/OSTC_code_asm_part1/spanish_text.asm Mon Dec 10 22:00:37 2012 +0100 @@ -330,10 +330,10 @@ TCODE .40, .35, "Alt. GF Low [%]" ;196 Alt. GF Low [%] TCODE .40, .35, "Alt. GF High[%]" ;197 Alt. GF High[%] TCODE .40, .35, "Allow GF change" ;198 Allow GF change - TCODE .40, .35, "unused " ;199 unused - TCODE .40, .35, "unused " ;200 unused - TCODE .40, .35, "unused " ;201 unused - TCODE .40, .35, "unused " ;202 unused + TCODE .40, .35, "S.StopLength[s]" ;199 S.StopLength[s] (CF70: Safety Stop Duration [s]) + TCODE .40, .35, "S.StopStart [m]" ;200 S.StopStart [m] (CF71: Safety Stop Start Depth [m]) + TCODE .40, .35, "S.StopEnd [m]" ;201 S.StopEnd [m] (CF72: Safety Stop End Depth [m]) + TCODE .40, .35, "S.StopReset [m]" ;202 S.StopReset [m] (CF73: Safety Stop Reset Depth [m]) TCODE .40, .35, "unused " ;203 unused TCODE .40, .35, "unused " ;204 unused TCODE .40, .35, "unused " ;205 unused
--- a/code_part1/OSTC_code_asm_part1/turkish_text.asm Mon Dec 10 16:55:18 2012 +0100 +++ b/code_part1/OSTC_code_asm_part1/turkish_text.asm Mon Dec 10 22:00:37 2012 +0100 @@ -329,13 +329,13 @@ TCODE .40, .35, "Color# inactive" ;193 Color# inactive TCODE .40, .35, "Use safety stop" ;194 Use safety stop TCODE .40, .35, "Show GF in NDL " ;195 Show GF in NDL (If GF > CF08) - TCODE .40, .35, "unused " ;196 unused - TCODE .40, .35, "unused " ;197 unused - TCODE .40, .35, "unused " ;198 unused - TCODE .40, .35, "unused " ;199 unused - TCODE .40, .35, "unused " ;200 unused - TCODE .40, .35, "unused " ;201 unused - TCODE .40, .35, "unused " ;202 unused + TCODE .40, .35, "Alt. GF Low [%]" ;196 Alt. GF Low [%] + TCODE .40, .35, "Alt. GF High[%]" ;197 Alt. GF High[%] + TCODE .40, .35, "Allow GF change" ;198 Allow GF change + TCODE .40, .35, "S.StopLength[s]" ;199 S.StopLength[s] (CF70: Safety Stop Duration [s]) + TCODE .40, .35, "S.StopStart [m]" ;200 S.StopStart [m] (CF71: Safety Stop Start Depth [m]) + TCODE .40, .35, "S.StopEnd [m]" ;201 S.StopEnd [m] (CF72: Safety Stop End Depth [m]) + TCODE .40, .35, "S.StopReset [m]" ;202 S.StopReset [m] (CF73: Safety Stop Reset Depth [m]) TCODE .40, .35, "unused " ;203 unused TCODE .40, .35, "unused " ;204 unused TCODE .40, .35, "unused " ;205 unused