From 3ddb853bbd6d485c92eeb71ac263b51fd3145fa2 Mon Sep 17 00:00:00 2001 From: leptun Date: Fri, 26 Jul 2019 18:53:08 +0300 Subject: [PATCH] Fix shifted languages. Use \n and \x0a --- Firmware/lcd.cpp | 6 +++++- Firmware/ultralcd.cpp | 4 ++-- lang/fw-build.sh | 2 +- lang/fw-clean.sh | 2 +- lang/lang-add.sh | 2 +- lang/lang-check.sh | 2 +- lang/lang_en.txt | 4 ++-- lang/lang_en_cz.txt | 8 ++++---- lang/lang_en_de.txt | 8 ++++---- lang/lang_en_es.txt | 8 ++++---- lang/lang_en_fr.txt | 8 ++++---- lang/lang_en_it.txt | 8 ++++---- lang/lang_en_pl.txt | 8 ++++---- lang/progmem.sh | 3 ++- 14 files changed, 39 insertions(+), 34 deletions(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index 1f4e6e2f..fd3e1328 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -143,7 +143,7 @@ static void lcd_command(uint8_t value, uint16_t delayExtra = 0) static void lcd_write(uint8_t value) { - if (value == '\n' || value == '\r') + if (value == '\n') { if (lcd_currline > 3) lcd_currline = -1; lcd_set_cursor(0, lcd_currline + 1); // LF @@ -257,7 +257,9 @@ void lcd_no_display(void) lcd_displaycontrol &= ~LCD_DISPLAYON; lcd_command(LCD_DISPLAYCONTROL | lcd_displaycontrol); } +#endif +#ifdef VT100 //required functions for VT100 // Turns the underline cursor on/off void lcd_no_cursor(void) { @@ -270,7 +272,9 @@ void lcd_cursor(void) lcd_displaycontrol |= LCD_CURSORON; lcd_command(LCD_DISPLAYCONTROL | lcd_displaycontrol); } +#endif +#if 0 // Turn on and off the blinking cursor void lcd_no_blink(void) { diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0d726769..acb369d9 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4344,7 +4344,7 @@ static void lcd_crash_mode_info() if ((tim + 1000) < _millis()) { lcd_clear(); - fputs_P(_i("Crash detection can\rbe turned on only in\rNormal mode"), lcdout);////MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 + fputs_P(_i("Crash detection can\nbe turned on only in\nNormal mode"), lcdout);////MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 tim = _millis(); } menu_back_if_clicked(); @@ -4357,7 +4357,7 @@ static void lcd_crash_mode_info2() if ((tim + 1000) < _millis()) { lcd_clear(); - fputs_P(_i("WARNING:\rCrash detection\rdisabled in\rStealth mode"), lcdout);////MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 + fputs_P(_i("WARNING:\nCrash detection\ndisabled in\nStealth mode"), lcdout);////MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 tim = _millis(); } menu_back_if_clicked(); diff --git a/lang/fw-build.sh b/lang/fw-build.sh index a6ac5879..98187bef 100755 --- a/lang/fw-build.sh +++ b/lang/fw-build.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # postbuild.sh - multi-language support script # Generate binary with secondary language. diff --git a/lang/fw-clean.sh b/lang/fw-clean.sh index df7e4962..2acd4d18 100755 --- a/lang/fw-clean.sh +++ b/lang/fw-clean.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # fw-clean.sh - multi-language support script # Remove all firmware output files from lang folder. diff --git a/lang/lang-add.sh b/lang/lang-add.sh index d33eacd9..f8031e19 100755 --- a/lang/lang-add.sh +++ b/lang/lang-add.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # lang-add.sh - multi-language support script # add new texts from list (lang_add.txt) to all dictionary files diff --git a/lang/lang-check.sh b/lang/lang-check.sh index 3d73d460..c363cdc0 100755 --- a/lang/lang-check.sh +++ b/lang/lang-check.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # lang_check.sh - multi-language support script # check lang_xx.bin (language binary file) diff --git a/lang/lang_en.txt b/lang/lang_en.txt index c8d35cce..2da37fc0 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -8,10 +8,10 @@ "[0;0] point offset" #MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -"Crash detection can\rbe turned on only in\rNormal mode" +"Crash detection can\x0abe turned on only in\x0aNormal mode" #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -"WARNING:\rCrash detection\rdisabled in\rStealth mode" +"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" # ">Cancel" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index d4606d56..ed682e81 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -11,12 +11,12 @@ "[0;0] odsazeni bodu" #MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -"Crash detection can\rbe turned on only in\rNormal mode" -"Crash detekce muze\rbyt zapnuta pouze v\rNormal modu" +"Crash detection can\x0abe turned on only in\x0aNormal mode" +"Crash detekce muze\x0abyt zapnuta pouze v\x0aNormal modu" #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -"WARNING:\rCrash detection\rdisabled in\rStealth mode" -"POZOR:\rCrash detekce\rdeaktivovana ve\rStealth modu" +"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +"POZOR:\x0aCrash detekce\x0adeaktivovana ve\x0aStealth modu" # ">Cancel" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 3c2c8a14..1d33f0f1 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -11,12 +11,12 @@ "[0;0] Punktversatz" #MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -"Crash detection can\rbe turned on only in\rNormal mode" -"Crash Erkennung kann\rnur im Modus Normal\rgenutzt werden" +"Crash detection can\x0abe turned on only in\x0aNormal mode" +"Crash Erkennung kann\x0anur im Modus Normal\x0agenutzt werden" #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -"WARNING:\rCrash detection\rdisabled in\rStealth mode" -"WARNUNG:\rCrash Erkennung\rdeaktiviert im\rStealth Modus" +"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +"WARNUNG:\x0aCrash Erkennung\x0adeaktiviert im\x0aStealth Modus" # ">Cancel" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 3f4629e9..a48da96f 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -11,12 +11,12 @@ "[0;0] punto offset" #MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -"Crash detection can\rbe turned on only in\rNormal mode" -"Dec. choque\rpuede ser activada solo en\rModo normal" +"Crash detection can\x0abe turned on only in\x0aNormal mode" +"Dec. choque puede\x0aser activada solo en\x0aModo normal" #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -"WARNING:\rCrash detection\rdisabled in\rStealth mode" -"ATENCION:\rDec. choque\rdesactivada en\rModo silencio" +"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +"ATENCION:\x0aDec. choque\x0adesactivada en\x0aModo silencio" # ">Cancel" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 2919f11f..320b91d9 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -11,12 +11,12 @@ "Offset point [0;0]" #MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -"Crash detection can\rbe turned on only in\rNormal mode" -"La detection de crash peut etre\ractive seulement\ren mode Normal" +"Crash detection can\x0abe turned on only in\x0aNormal mode" +"La detection de\x0acrash peut etre\x0aactive seulement en\x0amode Normal" #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -"WARNING:\rCrash detection\rdisabled in\rStealth mode" -"ATTENTION :\rDetection de crash\r desactivee en\rmode Furtif" +"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +"ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode Furtif" # ">Cancel" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 0726fef2..0b82c587 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -11,12 +11,12 @@ "[0;0] punto offset" #MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -"Crash detection can\rbe turned on only in\rNormal mode" -"Rilev. impatto\rattivabile solo\rin Modalita normale" +"Crash detection can\x0abe turned on only in\x0aNormal mode" +"Rilev. impatto\x0aattivabile solo\x0ain Modalita normale" #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -"WARNING:\rCrash detection\rdisabled in\rStealth mode" -"ATTENZIONE:\rRilev. impatto\rdisattivato in\rModalita silenziosa" +"WARNING:\x0aCrash detection disabled in Stealth mode" +"ATTENZIONE:\x0aRilev. impatto\x0adisattivato in\x0aModalita silenziosa" # ">Cancel" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 6919d057..47e0fbb0 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -11,12 +11,12 @@ "[0;0] przesuniecie punktu" #MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -"Crash detection can\rbe turned on only in\rNormal mode" -"Wykrywanie zderzen moze\rbyc wlaczone tylko w\rtrybie Normalnym" +"Crash detection can\x0abe turned on only in\x0aNormal mode" +"Wykrywanie zderzen\x0amoze byc wlaczone\x0atylko w\x0atrybie Normalnym" #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -"WARNING:\rCrash detection\rdisabled in\rStealth mode" -"UWAGA:\rWykrywanie zderzen\rwylaczone w\rtrybie Stealth" +"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +"UWAGA:\x0aWykrywanie zderzen\x0awylaczone w\x0atrybie Stealth" # ">Cancel" diff --git a/lang/progmem.sh b/lang/progmem.sh index 3e413025..53993b28 100755 --- a/lang/progmem.sh +++ b/lang/progmem.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # progmem.sh - multi-language support script # Examine content of progmem sections (default is progmem1). @@ -104,6 +104,7 @@ cat $PROGMEM.chr | \ sed 's/\\x1b/\\\\\\x1b/g;' | \ sed 's/\\x01/\\\\\\x01/g;' | \ sed 's/\\xf8/\\\\\\xf8/g;' | \ + sed 's/\\x0a/\\\\\\x0a/g;' | \ sed 's/\\x00$/\n/;s/^/\"/;s/$/\"\\/'; \ ) | sh > $PROGMEM.var