0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #3758 from thinkyhead/rc_verbiage

Browse source 
Tweaks to some verbiage
This commit is contained in:
Scott Lahteine 2016-05-14 15:27:11 -07:00
parent c63f95f2fe ddf3e1e22d
commit 585c8a918f
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/SanityCheck.h
View file

@ -121,7 +121,7 @@
* Individual axis homing is useless for DELTAS * Individual axis homing is useless for DELTAS
*/ */
#if ENABLED(INDIVIDUAL_AXIS_HOMING_MENU) && ENABLED(DELTA) #if ENABLED(INDIVIDUAL_AXIS_HOMING_MENU) && ENABLED(DELTA)
#error Individual axis homing will not work with a DELTA kinematics. #error INDIVIDUAL_AXIS_HOMING_MENU is incompatible with DELTA kinematics.
#endif #endif
/** /**

8
Marlin/utf_mapper.h
View file

@ -74,7 +74,7 @@
// ヰ ヱ ヲ ン フ ? ? ? ? ? ヲ ・ ー ヽ ヽ ? // ヰ ヱ ヲ ン フ ? ? ? ? ? ヲ ・ ー ヽ ヽ ?
}; };
#elif ENABLED(MAPPER_D0D1) #elif ENABLED(MAPPER_D0D1)
#error "Cyrillic on a japanese dsplay makes no sense. There are no matching symbols." #error "Cyrillic on a JAPANESE display makes no sense. There are no matching symbols."
#endif #endif
#elif DISPLAY_CHARSET_HD44780 == WESTERN #elif DISPLAY_CHARSET_HD44780 == WESTERN
@ -108,7 +108,7 @@
// p c T y Ф x Ч ч Ш Щ Ъ Ы b Э Ю Я // p c T y Ф x Ч ч Ш Щ Ъ Ы b Э Ю Я
}; };
#elif ENABLED(MAPPER_E382E383) #elif ENABLED(MAPPER_E382E383)
#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 DISPLAY_CHARSET_HD44780 == CYRILLIC #elif DISPLAY_CHARSET_HD44780 == CYRILLIC
@ -135,9 +135,9 @@
// ш щ ъ ы ь э ю я // 7 Ѱ ѱ Ѳ ѳ Ѵ ѵ Ѷ ѷ // ш щ ъ ы ь э ю я // 7 Ѱ ѱ Ѳ ѳ Ѵ ѵ Ѷ ѷ
}; // ѻ ѹ Ѻ ѻ Ѽ ѽ Ѿ ѿ }; // ѻ ѹ Ѻ ѻ Ѽ ѽ Ѿ ѿ
#elif ENABLED(MAPPER_C2C3) #elif ENABLED(MAPPER_C2C3)
#error "Western languages on a cyrillic display makes no sense. There are no matching symbols." #error "Western languages on a CYRILLIC display makes no sense. There are no matching symbols."
#elif ENABLED(MAPPER_E382E383) #elif ENABLED(MAPPER_E382E383)
#error "Katakana on a cyrillic display makes no sense. There are no matching symbols." #error "Katakana on a CYRILLIC display makes no sense. There are no matching symbols."
#endif #endif
#else #else
#error "Something went wrong in the setting of DISPLAY_CHARSET_HD44780" #error "Something went wrong in the setting of DISPLAY_CHARSET_HD44780"