Mercurial > public > mk2
changeset 574:101fec6a6137
New Custom Functions III menu (CF64-CF95)
| author | heinrichsweikamp |
|---|---|
| date | Sat, 21 Apr 2012 13:58:30 +0200 |
| parents | 77c8ff191cd7 |
| children | cbdcbbc91877 |
| files | code_part1/OSTC_code_asm_part1/changelog.txt 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/menu.asm code_part1/OSTC_code_asm_part1/menu_custom.asm code_part1/OSTC_code_asm_part1/menu_reset.asm code_part1/OSTC_code_asm_part1/pled_outputs.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 |
| diffstat | 11 files changed, 696 insertions(+), 574 deletions(-) [+] |
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/changelog.txt Sat Apr 21 12:09:37 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/changelog.txt Sat Apr 21 13:58:30 2012 +0200 @@ -1,4 +1,6 @@ New in 2.22: +BETA Version - Do NOT use for diving! +NEW: Custom Functions III menu (CF64-CF95) BUGFIX: Missed deco stops issue BUGFIX: Timeout for 2nd page of Gas Setup
--- a/code_part1/OSTC_code_asm_part1/english_text.asm Sat Apr 21 12:09:37 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/english_text.asm Sat Apr 21 13:58:30 2012 +0200 @@ -324,55 +324,52 @@ TCODE .0, .0, "ppO2 +" ;190 ppO2 + TCODE .0, .0, "ppO2 -" ;191 ppO2 - TCODE .0, .0, "Dil." ;192 Dil. (Rebreather diluent) -; ZH-L16 mode description - TCODE .0, .35, "Decotype: ZH-L16 OC" ;193 Decotype: ZH-L16 OC - TCODE .0, .65, "For Open Circuit " ;194 For Open Circuit - TCODE .0, .95, "Divers. Supports 5 " ;195 Divers. Supports 5 - TCODE .0, .125, "Trimix Gases. " ;196 Trimix Gases. - TCODE .0, .155, "Configure your gas " ;197 Configure your gas - TCODE .0, .185, "in Gassetup menu. " ;198 in Gassetup menu. - TCODE .0, .215, "Check CF11 & CF12 !" ;199 Check CF11 & CF12 ! -; Gaugemode description - TCODE .0, .35, "Decotype: Gauge " ;200 Decotype: Gauge - TCODE .0, .65, "Divetime will be in" ;201 Divetime will be in - TCODE .0, .95, "Minutes:Seconds. " ;202 Minutes:Seconds. - TCODE .0, .125, "OSTC2 will not " ;203 OSTC2 will not - TCODE .0, .155, "compute Deco, NoFly" ;204 compute Deco, NoFly - TCODE .0, .185, "time and Desat. " ;205 time and Desat. - TCODE .0, .215, "time at all! " ;206 time at all! -; Const.ppO2 description - TCODE .0, .35, "Decotype: ZH-L16 CC" ;207 Decotype: ZH-L16 CC - TCODE .0, .65, "For (Semi-)Closed " ;208 For (Semi-)Closed - TCODE .0, .95, "Circuit rebreathers" ;209 Circuit rebreathers - TCODE .0, .125, "Configure the 3 " ;210 Configure the 3 - TCODE .0, .155, "SetPoints in CCR - " ;211 SetPoints in CCR - - TCODE .0, .185, "Setup menu. 5 bail-" ;212 Setup menu. 5 bail- - TCODE .0, .215, "outs are available." ;213 outs are available. -; Apnoemode description - TCODE .0, .35, "Decotype: Apnoe " ;214 Decotype: Apnoe - TCODE .0, .65, "OSTC2 will display " ;215 OSTC2 will display - TCODE .0, .95, "each descent separ-" ;216 each descent separ- - TCODE .0, .125, "ately in Min:Sec. " ;217 ately in Min:Sec. - TCODE .0, .155, "Will temporally set" ;218 Will temporally set - TCODE .0, .185, "samplerate to 1 sec" ;219 samplerate to 1 sec - TCODE .0, .215, "No Deco calculation" ;220 No Deco calculation -; Multi GF OC mode description - TCODE .0, .35, "Decotype: L16-GF OC" ;221 Decotype: L16-GF OC - TCODE .0, .65, "Decompression cal- " ;222 Decompression cal- - TCODE .0, .95, "culations with the " ;223 culations with the - TCODE .0, .125, "GF-Method (GF_lo/GF" ;224 GF-Method (GF_lo/GF - TCODE .0, .155, "_hi). Check CF32 & " ;225 _hi). Check CF32 & - TCODE .0, .185, "CF33! Open Circuit " ;226 CF33! Open Circuit - TCODE .0, .215, "with Deep Stops. " ;227 with Deep Stops. -; Multi GF CC mode description - TCODE .0, .35, "Decotype: L16-GF CC" ;228 Decotype: L16-GF CC - TCODE .0, .65, "Decompression cal- " ;229 Decompression cal- - TCODE .0, .95, "culations with the " ;230 culations with the - TCODE .0, .125, "GF-Method (GF_lo/GF" ;231 GF-Method (GF_lo/GF - TCODE .0, .155, "_hi). Check CF32 & " ;232 _hi). Check CF32 & - TCODE .0, .185, "CF33!Closed Circuit" ;233 CF33!Closed Circuit - TCODE .0, .215, "with Deep Stops. " ;234 with Deep Stops. + +; 32 custom function descriptors III (FIXED LENGTH = 15 chars). + TCODE .40, .35, "unused " ;193 unused + TCODE .40, .35, "unused " ;194 unused + TCODE .40, .35, "unused " ;195 unused + 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, "unused " ;203 unused + TCODE .40, .35, "unused " ;204 unused + TCODE .40, .35, "unused " ;205 unused + TCODE .40, .35, "unused " ;206 unused + TCODE .40, .35, "unused " ;207 unused + TCODE .40, .35, "unused " ;208 unused + TCODE .40, .35, "unused " ;209 unused + TCODE .40, .35, "unused " ;210 unused + TCODE .40, .35, "unused " ;211 unused + TCODE .40, .35, "unused " ;212 unused + TCODE .40, .35, "unused " ;213 unused + TCODE .40, .35, "unused " ;214 unused + TCODE .40, .35, "unused " ;215 unused + TCODE .40, .35, "unused " ;216 unused + TCODE .40, .35, "unused " ;217 unused + TCODE .40, .35, "unused " ;218 unused + TCODE .40, .35, "unused " ;219 unused + TCODE .40, .35, "unused " ;220 unused + TCODE .40, .35, "unused " ;221 unused + TCODE .40, .35, "unused " ;222 unused + TCODE .40, .35, "unused " ;223 unused + TCODE .40, .35, "unused " ;224 unused ; + TCODE .7, .2, "Custom Functions III" ;225 Custom Functions III + TCODE .0, .0, "" ;226 unused + TCODE .0, .0, "" ;227 unused + TCODE .0, .0, "" ;228 unused + 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 .0, .0, "" ;234 unused + TCODE .10, .2, "Decomode changed! " ;235 Decomode changed! TCODE .85, .125, "L16-GF CC" ;236 L16-GF CC TCODE .2, .12, "Not found" ;237 Not found @@ -420,7 +417,7 @@ TCODE .0, .65, "were added! Check" ;273 were added! Check TCODE .0, .95, "CF I and CF II Menu" ;274 CF I and CF II Menu TCODE .0, .125, "for Details!" ;275 for Details! - TCODE .20, .95, "Salinity: " ;276 Salinity: + TCODE .20, .125, "Salinity: " ;276 Salinity: ; TCODE .20, .95, "Bottom Time:" ;277 Bottom Time: TCODE .20, .125, "Max. Depth:" ;278 Max. Depth: @@ -443,7 +440,7 @@ TCODE .20, .155, "-1 mbar" ;293 -1 mbar TCODE .85, .185, "Alt: " ;294 Alt: ; - TCODE .20, .125, "Show raw data" ;295 Show raw data + TCODE .20, .95, "Custom FunctionsIII" ;295 Custom FunctionsIII TCODE .50, .2, "Raw Data:" ;296 Raw Data: ; Gas-setup addons: TCODE .0, .0, "MOD:" ;297 MOD: (max operating depth of a gas). @@ -470,4 +467,63 @@ ; OLED Brightness settings TCODE .103, .155, "Eco " ;312 Eco (Same length as #313!) TCODE .103, .155, "High" ;313 High (Same length as #312!) + +; ZH-L16 mode description + TCODE .0, .35, "Decotype: ZH-L16 OC" ;314 Decotype: ZH-L16 OC + TCODE .0, .65, "For Open Circuit " ;315 For Open Circuit + TCODE .0, .95, "Divers. Supports 5 " ;316 Divers. Supports 5 + TCODE .0, .125, "Trimix Gases. " ;317 Trimix Gases. + TCODE .0, .155, "Configure your gas " ;318 Configure your gas + TCODE .0, .185, "in Gassetup menu. " ;319 in Gassetup menu. + TCODE .0, .215, "Check CF11 & CF12 !" ;320 Check CF11 & CF12 ! +; Gaugemode description + TCODE .0, .35, "Decotype: Gauge " ;321 Decotype: Gauge + TCODE .0, .65, "Divetime will be in" ;322 Divetime will be in + TCODE .0, .95, "Minutes:Seconds. " ;323 Minutes:Seconds. + TCODE .0, .125, "OSTC2 will not " ;324 OSTC2 will not + TCODE .0, .155, "compute Deco, NoFly" ;325 compute Deco, NoFly + TCODE .0, .185, "time and Desat. " ;326 time and Desat. + TCODE .0, .215, "time at all! " ;327 time at all! +; Const.ppO2 description + TCODE .0, .35, "Decotype: ZH-L16 CC" ;328 Decotype: ZH-L16 CC + TCODE .0, .65, "For closed" ;329 For closed + TCODE .0, .95, "circuit rebreathers" ;330 circuit rebreathers + TCODE .0, .125, "Configure the 3 " ;331 Configure the 3 + TCODE .0, .155, "SetPoints in CCR - " ;332 SetPoints in CCR - + TCODE .0, .185, "Setup menu. 5 bail-" ;333 Setup menu. 5 bail- + TCODE .0, .215, "outs are available." ;334 outs are available. +; Apnoemode description + TCODE .0, .35, "Decotype: Apnoe " ;335 Decotype: Apnoe + TCODE .0, .65, "OSTC2 will display " ;336 OSTC2 will display + TCODE .0, .95, "each descent separ-" ;337 each descent separ- + TCODE .0, .125, "ately in Min:Sec. " ;338 ately in Min:Sec. + TCODE .0, .155, "Will temporally set" ;339 Will temporally set + TCODE .0, .185, "samplerate to 1 sec" ;340 samplerate to 1 sec + TCODE .0, .215, "No Deco calculation" ;341 No Deco calculation +; Multi GF OC mode description + TCODE .0, .35, "Decotype: L16-GF OC" ;342 Decotype: L16-GF OC + TCODE .0, .65, "Decompression cal- " ;343 Decompression cal- + TCODE .0, .95, "culations with the " ;344 culations with the + TCODE .0, .125, "GF-Method (GF_lo/GF" ;345 GF-Method (GF_lo/GF + TCODE .0, .155, "_hi). Check CF32 & " ;346 _hi). Check CF32 & + TCODE .0, .185, "CF33! Open Circuit " ;347 CF33! Open Circuit + TCODE .0, .215, "with Deep Stops. " ;348 with Deep Stops. +; Multi GF CC mode description + TCODE .0, .35, "Decotype: L16-GF CC" ;349 Decotype: L16-GF CC + TCODE .0, .65, "Decompression cal- " ;350 Decompression cal- + TCODE .0, .95, "culations with the " ;351 culations with the + TCODE .0, .125, "GF-Method (GF_lo/GF" ;352 GF-Method (GF_lo/GF + TCODE .0, .155, "_hi). Check CF32 & " ;353 _hi). Check CF32 & + TCODE .0, .185, "CF33!Closed Circuit" ;354 CF33!Closed Circuit + TCODE .0, .215, "with Deep Stops. " ;355 with Deep Stops. +; Spare (PSCR?) + TCODE .0, .35, "" ;356 + TCODE .0, .65, "" ;357 + TCODE .0, .95, "" ;358 + TCODE .0, .125, "" ;359 + TCODE .0, .155, "" ;360 + TCODE .0, .185, "" ;361 + TCODE .0, .215, "" ;362 +; + ;=============================================================================
--- a/code_part1/OSTC_code_asm_part1/french_text.asm Sat Apr 21 12:09:37 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/french_text.asm Sat Apr 21 13:58:30 2012 +0200 @@ -324,55 +324,52 @@ TCODE .0, .0, "ppO2 +" ;190 ppO2 + TCODE .0, .0, "ppO2 -" ;191 ppO2 - TCODE .0, .0, "Dil." ;192 Dil. (Rebreather diluant) -; ZH-L16 mode description - TCODE .0, .35, "TypeDéco: ZH-L16 OC " ;193 Decotype: ZH-L16 OC (22 chars maximum) - TCODE .0, .65, "Pour les plongeurs en" ;194 For Open Circuit - TCODE .0, .95, "Circuit Ouvert. " ;195 Divers. Supports 5 - TCODE .0, .125, "Supporte 5 Gaz Trimix." ;196 Trimix Gases. - TCODE .0, .155, "Config des gaz dans le" ;197 Configure your gas - TCODE .0, .185, "menu Réglage des Gaz. " ;198 in Gassetup menu. - TCODE .0, .215, "Vérifiez CF11 & CF12 !" ;199 Check CF11 & CF12 ! -; Gaugemode description - TCODE .0, .35, "TypeDéco:Profondimètre" ;200 Decotype: Gauge - TCODE .0, .65, "La durée est affichée" ;201 Divetime will be in - TCODE .0, .95, "en Minutes:Secondes. " ;202 Minutes:Seconds. - TCODE .0, .125, "L'OSTC2 ne calculera" ;203 OSTC2 will not - TCODE .0, .155, "pas de Déco, de durée" ;204 compute Deco, NoFly - TCODE .0, .185, "sans avion ni de temps" ;205 time and Desat. - TCODE .0, .215, "de désaturation ! " ;206 time at all! -; Const.ppO2 description - TCODE .0, .35, "TypeDéco: ZH-L16 CC " ;207 Decotype: ZH-L16 CC - TCODE .0, .65, "Pour les recycleurs a" ;208 For (Semi-)Closed - TCODE .0, .95, "circuit (semi-)fermé. " ;209 Circuit rebreathers - TCODE .0, .125, "Configurez les 3" ;210 Configure the 3 - TCODE .0, .155, "SetPoints dans le" ;211 SetPoints in CCR - - TCODE .0, .185, "Menu SetPoint CCR. " ;212 Setup menu. 5 bail- - TCODE .0, .215, "5 bailouts disponibles" ;213 outs are available. -; Apnoemode description - TCODE .0, .35, "TypeDéco: Apnée " ;214 Decotype: Apnoe - TCODE .0, .65, "L'OSTC2 affichera les" ;215 OSTC2 will display - TCODE .0, .95, "descentes séparément" ;216 each descent separ- - TCODE .0, .125, "en Minutes:Secondes" ;217 ately in Min:Sec. - TCODE .0, .155, "sans calculer de Déco." ;218 Will temporally set - TCODE .0, .185, "Les mesures se font" ;219 samplerate to 1 sec - TCODE .0, .215, "toutes les secondes. " ;220 No Deco calculation -; Multi GF OC mode description - TCODE .0, .35, "TypeDéco: L16-GF OC " ;221 Decotype: L16-GF OC - TCODE .0, .65, "Calcul de Déco avec" ;222 Decompression cal- - TCODE .0, .95, "Facteurs de Gradient" ;223 culations with the - TCODE .0, .125, "(GF_bas/GF_haut). " ;224 GF-Method (GF_lo/GF - TCODE .0, .155, "Vérifiez CF32 & CF33 !" ;225 _hi). Check CF32 & - TCODE .0, .185, "Pour Circuit Ouvert" ;226 CF33! Open Circuit - TCODE .0, .215, "avec paliers profonds." ;227 with Deep Stops. -; Multi GF CC mode description - TCODE .0, .35, "TypeDéco: L16-GF CC " ;228 Decotype: L16-GF CC - TCODE .0, .65, "Calcul de Déco avec" ;229 Decompression cal- - TCODE .0, .95, "Facteurs de Gradient" ;230 culations with the - TCODE .0, .125, "(GF_bas/GF_haut). " ;231 GF-Method (GF_lo/GF - TCODE .0, .155, "Vérifiez CF32 & CF33 !" ;232 _hi). Check CF32 & - TCODE .0, .185, "Pour Circuit Fermé" ;233 CF33!Closed Circuit - TCODE .0, .215, "avec paliers profonds." ;234 with Deep Stops. + +; 32 custom function descriptors III (FIXED LENGTH = 15 chars). + TCODE .40, .35, "unused " ;193 unused + TCODE .40, .35, "unused " ;194 unused + TCODE .40, .35, "unused " ;195 unused + 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, "unused " ;203 unused + TCODE .40, .35, "unused " ;204 unused + TCODE .40, .35, "unused " ;205 unused + TCODE .40, .35, "unused " ;206 unused + TCODE .40, .35, "unused " ;207 unused + TCODE .40, .35, "unused " ;208 unused + TCODE .40, .35, "unused " ;209 unused + TCODE .40, .35, "unused " ;210 unused + TCODE .40, .35, "unused " ;211 unused + TCODE .40, .35, "unused " ;212 unused + TCODE .40, .35, "unused " ;213 unused + TCODE .40, .35, "unused " ;214 unused + TCODE .40, .35, "unused " ;215 unused + TCODE .40, .35, "unused " ;216 unused + TCODE .40, .35, "unused " ;217 unused + TCODE .40, .35, "unused " ;218 unused + TCODE .40, .35, "unused " ;219 unused + TCODE .40, .35, "unused " ;220 unused + TCODE .40, .35, "unused " ;221 unused + TCODE .40, .35, "unused " ;222 unused + TCODE .40, .35, "unused " ;223 unused + TCODE .40, .35, "unused " ;224 unused ; + TCODE .7, .2, "Config Fonctions III" ;225 Custom Functions III + TCODE .0, .0, "" ;226 unused + TCODE .0, .0, "" ;227 unused + TCODE .0, .0, "" ;228 unused + 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 .0, .0, "" ;234 unused + TCODE .10, .2, "Mode de Déco changé!" ;235 Decomode changed! TCODE .85, .125, "L16-GF CC" ;236 L16-GF CC TCODE .2, .12, "Non trouvé" ;237 Not found @@ -420,7 +417,7 @@ TCODE .0, .65, "ajoutées! Regardez les" ;273 were added! Check TCODE .0, .95, "Menus CF I et CF II" ;274 CF I and CF II Menu TCODE .0, .125, "pour plus de détails!" ;275 for Details! - TCODE .20, .95, "Salinité: " ;276 Salinity: + TCODE .20, .125, "Salinité: " ;276 Salinity: ; TCODE .20, .95, "Temps fond:" ;277 Bottom Time: TCODE .20, .125, "Prof. Max.:" ;278 Max. Depth: @@ -443,7 +440,7 @@ TCODE .20, .155, "-1 mbar" ;293 -1 mbar TCODE .85, .185, "Alt: " ;294 Alt: ; - TCODE .20, .125, "Aff. donn. brutes" ;295 Show raw data + TCODE .20, .95, "Config Fonctions III" ;295 Custom FunctionsIII TCODE .50, .2, "Données brutes:" ;296 Raw Data: ; Gas-setup addons: TCODE .0, .0, "PMU:" ;297 MOD: (max operating depth of a gas). @@ -470,4 +467,63 @@ ; OLED Brightness settings TCODE .103, .155, "Eco " ;312 Eco (Same length as #313!) TCODE .103, .155, "Forte" ;313 High (Same length as #312!) + +; ZH-L16 mode description + TCODE .0, .35, "TypeDéco: ZH-L16 OC " ;314 Decotype: ZH-L16 OC (22 chars maximum) + TCODE .0, .65, "Pour les plongeurs en" ;315 For Open Circuit + TCODE .0, .95, "Circuit Ouvert. " ;316 Divers. Supports 5 + TCODE .0, .125, "Supporte 5 Gaz Trimix." ;317 Trimix Gases. + TCODE .0, .155, "Config des gaz dans le" ;318 Configure your gas + TCODE .0, .185, "menu Réglage des Gaz. " ;319 in Gassetup menu. + TCODE .0, .215, "Vérifiez CF11 & CF12 !" ;320 Check CF11 & CF12 ! +; Gaugemode description + TCODE .0, .35, "TypeDéco:Profondimètre" ;321 Decotype: Gauge + TCODE .0, .65, "La durée est affichée" ;322 Divetime will be in + TCODE .0, .95, "en Minutes:Secondes. " ;323 Minutes:Seconds. + TCODE .0, .125, "L'OSTC2 ne calculera" ;324 OSTC2 will not + TCODE .0, .155, "pas de Déco, de durée" ;325 compute Deco, NoFly + TCODE .0, .185, "sans avion ni de temps" ;326 time and Desat. + TCODE .0, .215, "de désaturation ! " ;327 time at all! +; Const.ppO2 description + TCODE .0, .35, "TypeDéco: ZH-L16 CC " ;328 Decotype: ZH-L16 CC + TCODE .0, .65, "Pour les recycleurs a" ;329 For Closed + TCODE .0, .95, "circuit fermé." ;330 Circuit rebreathers + TCODE .0, .125, "Configurez les 3" ;331 Configure the 3 + TCODE .0, .155, "SetPoints dans le" ;332 SetPoints in CCR - + TCODE .0, .185, "Menu SetPoint CCR. " ;333 Setup menu. 5 bail- + TCODE .0, .215, "5 bailouts disponibles" ;334 outs are available. +; Apnoemode description + TCODE .0, .35, "TypeDéco: Apnée " ;335 Decotype: Apnoe + TCODE .0, .65, "L'OSTC2 affichera les" ;336 OSTC2 will display + TCODE .0, .95, "descentes séparément" ;337 each descent separ- + TCODE .0, .125, "en Minutes:Secondes" ;338 ately in Min:Sec. + TCODE .0, .155, "sans calculer de Déco." ;339 Will temporally set + TCODE .0, .185, "Les mesures se font" ;340 samplerate to 1 sec + TCODE .0, .215, "toutes les secondes. " ;341 No Deco calculation +; Multi GF OC mode description + TCODE .0, .35, "TypeDéco: L16-GF OC " ;342 Decotype: L16-GF OC + TCODE .0, .65, "Calcul de Déco avec" ;343 Decompression cal- + TCODE .0, .95, "Facteurs de Gradient" ;344 culations with the + TCODE .0, .125, "(GF_bas/GF_haut). " ;345 GF-Method (GF_lo/GF + TCODE .0, .155, "Vérifiez CF32 & CF33 !" ;346 _hi). Check CF32 & + TCODE .0, .185, "Pour Circuit Ouvert" ;347 CF33! Open Circuit + TCODE .0, .215, "avec paliers profonds." ;348 with Deep Stops. +; Multi GF CC mode description + TCODE .0, .35, "TypeDéco: L16-GF CC " ;349 Decotype: L16-GF CC + TCODE .0, .65, "Calcul de Déco avec" ;350 Decompression cal- + TCODE .0, .95, "Facteurs de Gradient" ;351 culations with the + TCODE .0, .125, "(GF_bas/GF_haut). " ;352 GF-Method (GF_lo/GF + TCODE .0, .155, "Vérifiez CF32 & CF33 !" ;353 _hi). Check CF32 & + TCODE .0, .185, "Pour Circuit Fermé" ;354 CF33!Closed Circuit + TCODE .0, .215, "avec paliers profonds." ;355 with Deep Stops. +; Spare (PSCR?) + TCODE .0, .35, "" ;356 + TCODE .0, .65, "" ;357 + TCODE .0, .95, "" ;358 + TCODE .0, .125, "" ;359 + TCODE .0, .155, "" ;360 + TCODE .0, .185, "" ;361 + TCODE .0, .215, "" ;362 +; + ;=============================================================================
--- a/code_part1/OSTC_code_asm_part1/german_text.asm Sat Apr 21 12:09:37 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/german_text.asm Sat Apr 21 13:58:30 2012 +0200 @@ -324,55 +324,52 @@ TCODE .0, .0, "ppO2 +" ;190 ppO2 + TCODE .0, .0, "ppO2 -" ;191 ppO2 - TCODE .0, .0, "Dil." ;192 Dil. (Rebreather diluent) -; ZH-L16 mode description - TCODE .0, .35, "Dekomodell: ZH-L16 OC" ;193 Decotype: ZH-L16 OC - TCODE .0, .65, "Für das Tauchen mit" ;194 For Open Circuit - TCODE .0, .95, "offenen Systemen. " ;195 Divers. Supports 5 - TCODE .0, .125, "Bis zu 5 Trimix Gase." ;196 Trimix Gases. - TCODE .0, .155, "Hierzu das Menü Gas-" ;197 Configure your gas - TCODE .0, .185, "einstellung verwenden." ;198 in Gassetup menu. - TCODE .0, .215, "CF11 & CF12 prüfen!" ;199 Check CF11 & CF12 ! -; Gaugemode description - TCODE .0, .35, "Dekomodell:Tiefenmesser" ;200 Decotype: Gauge - TCODE .0, .65, "Die Tauchzeit wird in" ;201 Divetime will be in - TCODE .0, .95, "Minuten:Sekunden ange-" ;202 Minutes:Seconds. - TCODE .0, .125, "zeigt. Der OSTC2 be-" ;203 OSTC2 will not - TCODE .0, .155, "rechnet keine Daten für" ;204 compute Deco, NoFly - TCODE .0, .185, "Deko, Flugverbots- oder" ;205 time and Desat. - TCODE .0, .215, "Entsättigungszeiten!" ;206 time at all! -; Const.ppO2 description - TCODE .0, .35, "Dekomodell: ZH-L16 CC" ;207 Decotype: ZH-L16 CC - TCODE .0, .65, "Für (halb-)geschlossene " ;208 For (Semi-)Closed - TCODE .0, .95, "Kreislaufsysteme." ;209 Circuit rebreathers - TCODE .0, .125, "Stelle die 3 Setpoints" ;210 Configure the 3 - TCODE .0, .155, "im CCR Setpoint Menü" ;211 SetPoints in CCR - - TCODE .0, .185, "ein. Bis zu 5 Bailout" ;212 Setup menu. 5 bail- - TCODE .0, .215, "Gase sind verfügbar." ;213 outs are available. -; Apnoemode description - TCODE .0, .35, "Dekomodell: Apnoe " ;214 Decotype: Apnoe - TCODE .0, .65, "Der OSTC2 zeigt jeden" ;215 OSTC2 will display - TCODE .0, .95, "Abstieg getrennt in" ;216 each descent separ- - TCODE .0, .125, "Min:Sek an. Die Abtast-" ;217 ately in Min:Sec. - TCODE .0, .155, "rate wird temporär auf" ;218 Will temporally set - TCODE .0, .185, "1 Sekunde eingestellt." ;219 samplerate to 1 sec - TCODE .0, .215, "Keine Deko Berechnung" ;220 No Deco calculation -; Multi GF OC mode description - TCODE .0, .35, "Dekomodell: L16-GF OC" ;221 Decotype: L16-GF OC - TCODE .0, .65, "Berechnung der Deko" ;222 Decompression cal- - TCODE .0, .95, "mittels der GF-Methode" ;223 culations with the - TCODE .0, .125, "(GF_lo/GF_hi). " ;224 GF-Method (GF_lo/GF - TCODE .0, .155, "Prüfe die CF32 & CF33" ;225 _hi). Check CF32 & - TCODE .0, .185, "Werte! Für offene Sys-" ;226 CF33! Open Circuit - TCODE .0, .215, "teme mit Tiefenstopps." ;227 with Deep Stops. -; Multi GF CC mode description - TCODE .0, .35, "Dekomodell: L16-GF CC" ;228 Decotype: L16-GF CC - TCODE .0, .65, "Berechnung der Deko" ;229 Decompression cal- - TCODE .0, .95, "mittels der GF-Methode" ;230 culations with the - TCODE .0, .125, "(GF_lo/GF_hi). Prüfe" ;231 GF-Method (GF_lo/GF - TCODE .0, .155, "die CF32 & CF33 Werte!" ;232 _hi). Check CF32 & - TCODE .0, .185, "Für geschlossene Sys-" ;233 CF33!Closed Circuit - TCODE .0, .215, "teme mit Tiefenstopps." ;234 with Deep Stops. + +; 32 custom function descriptors III (FIXED LENGTH = 15 chars). + TCODE .40, .35, "unbenutzt " ;193 unused + TCODE .40, .35, "unbenutzt " ;194 unused + TCODE .40, .35, "unbenutzt " ;195 unused + TCODE .40, .35, "unbenutzt " ;196 unused + TCODE .40, .35, "unbenutzt " ;197 unused + TCODE .40, .35, "unbenutzt " ;198 unused + 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, "unbenutzt " ;203 unused + TCODE .40, .35, "unbenutzt " ;204 unused + TCODE .40, .35, "unbenutzt " ;205 unused + TCODE .40, .35, "unbenutzt " ;206 unused + TCODE .40, .35, "unbenutzt " ;207 unused + TCODE .40, .35, "unbenutzt " ;208 unused + TCODE .40, .35, "unbenutzt " ;209 unused + TCODE .40, .35, "unbenutzt " ;210 unused + TCODE .40, .35, "unbenutzt " ;211 unused + TCODE .40, .35, "unbenutzt " ;212 unused + TCODE .40, .35, "unbenutzt " ;213 unused + TCODE .40, .35, "unbenutzt " ;214 unused + TCODE .40, .35, "unbenutzt " ;215 unused + TCODE .40, .35, "unbenutzt " ;216 unused + TCODE .40, .35, "unbenutzt " ;217 unused + TCODE .40, .35, "unbenutzt " ;218 unused + TCODE .40, .35, "unbenutzt " ;219 unused + TCODE .40, .35, "unbenutzt " ;220 unused + TCODE .40, .35, "unbenutzt " ;221 unused + TCODE .40, .35, "unbenutzt " ;222 unused + TCODE .40, .35, "unbenutzt " ;223 unused + TCODE .40, .35, "unbenutzt " ;224 unused ; + TCODE .7, .2, "Custom Funktionen III" ;225 Custom Functions III + TCODE .0, .0, "" ;226 unused + TCODE .0, .0, "" ;227 unused + TCODE .0, .0, "" ;228 unused + 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 .0, .0, "" ;234 unused + TCODE .10, .2, "Dekomodell verändert!" ;235 Decomode changed! TCODE .85, .125, "L16-GF CC" ;236 L16-GF CC TCODE .2, .12, "Nicht gefunden" ;237 Not found @@ -420,7 +417,7 @@ TCODE .0, .65, "wurden hinzugefügt!" ;273 were added! Check TCODE .0, .95, "Prüfe CFI und CF II" ;274 CF I and CF II Menu TCODE .0, .125, "Menü für Details!" ;275 for Details! - TCODE .20, .95, "Salzgeh.: " ;276 Salinity: + TCODE .20, .125, "Salzgeh.: " ;276 Salinity: ; TCODE .20, .95, "Grundzeit:" ;277 Bottom Time: TCODE .20, .125, "Max. Tiefe:" ;278 Max. Depth: @@ -443,7 +440,7 @@ TCODE .20, .155, "-1 mbar" ;293 -1 mbar TCODE .85, .185, "Höhe " ;294 Alt: ; - TCODE .20, .125, "Rohdaten anzeigen" ;295 Show raw data + TCODE .20, .95, "Custom FunktionenIII" ;295 Custom FunctionsIII TCODE .50, .2, "Rohdaten:" ;296 Raw Data: ; Gas-setup addons: TCODE .0, .0, "MOD:" ;297 MOD: (max operating depth of a gas). @@ -469,4 +466,64 @@ ; OLED Brightness settings TCODE .103, .155, "Eco " ;312 Eco (Same length as #313!) TCODE .103, .155, "Hoch" ;313 High (Same length as #312!) + +; ZH-L16 mode description + TCODE .0, .35, "Dekomodell: ZH-L16 OC" ;314 Decotype: ZH-L16 OC + TCODE .0, .65, "Für das Tauchen mit" ;315 For Open Circuit + TCODE .0, .95, "offenen Systemen. " ;316 Divers. Supports 5 + TCODE .0, .125, "Bis zu 5 Trimix Gase." ;317 Trimix Gases. + TCODE .0, .155, "Hierzu das Menü Gas-" ;318 Configure your gas + TCODE .0, .185, "einstellung verwenden." ;319 in Gassetup menu. + TCODE .0, .215, "CF11 & CF12 prüfen!" ;320 Check CF11 & CF12 ! +; Gaugemode description + TCODE .0, .35, "Dekomodell:Tiefenmesser" ;321 Decotype: Gauge + TCODE .0, .65, "Die Tauchzeit wird in" ;322 Divetime will be in + TCODE .0, .95, "Minuten:Sekunden ange-" ;323 Minutes:Seconds. + TCODE .0, .125, "zeigt. Der OSTC2 be-" ;324 OSTC2 will not + TCODE .0, .155, "rechnet keine Daten für" ;325 compute Deco, NoFly + TCODE .0, .185, "Deko, Flugverbots- oder" ;326 time and Desat. + TCODE .0, .215, "Entsättigungszeiten!" ;327 time at all! +; Const.ppO2 description + TCODE .0, .35, "Dekomodell: ZH-L16 CC" ;328 Decotype: ZH-L16 CC + TCODE .0, .65, "Für geschlossene" ;329 For Closed + TCODE .0, .95, "Kreislaufsysteme." ;330 Circuit rebreathers + TCODE .0, .125, "Stelle die 3 Setpoints" ;331 Configure the 3 + TCODE .0, .155, "im CCR Setpoint Menü" ;332 SetPoints in CCR - + TCODE .0, .185, "ein. Bis zu 5 Bailout" ;333 Setup menu. 5 bail- + TCODE .0, .215, "Gase sind verfügbar." ;334 outs are available. +; Apnoemode description + TCODE .0, .35, "Dekomodell: Apnoe " ;335 Decotype: Apnoe + TCODE .0, .65, "Der OSTC2 zeigt jeden" ;336 OSTC2 will display + TCODE .0, .95, "Abstieg getrennt in" ;337 each descent separ- + TCODE .0, .125, "Min:Sek an. Die Abtast-" ;338 ately in Min:Sec. + TCODE .0, .155, "rate wird temporär auf" ;339 Will temporally set + TCODE .0, .185, "1 Sekunde eingestellt." ;340 samplerate to 1 sec + TCODE .0, .215, "Keine Deko Berechnung" ;341 No Deco calculation +; Multi GF OC mode description + TCODE .0, .35, "Dekomodell: L16-GF OC" ;342 Decotype: L16-GF OC + TCODE .0, .65, "Berechnung der Deko" ;343 Decompression cal- + TCODE .0, .95, "mittels der GF-Methode" ;344 culations with the + TCODE .0, .125, "(GF_lo/GF_hi). " ;345 GF-Method (GF_lo/GF + TCODE .0, .155, "Prüfe die CF32 & CF33" ;346 _hi). Check CF32 & + TCODE .0, .185, "Werte! Für offene Sys-" ;347 CF33! Open Circuit + TCODE .0, .215, "teme mit Tiefenstopps." ;348 with Deep Stops. +; Multi GF CC mode description + TCODE .0, .35, "Dekomodell: L16-GF CC" ;349 Decotype: L16-GF CC + TCODE .0, .65, "Berechnung der Deko" ;350 Decompression cal- + TCODE .0, .95, "mittels der GF-Methode" ;351 culations with the + TCODE .0, .125, "(GF_lo/GF_hi). Prüfe" ;352 GF-Method (GF_lo/GF + TCODE .0, .155, "die CF32 & CF33 Werte!" ;353 _hi). Check CF32 & + TCODE .0, .185, "Für geschlossene Sys-" ;354 CF33!Closed Circuit + TCODE .0, .215, "teme mit Tiefenstopps." ;355 with Deep Stops. +; Spare (PSCR?) + TCODE .0, .35, "" ;356 + TCODE .0, .65, "" ;357 + TCODE .0, .95, "" ;358 + TCODE .0, .125, "" ;359 + TCODE .0, .155, "" ;360 + TCODE .0, .185, "" ;361 + TCODE .0, .215, "" ;362 + +; + ;=============================================================================
--- a/code_part1/OSTC_code_asm_part1/menu.asm Sat Apr 21 12:09:37 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu.asm Sat Apr 21 13:58:30 2012 +0200 @@ -207,7 +207,6 @@ bsf menubit bsf cursor call show_decotype - call show_salinity_value call PLED_menu_cursor bcf switch_left bcf switch_right @@ -246,7 +245,7 @@ dcfsnz menupos,F goto menu_custom_functions_page2 dcfsnz menupos,F - bra toggle_salinity + bra menu_custom_functions_page3 dcfsnz menupos,F bra toggle_decotype dcfsnz menupos,F @@ -321,7 +320,7 @@ mulwf EEDATA ; Multiply with Decomode 0-5 (5=Spare) movf PRODL,W - addlw d'193' ; Description text offset + addlw .314-.256 ; Description text offset movwf menupos ; Used as loop counter temp movlw d'7' @@ -329,7 +328,7 @@ menu0: movf menupos,W - call displaytext_1_low ; Display text! + call displaytext_1_high ; Display text! incf menupos,F decfsz temp1,F @@ -355,6 +354,7 @@ bsf cursor call show_debugstate call show_dateformat + call show_salinity_value call PLED_menu_cursor call toggle_brightness_show bcf switch_left @@ -404,114 +404,13 @@ dcfsnz menupos,F bra show_license dcfsnz menupos,F - bra show_rawdata + bra toggle_salinity dcfsnz menupos,F bra toggle_brightness ; toggle between ECO and HIGH movlw d'5' ; set cursor to "More again" movwf menupos bra setup_menu2 ; exit... -show_rawdata: ; Displays Sensor raw data - call PLED_ClearScreen - call PLED_topline_box - WIN_INVERT .1 ; Init new Wordprocessor - DISPLAYTEXTH .296 ; Raw Data: - WIN_INVERT .0 ; Init new Wordprocessor - - call PLED_static_raw_data - - - clrf timeout_counter2 - bcf sleepmode - bcf menubit3 - bsf menubit - -show_rawdata_loop: - rcall show_rawdata_wait - - btfsc menubit2 - bra show_rawdata_next - - btfsc onesecupdate - call PLED_update_raw_data - - bcf onesecupdate ; End of one second tasks, if any. - - goto show_rawdata_loop - -show_rawdata_wait: - bcf menubit2 - bcf switch_left - bcf switch_right - -show_rawdata_wait_1: - btfsc uart_dump_screen ; Asked to dump screen contains ? - call dump_screen ; Yes! - - btfsc switch_left ; Ack? - bsf menubit2 - btfsc switch_right ; Ack? - bsf menubit2 - - btfsc menubit2 - return - - btfss menubit - goto restart ; exit menu, restart and enter surfmode - - btfsc onesecupdate - call timeout_surfmode - - btfsc onesecupdate - call set_dive_modes - - btfsc sleepmode - bra show_rawdata_exit ; Exit - - btfsc divemode - goto restart ; exit menu, restart and enter divemode - - btfsc onesecupdate - return - - bra show_rawdata_wait_1 - -; Display blank/red/green/blue screens until click, to test OLED ageing. -show_rawdata_next: - ; display test draws more power then allowed -> potential hardware risk! -#ifndef DISPLAY_TEST - bra show_rawdata_exit -#endif - - setf WREG - WIN_BOX_COLOR .0,.240,.0,.160 - rcall show_rawdata_screen_wait - movlw color_red - WIN_BOX_COLOR .0,.240,.0,.160 - rcall show_rawdata_screen_wait - movlw color_green - WIN_BOX_COLOR .0,.240,.0,.160 - rcall show_rawdata_screen_wait - movlw color_blue - WIN_BOX_COLOR .0,.240,.0,.160 - rcall show_rawdata_screen_wait - bra show_rawdata_exit - -show_rawdata_screen_wait: - rcall show_rawdata_wait - bcf onesecupdate ; No dynamic update here... - - btfsc menubit2 - return - - bra show_rawdata_screen_wait - -show_rawdata_exit: - movlw d'4' - movwf menupos - bcf switch_right - bra more_setup_menu2 ; return to "more menu" loop - show_license: call startup_screen1 ;1/2 call startup_screen2 ;1/2 @@ -534,10 +433,10 @@ toggle_salinity2: write_int_eeprom d'26' ; Store salinity - movlw d'3' + movlw d'4' movwf menupos bcf switch_right - bra setup_menu3a ; return to manu loop + bra more_setup_menu3a ; return to manu loop toggle_salinity_reset: movlw d'100' @@ -552,7 +451,7 @@ movlw d'105' ; 105% ? cpfslt EEDATA ; Salinity higher limit rcall toggle_salinity_reset2 ; Reset before display! - WIN_TOP .95 + WIN_TOP .125 WIN_LEFT .90 ; +7 for spanish WIN_FONT FT_SMALL lfsr FSR2,letter
--- a/code_part1/OSTC_code_asm_part1/menu_custom.asm Sat Apr 21 12:09:37 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_custom.asm Sat Apr 21 13:58:30 2012 +0200 @@ -171,6 +171,15 @@ clrf EEADRH return ; return +menu_custom_functions_page3: + movlw .2 + movff WREG,cf_page_number ; CF page number (0: 0-31, 1: 32-63) + movlw .225 + movff WREG,cf_title_text ; # of text for title + movlw .193 + movff WREG,cf_descriptor_text ; # of descriptor text offset + bra menu_custom_functions0 + menu_custom_functions_page2: movlw .1 movff WREG,cf_page_number ; CF page number (0: 0-31, 1: 32-63) @@ -181,13 +190,12 @@ bra menu_custom_functions0 menu_custom_functions: - movlw .36 - movff WREG,cf_descriptor_text ; # of descriptor text offset + movlw .0 + movff WREG,cf_page_number ; CF page number (0: 0-31, 1: 32-63) movlw .27 movff WREG,cf_title_text ; # of text for title - movlw .0 - movff WREG,cf_page_number ; CF page number (0: 0-31, 1: 32-63) - + movlw .36 + movff WREG,cf_descriptor_text ; # of descriptor text offset menu_custom_functions0: bsf leftbind
--- a/code_part1/OSTC_code_asm_part1/menu_reset.asm Sat Apr 21 12:09:37 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_reset.asm Sat Apr 21 13:58:30 2012 +0200 @@ -177,7 +177,7 @@ CF_DEFAULT CF_BOOL, d'0', 0, 0 ; CF52 Show Tissue Graph in Divemode CF_DEFAULT CF_BOOL, d'0', 0, 0 ; CF53 Show Laeding Tissue in Divemode CF_DEFAULT CF_BOOL, d'0', 0, 0 ; CF54 Display shallowest stop first - CF_DEFAULT CF_INT8, d'0', d'0', d'10' ; GF55 Gas switch additional delay + CF_DEFAULT CF_INT8, d'0', d'0', d'10' ; CF55 Gas switch additional delay CF_DEFAULT CF_INT8, d'20', d'5', d'50' ; CF56 Bottom gas usage (SAC l/min) CF_DEFAULT CF_INT8, d'20', d'5', d'50' ; CF57 Ascent/deco gas usage (SAC l/min) @@ -189,43 +189,44 @@ CF_DEFAULT CF_PERCENT, .4, .0, .100 ; CF62 pSCR O2 Drop CF_DEFAULT CF_INT8, .10, .0, .100 ; CF63 pSCR counterlung ratio cf_default_table2: - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF64 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF65 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF66 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF67 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF68 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF64 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF65 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF66 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF67 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF68 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF69 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF70 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF71 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF72 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF73 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF69 unused + 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_INT8, d'0', d'0', d'0' ; GF74 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF75 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF76 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF77 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF78 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF74 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF75 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF76 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF77 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF78 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF79 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF80 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF81 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF82 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF83 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF79 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF80 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF81 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF82 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF83 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF84 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF85 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF87 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF88 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF89 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF84 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF85 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF86 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF87 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF88 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF90 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF91 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF92 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF93 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF94 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF89 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF90 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF91 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF92 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF93 unused - CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; GF95 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF94 unused + CF_DEFAULT CF_INT8, d'0', d'0', d'0' ; CF95 unused cf_default_table3: ;=============================================================================
--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm Sat Apr 21 12:09:37 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm Sat Apr 21 13:58:30 2012 +0200 @@ -912,131 +912,6 @@ STRCPY_PRINT "\xB7" return -PLED_static_raw_data: - WIN_FONT FT_SMALL - WIN_LEFT .0 - WIN_TOP .27 - STRCPY "C1:" - movff C1+0,lo - movff C1+1,hi - output_16 - call word_processor - WIN_LEFT .80 - WIN_TOP .27 - STRCPY "C2:" - movff C2+0,lo - movff C2+1,hi - output_16 - call word_processor - - WIN_LEFT .0 - WIN_TOP .52 - STRCPY "C3:" - movff C3+0,lo - movff C3+1,hi - output_16 - call word_processor - WIN_LEFT .80 - WIN_TOP .52 - STRCPY "C4:" - movff C4+0,lo - movff C4+1,hi - output_16 - call word_processor - - WIN_LEFT .0 - WIN_TOP .77 - STRCPY "C5:" - movff C5+0,lo - movff C5+1,hi - output_16 - call word_processor - WIN_LEFT .80 - WIN_TOP .77 - STRCPY "C6:" - movff C6+0,lo - movff C6+1,hi - output_16 - call word_processor - return - -PLED_update_raw_data: - WIN_LEFT .0 - WIN_TOP .102 - STRCPY "D1:" - movff D1+0,lo - movff D1+1,hi - output_16 - call word_processor - WIN_LEFT .80 - WIN_TOP .102 - STRCPY "D2:" - movff D2+0,lo - movff D2+1,hi - output_16 - call word_processor - - WIN_LEFT .0 - WIN_TOP .127 - STRCPY "OFF:" - movff OFF+0,lo - movff OFF+1,hi - output_16 - call word_processor - WIN_LEFT .80 - WIN_TOP .127 - STRCPY "SENS:" - movff SENS+0,lo - movff SENS+1,hi - output_16 - call word_processor - - WIN_LEFT .0 - WIN_TOP .152 - STRCPY "xdT:" - movff xdT+0,lo - movff xdT+1,hi - output_16 - call word_processor - WIN_LEFT .80 - WIN_TOP .152 - STRCPY "xdT2:" - movff xdT2+0,lo - movff xdT2+1,hi - output_16 - call word_processor - - WIN_LEFT .0 - WIN_TOP .177 - STRCPY "amb:" - SAFE_2BYTE_COPY amb_pressure, lo - output_16 - call word_processor - WIN_LEFT .80 - WIN_TOP .177 - STRCPY "temp:" - SAFE_2BYTE_COPY temperature, lo - call PLED_convert_signed_temperature ; converts lo:hi into signed-short and adds '-' to POSTINC2 if required - output_16 - call word_processor - - call get_battery_voltage ; get battery voltage - WIN_LEFT .0 - WIN_TOP .202 - STRCPY "AD0:" - movff ADRESL,lo - movff ADRESH,hi - output_16 - call word_processor - WIN_LEFT .80 - WIN_TOP .202 - STRCPY "BATT:" - movff batt_voltage+0,lo - movff batt_voltage+1,hi - output_16 - call word_processor - return - PLED_menu_mask: call PLED_topline_box WIN_INVERT .1 ; Init new Wordprocessor @@ -1057,7 +932,7 @@ WIN_INVERT .0 ; Init new Wordprocessor DISPLAYTEXT .99 ; Custom FunctionsI DISPLAYTEXT .153 ; Custom FunctionsII - DISPLAYTEXTH .276 ; Salinity: + DISPLAYTEXTH .295 ; Custom FunctionsIII DISPLAYTEXT .100 ; Decotype: DISPLAYTEXT .142 ; More... DISPLAYTEXT .11 ; Exit @@ -1071,7 +946,7 @@ DISPLAYTEXTH .257 ; Date format: DISPLAYTEXT .129 ; Debug: DISPLAYTEXT .187 ; Show License - DISPLAYTEXTH .295 ; Show raw data + DISPLAYTEXTH .276 ; Salinity: DISPLAYTEXTH .280 ; Brightness: DISPLAYTEXT .11 ; Exit return
--- a/code_part1/OSTC_code_asm_part1/russian_text.asm Sat Apr 21 12:09:37 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/russian_text.asm Sat Apr 21 13:58:30 2012 +0200 @@ -327,55 +327,52 @@ TCODE .0, .0, "ppO2 +" ;190 ppO2 + TCODE .0, .0, "ppO2 -" ;191 ppO2 - TCODE .0, .0, "Äèë." ;192 Dil. (Rebreather diluent) -; ZH-L16 mode description - TCODE .0, .35, "Àëãîðèòì: ZH-L16 OC" ;193 Decotype: ZH-L16 OC - TCODE .0, .65, "Äëÿ îòêðûòîé ñõåìû " ;194 For Open Circuit - TCODE .0, .95, "äûõàíèÿ. Äîñòóïíî " ;195 Divers. Supports 5 - TCODE .0, .125, "äî 5 Òðèìèêñ-ñìåñåé" ;196 Trimix Gases. - TCODE .0, .155, "Çàäàéòå ñâîè ãàçû " ;197 Configure your gas - TCODE .0, .185, "â ìåíþ íàñòðîéêè. " ;198 in Gassetup menu. - TCODE .0, .215, "Óòî÷í. ÄÏ11 & ÄÏ12!" ;199 Check CF11 & CF12 ! -; Gaugemode description - TCODE .0, .35, "Àëãîðèòì: Òàéìåð " ;200 Decotype: Gauge - TCODE .0, .65, "Âðåìÿ ïîä âîäîé â " ;201 Divetime will be in - TCODE .0, .95, "âèäå Ìèíóòû:Ñåêóíäû" ;202 Minutes:Seconds. - TCODE .0, .125, "OSTC2 íå âû÷èñëÿåò " ;203 OSTC2 will not - TCODE .0, .155, "äåêîìïðåññèþ, " ;204 compute Deco, NoFly - TCODE .0, .185, "íåëºòíîå âðåìÿ è " ;205 time and Desat. - TCODE .0, .215, "âðåìÿ ðàññûùåíèÿ! " ;206 time at all! -; Const.ppO2 description - TCODE .0, .35, "Àëãîðèòì: ZH-L16 CC" ;207 Decotype: ZH-L16 CC - TCODE .0, .65, "Äëÿ (ïîëó-)çàêðûòîé" ;208 For (Semi-)Closed - TCODE .0, .95, "ñõåìû äûõàíèÿ. " ;209 Circuit rebreathers - TCODE .0, .125, "Çàäàéòå 3 Ñåòïîèíòà" ;210 Configure the 3 - TCODE .0, .155, "â ìåíþ íàñòðîéêè " ;211 SetPoints in CCR - - TCODE .0, .185, "CCR. Äîñòóïíî äî 5 " ;212 Setup menu. 5 bail- - TCODE .0, .215, "çàïàñíûõ ñìåñåé. " ;213 outs are available. -; Apnoemode description - TCODE .0, .35, "Àëãîðèòì: Àïíîý " ;214 Decotype: Apnoe - TCODE .0, .65, "OSTC2 ïîêàçûâàåò " ;215 OSTC2 will display - TCODE .0, .95, "êàæäîå ïîãðóæåíèå " ;216 each descent separ- - TCODE .0, .125, "îòäåëüíî â Ìèí:Ñåê." ;217 ately in Min:Sec. - TCODE .0, .155, "Âðåìåííî âûñòàâëÿåò" ;218 Will temporally set - TCODE .0, .185, "ïåðèîä äàííûõ 1 ñåê" ;219 samplerate to 1 sec - TCODE .0, .215, "Íå âû÷èñëÿåò äåêî! " ;220 No Deco calculation -; Multi GF OC mode description - TCODE .0, .35, "Àëãîðèòì: L16-GF OC" ;221 Decotype: L16-GF OC - TCODE .0, .65, "Ðàñ÷åò äåêîìïðåññèè" ;222 Decompression cal- - TCODE .0, .95, "ñ ìåòîäîì ãðàäèåíò-" ;223 culations with the - TCODE .0, .125, "ôàêòîðà (ÃÔíèæ/ÃÔ " ;224 GF-Method (GF_lo/GF - TCODE .0, .155, "âðõ). Óòî÷í. ÄÏ32 &" ;225 _hi). Check CF32 & - TCODE .0, .185, "ÄÏ33!Îòêðûòûé öèêë," ;226 CF33! Open Circuit - TCODE .0, .215, "ãëóáîêèå îñòàíîâêè." ;227 with Deep Stops. -; Multi GF CC mode description - TCODE .0, .35, "Àëãîðèòì: L16-GF CC" ;228 Decotype: L16-GF CC - TCODE .0, .65, "Ðàñ÷åò äåêîìïðåññèè" ;229 Decompression cal- - TCODE .0, .95, "ñ ìåòîäîì ãðàäèåíò-" ;230 culations with the - TCODE .0, .125, "ôàêòîðà (ÃÔíèæ/ÃÔ " ;231 GF-Method (GF_lo/GF - TCODE .0, .155, "âðõ). Óòî÷í. ÄÏ32 &" ;232 _hi). Check CF32 & - TCODE .0, .185, "ÄÏ33!Çàêðûòûé öèêë," ;233 CF33!Closed Circuit - TCODE .0, .215, "ãëóáîêèå îñòàíîâêè." ;234 with Deep Stops. + +; 32 custom function descriptors III (FIXED LENGTH = 15 chars). + TCODE .40, .35, "unused " ;193 unused + TCODE .40, .35, "unused " ;194 unused + TCODE .40, .35, "unused " ;195 unused + 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, "unused " ;203 unused + TCODE .40, .35, "unused " ;204 unused + TCODE .40, .35, "unused " ;205 unused + TCODE .40, .35, "unused " ;206 unused + TCODE .40, .35, "unused " ;207 unused + TCODE .40, .35, "unused " ;208 unused + TCODE .40, .35, "unused " ;209 unused + TCODE .40, .35, "unused " ;210 unused + TCODE .40, .35, "unused " ;211 unused + TCODE .40, .35, "unused " ;212 unused + TCODE .40, .35, "unused " ;213 unused + TCODE .40, .35, "unused " ;214 unused + TCODE .40, .35, "unused " ;215 unused + TCODE .40, .35, "unused " ;216 unused + TCODE .40, .35, "unused " ;217 unused + TCODE .40, .35, "unused " ;218 unused + TCODE .40, .35, "unused " ;219 unused + TCODE .40, .35, "unused " ;220 unused + TCODE .40, .35, "unused " ;221 unused + TCODE .40, .35, "unused " ;222 unused + TCODE .40, .35, "unused " ;223 unused + TCODE .40, .35, "unused " ;224 unused ; + TCODE .12, .2, "Äîï. Ïàðàìåòðû III" ;225 Custom Functions III + TCODE .0, .0, "" ;226 unused + TCODE .0, .0, "" ;227 unused + TCODE .0, .0, "" ;228 unused + 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 .0, .0, "" ;234 unused + TCODE .10, .2, "Àëãîðèòì èçìåíåí! " ;235 Decomode changed! TCODE .85, .125, "L16-GF CC" ;236 L16-GF CC TCODE .2, .12, "Íå íàéäåí" ;237 Not found @@ -423,7 +420,7 @@ TCODE .0, .65, "äîáàâëåíû! Ïðîâåðüòå" ;273 were added! Check TCODE .0, .95, "Ìåíþ ÄÏ I and ÄÏ II" ;274 CF I and CF II Menu TCODE .0, .125, "äëÿ èíôîðìàöèè!" ;275 for Details! - TCODE .20, .95, "Ñîëåíîñòü: " ;276 Salinity: + TCODE .20, .125, "Ñîëåíîñòü: " ;276 Salinity: ; TCODE .20, .95, "Âðåìÿ íà äíå :" ;277 Bottom Time: TCODE .20, .125, "Ìàêñ. ãëóáèíà:" ;278 Max. Depth: @@ -446,7 +443,7 @@ TCODE .20, .155, "-1 ìáàð" ;293 -1 mbar TCODE .78, .185, "Àëüò: " ;294 Alt: ; - TCODE .20, .125, "Ïîêàçàòü äàìï" ;295 Show raw data + TCODE .20, .95, "Äîï. Ïàðàìåòðû III" ;295 Custom FunctionsIII TCODE .50, .2, "Äàìï:" ;296 Raw Data: ; Gas-setup addons: TCODE .0, .0, "MOD:" ;297 MOD: (max operating depth of a gas). @@ -471,4 +468,63 @@ ; OLED Brightness settings TCODE .103, .155, "Íîðì" ;312 Eco (Same length as #313!) TCODE .103, .155, "ßðêî" ;313 High (Same length as #312!) + +; ZH-L16 mode description + TCODE .0, .35, "Àëãîðèòì: ZH-L16 OC" ;314 Decotype: ZH-L16 OC + TCODE .0, .65, "Äëÿ îòêðûòîé ñõåìû " ;315 For Open Circuit + TCODE .0, .95, "äûõàíèÿ. Äîñòóïíî " ;316 Divers. Supports 5 + TCODE .0, .125, "äî 5 Òðèìèêñ-ñìåñåé" ;317 Trimix Gases. + TCODE .0, .155, "Çàäàéòå ñâîè ãàçû " ;318 Configure your gas + TCODE .0, .185, "â ìåíþ íàñòðîéêè. " ;319 in Gassetup menu. + TCODE .0, .215, "Óòî÷í. ÄÏ11 & ÄÏ12!" ;320 Check CF11 & CF12 ! +; Gaugemode description + TCODE .0, .35, "Àëãîðèòì: Òàéìåð " ;321 Decotype: Gauge + TCODE .0, .65, "Âðåìÿ ïîä âîäîé â " ;322 Divetime will be in + TCODE .0, .95, "âèäå Ìèíóòû:Ñåêóíäû" ;323 Minutes:Seconds. + TCODE .0, .125, "OSTC2 íå âû÷èñëÿåò " ;324 OSTC2 will not + TCODE .0, .155, "äåêîìïðåññèþ, " ;325 compute Deco, NoFly + TCODE .0, .185, "íåëºòíîå âðåìÿ è " ;326 time and Desat. + TCODE .0, .215, "âðåìÿ ðàññûùåíèÿ! " ;327 time at all! +; Const.ppO2 description + TCODE .0, .35, "Àëãîðèòì: ZH-L16 CC" ;328 Decotype: ZH-L16 CC + TCODE .0, .65, "Äëÿ çàêðûòîé" ;329 For Closed + TCODE .0, .95, "ñõåìû äûõàíèÿ. " ;330 Circuit rebreathers + TCODE .0, .125, "Çàäàéòå 3 Ñåòïîèíòà" ;331 Configure the 3 + TCODE .0, .155, "â ìåíþ íàñòðîéêè " ;332 SetPoints in CCR - + TCODE .0, .185, "CCR. Äîñòóïíî äî 5 " ;333 Setup menu. 5 bail- + TCODE .0, .215, "çàïàñíûõ ñìåñåé. " ;334 outs are available. +; Apnoemode description + TCODE .0, .35, "Àëãîðèòì: Àïíîý " ;335 Decotype: Apnoe + TCODE .0, .65, "OSTC2 ïîêàçûâàåò " ;336 OSTC2 will display + TCODE .0, .95, "êàæäîå ïîãðóæåíèå " ;337 each descent separ- + TCODE .0, .125, "îòäåëüíî â Ìèí:Ñåê." ;338 ately in Min:Sec. + TCODE .0, .155, "Âðåìåííî âûñòàâëÿåò" ;339 Will temporally set + TCODE .0, .185, "ïåðèîä äàííûõ 1 ñåê" ;340 samplerate to 1 sec + TCODE .0, .215, "Íå âû÷èñëÿåò äåêî! " ;341 No Deco calculation +; Multi GF OC mode description + TCODE .0, .35, "Àëãîðèòì: L16-GF OC" ;342 Decotype: L16-GF OC + TCODE .0, .65, "Ðàñ÷åò äåêîìïðåññèè" ;343 Decompression cal- + TCODE .0, .95, "ñ ìåòîäîì ãðàäèåíò-" ;344 culations with the + TCODE .0, .125, "ôàêòîðà (ÃÔíèæ/ÃÔ " ;345 GF-Method (GF_lo/GF + TCODE .0, .155, "âðõ). Óòî÷í. ÄÏ32 &" ;346 _hi). Check CF32 & + TCODE .0, .185, "ÄÏ33!Îòêðûòûé öèêë," ;347 CF33! Open Circuit + TCODE .0, .215, "ãëóáîêèå îñòàíîâêè." ;348 with Deep Stops. +; Multi GF CC mode description + TCODE .0, .35, "Àëãîðèòì: L16-GF CC" ;349 Decotype: L16-GF CC + TCODE .0, .65, "Ðàñ÷åò äåêîìïðåññèè" ;350 Decompression cal- + TCODE .0, .95, "ñ ìåòîäîì ãðàäèåíò-" ;351 culations with the + TCODE .0, .125, "ôàêòîðà (ÃÔíèæ/ÃÔ " ;352 GF-Method (GF_lo/GF + TCODE .0, .155, "âðõ). Óòî÷í. ÄÏ32 &" ;353 _hi). Check CF32 & + TCODE .0, .185, "ÄÏ33!Çàêðûòûé öèêë," ;354 CF33!Closed Circuit + TCODE .0, .215, "ãëóáîêèå îñòàíîâêè." ;355 with Deep Stops. +; Spare (PSCR?) + TCODE .0, .35, "" ;356 + TCODE .0, .65, "" ;357 + TCODE .0, .95, "" ;358 + TCODE .0, .125, "" ;359 + TCODE .0, .155, "" ;360 + TCODE .0, .185, "" ;361 + TCODE .0, .215, "" ;362 +; + ;============================================================================= \ No newline at end of file
--- a/code_part1/OSTC_code_asm_part1/spanish_text.asm Sat Apr 21 12:09:37 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/spanish_text.asm Sat Apr 21 13:58:30 2012 +0200 @@ -323,55 +323,52 @@ TCODE .0, .0, "ppO2 +" ;190 ppO2 + TCODE .0, .0, "ppO2 -" ;191 ppO2 - TCODE .0, .0, "Dil." ;192 Dil. (Rebreather diluent) -; ZH-L16 mode description - TCODE .0, .35, "Tipodeco: ZH-L16 OC" ;193 Decotype: ZH-L16 OC - TCODE .0, .65, "Para Buceo Circuito" ;194 For Open Circuit - TCODE .0, .95, "Abierto. Soporta 5 " ;195 Divers. Supports 5 - TCODE .0, .125, "Gases Trimix. " ;196 Trimix Gases. - TCODE .0, .155, "Configure su gas en" ;197 Configure your gas - TCODE .0, .185, "el menú Config. Gas" ;198 in Gassetup menu. - TCODE .0, .215, "¡Mirar CF11 & CF12!" ;199 Check CF11 & CF12 ! -; Gaugemode description - TCODE .0, .35, "Tipodeco: Indicador" ;200 Decotype: Gauge - TCODE .0, .65, "TiempoBuceo será en" ;201 Divetime will be in - TCODE .0, .95, "Minutos:Segundos. " ;202 Minutes:Seconds. - TCODE .0, .125, "OSTC2 no calculará " ;203 OSTC2 will not - TCODE .0, .155, "Deco, tiempo NoVue " ;204 compute Deco, NoFly - TCODE .0, .185, "y Desat. " ;205 time and Desat. - TCODE .0, .215, "¡Tan sólo tiempo! " ;206 time at all! -; Const.ppO2 description - TCODE .0, .35, "Tipodeco: ZH-L16 CC" ;207 Decotype: ZH-L16 CC - TCODE .0, .65, "Para rebreathers " ;208 For (Semi-)Closed - TCODE .0, .95, "(Semi-)Cerrados " ;209 Circuit rebreathers - TCODE .0, .125, "Configure los 3 " ;210 Configure the 3 - TCODE .0, .155, "SetPoints en menú " ;211 SetPoints in CCR - - TCODE .0, .185, "Conf. CCR. Hay 5 " ;212 Setup menu. 5 bail- - TCODE .0, .215, "bailouts disponible" ;213 outs are available. -; Apnoemode description - TCODE .0, .35, "Tipodeco: Apnea " ;214 Decotype: Apnoe - TCODE .0, .65, "OSTC2 mostrará cada" ;215 OSTC2 will display - TCODE .0, .95, "descenso por sepa- " ;216 each descent separ- - TCODE .0, .125, "rado en Min:Seg. " ;217 ately in Min:Sec. - TCODE .0, .155, "Temporal.fija frec." ;218 Will temporally set - TCODE .0, .185, "muestras a 1 seg. " ;219 samplerate to 1 sec - TCODE .0, .215, "No se calcula Deco " ;220 No Deco calculation -; Multi GF OC mode description - TCODE .0, .35, "Tipodeco: L16-GF OC" ;221 Decotype: L16-GF OC - TCODE .0, .65, "Cálculos descompr. " ;222 Decompression cal- - TCODE .0, .95, "con el método-GF " ;223 culations with the - TCODE .0, .125, "(GF_bajo/GF_alto). " ;224 GF-Method (GF_lo/GF - TCODE .0, .155, "¡Mirar CF32 y CF33!" ;225 _hi). Check CF32 & - TCODE .0, .185, "CircuitoAbierto con" ;226 CF33! Open Circuit - TCODE .0, .215, "Paradas Profundas. " ;227 with Deep Stops. -; Multi GF CC mode description - TCODE .0, .35, "Tipodeco: L16-GF CC" ;228 Decotype: L16-GF CC - TCODE .0, .65, "Cálculos descompr. " ;229 Decompression cal- - TCODE .0, .95, "con el método-GF " ;230 culations with the - TCODE .0, .125, "(GF_bajo/GF_alto). " ;231 GF-Method (GF_lo/GF - TCODE .0, .155, "¡Mirar CF32 & CF33!" ;232 _hi). Check CF32 & - TCODE .0, .185, "CircuitoCerrado con" ;233 CF33!Closed Circuit - TCODE .0, .215, "Paradas Profundas. " ;234 with Deep Stops. + +; 32 custom function descriptors III (FIXED LENGTH = 15 chars). + TCODE .40, .35, "unused " ;193 unused + TCODE .40, .35, "unused " ;194 unused + TCODE .40, .35, "unused " ;195 unused + 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, "unused " ;203 unused + TCODE .40, .35, "unused " ;204 unused + TCODE .40, .35, "unused " ;205 unused + TCODE .40, .35, "unused " ;206 unused + TCODE .40, .35, "unused " ;207 unused + TCODE .40, .35, "unused " ;208 unused + TCODE .40, .35, "unused " ;209 unused + TCODE .40, .35, "unused " ;210 unused + TCODE .40, .35, "unused " ;211 unused + TCODE .40, .35, "unused " ;212 unused + TCODE .40, .35, "unused " ;213 unused + TCODE .40, .35, "unused " ;214 unused + TCODE .40, .35, "unused " ;215 unused + TCODE .40, .35, "unused " ;216 unused + TCODE .40, .35, "unused " ;217 unused + TCODE .40, .35, "unused " ;218 unused + TCODE .40, .35, "unused " ;219 unused + TCODE .40, .35, "unused " ;220 unused + TCODE .40, .35, "unused " ;221 unused + TCODE .40, .35, "unused " ;222 unused + TCODE .40, .35, "unused " ;223 unused + TCODE .40, .35, "unused " ;224 unused ; + TCODE .7, .2, "Func.Personaliz. III" ;225 Custom Functions III + TCODE .0, .0, "" ;226 unused + TCODE .0, .0, "" ;227 unused + TCODE .0, .0, "" ;228 unused + 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 .0, .0, "" ;234 unused + TCODE .10, .2, "¡ModoDeco cambiado!" ;235 Decomode changed! TCODE .85, .125, "L16-GF CC" ;236 L16-GF CC TCODE .2, .12, "No encont" ;237 Not found @@ -419,7 +416,7 @@ TCODE .0, .65, "Pers.! ¡Comprobar menú" ;273 were added! Check TCODE .0, .95, "CF I y CF II para" ;274 CF I and CF II Menu TCODE .0, .125, "más Detalles!" ;275 for Details! - TCODE .20, .95, "Salinidad:" ;276 Salinity: + TCODE .20, .125, "Salinidad:" ;276 Salinity: ; TCODE .20, .95, "Tiempo Fondo:" ;277 Bottom Time: TCODE .20, .125, "Prof. Max.:" ;278 Max. Depth: @@ -442,7 +439,7 @@ TCODE .20, .155, "-1 mbar" ;293 -1 mbar TCODE .85, .185, "Alt: " ;294 Alt: ; - TCODE .20, .125, "Ver datos raw" ;295 Show raw data + TCODE .20, .95, "Func.Personaliz.III" ;295 Custom FunctionsIII TCODE .50, .2, "DatosRaw:" ;296 Raw Data: ; Gas-setup addons: TCODE .0, .0, "MOD:" ;297 MOD: (max operating depth of a gas). @@ -468,4 +465,63 @@ ; OLED Brightness settings TCODE .103, .155, "Eco " ;312 Eco (Same length as #313!) TCODE .103, .155, "High" ;313 High (Same length as #312!) + +; ZH-L16 mode description + TCODE .0, .35, "Tipodeco: ZH-L16 OC" ;314 Decotype: ZH-L16 OC + TCODE .0, .65, "Para Buceo Circuito" ;315 For Open Circuit + TCODE .0, .95, "Abierto. Soporta 5 " ;316 Divers. Supports 5 + TCODE .0, .125, "Gases Trimix. " ;317 Trimix Gases. + TCODE .0, .155, "Configure su gas en" ;318 Configure your gas + TCODE .0, .185, "el menú Config. Gas" ;319 in Gassetup menu. + TCODE .0, .215, "¡Mirar CF11 & CF12!" ;320 Check CF11 & CF12 ! +; Gaugemode description + TCODE .0, .35, "Tipodeco: Indicador" ;321 Decotype: Gauge + TCODE .0, .65, "TiempoBuceo será en" ;322 Divetime will be in + TCODE .0, .95, "Minutos:Segundos. " ;323 Minutes:Seconds. + TCODE .0, .125, "OSTC2 no calculará " ;324 OSTC2 will not + TCODE .0, .155, "Deco, tiempo NoVue " ;325 compute Deco, NoFly + TCODE .0, .185, "y Desat. " ;326 time and Desat. + TCODE .0, .215, "¡Tan sólo tiempo! " ;327 time at all! +; Const.ppO2 description + TCODE .0, .35, "Tipodeco: ZH-L16 CC" ;328 Decotype: ZH-L16 CC + TCODE .0, .65, "Para rebreathers " ;329 For Closed + TCODE .0, .95, "Cerrados" ;330 Circuit rebreathers + TCODE .0, .125, "Configure los 3 " ;331 Configure the 3 + TCODE .0, .155, "SetPoints en menú " ;332 SetPoints in CCR - + TCODE .0, .185, "Conf. CCR. Hay 5 " ;333 Setup menu. 5 bail- + TCODE .0, .215, "bailouts disponible" ;334 outs are available. +; Apnoemode description + TCODE .0, .35, "Tipodeco: Apnea " ;335 Decotype: Apnoe + TCODE .0, .65, "OSTC2 mostrará cada" ;336 OSTC2 will display + TCODE .0, .95, "descenso por sepa- " ;337 each descent separ- + TCODE .0, .125, "rado en Min:Seg. " ;338 ately in Min:Sec. + TCODE .0, .155, "Temporal.fija frec." ;339 Will temporally set + TCODE .0, .185, "muestras a 1 seg. " ;340 samplerate to 1 sec + TCODE .0, .215, "No se calcula Deco " ;341 No Deco calculation +; Multi GF OC mode description + TCODE .0, .35, "Tipodeco: L16-GF OC" ;342 Decotype: L16-GF OC + TCODE .0, .65, "Cálculos descompr. " ;343 Decompression cal- + TCODE .0, .95, "con el método-GF " ;344 culations with the + TCODE .0, .125, "(GF_bajo/GF_alto). " ;345 GF-Method (GF_lo/GF + TCODE .0, .155, "¡Mirar CF32 y CF33!" ;346 _hi). Check CF32 & + TCODE .0, .185, "CircuitoAbierto con" ;347 CF33! Open Circuit + TCODE .0, .215, "Paradas Profundas. " ;348 with Deep Stops. +; Multi GF CC mode description + TCODE .0, .35, "Tipodeco: L16-GF CC" ;349 Decotype: L16-GF CC + TCODE .0, .65, "Cálculos descompr. " ;350 Decompression cal- + TCODE .0, .95, "con el método-GF " ;351 culations with the + TCODE .0, .125, "(GF_bajo/GF_alto). " ;352 GF-Method (GF_lo/GF + TCODE .0, .155, "¡Mirar CF32 & CF33!" ;353 _hi). Check CF32 & + TCODE .0, .185, "CircuitoCerrado con" ;354 CF33!Closed Circuit + TCODE .0, .215, "Paradas Profundas. " ;355 with Deep Stops. +; Spare (PSCR?) + TCODE .0, .35, "" ;356 + TCODE .0, .65, "" ;357 + TCODE .0, .95, "" ;358 + TCODE .0, .125, "" ;359 + TCODE .0, .155, "" ;360 + TCODE .0, .185, "" ;361 + TCODE .0, .215, "" ;362 +; + ;=============================================================================
--- a/code_part1/OSTC_code_asm_part1/turkish_text.asm Sat Apr 21 12:09:37 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/turkish_text.asm Sat Apr 21 13:58:30 2012 +0200 @@ -213,7 +213,6 @@ TCODE .0, .0, "m/dk " ;083 m/min TCODE .100, .113, "Dekosuz " ;084 No Stop TCODE .135, .113, "Yüzey Varis" ;085 TTS -; TCODE .71, .113, "Yüzey Varis" ;085 TTS TCODE .85, .0, "Dalis Süre" ;086 Divetime TCODE .0, .0, "Derinlik" ;087 Depth TCODE .0, .0, "Ilk Gaz ? " ;088 First Gas? @@ -327,55 +326,52 @@ TCODE .0, .0, "ppO2 +" ;190 ppO2 + TCODE .0, .0, "ppO2 -" ;191 ppO2 - TCODE .0, .0, "Dil." ;192 Dil. (Rebreather diluent) -; ZH-L16 mode description - TCODE .0, .35, "Deko Modeli: ZH-L16 OC " ;193 Decotype: ZH-L16 OC - TCODE .0, .65, "Standart dalis modeli. " ;194 For Open Circuit - TCODE .0, .95, "Cihaz,5 adet Trimix ga-" ;195 Divers. Supports 5 - TCODE .0, .125, "zini desteklemektedir. " ;196 Trimix Gases. - TCODE .0, .155, "Lütfen ozel fonksiyon- " ;197 Configure your gas - TCODE .0, .185, "lardan CF11 & CF12 yi " ;198 in Gassetup menu. - TCODE .0, .215, "kontrol ediniz! " ;199 Check CF11 & CF12 ! -; Gaugemode description - TCODE .0, .35, "Deko Modeli: Geyc Modu " ;200 Decotype: Gauge - TCODE .0, .65, "Dalis zamani dakika ve " ;201 Divetime will be in - TCODE .0, .95, "saniye cinsinden göste-" ;202 Minutes:Seconds. - TCODE .0, .125, "rilecektir. Bilgisayar " ;203 OSTC2 will not - TCODE .0, .155, "hicbir sekilde Deko bil" ;204 compute Deco, NoFly - TCODE .0, .185, "gisi hesaplamayacaktir " ;205 time and Desat. - TCODE .0, .215, " " ;206 time at all! -; Const.ppO2 description - TCODE .0, .35, "Deko Modeli: ZH-L16 CC " ;207 Decotype: ZH-L16 CC - TCODE .0, .65, "Tam/Yari Kapali Devre " ;208 For (Semi-)Closed - TCODE .0, .95, "Geri Solutucu modeli. " ;209 Circuit rebreathers - TCODE .0, .125, "Kapali Devre icin 3 " ;210 Configure the 3 - TCODE .0, .155, "farkli SetPoint ve 5 " ;211 SetPoints in CCR - - TCODE .0, .185, "adet Bailout(kurtarma) " ;212 Setup menu. 5 bail- - TCODE .0, .215, "sistemde bulunmaktadir." ;213 outs are available. -; Apnoemode description - TCODE .0, .35, "Deko Modeli: Apnea Modu" ;214 Decotype: Apnoe - TCODE .0, .65, "OSTC2 sadece inis bilgi" ;215 OSTC2 will display - TCODE .0, .95, "sini dakika ve saniye " ;216 each descent separ- - TCODE .0, .125, "cinsinden gosterecektir" ;217 ately in Min:Sec. - TCODE .0, .155, "Deko hesaplamasi bu " ;218 Will temporally set - TCODE .0, .185, "modda yapilmayacaktir! " ;219 samplerate to 1 sec - TCODE .0, .215, " " ;220 No Deco calculation -; Multi GF OC mode description - TCODE .0, .35, "Deko Modeli: L16-GF OC " ;221 Decotype: L16-GF OC - TCODE .0, .65, "Deko hesaplamalari GF- " ;222 Decompression cal- - TCODE .0, .95, "Gradient Factor'e göre " ;223 culations with the - TCODE .0, .125, "yapilmaktadir. Lütfen " ;224 GF-Method (GF_lo/GF - TCODE .0, .155, "CF32 & CF33 nolu fonksi" ;225 _hi). Check CF32 & - TCODE .0, .185, "yonlari kontrol ediniz." ;226 CF33! Open Circuit - TCODE .0, .215, " " ;227 with Deep Stops. -; Multi GF CC mode description - TCODE .0, .35, "Deko Modeli: L16-GF CC " ;228 Decotype: L16-GF CC - TCODE .0, .65, "Deko hesaplamalari " ;229 Decompression cal- - TCODE .0, .95, "Gradient Factor'e göre " ;230 culations with the - TCODE .0, .125, "yapilmaktadir. Lütfen " ;231 GF-Method (GF_lo/GF - TCODE .0, .155, "CF32 & CF33 nolu fonksi" ;232 _hi). Check CF32 & - TCODE .0, .185, "yonlari kontrol ediniz." ;233 CF33!Closed Circuit - TCODE .0, .215, " " ;234 with Deep Stops. + +; 32 custom function descriptors III (FIXED LENGTH = 15 chars). + TCODE .40, .35, "unused " ;193 unused + TCODE .40, .35, "unused " ;194 unused + TCODE .40, .35, "unused " ;195 unused + 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, "unused " ;203 unused + TCODE .40, .35, "unused " ;204 unused + TCODE .40, .35, "unused " ;205 unused + TCODE .40, .35, "unused " ;206 unused + TCODE .40, .35, "unused " ;207 unused + TCODE .40, .35, "unused " ;208 unused + TCODE .40, .35, "unused " ;209 unused + TCODE .40, .35, "unused " ;210 unused + TCODE .40, .35, "unused " ;211 unused + TCODE .40, .35, "unused " ;212 unused + TCODE .40, .35, "unused " ;213 unused + TCODE .40, .35, "unused " ;214 unused + TCODE .40, .35, "unused " ;215 unused + TCODE .40, .35, "unused " ;216 unused + TCODE .40, .35, "unused " ;217 unused + TCODE .40, .35, "unused " ;218 unused + TCODE .40, .35, "unused " ;219 unused + TCODE .40, .35, "unused " ;220 unused + TCODE .40, .35, "unused " ;221 unused + TCODE .40, .35, "unused " ;222 unused + TCODE .40, .35, "unused " ;223 unused + TCODE .40, .35, "unused " ;224 unused ; + TCODE .7, .2, "Ozel Fonksiyonlar III" ;225 Custom Functions III + TCODE .0, .0, "" ;226 unused + TCODE .0, .0, "" ;227 unused + TCODE .0, .0, "" ;228 unused + 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 .0, .0, "" ;234 unused + TCODE .10, .2, "Deko Modeli Degisti!" ;235 Decomode changed! TCODE .85, .125, "L16-GF CC" ;236 L16-GF CC TCODE .2, .12, "Bulunamadi! " ;237 Not found @@ -423,7 +419,7 @@ TCODE .0, .65, "Eklendi,Lütfen " ;273 were added! Check TCODE .0, .95, "Ozel Fonksiyonlari " ;274 CF I and CF II Menu TCODE .0, .125, "Kontrol Ediniz! " ;275 for Details! - TCODE .20, .95, "Tuzluluk: " ;276 Salinity: + TCODE .20, .125, "Tuzluluk: " ;276 Salinity: ; TCODE .20, .95, "Dip Zaman:" ;277 Bottom Time: TCODE .20, .125, "Derinlik :" ;278 Max. Depth: @@ -446,7 +442,7 @@ TCODE .20, .155, "-1 mbar" ;293 -1 mbar TCODE .85, .185, "Alt: " ;294 Alt: ; - TCODE .20, .125, "Degiskenler... " ;295 Show raw data + TCODE .20, .95, "Ozel FonksiyonlarIII" ;295 Custom FunctionsIII TCODE .50, .2, "Degiskenler" ;296 Raw Data: ; Gas-setup addons: TCODE .0, .0, "MOD:" ;297 MOD: (max operating depth of a gas). @@ -473,4 +469,64 @@ TCODE .103, .155, "Dusuk " ;312 Eco (Same length as #313!) TCODE .103, .155, "Parlak" ;313 High (Same length as #312!) +; ZH-L16 mode description + TCODE .0, .35, "Deko Modeli: ZH-L16 OC " ;314 Decotype: ZH-L16 OC + TCODE .0, .65, "Standart dalis modeli. " ;315 For Open Circuit + TCODE .0, .95, "Cihaz,5 adet Trimix ga-" ;316 Divers. Supports 5 + TCODE .0, .125, "zini desteklemektedir. " ;317 Trimix Gases. + TCODE .0, .155, "Lütfen ozel fonksiyon- " ;318 Configure your gas + TCODE .0, .185, "lardan CF11 & CF12 yi " ;319 in Gassetup menu. + TCODE .0, .215, "kontrol ediniz! " ;320 Check CF11 & CF12 ! +; Gaugemode description + TCODE .0, .35, "Deko Modeli: Geyc Modu " ;321 Decotype: Gauge + TCODE .0, .65, "Dalis zamani dakika ve " ;322 Divetime will be in + TCODE .0, .95, "saniye cinsinden göste-" ;323 Minutes:Seconds. + TCODE .0, .125, "rilecektir. Bilgisayar " ;324 OSTC2 will not + TCODE .0, .155, "hicbir sekilde Deko bil" ;325 compute Deco, NoFly + TCODE .0, .185, "gisi hesaplamayacaktir " ;326 time and Desat. + TCODE .0, .215, " " ;327 time at all! +; Const.ppO2 description + TCODE .0, .35, "Deko Modeli: ZH-L16 CC " ;328 Decotype: ZH-L16 CC + TCODE .0, .65, "Tam Kapali Devre" ;329 For Closed + TCODE .0, .95, "Geri Solutucu modeli. " ;330 Circuit rebreathers + TCODE .0, .125, "Kapali Devre icin 3 " ;331 Configure the 3 + TCODE .0, .155, "farkli SetPoint ve 5 " ;332 SetPoints in CCR - + TCODE .0, .185, "adet Bailout(kurtarma) " ;333 Setup menu. 5 bail- + TCODE .0, .215, "sistemde bulunmaktadir." ;334 outs are available. +; Apnoemode description + TCODE .0, .35, "Deko Modeli: Apnea Modu" ;335 Decotype: Apnoe + TCODE .0, .65, "OSTC2 sadece inis bilgi" ;336 OSTC2 will display + TCODE .0, .95, "sini dakika ve saniye " ;337 each descent separ- + TCODE .0, .125, "cinsinden gosterecektir" ;338 ately in Min:Sec. + TCODE .0, .155, "Deko hesaplamasi bu " ;339 Will temporally set + TCODE .0, .185, "modda yapilmayacaktir! " ;340 samplerate to 1 sec + TCODE .0, .215, " " ;341 No Deco calculation +; Multi GF OC mode description + TCODE .0, .35, "Deko Modeli: L16-GF OC " ;342 Decotype: L16-GF OC + TCODE .0, .65, "Deko hesaplamalari GF- " ;343 Decompression cal- + TCODE .0, .95, "Gradient Factor'e göre " ;344 culations with the + TCODE .0, .125, "yapilmaktadir. Lütfen " ;345 GF-Method (GF_lo/GF + TCODE .0, .155, "CF32 & CF33 nolu fonksi" ;346 _hi). Check CF32 & + TCODE .0, .185, "yonlari kontrol ediniz." ;347 CF33! Open Circuit + TCODE .0, .215, " " ;348 with Deep Stops. +; Multi GF CC mode description + TCODE .0, .35, "Deko Modeli: L16-GF CC " ;349 Decotype: L16-GF CC + TCODE .0, .65, "Deko hesaplamalari " ;350 Decompression cal- + TCODE .0, .95, "Gradient Factor'e göre " ;351 culations with the + TCODE .0, .125, "yapilmaktadir. Lütfen " ;352 GF-Method (GF_lo/GF + TCODE .0, .155, "CF32 & CF33 nolu fonksi" ;353 _hi). Check CF32 & + TCODE .0, .185, "yonlari kontrol ediniz." ;354 CF33!Closed Circuit + TCODE .0, .215, " " ;355 with Deep Stops. +; Spare (PSCR?) + TCODE .0, .35, "" ;356 + TCODE .0, .65, "" ;357 + TCODE .0, .95, "" ;358 + TCODE .0, .125, "" ;359 + TCODE .0, .155, "" ;360 + TCODE .0, .185, "" ;361 + TCODE .0, .215, "" ;362 + +; + + ;=============================================================================