MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Applied thinkyheads corrections from 2015-03-17

Browse Source
This commit is contained in:
AnHardt 2015-03-17 11:23:44 +01:00
parent 8a29dd4839
commit 1883e1bb60
20 changed files with 43 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/Configuration.h
View File

@ -558,10 +558,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
// Chose ONE of the next three charsets. This has to match your hardware. In case of a full graphic display this information is not important. // Chose ONE of the next three charsets. This has to match your hardware. In case of a full graphic display this information is not important.
// To find out what type you have - compile with (test) - upload - click to get the menu. You'll see two typical lines from the upper half of the charset. // To find out what type you have - compile with (test) - upload - click to get the menu. You'll see two typical lines from the upper half of the charset.
// Se also documentation/LCDLanguageFont.md // See also documentation/LCDLanguageFont.md
#define DISPLAY_CHARSET_HD44780_JAPAN // this is the most common hardware #define DISPLAY_CHARSET_HD44780_JAPAN // this is the most common hardware
//#define DISPLAY_CHARSET_HD44780_WESTERN //#define DISPLAY_CHARSET_HD44780_WESTERN
//#define DISPLAY_CHARSET_HD44780_CYRILIC //#define DISPLAY_CHARSET_HD44780_CYRILLIC
//#define ULTRA_LCD //general LCD support, also 16x2 //#define ULTRA_LCD //general LCD support, also 16x2
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)

4
Marlin/dogm_lcd_implementation.h
View File

@ -14,8 +14,6 @@
#ifndef DOGM_LCD_IMPLEMENTATION_H #ifndef DOGM_LCD_IMPLEMENTATION_H
#define DOGM_LCD_IMPLEMENTATION_H #define DOGM_LCD_IMPLEMENTATION_H
#define MARLIN_VERSION "1.0.2"
/** /**
* Implementation of the LCD display routines for a DOGM128 graphic display. These are common LCD 128x64 pixel graphic displays. * Implementation of the LCD display routines for a DOGM128 graphic display. These are common LCD 128x64 pixel graphic displays.
*/ */
@ -71,7 +69,7 @@
#elif defined( DISPLAY_CHARSET_HD44780_WESTERN ) #elif defined( DISPLAY_CHARSET_HD44780_WESTERN )
#include "dogm_font_data_HD44780_W.h" #include "dogm_font_data_HD44780_W.h"
#define FONT_MENU_NAME HD44780_W_5x7 #define FONT_MENU_NAME HD44780_W_5x7
#elif defined( DISPLAY_CHARSET_HD44780_CYRILIC ) #elif defined( DISPLAY_CHARSET_HD44780_CYRILLIC )
#include "dogm_font_data_HD44780_C.h" #include "dogm_font_data_HD44780_C.h"
#define FONT_MENU_NAME HD44780_C_5x7 #define FONT_MENU_NAME HD44780_C_5x7
#else // fall-back #else // fall-back

4
Marlin/language.h
View File

@ -11,7 +11,7 @@
// //
// ==> ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRALCD" / "SDSUPPORT" #define IN "Configuration.h" // ==> ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRALCD" / "SDSUPPORT" #define IN "Configuration.h"
// ==> ALSO TRY ALL AVAILABLE LANGUAGE OPTIONS // ==> ALSO TRY ALL AVAILABLE LANGUAGE OPTIONS
// Se also documentation/LCDLanguageFont.md // See also documentation/LCDLanguageFont.md
// Languages // Languages
// en English // en English
@ -203,7 +203,7 @@
// LCD Menu Messages // LCD Menu Messages
#if !(defined( DISPLAY_CHARSET_HD44780_JAPAN ) || defined( DISPLAY_CHARSET_HD44780_WESTERN ) || defined( DISPLAY_CHARSET_HD44780_CYRILIC )) #if !(defined( DISPLAY_CHARSET_HD44780_JAPAN ) || defined( DISPLAY_CHARSET_HD44780_WESTERN ) || defined( DISPLAY_CHARSET_HD44780_CYRILLIC ))
#define DISPLAY_CHARSET_HD44780_JAPAN #define DISPLAY_CHARSET_HD44780_JAPAN
#endif #endif

