Mercurial > public > mk2
changeset 445:6e57b5bb98ce
localisation part 1 from Sergei
| author | heinrichsweikamp |
|---|---|
| date | Thu, 11 Aug 2011 20:01:55 +0200 |
| parents | f6cdd0079c36 |
| children | 92304826000d |
| files | code_part1/OSTC_code_asm_part1/aa_fonts.asm code_part1/OSTC_code_asm_part1/altimeter.asm code_part1/OSTC_code_asm_part1/english_text.asm code_part1/OSTC_code_asm_part1/menu.asm code_part1/OSTC_code_asm_part1/menu_battery.asm code_part1/OSTC_code_asm_part1/menu_custom.asm code_part1/OSTC_code_asm_part1/menu_gassetup.asm code_part1/OSTC_code_asm_part1/menu_logbook.asm code_part1/OSTC_code_asm_part1/menu_ppO2.asm code_part1/OSTC_code_asm_part1/russian_text.asm code_part1/OSTC_code_asm_part1/simulator.asm |
| diffstat | 11 files changed, 185 insertions(+), 101 deletions(-) [+] |
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/aa_fonts.asm Thu Aug 11 13:30:29 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/aa_fonts.asm Thu Aug 11 20:01:55 2011 +0200 @@ -54,7 +54,7 @@ DB 0 ; End of translation table DB aa_font28_firstChar ; To be substracted DB aa_font28_chars ; Max value - DB 0x83-aa_font28_firstChar; replace by ¤ when unknown. + DB 0x8F-aa_font28_firstChar; replace by ¤ when unknown. DB aa_font28_height + 0x80 ; #include "aa_font28_idx.inc" ; SHOULD FOLLOW ! @@ -99,40 +99,40 @@ DB 0xD8, 0x8D DB 0xD9, 0x8E DB 0xDA, 0x8F - DB 0xDB, 0x94 - DB 0xDC, 0x95 - DB 0xDD, 0x96 - DB 0xDE, 0x97 - DB 0xDF, 0x98 - DB 0xE1, 0x99 - DB 0xE2, 0x9A - DB 0xE3, 0x9B - DB 0xE4, 0x9C - DB 0xE6, 0x9D - DB 0xE7, 0x9E - DB 0xE8, 0x9F - DB 0xE9, 0xA0 - DB 0xEA, 0xA1 - DB 0xEB, 0xA2 - DB 0xEC, 0xA3 - DB 0xED, 0xA5 - DB 0xEF, 0xA6 - DB 0xF2, 0xA7 - DB 0xF4, 0xA8 - DB 0xF6, 0xA9 - DB 0xF7, 0xAA - DB 0xF8, 0xAB - DB 0xF9, 0xAC - DB 0xFA, 0xAD - DB 0xFB, 0xAF - DB 0xFC, 0xB1 - DB 0xFD, 0xB2 - DB 0xFE, 0xB3 - DB 0xFF, 0xB4 + DB 0xDB, 0x96 + DB 0xDC, 0x97 + DB 0xDD, 0x98 + DB 0xDE, 0x99 + DB 0xDF, 0x9A + DB 0xE1, 0x9B + DB 0xE2, 0x9C + DB 0xE3, 0x9D + DB 0xE4, 0x9E + DB 0xE6, 0x9F + DB 0xE7, 0xA0 + DB 0xE8, 0xA1 + DB 0xE9, 0xA2 + DB 0xEA, 0xA3 + DB 0xEB, 0xA5 + DB 0xEC, 0xA6 + DB 0xED, 0xA7 + DB 0xEF, 0xA8 + DB 0xF2, 0xA9 + DB 0xF4, 0xAA + DB 0xF6, 0xAB + DB 0xF7, 0xAC + DB 0xF8, 0xAD + DB 0xF9, 0xAF + DB 0xFA, 0xB1 + DB 0xFB, 0xB2 + DB 0xFC, 0xB3 + DB 0xFD, 0xB4 + DB 0xFE, 0xB5 + DB 0xFF, 0xB6 DB 0 ; End of translation table DB aa_font28_firstChar ; To be substracted DB aa_font28_chars ; Max value - DB 0xA4-aa_font28_firstChar ; replace by д when unknown. + DB 0xA4-aa_font28_firstChar ; replace by ¤ when unknown. DB aa_font28_height + 0x80 ; #include "aa_font28_idx_rus.inc" ; SHOULD FOLLOW !
--- a/code_part1/OSTC_code_asm_part1/altimeter.asm Thu Aug 11 13:30:29 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/altimeter.asm Thu Aug 11 20:01:55 2011 +0200 @@ -114,7 +114,7 @@ WIN_FONT .0 call PLED_standard_color - STRCPY "Alt: " + STRCPY TXT_ALT5 movff altitude+0,lo ; BANK-SAFE read altitude movff altitude+1,hi @@ -132,7 +132,7 @@ output_16 bcf leftbind - STRCAT_PRINT "m " + STRCAT_PRINT TXT_METER5 return ;============================================================================= @@ -257,7 +257,7 @@ bsf leftbind output_16 - STRCAT_PRINT " mbar " + STRCAT_PRINT TXT_MBAR7 WIN_TOP .65 ; Action enable lfsr FSR2, letter @@ -296,7 +296,7 @@ bsf leftbind output_16 bcf leftbind - STRCAT_PRINT "m " + STRCAT_PRINT TXT_METER5 alt_menu_loop: call PLED_menu_cursor ; Display cursor
--- a/code_part1/OSTC_code_asm_part1/english_text.asm Thu Aug 11 13:30:29 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/english_text.asm Thu Aug 11 20:01:55 2011 +0200 @@ -56,6 +56,48 @@ ; you will have to adjust position. A char is 7 pixels wide. ; ;============================================================================= +; Define's section +; Definition "translation" ; English original +#IFNDEF TXT_DEFINED +#DEFINE TXT_DEFINED + +#DEFINE TXT_GAS_C 'G' ; 'G' +#DEFINE TXT_METER_C 'm' ; 'm' +#DEFINE TXT_METER5 "m " ; "m " +#DEFINE TXT_METER3 "m " ; "m " +#DEFINE TXT_METER2 "m " ; "m " +#DEFINE TXT_METER1 "m" ; "m" +#DEFINE TXT_MBAR7 " mbar " ; " mbar " +#DEFINE TXT_MBAR5 "mbar " ; "mbar " +#DEFINE TXT_BAR4 "bar " ; "bar " +#DEFINE TXT_ALT5 "Alt: " ; "Alt: " +#DEFINE TXT_KGL4 "kg/l" ; "kg/l" +#DEFINE TXT_VOLT1 "V" ; "V" +#DEFINE TXT_STEP5 "Step:" ; "Step:" +#DEFINE TXT_CF2 "CF" ; "CF" +#DEFINE TXT_O2_4 "O2: " ; "O2: " +#DEFINE TXT_O2_3 "O2 " ; "O2 " +#DEFINE TXT_AIR4 "AIR " ; "AIR " +#DEFINE TXT_ERR4 "ERR " ; "ERR " +#DEFINE TXT_HE4 "He: " ; "He: " +#DEFINE TXT_NX3 "NX " ; "NX " +#DEFINE TXT_TX3 "TX " ; "TX " +#DEFINE TXT_IN4 " in " ; " in " +#DEFINE TXT_G1_3 "G1:" ; "G1:" +#DEFINE TXT_G2_3 "G2:" ; "G2:" +#DEFINE TXT_G3_3 "G3:" ; "G3:" +#DEFINE TXT_G4_3 "G4:" ; "G4:" +#DEFINE TXT_G5_3 "G5:" ; "G5:" +#DEFINE TXT_G6_3 "G6:" ; "G6:" +#DEFINE TXT_1ST4 "1st:" ; "1st:" +#DEFINE TXT_CNS4 "CNS:" ; "CNS:" +#DEFINE TXT_CNSGR10 "CNS > 250%" ; "CNS > 250%" +#DEFINE TXT_AVR4 "Avr:" ; "Avr:" +#DEFINE TXT_GF3 "GF:" ; "GF:" +#DEFINE TXT_SAT4 "Sat:" ; "Sat:" + +#ENDIF +;============================================================================= ; macro X Y "translation" ; English original TCODE .0, .0, "Building MD2 Hash" ;001 Building MD2 Hash TCODE .0, .25, "Please Wait..." ;002 Please Wait...
--- a/code_part1/OSTC_code_asm_part1/menu.asm Thu Aug 11 13:30:29 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu.asm Thu Aug 11 20:01:55 2011 +0200 @@ -560,7 +560,7 @@ bsf leftbind output_16dp d'3' bcf leftbind - STRCAT_PRINT "kg/l" + STRCAT_PRINT TXT_KGL4 return toggle_salinity_reset2:
--- a/code_part1/OSTC_code_asm_part1/menu_battery.asm Thu Aug 11 13:30:29 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_battery.asm Thu Aug 11 20:01:55 2011 +0200 @@ -75,7 +75,7 @@ bsf leftbind output_16dp d'2' bcf leftbind - STRCAT_PRINT "V" + STRCAT_PRINT TXT_VOLT1 WIN_TOP .125 lfsr FSR2,letter
--- a/code_part1/OSTC_code_asm_part1/menu_custom.asm Thu Aug 11 13:30:29 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_custom.asm Thu Aug 11 20:01:55 2011 +0200 @@ -246,7 +246,7 @@ call word_processor WIN_TOP .95 - STRCPY "Step:" + STRCPY TXT_STEP5 clrf hi movff cf_step,lo call display_formated ; Typed display, w/o fill line. @@ -856,7 +856,7 @@ WIN_INVERT .1 ; Init new Wordprocessor call PLED_warnings_color - STRCPY "CF" + STRCPY TXT_CF2 movff cf_checker_counter,lo output_99x STRCAT_PRINT "!"
--- a/code_part1/OSTC_code_asm_part1/menu_gassetup.asm Thu Aug 11 13:30:29 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_gassetup.asm Thu Aug 11 20:01:55 2011 +0200 @@ -55,7 +55,7 @@ movf waitms_temp,W ; Load row into WREG movff WREG,win_top lfsr FSR2,letter - PUTC 'G' + PUTC TXT_GAS_C movff decodata+0,lo incf lo,F bsf leftbind @@ -131,7 +131,7 @@ ; New v1.44se menu_gassetup_O2: - STRCAT "O2 " + STRCAT TXT_O2_3 output_8 bra menu_gassetup_list0 @@ -140,13 +140,13 @@ cpfseq lo ; o2 = 21% call menu_gassetup_Err - STRCAT "AIR " + STRCAT TXT_AIR4 output_8 bra menu_gassetup_list0 ; New v1.44se menu_gassetup_Err: - STRCAT "ERR " + STRCAT TXT_ERR4 output_8 ; Changed v1.44se @@ -160,14 +160,14 @@ movff WREG,win_top lfsr FSR2,letter - STRCAT " in " + STRCAT TXT_IN4 movf decodata+0,W ; read current value addlw d'28' ; offset in memory movwf EEADR call read_eeprom ; Low-value movff EEDATA,lo output_8 - PUTC 'm' + PUTC TXT_METER_C movf decodata+0,W call PLED_grey_inactive_gas ; Sets Greyvalue for inactive gases call word_processor @@ -301,7 +301,7 @@ WIN_LEFT .20 WIN_TOP .65 - STRCPY "O2: " + STRCPY TXT_O2_4 movf divemins+0,W addlw 0x06 @@ -319,11 +319,11 @@ rcall gassetup_get_mod ; compute MOD based on CF18 into lo:hi output_16 - STRCAT_PRINT "m " + STRCAT_PRINT TXT_METER3 WIN_LEFT .20 WIN_TOP .95 - STRCPY "He: " + STRCPY TXT_HE4 movf divemins+0,W addlw 0x07 movwf EEADR @@ -384,7 +384,7 @@ subwfb xC+1,F movff xC+1,hi output_16 - STRCAT_PRINT "m " + STRCAT_PRINT TXT_METER3 WIN_LEFT .20 WIN_TOP .125 @@ -681,7 +681,7 @@ ; lo still holds change depth bsf leftbind output_8 - STRCAT_PRINT "m " + STRCAT_PRINT TXT_METER2 ; Show ppO2 after change depth WIN_TOP .125 @@ -729,7 +729,7 @@ clrf hi ; Yes, display 0m output_16 - STRCAT_PRINT "m " + STRCAT_PRINT TXT_METER3 WIN_TOP .35 WIN_LEFT .20 @@ -987,7 +987,7 @@ ; New v1.44se gassetup_title_bar4: - STRCAT "O2 " + STRCAT TXT_O2_3 output_8 bra gassetup_title_bar7 @@ -996,37 +996,37 @@ cpfseq lo ; o2 = 21% bra gassetup_title_bar6 - STRCAT "AIR " + STRCAT TXT_AIR4 output_8 bra gassetup_title_bar7 ; New v1.44se gassetup_title_bar6: ; ERROR - STRCAT "ERR " + STRCAT TXT_ERR4 output_8 bra gassetup_title_bar7 gassetup_title_bar7: - STRCAT " in " + STRCAT TXT_IN4 movf decodata+0,W ; read current value addlw d'28' ; offset in memory movwf EEADR call read_eeprom ; Low-value movff EEDATA,lo output_8 - STRCAT_PRINT "m " + STRCAT_PRINT TXT_METER2 WIN_INVERT .0 ; Init new Wordprocessor return ; New v1.44se gassetup_write_Nx: - STRCAT "NX " + STRCAT TXT_NX3 return ; New v1.44se gassetup_write_Tx: - STRCAT "TX " + STRCAT TXT_TX3 return gassetup_show_ppO2:
--- a/code_part1/OSTC_code_asm_part1/menu_logbook.asm Thu Aug 11 13:30:29 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_logbook.asm Thu Aug 11 20:01:55 2011 +0200 @@ -392,7 +392,7 @@ display_profile_offset4: bsf leftbind output_16dp d'3' ; max. depth - STRCAT "m " + STRCAT TXT_METER2 call I2CREAD2 ; divetime in minutes movff SSPBUF,lo call I2CREAD2 @@ -505,7 +505,7 @@ bsf leftbind output_16 ; Air pressure before dive - STRCAT "mbar " + STRCAT TXT_MBAR5 OUTPUTTEXT .014 ; Desat PUTC ' ' @@ -820,7 +820,7 @@ bsf leftbind WIN_TOP .0 WIN_LEFT .0 - STRCPY "G1:" + STRCPY TXT_G1_3 call I2CREAD2 ; Gas1 current O2 movff SSPBUF,lo output_99x @@ -833,7 +833,7 @@ movlw color_green ; Color for Gas 2 call PLED_set_color ; Set Color... WIN_TOP .25 - STRCPY "G2:" + STRCPY TXT_G2_3 call I2CREAD2 ; Gas2 current O2 movff SSPBUF,lo output_8 @@ -846,7 +846,7 @@ movlw color_red ; Color for Gas 3 call PLED_set_color ; Set Color... WIN_TOP .50 - STRCPY "G3:" + STRCPY TXT_G3_3 call I2CREAD2 ; Gas3 current O2 movff SSPBUF,lo output_8 @@ -860,7 +860,7 @@ call PLED_set_color ; Set Color... WIN_TOP .0 WIN_LEFT .60 - STRCPY "G4:" + STRCPY TXT_G4_3 call I2CREAD2 ; Gas4 current O2 movff SSPBUF,lo output_8 @@ -873,7 +873,7 @@ movlw color_violet ; Color for Gas 5 call PLED_set_color ; Set Color... WIN_TOP .25 - STRCPY "G5:" + STRCPY TXT_G5_3 call I2CREAD2 ; Gas5 current O2 movff SSPBUF,lo output_8 @@ -886,7 +886,7 @@ movlw color_cyan ; Color for Gas 6 call PLED_set_color ; Set Color... WIN_TOP .50 - STRCPY "G6:" + STRCPY TXT_G6_3 call I2CREAD2 ; Gas6 current O2 movff SSPBUF,lo output_8 @@ -899,7 +899,7 @@ call PLED_standard_color WIN_TOP .0 WIN_LEFT .120 - STRCPY "1st:" + STRCPY TXT_1ST4 call I2CREAD2 ; Start Gas movff SSPBUF,lo output_8 @@ -938,7 +938,7 @@ bsf leftbind output_16dp d'2' ; e.g. 3.45V bcf leftbind - STRCAT_PRINT "V" + STRCAT_PRINT TXT_VOLT1 bcf leftbind ; Clear flag @@ -983,7 +983,7 @@ movff SSPBUF,lo clrf hi output_16dp d'3' - STRCAT_PRINT "kg/l" + STRCAT_PRINT TXT_KGL4 call I2CREAD2 ; Read CNS% @@ -992,7 +992,7 @@ movff SSPBUF,lo WIN_TOP .25 - STRCPY "CNS:" + STRCPY TXT_CNS4 output_8 STRCAT_PRINT "%" ; Display CNS % @@ -1007,9 +1007,9 @@ movff SSPBUF,lo call I2CREAD2 ; Read average depth movff SSPBUF,hi - STRCPY "Avr:" + STRCPY TXT_AVR4 output_16dp d'3' ; Average depth - STRCAT_PRINT "m" + STRCAT_PRINT TXT_METER1 incf_eeprom_address d'4' ; Skip total dive time and GF factors call I2CREAD ; Read deco modell @@ -1029,7 +1029,7 @@ movff SSPBUF,lo call I2CREAD2 ; Read GF_hi movff SSPBUF,hi - STRCPY "GF:" + STRCPY TXT_GF3 output_8 ; GF_lo PUTC '/' movff hi,lo ; copy GF_hi @@ -1042,7 +1042,7 @@ movff SSPBUF,hi call I2CREAD2 ; Read Desaturation x movff SSPBUF,lo - STRCPY "Sat:" + STRCPY TXT_SAT4 output_8 ; Sat x STRCAT "%/" movff hi,lo ; copy Desat x @@ -1389,7 +1389,7 @@ bsf leftbind bsf ignore_digit5 ; Do not display 1cm figure output_16dp d'3' ; max. depth - STRCAT "m " + STRCAT TXT_METER2 call I2CREAD4 ; Block read movff SSPBUF,lo ; read divetime in minutes call I2CREAD4 ; Block read
--- a/code_part1/OSTC_code_asm_part1/menu_ppO2.asm Thu Aug 11 13:30:29 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_ppO2.asm Thu Aug 11 20:01:55 2011 +0200 @@ -105,7 +105,7 @@ bsf leftbind output_16dp d'3' bcf leftbind - STRCAT_PRINT "bar " + STRCAT_PRINT TXT_BAR4 WIN_LEFT .20 WIN_TOP .95
--- a/code_part1/OSTC_code_asm_part1/russian_text.asm Thu Aug 11 13:30:29 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/russian_text.asm Thu Aug 11 20:01:55 2011 +0200 @@ -59,6 +59,48 @@ ; you will have to adjust position. A char is 7 pixels wide. ; ;============================================================================= +; Define's section +; Definition "translation" ; English original +#IFNDEF TXT_DEFINED +#DEFINE TXT_DEFINED + ; 'G' +#DEFINE TXT_GAS_C 'Г' ; 'm' +#DEFINE TXT_METER_C 'м' ; "m " +#DEFINE TXT_METER5 "м " ; "m " +#DEFINE TXT_METER3 "м " ; "m " +#DEFINE TXT_METER2 "м " ; "m" +#DEFINE TXT_METER1 "м" ; " mbar " +#DEFINE TXT_MBAR7 " мбар " ; "mbar " +#DEFINE TXT_MBAR5 "мбар " ; "bar " +#DEFINE TXT_BAR4 "бар " ; "Alt: " +#DEFINE TXT_ALT5 "Альт " ; "kg/l" +#DEFINE TXT_KGL4 "кг/л" ; "V" +#DEFINE TXT_VOLT1 "V" ; "Step:" +#DEFINE TXT_STEP5 "Шаг: " ; "CF" +#DEFINE TXT_CF2 "ДП" ; "O2: " +#DEFINE TXT_O2_4 "O2: " ; "O2 " +#DEFINE TXT_O2_3 "O2 " ; "AIR " +#DEFINE TXT_AIR4 "AIR " ; "ERR " +#DEFINE TXT_ERR4 "ERR " ; "He: " +#DEFINE TXT_HE4 "He: " ; "NX " +#DEFINE TXT_NX3 "NX " ; "TX " +#DEFINE TXT_TX3 "TX " ; " in " +#DEFINE TXT_IN4 " на " ; "G1:" +#DEFINE TXT_G1_3 "Г1:" ; "G2:" +#DEFINE TXT_G2_3 "Г2:" ; "G3:" +#DEFINE TXT_G3_3 "Г3:" ; "G4:" +#DEFINE TXT_G4_3 "Г4:" ; "G5:" +#DEFINE TXT_G5_3 "Г5:" ; "G6:" +#DEFINE TXT_G6_3 "Г6:" ; "1st:" +#DEFINE TXT_1ST4 "Нач:" ; "CNS:" +#DEFINE TXT_CNS4 "ЦНС:" ; "CNS > 250%" +#DEFINE TXT_CNSGR10 "ЦНС > 250%" ; "Avr:" +#DEFINE TXT_AVR4 "Срд:" ; "GF:" +#DEFINE TXT_GF3 "ГФ:" ; "Sat:" +#DEFINE TXT_SAT4 "Сат:" + +#ENDIF +;============================================================================= ; macro X Y "translation" ; English original TCODE .0, .0, "Расчет MD2 хэша" ;001 Building MD2 Hash TCODE .0, .25, "Пожалуйста ждите..." ;002 Please Wait... @@ -91,7 +133,7 @@ TCODE .15, .2, "Установка времени:" ;029 Set Time: TCODE .100, .50, "Маркер" ;030 SetMarker (Add a mark in logbook profile) TCODE .100, .25, "Декоплан" ;031 Decoplan - TCODE .100, .0, "Мои Газы" ;032 Gaslist + TCODE .100, .0, "Мои газы" ;032 Gaslist TCODE .100, .50, "Сбр.Сред" ;033 ResetAvr (Reset average depth) TCODE .100, .100, "Выход" ;034 Exit (Exit current menu) TCODE .0, .0, "Нелєт" ;035 NoFly (No-flight count-down) @@ -105,14 +147,14 @@ TCODE .40, .35, "Скорость[м/мин]" ;041 velocity[m/min] TCODE .40, .35, "Автовключ[мбар]" ;042 Wake-up [mbar] TCODE .40, .35, "max. Верх[мбар]" ;043 max.Surf.[mbar] - TCODE .40, .35, "Показать GF [%]" ;044 GF display [%] - TCODE .40, .35, "min.O2 показ[%]" ;045 min. O2 Dis.[%] + TCODE .40, .35, "Показать ГФ [%]" ;044 GF display [%] + TCODE .40, .35, "мин.O2 показ[%]" ;045 min. O2 Dis.[%] TCODE .40, .35, "Меню погр.[мин]" ;046 Dive menus[min] TCODE .40, .35, "Насыщение x [%]" ;047 Saturate x [%] TCODE .40, .35, "Рассыщение x[%]" ;048 Desaturate x[%] TCODE .40, .35, "Нелєт фактор[%]" ;049 NoFly Ratio [%] (Grandient factor tolerance for no-flight countdown). - TCODE .40, .35, "GF тревога 1[%]" ;050 GF alarm 1 [%] - TCODE .40, .35, "CNS наверху [%]" ;051 CNSshow surf[%] + TCODE .40, .35, "ГФ тревога 1[%]" ;050 GF alarm 1 [%] + TCODE .40, .35, "ЦНС наверху [%]" ;051 CNSshow surf[%] TCODE .40, .35, "Деко ниже [м]" ;052 Deco Offset [m] TCODE .40, .35, "ppO2 низк [бар]" ;053 ppO2 low [bar] TCODE .40, .35, "ppO2 высок[бар]" ;054 ppO2 high [bar] @@ -120,11 +162,11 @@ TCODE .40, .35, "Интервал данных" ;056 sampling rate TCODE .40, .35, "Делитель темпер" ;057 Divisor Temp TCODE .40, .35, "Делитель деко " ;058 Divisor Decodat - TCODE .40, .35, "Делитель GF " ;059 Divisor GF + TCODE .40, .35, "Делитель ГФ " ;059 Divisor GF TCODE .40, .35, "Делитель ppO2 " ;060 Divisor ppO2 TCODE .40, .35, "Делитель дебаг " ;061 Divisor Debug - TCODE .40, .35, "Делитель CNS " ;062 Divisor CNS - TCODE .40, .35, "CNS показать[%]" ;063 CNSshow dive[%] + TCODE .40, .35, "Делитель ЦНС " ;062 Divisor CNS + TCODE .40, .35, "ЦНС показать[%]" ;063 CNSshow dive[%] TCODE .40, .35, "Номер в журнале" ;064 Logbook offset TCODE .40, .35, "Крайняя деко[м]" ;065 Last Deco at[m] TCODE .40, .35, "Конец Apnoe [ч]" ;066 End Apnoe [h] @@ -203,7 +245,7 @@ TCODE .10, .25, "режима погружения! " ;134 Divemode! Please help TCODE .10, .50, "Сообщите об ошибке, " ;135 and report the Debug TCODE .10, .75, "отправьте отчет ниже!" ;136 Information below! - TCODE .100, .75, "Бэйлаут" ;137 Bailout + TCODE .100, .75, "На запас" ;137 Bailout TCODE .85, .125, "Apnoe " ;138 Apnoe TCODE .112, .120, "В воде" ;139 Descent TCODE .105, .60, "Наверху" ;140 Surface @@ -222,8 +264,8 @@ TCODE .20, .65, "Доп. Параметры II" ;153 Custom FunctionsII ; ; 32 custom function descriptors II (FIXED LENGTH = 15 chars). - TCODE .40, .35, "GF Low [%]" ;154 GF Low [%] - TCODE .40, .35, "GF High [%]" ;155 GF High [%] + TCODE .40, .35, "ГФ ниж. гран[%]" ;154 GF Low [%] + TCODE .40, .35, "ГФ верх.гран[%]" ;155 GF High [%] TCODE .40, .35, "Цвет# батареи" ;156 Color# Battery TCODE .40, .35, "Цвет# стардарт" ;157 Color# Standard TCODE .40, .35, "Цвет# под водой" ;158 Color# Divemask @@ -234,8 +276,8 @@ TCODE .40, .35, "Картинки газов " ;163 Mix type icons TCODE .40, .35, "Напом. лучш.газ" ;164 Blink BetterGas (Remainder in divemode to switch to a better decompression gas). TCODE .40, .35, "Трев.глуб[мбар]" ;165 DepthWarn[mbar] - TCODE .40, .35, "CNS предупр.[%]" ;166 CNS warning [%] - TCODE .40, .35, "GF предупр. [%]" ;167 GF warning [%] + TCODE .40, .35, "ЦНС предупр.[%]" ;166 CNS warning [%] + TCODE .40, .35, "ГФ предупр. [%]" ;167 GF warning [%] TCODE .40, .35, "ppO2 пред.[бар]" ;168 ppO2 warn [bar] TCODE .40, .35, "Скор.пр.[м/мин]" ;169 Vel.warn[m/min] TCODE .40, .35, "Коррекция часов" ;170 Time offset/day @@ -286,7 +328,7 @@ 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. + TCODE .0, .215, "запасных смесей. " ;213 outs are available. ; Apnoemode description TCODE .0, .35, "Алгоритм: Apnoe " ;214 Decotype: Apnoe TCODE .0, .65, "OSTC2 показывает " ;215 OSTC2 will display @@ -299,16 +341,16 @@ 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, "фактора (GF_lo/GF " ;224 GF-Method (GF_lo/GF - TCODE .0, .155, "_hi). Уточн. ДП32 &" ;225 _hi). Check CF32 & + 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, "фактора (GF_lo/GF " ;231 GF-Method (GF_lo/GF - TCODE .0, .155, "_hi). Уточн. ДП32 &" ;232 _hi). Check CF32 & + 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. ; @@ -343,9 +385,9 @@ TCODE .105, .35, "DDMMYY" ;260 DDMMYY TCODE .105, .35, "YYMMDD" ;261 YYMMDD TCODE .1, .1, "OSTC " ;262 OSTC - TCODE .65, .168, "Bail " ;263 Bail - TCODE .7, .48, "Air " ;264 Air - TCODE .120, .135, "Air " ;265 Air + TCODE .65, .168, "Запас" ;263 Bail + TCODE .7, .48, "Возд." ;264 Air + TCODE .120, .135, "Возд." ;265 Air TCODE .2, .39, "Калибровка" ;266 Calibrate TCODE .0, .216, "Макс." ;267 Max. TCODE .10, .8, "не" ;268 not @@ -378,7 +420,7 @@ TCODE .20, .95, "Умолчание: 1013 мбар" ;291 Default: 1013 mbar TCODE .20, .125, "+1 мбар" ;292 +1 mbar TCODE .20, .155, "-1 мбар" ;293 -1 mbar - TCODE .85, .185, "Alt: " ;294 Alt: + TCODE .78, .185, "Альт: " ;294 Alt: ; TCODE .20, .125, "Показать дамп" ;295 Show raw data TCODE .50, .2, "Дамп:" ;296 Raw Data:
--- a/code_part1/OSTC_code_asm_part1/simulator.asm Thu Aug 11 13:30:29 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/simulator.asm Thu Aug 11 20:01:55 2011 +0200 @@ -224,7 +224,7 @@ cpfslt sim_CNS call PLED_warnings_color ; Yes: draw in red ! - STRCPY "CNS:" + STRCPY TXT_CNS4 movff char_O_CNS_fraction,lo ; Current CNS, before dive. output_8 STRCAT "%\x92" ; Right-arrow @@ -236,7 +236,7 @@ simulator_decoplan_cns_1: call PLED_warnings_color ; Yes: draw in red ! - STRCPY_PRINT "CNS > 250%" + STRCPY_PRINT TXT_CNSGR10 simulator_decoplan_cns_2: call PLED_standard_color ; Back to normal.