Mercurial > public > mk2
changeset 744:7e7e98247a8a
Merge
| author | JeanDo |
|---|---|
| date | Mon, 12 Aug 2013 15:12:14 +0200 |
| parents | 69c9a8c41b94 (diff) 8466932a2fcf (current diff) |
| children | d8c403b69576 |
| files | code_part1/OSTC_code_c_part2/p2_deco.c |
| diffstat | 12 files changed, 41 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/changelog.txt Mon Aug 12 15:08:05 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/changelog.txt Mon Aug 12 15:12:14 2013 +0200 @@ -1,3 +1,11 @@ +New in 2.72: +BETA Version - Do NOT use for diving! + +New in 2.71: +BETA Version - Do NOT use for diving! +NEW: Indicate First Gas (OC) as Better Gas in Bailout list +BUGFIX: Clear end-of-dive countdown properly when descending again + New in 2.70: Intermediate release for OSTC 2C users (Language support)
--- a/code_part1/OSTC_code_asm_part1/definitions.asm Mon Aug 12 15:08:05 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/definitions.asm Mon Aug 12 15:12:14 2013 +0200 @@ -22,7 +22,7 @@ ; ToDo: #DEFINE softwareversion_x d'2' ; Software version XX.YY -#DEFINE softwareversion_y d'71' ; Software version XX.YY +#DEFINE softwareversion_y d'72' ; Software version XX.YY #DEFINE softwareversion_beta 1 ; (and 0 for release)
--- a/code_part1/OSTC_code_asm_part1/divemode_menu.asm Mon Aug 12 15:08:05 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/divemode_menu.asm Mon Aug 12 15:12:14 2013 +0200 @@ -665,18 +665,26 @@ btfss FLAG_const_ppO2_mode ; are we in ppO2 mode? bra divemenu_set_gas2a ; no, choose gas ; Yes, so select SP 1-3 - bcf is_bailout ;=1: CC mode, but bailout active! - call DISP_show_ppO2_clear ; Clear ppO2 value divemenu_set_gas1: movlw d'1' cpfseq menupos ; At the "Bailout" position? bra divemenu_set_gas1b ; No, select SetPoint 1-3 or Diluent - bsf select_bailoutgas ; Set Flag + + bsf select_bailoutgas ; Set Flag bcf display_set_setpoint ; Clear Flag + btfsc is_bailout ; Already in bailout? + bra divemenu_set_gas_2 ; Yes. + + ;Setup first gas as better gas + bsf better_gas_available + read_int_eeprom .33 ; 1-5 + movff EEDATA,better_gas_number bra divemenu_set_gas_2 ; Configure the extra gas / Select Bailout divemenu_set_gas1b: + bcf is_bailout ;=1: CC mode, but bailout active! + call DISP_show_ppO2_clear ; Clear ppO2 value movlw d'5' cpfseq menupos ; At the "Diluent" position? bra divemenu_set_gas1c ; No, select SetPoint 1-3
--- a/code_part1/OSTC_code_asm_part1/english_text.asm Mon Aug 12 15:08:05 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/english_text.asm Mon Aug 12 15:12:14 2013 +0200 @@ -151,7 +151,7 @@ TCODE .14, .2, "Custom Functions I" ;027 Custom Functions I TCODE .40, .2, "Reset Menu" ;028 Reset Menu TCODE .50, .2, "Set Time:" ;029 Set Time: - TCODE .100, .50, "SetMarker" ;030 SetMarker (Add a mark in logbook profile) + TCODE .100, .50, "Marker" ;030 Marker (Add a mark in logbook profile) TCODE .100, .25, "Decoplan" ;031 Decoplan TCODE .100, .0, "Gaslist" ;032 Gaslist TCODE .100, .50, "ResetAvr" ;033 ResetAvr (Reset average depth)
--- a/code_part1/OSTC_code_asm_part1/french_text.asm Mon Aug 12 15:08:05 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/french_text.asm Mon Aug 12 15:12:14 2013 +0200 @@ -186,7 +186,7 @@ TCODE .40, .35, "Divis.Donn.Déco" ;058 Divisor Decodat TCODE .40, .35, "Diviseur GF " ;059 Divisor GF TCODE .40, .35, "Diviseur ppO2 " ;060 Divisor ppO2 - TCODE .40, .35, "Diviseur Debug " ;061 Divisor Debug + TCODE .40, .35, "Divis. Paliers " ;061 Divisor Decoplan TCODE .40, .35, "Diviseur CNS " ;062 Divisor CNS TCODE .40, .35, "Aff.CNSPlong[%]" ;063 CNSshow dive[%] TCODE .40, .35, "Décalage Carnet" ;064 Logbook offset
--- a/code_part1/OSTC_code_asm_part1/italian_text.asm Mon Aug 12 15:08:05 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/italian_text.asm Mon Aug 12 15:12:14 2013 +0200 @@ -151,7 +151,7 @@ TCODE .14, .2, "Funzioni Custom I" ;027 Custom Functions I TCODE .40, .2, "Reset Menu" ;028 Reset Menu TCODE .43, .2, "Imposta ora:" ;029 Set Time: - TCODE .100, .50, "SetMarker" ;030 SetMarker (Add a mark in logbook profile) + TCODE .100, .50, "Marker" ;030 Marker (Add a mark in logbook profile) TCODE .100, .25, "PianoDeco" ;031 Decoplan TCODE .100, .0, "ListaGas" ;032 Gaslist TCODE .100, .50, "AzzeraAvr" ;033 ResetAvr (Reset average depth)
--- a/code_part1/OSTC_code_asm_part1/outputs.asm Mon Aug 12 15:08:05 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/outputs.asm Mon Aug 12 15:12:14 2013 +0200 @@ -690,7 +690,7 @@ call DISP_display_deko_mask ; Yes, redraw mask WIN_TOP .54 - WIN_LEFT .112 + WIN_LEFT .110 movlw d'6' movwf temp1 bcf timeout_display ; Clear flag @@ -3105,6 +3105,7 @@ cpfseq hi ; All gases shown? bra DISP_gas_list_loop ; No + WIN_INVERT .0 DISPLAYTEXT d'122' ; More return ; return (OC mode)
--- a/code_part1/OSTC_code_asm_part1/russian_text.asm Mon Aug 12 15:08:05 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/russian_text.asm Mon Aug 12 15:12:14 2013 +0200 @@ -118,7 +118,9 @@ #DEFINE TXT_TX2 "x" ; "x" #DEFINE TXT_NX1 "N" ; "N" #DEFINE TXT_NX2 "x" ; "x" -#DEFINE TXT_aGF4 "aGF:" ; "aGF:" +#DEFINE TXT_DIL_C "D" ; "D" +#DEFINE TXT_DIL5 "Äèë.#" ; "Dil.#" +#DEFINE TXT_aGF4 "äÃÔ:" ; "aGF:" #ENDIF ;============================================================================= @@ -330,14 +332,14 @@ ; 32 custom function descriptors III (FIXED LENGTH = 15 chars). TCODE .40, .35, "Öâåò# íåàêòèâí" ;193 Color# inactive TCODE .40, .35, "Îñòàí. áåçîïàñí" ;194 Use safety stop - TCODE .40, .35, "Ïîêàç GF â NDL " ;195 Show GF in NDL (If GF > CF08) - 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, "Ïîêàç ÃÔ â NDL " ;195 Show GF in NDL (If GF > CF08) + TCODE .40, .35, "Äîï. ÃÔ Íèæ [%]" ;196 Alt. GF Low [%] + TCODE .40, .35, "Äîï. ÃÔ Âåðõ[%]" ;197 Alt. GF High[%] + TCODE .40, .35, "Ðàçðåø. Äîï. ÃÔ" ;198 Allow GF change + TCODE .40, .35, "Îñò.Áåç.Äëèò[s]" ;199 S.StopLength[s] (CF70: Safety Stop Duration [s]) + TCODE .40, .35, "Îñò.Áåç. Íà÷[m]" ;200 S.StopStart [m] (CF71: Safety Stop Start Depth [m]) + TCODE .40, .35, "Îñò.Áåç. Êíö[m]" ;201 S.StopEnd [m] (CF72: Safety Stop End Depth [m]) + TCODE .40, .35, "Îñò.Áåç. Ñáð[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 @@ -409,8 +411,8 @@ TCODE .0, .0, "pSCR Èíôî" ;266 pSCR Info (Must be 9Chars!) TCODE .0, .184, "Ìàêñ." ;267 Max. - TCODE .93, .170, "GF Values" ;268 GF Values - TCODE .100, .50, "ToggleGF" ;269 ToggleGF (In Divemode Menu) + TCODE .93, .170, "Ïà®àì. ÃÔ" ;268 GF Values + TCODE .100, .50, "Ñìåíà ÃÔ" ;269 ToggleGF (In Divemode Menu) TCODE .0, .0, "" ;270 unused ; New CFs Warning
--- a/code_part1/OSTC_code_asm_part1/spanish_text.asm Mon Aug 12 15:08:05 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/spanish_text.asm Mon Aug 12 15:12:14 2013 +0200 @@ -150,7 +150,7 @@ TCODE .14, .2, "Func. Personaliz. I" ;027 Custom Functions I TCODE .20, .2, "Menú Reinicio" ;028 Reset Menu TCODE .35, .2, "Fijar Hora:" ;029 Set Time: - TCODE .100, .50, "Marcar " ;030 SetMarker (Add a mark in logbook profile) + TCODE .100, .50, "Marcar" ;030 Marker (Add a mark in logbook profile) TCODE .100, .25, "Plandeco" ;031 Decoplan TCODE .100, .0, "Listagas" ;032 Gaslist TCODE .100, .50, "ReiniMed" ;033 ResetAvr (Reset average depth)
--- a/code_part1/OSTC_code_asm_part1/turkish_text.asm Mon Aug 12 15:08:05 2013 +0200 +++ b/code_part1/OSTC_code_asm_part1/turkish_text.asm Mon Aug 12 15:12:14 2013 +0200 @@ -146,9 +146,9 @@ TCODE .6, .0, "Sifirla... " ;025 Reset... TCODE .55, .2, "LogBook" ;026 Logbook TCODE .14, .2, "Ozel Fonksiyonlar I" ;027 Custom Functions I - TCODE .14, .2, "Cihaz Sifirla " ;028 Reset Menu + TCODE .14, .2, "Cihaz Sifirla " ;028 Reset Menu TCODE .14, .2, "Saati Ayarla: " ;029 Set Time: - TCODE .100, .50, "Isaret " ;030 SetMarker (Add a mark in logbook profile) + TCODE .100, .50, "Isaret" ;030 Marker (Add a mark in logbook profile) TCODE .100, .25, "Dekoplan" ;031 Decoplan TCODE .100, .0, "GazListe" ;032 Gaslist TCODE .100, .50, "Sifirla " ;033 ResetAvr (Reset average depth)
--- a/code_part1/OSTC_code_c_part2/p2_deco.c Mon Aug 12 15:08:05 2013 +0200 +++ b/code_part1/OSTC_code_c_part2/p2_deco.c Mon Aug 12 15:12:14 2013 +0200 @@ -221,7 +221,6 @@ static float float_saturation_multiplier; // new in v.101 static float float_desaturation_multiplier; // new in v.101 static float float_deco_distance; // new in v.101 -static char flag_in_divemode; // new in v.108 static unsigned char deco_gas_change[NUM_GAS]; // new in v.109 @@ -997,7 +996,6 @@ static void clear_tissue(void) { overlay float p; - flag_in_divemode = 0; // Kludge: the 0.0002 of 0.7902 are missing with standard air. N2_ratio = 0.7902;