2
Marlin/language_an.h
View File

@ -2,7 +2,7 @@
* Aragonese * Aragonese
* *
* LCD Menu Messages * LCD Menu Messages
* Se also documentation/LCDLanguageFont.md * See also documentation/LCDLanguageFont.md
* *
*/ */
#ifndef LANGUAGE_AN_H #ifndef LANGUAGE_AN_H

2
Marlin/language_ca.h
View File

@ -2,7 +2,7 @@
* Catalan * Catalan
* *
* LCD Menu Messages * LCD Menu Messages
* Se also documentation/LCDLanguageFont.md * See also documentation/LCDLanguageFont.md
* *
*/ */
#ifndef LANGUAGE_CA_H #ifndef LANGUAGE_CA_H

2
Marlin/language_de.h
View File

@ -2,7 +2,7 @@
* German * German
* *
* LCD Menu Messages * LCD Menu Messages
* Se also documentation/LCDLanguageFont.md * See also documentation/LCDLanguageFont.md
* *
*/ */
#ifndef LANGUAGE_DE_H #ifndef LANGUAGE_DE_H

2
Marlin/language_es.h
View File

@ -2,7 +2,7 @@
* Spanish * Spanish
* *
* LCD Menu Messages * LCD Menu Messages
* Se also documentation/LCDLanguageFont.md * See also documentation/LCDLanguageFont.md
* *
*/ */
#ifndef LANGUAGE_ES_H #ifndef LANGUAGE_ES_H

2
Marlin/language_eu.h
View File

@ -2,7 +2,7 @@
* Basque-Euskera * Basque-Euskera
* *
* LCD Menu Messages * LCD Menu Messages
* Se also documentation/LCDLanguageFont.md * See also documentation/LCDLanguageFont.md
* *
*/ */
#ifndef LANGUAGE_EU_H #ifndef LANGUAGE_EU_H

2
Marlin/language_fi.h
View File

@ -2,7 +2,7 @@
* Finnish * Finnish
* *
* LCD Menu Messages * LCD Menu Messages
* Se also documentation/LCDLanguageFont.md * See also documentation/LCDLanguageFont.md
* *
*/ */
#ifndef LANGUAGE_FI_H #ifndef LANGUAGE_FI_H

2
Marlin/language_fr.h
View File

@ -2,7 +2,7 @@
* French * French
* *
* LCD Menu Messages * LCD Menu Messages
* Se also documentation/LCDLanguageFont.md * See also documentation/LCDLanguageFont.md
* *
*/ */
#ifndef LANGUAGE_FR_H #ifndef LANGUAGE_FR_H

2
Marlin/language_it.h
View File

@ -2,7 +2,7 @@
* Italian * Italian
* *
* LCD Menu Messages * LCD Menu Messages
* Se also documentation/LCDLanguageFont.md * See also documentation/LCDLanguageFont.md
* *
*/ */
#ifndef LANGUAGE_IT_H #ifndef LANGUAGE_IT_H

2
Marlin/language_kana.h
View File

@ -2,7 +2,7 @@
* Japanese (Kana) * Japanese (Kana)
* *
* LCD Menu Messages * LCD Menu Messages
* Se also documentation/LCDLanguageFont.md * See also documentation/LCDLanguageFont.md
* *
*/ */

2
Marlin/language_kana_utf8.h
View File

@ -2,7 +2,7 @@
* Japanese (Kana UTF8 version) * Japanese (Kana UTF8 version)
* *
* LCD Menu Messages * LCD Menu Messages
* Se also documentation/LCDLanguageFont.md * See also documentation/LCDLanguageFont.md
* *
*/ */

2
Marlin/language_nl.h
View File

@ -2,7 +2,7 @@
* Dutch * Dutch
* *
* LCD Menu Messages * LCD Menu Messages
* Se also documentation/LCDLanguageFont.md * See also documentation/LCDLanguageFont.md
* *
*/ */
#ifndef LANGUAGE_NL_H #ifndef LANGUAGE_NL_H

