# HG changeset patch # User JeanDo # Date 1297016983 -3600 # Node ID f720ce017244743c213fb7e7cbd48f844d3442db # Parent adadccc367a699d49b906379fc6fc504096b9f95 Spanish special chars. + Avoid uppercase accents. + Tweak a pair of screen position. diff -r adadccc367a6 -r f720ce017244 code_part1/OSTC_code_asm_part1/aa_font28.inc --- a/code_part1/OSTC_code_asm_part1/aa_font28.inc Sun Feb 06 17:49:58 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/aa_font28.inc Sun Feb 06 19:29:43 2011 +0100 @@ -1,5 +1,5 @@ ;========================================================================== -; Font data exported ven. févr. 4 2011 by FontIO.cpp 57 2010-11-24 23:24:47Z gascuel $ +; Font data exported dim. févr. 6 2011 by FontIO.cpp 103 2011-02-04 22:26:15Z gascuel $ ;========================================================================== aa_font28_height EQU .24 aa_font28_width EQU .14 @@ -626,47 +626,48 @@ DB 0x85, 0x01, 0x88, 0x01, 0x81, 0x01, 0x86, 0x01 DB 0x88, 0x01, 0x8B, 0x01, 0x86, 0x01, 0xB5 ; ˆ 88 - DB 0x9C, 0x01, 0x86, 0x01, 0x8D, 0x08, 0x8F, 0x06 - DB 0x8F, 0x02, 0x82, 0x02, 0x8E, 0x01, 0x84, 0x01 - DB 0x8E, 0x01, 0x84, 0x01, 0x8E, 0x01, 0x84, 0x01 - DB 0x8E, 0x02, 0x82, 0x02, 0x8F, 0x06, 0x8F, 0x08 - DB 0x8D, 0x01, 0x86, 0x01, 0xB7 + DB 0xA5, 0x02, 0x8D, 0x01, 0x83, 0x04, 0x8B, 0x01 + DB 0x83, 0x01, 0x81, 0x02, 0x8A, 0x01, 0x83, 0x01 + DB 0x82, 0x01, 0x8A, 0x01, 0x82, 0x01, 0x83, 0x01 + DB 0x87, 0x00, 0x81, 0x01, 0x82, 0x01, 0x83, 0x01 + DB 0x86, 0x01, 0x81, 0x01, 0x82, 0x01, 0x83, 0x01 + DB 0x85, 0x01, 0x82, 0x01, 0x82, 0x01, 0x83, 0x00 + DB 0x86, 0x01, 0x82, 0x02, 0x81, 0x01, 0x82, 0x01 + DB 0x86, 0x00, 0x84, 0x0A, 0x8D, 0x0A, 0x95, 0x01 + DB 0x95, 0x00, 0x85 ; ‰ 89 - DB 0x9C, 0x01, 0x86, 0x01, 0x8D, 0x08, 0x8F, 0x06 - DB 0x8F, 0x02, 0x82, 0x02, 0x8E, 0x01, 0x84, 0x01 - DB 0x8E, 0x01, 0x84, 0x01, 0x8E, 0x01, 0x84, 0x01 - DB 0x8E, 0x02, 0x82, 0x02, 0x8F, 0x06, 0x8F, 0x08 - DB 0x8D, 0x01, 0x86, 0x01, 0xB7 + DB 0x9D, 0x01, 0x95, 0x01, 0x95, 0x01, 0x95, 0x01 + DB 0x92, 0x00, 0x81, 0x01, 0x91, 0x01, 0x81, 0x0C + DB 0x85, 0x01, 0x82, 0x0C, 0x85, 0x01, 0x95, 0x00 + DB 0xF5 ; Š 8A - DB 0x9C, 0x01, 0x86, 0x01, 0x8D, 0x08, 0x8F, 0x06 - DB 0x8F, 0x02, 0x82, 0x02, 0x8E, 0x01, 0x84, 0x01 - DB 0x8E, 0x01, 0x84, 0x01, 0x8E, 0x01, 0x84, 0x01 - DB 0x8E, 0x02, 0x82, 0x02, 0x8F, 0x06, 0x8F, 0x08 - DB 0x8D, 0x01, 0x86, 0x01, 0xB7 + DB 0xA1, 0x04, 0x90, 0x08, 0x8D, 0x02, 0x84, 0x02 + DB 0x8B, 0x02, 0x86, 0x02, 0x87, 0x00, 0x81, 0x01 + DB 0x88, 0x01, 0x86, 0x01, 0x81, 0x01, 0x88, 0x01 + DB 0x85, 0x01, 0x82, 0x01, 0x88, 0x01, 0x85, 0x01 + DB 0x82, 0x01, 0x88, 0x01, 0x85, 0x00, 0x83, 0x02 + DB 0x86, 0x02, 0x8B, 0x02, 0x84, 0x02, 0x8D, 0x08 + DB 0x8F, 0x05, 0xA0 ; ‹ 8B - DB 0x9C, 0x01, 0x86, 0x01, 0x8D, 0x08, 0x8F, 0x06 - DB 0x8F, 0x02, 0x82, 0x02, 0x8E, 0x01, 0x84, 0x01 - DB 0x8E, 0x01, 0x84, 0x01, 0x8E, 0x01, 0x84, 0x01 - DB 0x8E, 0x02, 0x82, 0x02, 0x8F, 0x06, 0x8F, 0x08 - DB 0x8D, 0x01, 0x86, 0x01, 0xB7 + DB 0xB5, 0x0A, 0x8C, 0x0B, 0x95, 0x02, 0x87, 0x00 + DB 0x8C, 0x01, 0x86, 0x01, 0x8C, 0x01, 0x85, 0x01 + DB 0x8D, 0x01, 0x85, 0x01, 0x8C, 0x01, 0x86, 0x00 + DB 0x8C, 0x01, 0x8C, 0x0C, 0x8A, 0x0C, 0xB4 ; Œ 8C - DB 0x9C, 0x01, 0x86, 0x01, 0x8D, 0x08, 0x8F, 0x06 - DB 0x8F, 0x02, 0x82, 0x02, 0x8E, 0x01, 0x84, 0x01 - DB 0x8E, 0x01, 0x84, 0x01, 0x8E, 0x01, 0x84, 0x01 - DB 0x8E, 0x02, 0x82, 0x02, 0x8F, 0x06, 0x8F, 0x08 - DB 0x8D, 0x01, 0x86, 0x01, 0xB7 + DB 0xB5, 0x0C, 0x86, 0x01, 0x81, 0x0C, 0x85, 0x01 + DB 0x84, 0x01, 0x8E, 0x01, 0x83, 0x01, 0x8F, 0x01 + DB 0x82, 0x01, 0x91, 0x01, 0x81, 0x01, 0x91, 0x01 + DB 0x81, 0x01, 0x91, 0x01, 0x81, 0x02, 0x8F, 0x01 + DB 0x83, 0x0B, 0x8C, 0x0A, 0xB4 ; 8D - DB 0x9C, 0x01, 0x86, 0x01, 0x8D, 0x08, 0x8F, 0x06 - DB 0x8F, 0x02, 0x82, 0x02, 0x8E, 0x01, 0x84, 0x01 - DB 0x8E, 0x01, 0x84, 0x01, 0x8E, 0x01, 0x84, 0x01 - DB 0x8E, 0x02, 0x82, 0x02, 0x8F, 0x06, 0x8F, 0x08 - DB 0x8D, 0x01, 0x86, 0x01, 0xB7 + DB 0xFD, 0x02, 0x94, 0x02, 0x81, 0x0C, 0x85, 0x02 + DB 0x81, 0x0C, 0xFF, 0x8F ; Ž 8E - DB 0x9C, 0x01, 0x86, 0x01, 0x8D, 0x08, 0x8F, 0x06 - DB 0x8F, 0x02, 0x82, 0x02, 0x8E, 0x01, 0x84, 0x01 - DB 0x8E, 0x01, 0x84, 0x01, 0x8E, 0x01, 0x84, 0x01 - DB 0x8E, 0x02, 0x82, 0x02, 0x8F, 0x06, 0x8F, 0x08 - DB 0x8D, 0x01, 0x86, 0x01, 0xB7 + DB 0xC1, 0x03, 0x92, 0x05, 0x90, 0x01, 0x82, 0x02 + DB 0x8E, 0x01, 0x84, 0x01, 0x85, 0x02, 0x84, 0x01 + DB 0x85, 0x01, 0x85, 0x02, 0x81, 0x03, 0x86, 0x01 + DB 0x85, 0x02, 0x81, 0x02, 0x87, 0x01, 0x95, 0x01 + DB 0x93, 0x03, 0x93, 0x02, 0xB0 ; 8F DB 0x9C, 0x01, 0x86, 0x01, 0x8D, 0x08, 0x8F, 0x06 DB 0x8F, 0x02, 0x82, 0x02, 0x8E, 0x01, 0x84, 0x01 @@ -712,4 +713,4 @@ DB 0x89, 0x62, 0x94, 0x62, 0x94, 0x62, 0x8E, 0x6E DB 0x89, 0x6C, 0x8B, 0x6A, 0x8D, 0x68, 0x8F, 0x66 DB 0x91, 0x64, 0x93, 0x62, 0x95, 0x60, 0xD3 -; TOTAL COMPRESSED SIZE = 4293 +; TOTAL COMPRESSED SIZE = 4294 diff -r adadccc367a6 -r f720ce017244 code_part1/OSTC_code_asm_part1/aa_font28_idx.inc --- a/code_part1/OSTC_code_asm_part1/aa_font28_idx.inc Sun Feb 06 17:49:58 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/aa_font28_idx.inc Sun Feb 06 19:29:43 2011 +0100 @@ -1,5 +1,5 @@ ;========================================================================== -; Font index exported ven. févr. 4 2011 by FontIO.cpp 57 2010-11-24 23:24:47Z gascuel $ +; Font index exported dim. févr. 6 2011 by FontIO.cpp 103 2011-02-04 22:26:15Z gascuel $ ;========================================================================== aa_font28_chars EQU .116 aa_font28_firstChar EQU ' ' @@ -111,15 +111,15 @@ DW aa_font28_bits + 0x0E17 ; † 86 DW aa_font28_bits + 0x0E62 ; ‡ 87 DW aa_font28_bits + 0x0E91 ; ˆ 88 - DW aa_font28_bits + 0x0EB6 ; ‰ 89 - DW aa_font28_bits + 0x0EDB ; Š 8A - DW aa_font28_bits + 0x0F00 ; ‹ 8B - DW aa_font28_bits + 0x0F25 ; Œ 8C - DW aa_font28_bits + 0x0F4A ; 8D - DW aa_font28_bits + 0x0F6F ; Ž 8E - DW aa_font28_bits + 0x0F94 ; 8F - DW aa_font28_bits + 0x0FB9 ; 90 - DW aa_font28_bits + 0x103E ; ‘ 91 - DW aa_font28_bits + 0x1089 ; ’ 92 - DW aa_font28_bits + 0x10AE ; “ 93 - DW aa_font28_bits + 0x10C5 ; END OF INDEX + DW aa_font28_bits + 0x0ED4 ; ‰ 89 + DW aa_font28_bits + 0x0EED ; Š 8A + DW aa_font28_bits + 0x0F20 ; ‹ 8B + DW aa_font28_bits + 0x0F3F ; Œ 8C + DW aa_font28_bits + 0x0F64 ; 8D + DW aa_font28_bits + 0x0F70 ; Ž 8E + DW aa_font28_bits + 0x0F95 ; 8F + DW aa_font28_bits + 0x0FBA ; 90 + DW aa_font28_bits + 0x103F ; ‘ 91 + DW aa_font28_bits + 0x108A ; ’ 92 + DW aa_font28_bits + 0x10AF ; “ 93 + DW aa_font28_bits + 0x10C6 ; END OF INDEX diff -r adadccc367a6 -r f720ce017244 code_part1/OSTC_code_asm_part1/aa_fonts.asm --- a/code_part1/OSTC_code_asm_part1/aa_fonts.asm Sun Feb 06 17:49:58 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/aa_fonts.asm Sun Feb 06 19:29:43 2011 +0100 @@ -35,11 +35,19 @@ DB 'ä', 0x81 DB 'ü', 0x82 DB 'ß', 0x83 - DB 'é', 0x84 + DB 'é', 0x84 ; French accents DB 'è', 0x85 DB 'ê', 0x86 DB 'ç', 0x87 - DB '¤', 0x8F + DB 'á', 0x88 ; Spanish accents + DB 'í', 0x89 + DB 'ó', 0x8A + DB 'ú', 0x8B + DB 'ñ', 0x8C + DB '¡', 0x8D + DB '¿', 0x8E + DB '¤', 0x8F ; Unused + ; 90, 91 are the logo. DB 0xB7,0x92 ; Cursor DB 0xB8,0x93 ; Dimmed cursor. DB 0 ; End of translation table diff -r adadccc367a6 -r f720ce017244 code_part1/OSTC_code_asm_part1/menu.asm --- a/code_part1/OSTC_code_asm_part1/menu.asm Sun Feb 06 17:49:58 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/menu.asm Sun Feb 06 19:29:43 2011 +0100 @@ -448,7 +448,7 @@ cpfslt EEDATA ; Salinity higher limit rcall toggle_salinity_reset2 ; Reset before display! WIN_TOP .95 - WIN_LEFT .83 + WIN_LEFT .90 ; +7 for spanish WIN_FONT FT_SMALL lfsr FSR2,letter movff EEDATA,lo diff -r adadccc367a6 -r f720ce017244 code_part1/OSTC_code_asm_part1/pled_outputs.asm --- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm Sun Feb 06 17:49:58 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm Sun Feb 06 19:29:43 2011 +0100 @@ -507,7 +507,7 @@ PLED_simulator_data: WIN_TOP .65 - WIN_LEFT .105 + WIN_LEFT .112 ; +7 for spanish. WIN_FONT FT_SMALL call PLED_standard_color lfsr FSR2,letter @@ -753,7 +753,7 @@ WIN_INVERT .0 ; Init new Wordprocessor DISPLAYTEXT .99 ; Custom FunctionsI DISPLAYTEXT .153 ; Custom FunctionsII - DISPLAYTEXTH .276 ; Salinity: + DISPLAYTEXTH .276 ; Salinity: DISPLAYTEXT .100 ; Decotype: DISPLAYTEXT .142 ; More... DISPLAYTEXT .11 ; Exit @@ -1422,7 +1422,7 @@ movlw .039 cpfslt hi - bra depth_greater_99_84mtr + bra depth_greater_99_84mtr btfsc depth_greater_100m ; Was depth>100m during last call call PLED_clear_depth ; Yes, clear depth area diff -r adadccc367a6 -r f720ce017244 code_part1/OSTC_code_asm_part1/spanish_text.asm --- a/code_part1/OSTC_code_asm_part1/spanish_text.asm Sun Feb 06 17:49:58 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/spanish_text.asm Sun Feb 06 19:29:43 2011 +0100 @@ -131,13 +131,13 @@ TCODE .0, .35, "Este programa se" ;068 This program is TCODE .0, .65, "distribuye con el deseo" ;069 distributed in the TCODE .0, .95, "de que le resulte útil," ;070 hope that it will be - TCODE .0, .125, "pero SIN GARANTÍAS" ;071 useful, but WITHOUT - TCODE .0, .155, "DE NINGÚN TIPO;" ;072 ANY WARRANTY + TCODE .0, .125, "pero SIN GARANTIAS" ;071 useful, but WITHOUT + TCODE .0, .155, "DE NINGUN TIPO;" ;072 ANY WARRANTY TCODE .0, .185, "ni siquiera con las" ;073 even the implied TCODE .0, .215, "garantías implícitas" ;074 warranty of TCODE .0, .35, "de COMERCIABILIDAD" ;075 MERCHANTABILITY or TCODE .0, .65, "o APTITUD PARA UN" ;076 FITNESS FOR A - TCODE .0, .95, "PROPÓSITO DETERMINADO." ;077 PARTICULAR PURPOSE. + TCODE .0, .95, "PROPOSITO DETERMINADO." ;077 PARTICULAR PURPOSE. TCODE .0, .125, "Para más información," ;078 See the GNU General TCODE .0, .155, "consulte la Licencia" ;079 Public License for TCODE .0, .185, "Pública General de GNU:" ;080 more details: @@ -167,7 +167,7 @@ TCODE .85, .125, "Indicador" ;102 Gauge TCODE .85, .125, "Indi." ;103 Gauge TCODE .85, .125, "ZH-L16 CC" ;104 ZH-L16 CC - TCODE .0, .0, "¿Gas Activo?" ;105 Active Gas? + TCODE .0, .0, "¿Gas Activo? " ;105 Active Gas? TCODE .10, .2, "Conf.Gas - Listagas" ;106 Gas Setup - Gaslist TCODE .0, .0, "Prof. +" ;107 Depth + TCODE .0, .0, "Prof. -" ;108 Depth - @@ -179,7 +179,7 @@ TCODE .10, .2, "Información Batería" ;114 Battery Information TCODE .0, .9, "Ciclos:" ;115 Cycles: TCODE .85, .125, "Apnea" ;116 Apnoe - TCODE .0, .18, "Últ. Completo:" ;117 Last Complete: + TCODE .0, .18, "Ult. Completo:" ;117 Last Complete: TCODE .0, .27, "Vbatt Mínimo:" ;118 Lowest Vbatt: TCODE .0, .36, "Mínimo el:" ;119 Lowest at: TCODE .0, .45, "Tmín:" ;120 Tmin: @@ -192,7 +192,7 @@ TCODE .100, .0, "Sal." ;127 Exit TCODE .100, .25, "Borrar" ;128 Delete TCODE .20, .65, "Depur:" ;129 Debug: - TCODE .65, .65, "ACT" ;130 ON + TCODE .65, .65, "ACT" ;130 ON TCODE .65, .65, "DES" ;131 OFF TCODE .100, .50, "Borrtodo" ;132 Del. all TCODE .0, .0, "¡Reinicio inesperado" ;133 Unexpected reset from @@ -322,7 +322,7 @@ TCODE .50, .145, "BatBaja!" ;246 LowBatt! TCODE .20, .125, "Simulador" ;247 Simulator TCODE .30, .2, "Simulador OSTC" ;248 OSTC Simulator - TCODE .20, .35, "InicioBuc." ;249 Start Dive + TCODE .20, .35, "Inicio Buc." ;249 Start Dive TCODE .100, .25, "+ 1m" ;250 + 1m TCODE .100, .50, "- 1m" ;251 - 1m TCODE .100, .75, "+10m" ;252 +10m @@ -355,7 +355,7 @@ TCODE .0, .125, "más Detalles!" ;275 for Details! TCODE .20, .95, "Salinidad:" ;276 Salinity: ; - TCODE .20, .65, "TiempoFondo:" ;277 Bottom Time: + TCODE .20, .65, "Tiempo Fondo:" ;277 Bottom Time: TCODE .20, .95, "Prof. Max.:" ;278 Max. Depth: TCODE .20, .125, "Calcular Deco" ;279 Calculate Deco TCODE .20, .155, "Mostr. Plan Deco" ;280 Show Decoplan