3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2050 from leptun/MK3_fix_languages_lcd3

Browse Source 
Fix shifted languages. Use \n and \x0a
This commit is contained in:
DRracer 2019-07-26 21:52:26 +02:00 committed by GitHub
commit da7ce65bb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Firmware/lcd.cpp
View File

@ -143,7 +143,7 @@ static void lcd_command(uint8_t value, uint16_t delayExtra = 0)
static void lcd_write(uint8_t value) static void lcd_write(uint8_t value)
{ {
if (value == '\n' || value == '\r') if (value == '\n')
{ {
if (lcd_currline > 3) lcd_currline = -1; if (lcd_currline > 3) lcd_currline = -1;
lcd_set_cursor(0, lcd_currline + 1); // LF lcd_set_cursor(0, lcd_currline + 1); // LF
@ -257,7 +257,9 @@ void lcd_no_display(void)
lcd_displaycontrol &= ~LCD_DISPLAYON; lcd_displaycontrol &= ~LCD_DISPLAYON;
lcd_command(LCD_DISPLAYCONTROL | lcd_displaycontrol); lcd_command(LCD_DISPLAYCONTROL | lcd_displaycontrol);
} }
#endif
#ifdef VT100 //required functions for VT100
// Turns the underline cursor on/off // Turns the underline cursor on/off
void lcd_no_cursor(void) void lcd_no_cursor(void)
{ {
@ -270,7 +272,9 @@ void lcd_cursor(void)
lcd_displaycontrol |= LCD_CURSORON; lcd_displaycontrol |= LCD_CURSORON;
lcd_command(LCD_DISPLAYCONTROL | lcd_displaycontrol); lcd_command(LCD_DISPLAYCONTROL | lcd_displaycontrol);
} }
#endif
#if 0
// Turn on and off the blinking cursor // Turn on and off the blinking cursor
void lcd_no_blink(void) void lcd_no_blink(void)
{ {

4
Firmware/ultralcd.cpp
View File

@ -4344,7 +4344,7 @@ static void lcd_crash_mode_info()
if ((tim + 1000) < _millis()) if ((tim + 1000) < _millis())
{ {
lcd_clear(); 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(); tim = _millis();
} }
menu_back_if_clicked(); menu_back_if_clicked();
@ -4357,7 +4357,7 @@ static void lcd_crash_mode_info2()
if ((tim + 1000) < _millis()) if ((tim + 1000) < _millis())
{ {
lcd_clear(); 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(); tim = _millis();
} }
menu_back_if_clicked(); menu_back_if_clicked();

2
lang/fw-build.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# #
# postbuild.sh - multi-language support script # postbuild.sh - multi-language support script
# Generate binary with secondary language. # Generate binary with secondary language.

2
lang/fw-clean.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# #
# fw-clean.sh - multi-language support script # fw-clean.sh - multi-language support script
# Remove all firmware output files from lang folder. # Remove all firmware output files from lang folder.

2
lang/lang-add.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# #
# lang-add.sh - multi-language support script # lang-add.sh - multi-language support script
# add new texts from list (lang_add.txt) to all dictionary files # add new texts from list (lang_add.txt) to all dictionary files

2
lang/lang-check.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# #
# lang_check.sh - multi-language support script # lang_check.sh - multi-language support script
# check lang_xx.bin (language binary file) # check lang_xx.bin (language binary file)

4
lang/lang_en.txt
View File

@ -8,10 +8,10 @@
"[0;0] point offset" "[0;0] point offset"
#MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 #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 #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" ">Cancel"

8
lang/lang_en_cz.txt
View File

@ -11,12 +11,12 @@
"[0;0] odsazeni bodu" "[0;0] odsazeni bodu"
#MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 #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"
"Crash detekce muze\rbyt zapnuta pouze v\rNormal modu" "Crash detekce muze\x0abyt zapnuta pouze v\x0aNormal modu"
#MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4
"WARNING:\rCrash detection\rdisabled in\rStealth mode" "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
"POZOR:\rCrash detekce\rdeaktivovana ve\rStealth modu" "POZOR:\x0aCrash detekce\x0adeaktivovana ve\x0aStealth modu"
# #
">Cancel" ">Cancel"

8
lang/lang_en_de.txt
View File

@ -11,12 +11,12 @@
"[0;0] Punktversatz" "[0;0] Punktversatz"
#MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 #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"
"Crash Erkennung kann\rnur im Modus Normal\rgenutzt werden" "Crash Erkennung kann\x0anur im Modus Normal\x0agenutzt werden"
#MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4
"WARNING:\rCrash detection\rdisabled in\rStealth mode" "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
"WARNUNG:\rCrash Erkennung\rdeaktiviert im\rStealth Modus" "WARNUNG:\x0aCrash Erkennung\x0adeaktiviert im\x0aStealth Modus"
# #
">Cancel" ">Cancel"

8
lang/lang_en_es.txt
View File

@ -11,12 +11,12 @@
"[0;0] punto offset" "[0;0] punto offset"
#MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 #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"
"Dec. choque\rpuede ser activada solo en\rModo normal" "Dec. choque puede\x0aser activada solo en\x0aModo normal"
#MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4
"WARNING:\rCrash detection\rdisabled in\rStealth mode" "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
"ATENCION:\rDec. choque\rdesactivada en\rModo silencio" "ATENCION:\x0aDec. choque\x0adesactivada en\x0aModo silencio"
# #
">Cancel" ">Cancel"

8
lang/lang_en_fr.txt
View File

@ -11,12 +11,12 @@
"Offset point [0;0]" "Offset point [0;0]"
#MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 #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"
"La detection de crash peut etre\ractive seulement\ren mode Normal" "La detection de\x0acrash peut etre\x0aactive seulement en\x0amode Normal"
#MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4
"WARNING:\rCrash detection\rdisabled in\rStealth mode" "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
"ATTENTION :\rDetection de crash\r desactivee en\rmode Furtif" "ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode Furtif"
# #
">Cancel" ">Cancel"

8
lang/lang_en_it.txt
View File

@ -11,12 +11,12 @@
"[0;0] punto offset" "[0;0] punto offset"
#MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 #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"
"Rilev. impatto\rattivabile solo\rin Modalita normale" "Rilev. impatto\x0aattivabile solo\x0ain Modalita normale"
#MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4
"WARNING:\rCrash detection\rdisabled in\rStealth mode" "WARNING:\x0aCrash detection disabled in Stealth mode"
"ATTENZIONE:\rRilev. impatto\rdisattivato in\rModalita silenziosa" "ATTENZIONE:\x0aRilev. impatto\x0adisattivato in\x0aModalita silenziosa"
# #
">Cancel" ">Cancel"

8
lang/lang_en_pl.txt
View File

@ -11,12 +11,12 @@
"[0;0] przesuniecie punktu" "[0;0] przesuniecie punktu"
#MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 #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"
"Wykrywanie zderzen moze\rbyc wlaczone tylko w\rtrybie Normalnym" "Wykrywanie zderzen\x0amoze byc wlaczone\x0atylko w\x0atrybie Normalnym"
#MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4
"WARNING:\rCrash detection\rdisabled in\rStealth mode" "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
"UWAGA:\rWykrywanie zderzen\rwylaczone w\rtrybie Stealth" "UWAGA:\x0aWykrywanie zderzen\x0awylaczone w\x0atrybie Stealth"
# #
">Cancel" ">Cancel"

3
lang/progmem.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# #
# progmem.sh - multi-language support script # progmem.sh - multi-language support script
# Examine content of progmem sections (default is progmem1). # Examine content of progmem sections (default is progmem1).
@ -104,6 +104,7 @@ cat $PROGMEM.chr | \
sed 's/\\x1b/\\\\\\x1b/g;' | \ sed 's/\\x1b/\\\\\\x1b/g;' | \
sed 's/\\x01/\\\\\\x01/g;' | \ sed 's/\\x01/\\\\\\x01/g;' | \
sed 's/\\xf8/\\\\\\xf8/g;' | \ sed 's/\\xf8/\\\\\\xf8/g;' | \
sed 's/\\x0a/\\\\\\x0a/g;' | \
sed 's/\\x00$/\n/;s/^/\"/;s/$/\"\\/'; \ sed 's/\\x00$/\n/;s/^/\"/;s/$/\"\\/'; \
) | sh > $PROGMEM.var ) | sh > $PROGMEM.var