2
Marlin/language_pl.h
View File

@ -2,7 +2,7 @@
* Polish * Polish
* *
* LCD Menu Messages * LCD Menu Messages
* Se also documentation/LCDLanguageFont.md * See also documentation/LCDLanguageFont.md
* *
*/ */
#ifndef LANGUAGE_PL_H #ifndef LANGUAGE_PL_H

2
Marlin/language_pt-br.h
View File

@ -2,7 +2,7 @@
* Portuguese (Brazil) * Portuguese (Brazil)
* *
* LCD Menu Messages * LCD Menu Messages
* Se also documentation/LCDLanguageFont.md * See also documentation/LCDLanguageFont.md
* *
*/ */
#ifndef LANGUAGE_PT_BR_H #ifndef LANGUAGE_PT_BR_H

2
Marlin/language_pt.h
View File

@ -2,7 +2,7 @@
* Portuguese * Portuguese
* *
* LCD Menu Messages * LCD Menu Messages
* Se also documentation/LCDLanguageFont.md * See also documentation/LCDLanguageFont.md
* *
*/ */
#ifndef LANGUAGE_PT_H #ifndef LANGUAGE_PT_H

2
Marlin/language_ru.h
View File

@ -2,7 +2,7 @@
* Russian * Russian
* *
* LCD Menu Messages * LCD Menu Messages
* Se also documentation/LCDLanguageFont.md * See also documentation/LCDLanguageFont.md
* *
*/ */
#ifndef LANGUAGE_RU_H #ifndef LANGUAGE_RU_H

2
Marlin/language_test.h
View File

@ -2,7 +2,7 @@
* TEST * TEST
* *
* LCD Menu Messages * LCD Menu Messages
* Se also documentation/LCDLanguageFont.md * See also documentation/LCDLanguageFont.md
* *
*/ */
#ifndef LANGUAGE_TEST_H #ifndef LANGUAGE_TEST_H

44
Marlin/utf_mapper.h
View File

