# HG changeset patch # User heinrichsweikamp # Date 1533594245 -7200 # Node ID a7683f9765da29e61daee4482f1797ccb682b7f6 # Parent 321df89d5710319f590275ca8df30d9f2e733308 Italian activated (needs some fine tuning), special characters (?,?,?,?,? and others) currently not working... diff -r 321df89d5710 -r a7683f9765da .hgignore --- a/.hgignore Sun Aug 05 12:57:49 2018 +0200 +++ b/.hgignore Tue Aug 07 00:24:05 2018 +0200 @@ -0,0 +1,5 @@ +syntax: glob +RefPrj/* +.settings/* +.project +ostc4pack/OSTC4update_*.bin diff -r 321df89d5710 -r a7683f9765da Discovery/Src/settings.c --- a/Discovery/Src/settings.c Sun Aug 05 12:57:49 2018 +0200 +++ b/Discovery/Src/settings.c Tue Aug 07 00:24:05 2018 +0200 @@ -55,15 +55,15 @@ { .versionFirst = 1, .versionSecond = 3, - .versionThird = 3, - .versionBeta = 1, + .versionThird = 5, + .versionBeta = 0, /* 4 bytes with trailing 0 */ - .signature = "cw", + .signature = "mh", - .release_year = 17, - .release_month = 7, - .release_day = 4, + .release_year = 18, + .release_month = 8, + .release_day = 6, .release_sub = 0, /* max 48 with trailing 0 */ @@ -351,11 +351,6 @@ pSettings->scooterControl = 0; - if((pSettings->serialHigh == 0) && (pSettings->serialLow == 25)) - { - memcpy(pSettings->customtext, " Salom�\n\r" " Wiedmer\n\r", 60); - } - switch(pSettings->header) { case 0xFFFF0000: diff -r 321df89d5710 -r a7683f9765da Discovery/Src/tMenuEditSystem.c --- a/Discovery/Src/tMenuEditSystem.c Sun Aug 05 12:57:49 2018 +0200 +++ b/Discovery/Src/tMenuEditSystem.c Tue Aug 07 00:24:05 2018 +0200 @@ -274,8 +274,8 @@ if((blockNumber == 1) && (digitContentNew > '0' + 12)) digitContentNew = '1'; // year range 2017-2018 - if((blockNumber == 2) && (digitContentNew > '0' + 18)) - digitContentNew = '0' + 17; + if((blockNumber == 2) && (digitContentNew > '0' + 22)) + digitContentNew = '0' + 18; return digitContentNew; } if(action == ACTION_BUTTON_BACK) @@ -497,7 +497,7 @@ else active = 0; write_field_on_off(StMSYS2_French, 30, 800, ME_Y_LINE3, &FontT48, text, active); -/* + pSettings->selected_language = LANGUAGE_Italian; if( actualLanguage == pSettings->selected_language) @@ -506,6 +506,7 @@ active = 0; write_field_on_off(StMSYS2_Italian, 30, 800, ME_Y_LINE4, &FontT48, text, active); +/* pSettings->selected_language = LANGUAGE_Espanol; if( actualLanguage == pSettings->selected_language) active = 1; @@ -520,7 +521,7 @@ setEvent(StMSYS2_English, (uint32_t)OnAction_English); setEvent(StMSYS2_German, (uint32_t)OnAction_German); setEvent(StMSYS2_French, (uint32_t)OnAction_French); - //setEvent(StMSYS2_Italian, (uint32_t)OnAction_Italian); + setEvent(StMSYS2_Italian, (uint32_t)OnAction_Italian); //setEvent(StMSYS2_Espanol, (uint32_t)OnAction_Espanol); } diff -r 321df89d5710 -r a7683f9765da Discovery/Src/text_multilanguage.c --- a/Discovery/Src/text_multilanguage.c Sun Aug 05 12:57:49 2018 +0200 +++ b/Discovery/Src/text_multilanguage.c Tue Aug 07 00:24:05 2018 +0200 @@ -54,7 +54,7 @@ static uint8_t text_EN_Depth[] = "Depth"; static uint8_t text_DE_Depth[] = "Tiefe"; static uint8_t text_FR_Depth[] = "Profondeur"; -static uint8_t text_IT_Depth[] = "Profondità"; +static uint8_t text_IT_Depth[] = "Profondita"; static uint8_t text_ES_Depth[] = ""; // dive mode @@ -68,14 +68,14 @@ static uint8_t text_EN_MaxDepth[] = "Max Depth"; static uint8_t text_DE_MaxDepth[] = "Max Tiefe"; static uint8_t text_FR_MaxDepth[] = "Prof. max"; // Profondeur -static uint8_t text_IT_MaxDepth[] = "Profondità Max"; +static uint8_t text_IT_MaxDepth[] = "Profondita Max"; static uint8_t text_ES_MaxDepth[] = ""; // dive mode static uint8_t text_EN_AvgDepth[] = "Avg Depth"; static uint8_t text_DE_AvgDepth[] = "(/) Tiefe"; static uint8_t text_FR_AvgDepth[] = "Prof. Moy"; -static uint8_t text_IT_AvgDepth[] = "Profondità media"; +static uint8_t text_IT_AvgDepth[] = "Profonditamedia"; static uint8_t text_ES_AvgDepth[] = ""; // dive mode @@ -194,7 +194,7 @@ static uint8_t text_EN_Brightness[] = "Brightness"; static uint8_t text_DE_Brightness[] = "Display Helligkeit"; static uint8_t text_FR_Brightness[] = "Luminosité"; -static uint8_t text_IT_Brightness[] = "Luminosità"; +static uint8_t text_IT_Brightness[] = "Luminosite"; static uint8_t text_ES_Brightness[] = ""; // Menu SYS1 @@ -208,7 +208,7 @@ static uint8_t text_EN_Eco[] = "Eco"; static uint8_t text_DE_Eco[] = "Eco-Sparmodus"; static uint8_t text_FR_Eco[] = "Mode éco"; -static uint8_t text_IT_Eco[] = "Modalità ECO"; +static uint8_t text_IT_Eco[] = "ModalitaECO"; static uint8_t text_ES_Eco[] = ""; // Menu SYS1 @@ -415,7 +415,7 @@ static uint8_t text_EN_Salinity[] = "Salinity"; static uint8_t text_DE_Salinity[] = "Salzgehalt"; static uint8_t text_FR_Salinity[] = "Salinité"; -static uint8_t text_IT_Salinity[] = "Salinità"; +static uint8_t text_IT_Salinity[] = "Salinit�"; static uint8_t text_ES_Salinity[] = ""; // Menu DECO1 @@ -550,14 +550,14 @@ static uint8_t text_EN_SetToMOD[] = "Set Change Depth To MOD"; static uint8_t text_DE_SetToMOD[] = "Setze Wechseltiefe auf MOD"; static uint8_t text_FR_SetToMOD[] = "Régler prof. chgmt. à PMU"; -static uint8_t text_IT_SetToMOD[] = "Cambia profondità"; +static uint8_t text_IT_SetToMOD[] = "Cambia profondita"; static uint8_t text_ES_SetToMOD[] = ""; // Menu SYS2 sub static uint8_t text_EN_Units[] = "Units"; static uint8_t text_DE_Units[] = "Einheit"; static uint8_t text_FR_Units[] = "Unités"; -static uint8_t text_IT_Units[] = "Unità"; +static uint8_t text_IT_Units[] = "Unit�"; static uint8_t text_ES_Units[] = ""; // Menu SYS2 sub @@ -754,7 +754,7 @@ static uint8_t text_EN_SimMaxDepth[] = "Max. Depth"; static uint8_t text_DE_SimMaxDepth[] = "Max. Tiefe"; static uint8_t text_FR_SimMaxDepth[] = "Prof. max"; -static uint8_t text_IT_SimMaxDepth[] = "Profondità Max."; +static uint8_t text_IT_SimMaxDepth[] = "Profondit� Max."; static uint8_t text_ES_SimMaxDepth[] = ""; // Menu SIM sub @@ -831,7 +831,7 @@ static uint8_t text_EN_ButtonSensitivity[] = "Button sensitivity"; static uint8_t text_DE_ButtonSensitivity[] = "Taster Ansprechen"; static uint8_t text_FR_ButtonSensitivity[] = "Bouton sensibilité"; -static uint8_t text_IT_ButtonSensitivity[] = "Sensibilità Pulsante"; +static uint8_t text_IT_ButtonSensitivity[] = "Sensibilit� Pulsante"; static uint8_t text_ES_ButtonSensitivity[] = ""; // @@ -1166,31 +1166,31 @@ static uint8_t text_EN_Monday[] = "Monday"; static uint8_t text_DE_Monday[] = "Montag"; static uint8_t text_FR_Monday[] = "Lundi"; -static uint8_t text_IT_Monday[] = "Lunedì"; +static uint8_t text_IT_Monday[] = "Lunedi"; static uint8_t text_ES_Monday[] = ""; static uint8_t text_EN_Tuesday[] = "Tuesday"; static uint8_t text_DE_Tuesday[] = "Dienstag"; static uint8_t text_FR_Tuesday[] = "Mardi"; -static uint8_t text_IT_Tuesday[] = "Martedì"; +static uint8_t text_IT_Tuesday[] = "Martedi"; static uint8_t text_ES_Tuesday[] = ""; static uint8_t text_EN_Wednesday[] = "Wednesday"; static uint8_t text_DE_Wednesday[] = "Mittwoch"; static uint8_t text_FR_Wednesday[] = "Mercredi"; -static uint8_t text_IT_Wednesday[] = "Mercoledì"; +static uint8_t text_IT_Wednesday[] = "Mercoledi"; static uint8_t text_ES_Wednesday[] = ""; static uint8_t text_EN_Thursday[] = "Thursday"; static uint8_t text_DE_Thursday[] = "Donnerstag"; static uint8_t text_FR_Thursday[] = "Jeudi"; -static uint8_t text_IT_Thursday[] = "Giovedì"; +static uint8_t text_IT_Thursday[] = "Giovedi"; static uint8_t text_ES_Thursday[] = ""; static uint8_t text_EN_Friday[] = "Friday"; static uint8_t text_DE_Friday[] = "Freitag"; static uint8_t text_FR_Friday[] = "Vendredi"; -static uint8_t text_IT_Friday[] = "Venerdì"; +static uint8_t text_IT_Friday[] = "Venerdi"; static uint8_t text_ES_Friday[] = ""; static uint8_t text_EN_Saturday[] = "Saturday"; @@ -1217,7 +1217,7 @@ static uint8_t text_EN_ScooterSpeed[] = "Speed"; static uint8_t text_DE_ScooterSpeed[] = "Geschwindigkeit"; static uint8_t text_FR_ScooterSpeed[] = "Vitesse"; -static uint8_t text_IT_ScooterSpeed[] = "Velocità"; +static uint8_t text_IT_ScooterSpeed[] = "Velocita"; static uint8_t text_ES_ScooterSpeed[] = ""; // Menu SYS1 (Bonex Computer) diff -r 321df89d5710 -r a7683f9765da Small_CPU/Src/baseCPU2.c --- a/Small_CPU/Src/baseCPU2.c Sun Aug 05 12:57:49 2018 +0200 +++ b/Small_CPU/Src/baseCPU2.c Tue Aug 07 00:24:05 2018 +0200 @@ -169,10 +169,10 @@ .versionFirst = 1, .versionSecond = 4, .versionThird = 1, - .versionBeta = 1, + .versionBeta = 0, /* 4 bytes with trailing 0 */ - .signature = "cw", + .signature = "mh", .release_year = 18, .release_month = 7, diff -r 321df89d5710 -r a7683f9765da ostc4pack/OSTC4_Firmware.bin Binary file ostc4pack/OSTC4_Firmware.bin has changed diff -r 321df89d5710 -r a7683f9765da ostc4pack/OSTC4_RTE.bin Binary file ostc4pack/OSTC4_RTE.bin has changed diff -r 321df89d5710 -r a7683f9765da ostc4pack/OSTC4_RTE_upload.bin Binary file ostc4pack/OSTC4_RTE_upload.bin has changed diff -r 321df89d5710 -r a7683f9765da ostc4pack/OSTC4_firmware_upload.bin Binary file ostc4pack/OSTC4_firmware_upload.bin has changed