@ -4,9 +4,9 @@
#include "language.h" #include "language.h"
#ifdef DOGLCD #ifdef DOGLCD
#define HARDWAERE_CHAR_OUT u8g.print #define HARDWARE_CHAR_OUT u8g.print
#else #else
#define HARDWAERE_CHAR_OUT lcd.write #define HARDWARE_CHAR_OUT lcd.write
#endif #endif
#if !(defined( SIMULATE_ROMFONT )) && defined( DOGLCD ) #if !(defined( SIMULATE_ROMFONT )) && defined( DOGLCD )
@ -90,7 +90,7 @@
#error( "Katakana on a western display makes no sense. There are no matching symbols." ); #error( "Katakana on a western display makes no sense. There are no matching symbols." );
#endif #endif
#elif defined( DISPLAY_CHARSET_HD44780_CYRILIC ) #elif defined( DISPLAY_CHARSET_HD44780_CYRILLIC )
#if defined( MAPPER_D0D1 ) #if defined( MAPPER_D0D1 )
#define MAPPER_D0D1_MOD #define MAPPER_D0D1_MOD
// it is a Russian alphabet translation // it is a Russian alphabet translation
@ -120,12 +120,12 @@
#endif #endif
#else #else
#error("Something went wrong in the selection of DISPLAY_CHARSET_HD44780's"); #error("Something went wrong in the selection of DISPLAY_CHARSET_HD44780's");
#endif // DISPLAY_CHARSET_HD44780_CYRILIC #endif // DISPLAY_CHARSET_HD44780_CYRILLIC
#endif // SIMULATE_ROMFONT #endif // SIMULATE_ROMFONT
#if defined( MAPPER_NON ) #if defined( MAPPER_NON )
char charset_mapper(char c){ char charset_mapper(char c){
HARDWAERE_CHAR_OUT( c ); HARDWARE_CHAR_OUT( c );
return 1; return 1;
} }
#elif defined( MAPPER_C2C3 ) #elif defined( MAPPER_C2C3 )
@ -142,17 +142,17 @@
else if (seen_c2){ else if (seen_c2){
d &= 0x3f; d &= 0x3f;
#ifndef MAPPER_ONE_TO_ONE #ifndef MAPPER_ONE_TO_ONE
HARDWAERE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) ); HARDWARE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
#else #else
HARDWAERE_CHAR_OUT( (char) (0x80 + ( utf_hi_char << 6 ) + d) ) ; HARDWARE_CHAR_OUT( (char) (0x80 + ( utf_hi_char << 6 ) + d) ) ;
#endif #endif
} }
else { else {
HARDWAERE_CHAR_OUT('?'); HARDWARE_CHAR_OUT('?');
} }
} }
else { else {
HARDWAERE_CHAR_OUT((char) c ); HARDWARE_CHAR_OUT((char) c );
} }
seen_c2 = false; seen_c2 = false;
return 1; return 1;
@ -172,18 +172,18 @@
} else if (seen_d5) { } else if (seen_d5) {
d &= 0x3f; d &= 0x3f;
if ( !utf_hi_char && ( d == 1 )) { if ( !utf_hi_char && ( d == 1 )) {
HARDWAERE_CHAR_OUT((char) 0xa2 ); // Ё HARDWARE_CHAR_OUT((char) 0xa2 ); // Ё
} else if ((utf_hi_char == 1) && (d == 0x11)) { } else if ((utf_hi_char == 1) && (d == 0x11)) {
HARDWAERE_CHAR_OUT((char) 0xb5 ); // ё HARDWARE_CHAR_OUT((char) 0xb5 ); // ё
} else { } else {
HARDWAERE_CHAR_OUT((char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x10 ) ); HARDWARE_CHAR_OUT((char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x10 ) );
} }
} }
else { else {
HARDWAERE_CHAR_OUT('?'); HARDWARE_CHAR_OUT('?');
} }
} else { } else {
HARDWAERE_CHAR_OUT((char) c ); HARDWARE_CHAR_OUT((char) c );
} }
seen_d5 = false; seen_d5 = false;
return 1; return 1;
@ -201,15 +201,15 @@
} else if (seen_d5) { } else if (seen_d5) {
d &= 0x3fu; d &= 0x3fu;
#ifndef MAPPER_ONE_TO_ONE #ifndef MAPPER_ONE_TO_ONE
HARDWAERE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) ); HARDWARE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
#else #else
HARDWAERE_CHAR_OUT( (char) (0xa0u + ( utf_hi_char << 6 ) + d ) ) ; HARDWARE_CHAR_OUT( (char) (0xa0u + ( utf_hi_char << 6 ) + d ) ) ;
#endif #endif
} else { } else {
HARDWAERE_CHAR_OUT('?'); HARDWARE_CHAR_OUT('?');
} }
} else { } else {
HARDWAERE_CHAR_OUT((char) c ); HARDWARE_CHAR_OUT((char) c );
} }
seen_d5 = false; seen_d5 = false;
return 1; return 1;
@ -231,15 +231,15 @@
} else if ((seen_e3 == true) && (seen_82_83 == true)){ } else if ((seen_e3 == true) && (seen_82_83 == true)){
d &= 0x3f; d &= 0x3f;
#ifndef MAPPER_ONE_TO_ONE #ifndef MAPPER_ONE_TO_ONE
HARDWAERE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) ); HARDWARE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
#else #else
HARDWAERE_CHAR_OUT( (char) (0x80 + ( utf_hi_char << 6 ) + d ) ) ; HARDWARE_CHAR_OUT( (char) (0x80 + ( utf_hi_char << 6 ) + d ) ) ;
#endif #endif
} else { } else {
HARDWAERE_CHAR_OUT((char) '?' ); HARDWARE_CHAR_OUT((char) '?' );
} }
} else { } else {
HARDWAERE_CHAR_OUT((char) c ); HARDWARE_CHAR_OUT((char) c );
} }
seen_e3 = false; seen_e3 = false;
seen_82_83 = false; seen_82_83 = false;