From e773d081c0ff1345df7c61e15c801c607d384c46 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 11 Apr 2016 19:42:09 -0700 Subject: [PATCH 1/2] General language file cleanup --- Marlin/language_an.h | 12 +++++------- Marlin/language_bg.h | 12 +++++------- Marlin/language_ca.h | 12 +++++------- Marlin/language_cn.h | 13 +++++-------- Marlin/language_cz.h | 12 +++++------- Marlin/language_da.h | 12 +++++------- Marlin/language_es.h | 12 +++++------- Marlin/language_eu.h | 12 +++++------- Marlin/language_fi.h | 12 +++++------- Marlin/language_fr.h | 13 +++++-------- Marlin/language_gl.h | 12 +++++------- Marlin/language_it.h | 13 +++++-------- Marlin/language_kana.h | 12 +++++------- Marlin/language_kana_utf8.h | 12 +++++------- Marlin/language_nl.h | 12 +++++------- Marlin/language_pl.h | 13 +++++-------- Marlin/language_pt-br.h | 13 +++++-------- Marlin/language_pt-br_utf8.h | 13 +++++-------- Marlin/language_pt.h | 12 +++++------- Marlin/language_pt_utf8.h | 12 +++++------- 20 files changed, 100 insertions(+), 146 deletions(-) diff --git a/Marlin/language_an.h b/Marlin/language_an.h index 17e32ef8d..ea476d69f 100644 --- a/Marlin/language_an.h +++ b/Marlin/language_an.h @@ -151,12 +151,10 @@ #define MSG_END_HOUR "hours" #define MSG_END_MINUTE "minutes" -#if ENABLED(DELTA_CALIBRATION_MENU) - #define MSG_DELTA_CALIBRATE "Delta Calibration" - #define MSG_DELTA_CALIBRATE_X "Calibrate X" - #define MSG_DELTA_CALIBRATE_Y "Calibrate Y" - #define MSG_DELTA_CALIBRATE_Z "Calibrate Z" - #define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center" -#endif // DELTA_CALIBRATION_MENU +#define MSG_DELTA_CALIBRATE "Delta Calibration" +#define MSG_DELTA_CALIBRATE_X "Calibrate X" +#define MSG_DELTA_CALIBRATE_Y "Calibrate Y" +#define MSG_DELTA_CALIBRATE_Z "Calibrate Z" +#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center" #endif // LANGUAGE_AN_H diff --git a/Marlin/language_bg.h b/Marlin/language_bg.h index 062deb0de..abff7baa7 100644 --- a/Marlin/language_bg.h +++ b/Marlin/language_bg.h @@ -152,12 +152,10 @@ #define MSG_END_HOUR "часа" #define MSG_END_MINUTE "минути" -#if ENABLED(DELTA_CALIBRATION_MENU) - #define MSG_DELTA_CALIBRATE "Делта Калибровка" - #define MSG_DELTA_CALIBRATE_X "Калибровка X" - #define MSG_DELTA_CALIBRATE_Y "Калибровка Y" - #define MSG_DELTA_CALIBRATE_Z "Калибровка Z" - #define MSG_DELTA_CALIBRATE_CENTER "Калибровка Център" -#endif // DELTA_CALIBRATION_MENU +#define MSG_DELTA_CALIBRATE "Делта Калибровка" +#define MSG_DELTA_CALIBRATE_X "Калибровка X" +#define MSG_DELTA_CALIBRATE_Y "Калибровка Y" +#define MSG_DELTA_CALIBRATE_Z "Калибровка Z" +#define MSG_DELTA_CALIBRATE_CENTER "Калибровка Център" #endif // LANGUAGE_BG_H diff --git a/Marlin/language_ca.h b/Marlin/language_ca.h index 77fab60d8..783d08878 100644 --- a/Marlin/language_ca.h +++ b/Marlin/language_ca.h @@ -152,12 +152,10 @@ #define MSG_END_HOUR "hours" #define MSG_END_MINUTE "minutes" -#if ENABLED(DELTA_CALIBRATION_MENU) - #define MSG_DELTA_CALIBRATE "Delta Calibration" - #define MSG_DELTA_CALIBRATE_X "Calibrate X" - #define MSG_DELTA_CALIBRATE_Y "Calibrate Y" - #define MSG_DELTA_CALIBRATE_Z "Calibrate Z" - #define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center" -#endif // DELTA_CALIBRATION_MENU +#define MSG_DELTA_CALIBRATE "Delta Calibration" +#define MSG_DELTA_CALIBRATE_X "Calibrate X" +#define MSG_DELTA_CALIBRATE_Y "Calibrate Y" +#define MSG_DELTA_CALIBRATE_Z "Calibrate Z" +#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center" #endif // LANGUAGE_CA_H diff --git a/Marlin/language_cn.h b/Marlin/language_cn.h index c19fa82c6..95c794afd 100644 --- a/Marlin/language_cn.h +++ b/Marlin/language_cn.h @@ -157,13 +157,10 @@ #define MSG_END_HOUR "hours" #define MSG_END_MINUTE "minutes" -#if ENABLED(DELTA_CALIBRATION_MENU) - #define MSG_DELTA_CALIBRATE "Delta Calibration" - #define MSG_DELTA_CALIBRATE_X "Calibrate X" - #define MSG_DELTA_CALIBRATE_Y "Calibrate Y" - #define MSG_DELTA_CALIBRATE_Z "Calibrate Z" - #define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center" -#endif // DELTA_CALIBRATION_MENU +#define MSG_DELTA_CALIBRATE "Delta Calibration" +#define MSG_DELTA_CALIBRATE_X "Calibrate X" +#define MSG_DELTA_CALIBRATE_Y "Calibrate Y" +#define MSG_DELTA_CALIBRATE_Z "Calibrate Z" +#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center" #endif // LANGUAGE_CN_H - diff --git a/Marlin/language_cz.h b/Marlin/language_cz.h index 2cc2d2549..db82d7d97 100644 --- a/Marlin/language_cz.h +++ b/Marlin/language_cz.h @@ -169,12 +169,10 @@ #define MSG_BED_HEATING "Zahrivani podl." #define MSG_BED_DONE "Podlozka hotova." -#if ENABLED(DELTA_CALIBRATION_MENU) - #define MSG_DELTA_CALIBRATE "Delta Kalibrace" - #define MSG_DELTA_CALIBRATE_X "Kalibrovat X" - #define MSG_DELTA_CALIBRATE_Y "Kalibrovat Y" - #define MSG_DELTA_CALIBRATE_Z "Kalibrovat Z" - #define MSG_DELTA_CALIBRATE_CENTER "Kalibrovat Stred" -#endif // DELTA_CALIBRATION_MENU +#define MSG_DELTA_CALIBRATE "Delta Kalibrace" +#define MSG_DELTA_CALIBRATE_X "Kalibrovat X" +#define MSG_DELTA_CALIBRATE_Y "Kalibrovat Y" +#define MSG_DELTA_CALIBRATE_Z "Kalibrovat Z" +#define MSG_DELTA_CALIBRATE_CENTER "Kalibrovat Stred" #endif // LANGUAGE_CZ_H diff --git a/Marlin/language_da.h b/Marlin/language_da.h index 2031d4e58..4d9b46f2b 100644 --- a/Marlin/language_da.h +++ b/Marlin/language_da.h @@ -157,12 +157,10 @@ #define MSG_BED_DONE "Plade opvarmet" #define MSG_ENDSTOP_ABORT "Endstop abort" -#ifdef DELTA_CALIBRATION_MENU - #define MSG_DELTA_CALIBRATE "Delta Kalibrering" - #define MSG_DELTA_CALIBRATE_X "Kalibrer X" - #define MSG_DELTA_CALIBRATE_Y "Kalibrer Y" - #define MSG_DELTA_CALIBRATE_Z "Kalibrer Z" - #define MSG_DELTA_CALIBRATE_CENTER "Kalibrerings Center" -#endif // DELTA_CALIBRATION_MENU +#define MSG_DELTA_CALIBRATE "Delta Kalibrering" +#define MSG_DELTA_CALIBRATE_X "Kalibrer X" +#define MSG_DELTA_CALIBRATE_Y "Kalibrer Y" +#define MSG_DELTA_CALIBRATE_Z "Kalibrer Z" +#define MSG_DELTA_CALIBRATE_CENTER "Kalibrerings Center" #endif // LANGUAGE_DA_H diff --git a/Marlin/language_es.h b/Marlin/language_es.h index e91418c3f..0032de8fd 100644 --- a/Marlin/language_es.h +++ b/Marlin/language_es.h @@ -165,12 +165,10 @@ #define MSG_BED_HEATING "Calentando plataforma ..." #define MSG_BED_DONE "Plataforma Caliente" -#if ENABLED(DELTA_CALIBRATION_MENU) - #define MSG_DELTA_CALIBRATE "Calibracion Delta" - #define MSG_DELTA_CALIBRATE_X "Calibrar X" - #define MSG_DELTA_CALIBRATE_Y "Calibrar Y" - #define MSG_DELTA_CALIBRATE_Z "Calibrar Z" - #define MSG_DELTA_CALIBRATE_CENTER "Calibrar Centro" -#endif // DELTA_CALIBRATION_MENU +#define MSG_DELTA_CALIBRATE "Calibracion Delta" +#define MSG_DELTA_CALIBRATE_X "Calibrar X" +#define MSG_DELTA_CALIBRATE_Y "Calibrar Y" +#define MSG_DELTA_CALIBRATE_Z "Calibrar Z" +#define MSG_DELTA_CALIBRATE_CENTER "Calibrar Centro" #endif // LANGUAGE_ES_H diff --git a/Marlin/language_eu.h b/Marlin/language_eu.h index bc775ec10..8158d2654 100644 --- a/Marlin/language_eu.h +++ b/Marlin/language_eu.h @@ -151,12 +151,10 @@ #define MSG_END_HOUR "hours" #define MSG_END_MINUTE "minutes" -#if ENABLED(DELTA_CALIBRATION_MENU) - #define MSG_DELTA_CALIBRATE "Delta Calibration" - #define MSG_DELTA_CALIBRATE_X "Calibrate X" - #define MSG_DELTA_CALIBRATE_Y "Calibrate Y" - #define MSG_DELTA_CALIBRATE_Z "Calibrate Z" - #define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center" -#endif // DELTA_CALIBRATION_MENU +#define MSG_DELTA_CALIBRATE "Delta Calibration" +#define MSG_DELTA_CALIBRATE_X "Calibrate X" +#define MSG_DELTA_CALIBRATE_Y "Calibrate Y" +#define MSG_DELTA_CALIBRATE_Z "Calibrate Z" +#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center" #endif // LANGUAGE_EU_H diff --git a/Marlin/language_fi.h b/Marlin/language_fi.h index 9d550c498..600a009fe 100644 --- a/Marlin/language_fi.h +++ b/Marlin/language_fi.h @@ -151,12 +151,10 @@ #define MSG_END_HOUR "hours" #define MSG_END_MINUTE "minutes" -#if ENABLED(DELTA_CALIBRATION_MENU) - #define MSG_DELTA_CALIBRATE "Delta Kalibrointi" - #define MSG_DELTA_CALIBRATE_X "Kalibroi X" - #define MSG_DELTA_CALIBRATE_Y "Kalibroi Y" - #define MSG_DELTA_CALIBRATE_Z "Kalibroi Z" - #define MSG_DELTA_CALIBRATE_CENTER "Kalibroi Center" -#endif // DELTA_CALIBRATION_MENU +#define MSG_DELTA_CALIBRATE "Delta Kalibrointi" +#define MSG_DELTA_CALIBRATE_X "Kalibroi X" +#define MSG_DELTA_CALIBRATE_Y "Kalibroi Y" +#define MSG_DELTA_CALIBRATE_Z "Kalibroi Z" +#define MSG_DELTA_CALIBRATE_CENTER "Kalibroi Center" #endif // LANGUAGE_FI_H diff --git a/Marlin/language_fr.h b/Marlin/language_fr.h index 3145f78a6..acb17ce3f 100644 --- a/Marlin/language_fr.h +++ b/Marlin/language_fr.h @@ -166,13 +166,10 @@ #define MSG_BED_HEATING "Plateau en chauffe..." #define MSG_BED_DONE "Chauffe plateau terminee" - -#if ENABLED(DELTA_CALIBRATION_MENU) - #define MSG_DELTA_CALIBRATE "Calibration Delta" - #define MSG_DELTA_CALIBRATE_X "Calibrer X" - #define MSG_DELTA_CALIBRATE_Y "Calibrer Y" - #define MSG_DELTA_CALIBRATE_Z "Calibrer Z" - #define MSG_DELTA_CALIBRATE_CENTER "Calibrer centre" -#endif // DELTA_CALIBRATION_MENU +#define MSG_DELTA_CALIBRATE "Calibration Delta" +#define MSG_DELTA_CALIBRATE_X "Calibrer X" +#define MSG_DELTA_CALIBRATE_Y "Calibrer Y" +#define MSG_DELTA_CALIBRATE_Z "Calibrer Z" +#define MSG_DELTA_CALIBRATE_CENTER "Calibrer centre" #endif // LANGUAGE_FR_H diff --git a/Marlin/language_gl.h b/Marlin/language_gl.h index 11f21ac0e..0921bbf2a 100644 --- a/Marlin/language_gl.h +++ b/Marlin/language_gl.h @@ -162,12 +162,10 @@ #define MSG_BED_HEATING "Quentando cama" #define MSG_BED_DONE "Cama esta quente" -#if ENABLED(DELTA_CALIBRATION_MENU) - #define MSG_DELTA_CALIBRATE "Calibracion Delta" - #define MSG_DELTA_CALIBRATE_X "Calibrar X" - #define MSG_DELTA_CALIBRATE_Y "Calibrar Y" - #define MSG_DELTA_CALIBRATE_Z "Calibrar Z" - #define MSG_DELTA_CALIBRATE_CENTER "Calibrar Centro" -#endif // DELTA_CALIBRATION_MENU +#define MSG_DELTA_CALIBRATE "Calibracion Delta" +#define MSG_DELTA_CALIBRATE_X "Calibrar X" +#define MSG_DELTA_CALIBRATE_Y "Calibrar Y" +#define MSG_DELTA_CALIBRATE_Z "Calibrar Z" +#define MSG_DELTA_CALIBRATE_CENTER "Calibrar Centro" #endif // LANGUAGE_GL_H diff --git a/Marlin/language_it.h b/Marlin/language_it.h index 0c849d0db..247030e9e 100644 --- a/Marlin/language_it.h +++ b/Marlin/language_it.h @@ -165,13 +165,10 @@ #define MSG_BED_HEATING "Risc. Piatto.." #define MSG_BED_DONE "Piatto Pronto" - -#if ENABLED(DELTA_CALIBRATION_MENU) - #define MSG_DELTA_CALIBRATE "Calibraz. Delta" - #define MSG_DELTA_CALIBRATE_X "Calibra X" - #define MSG_DELTA_CALIBRATE_Y "Calibra Y" - #define MSG_DELTA_CALIBRATE_Z "Calibra Z" - #define MSG_DELTA_CALIBRATE_CENTER "Calibra Center" -#endif // DELTA_CALIBRATION_MENU +#define MSG_DELTA_CALIBRATE "Calibraz. Delta" +#define MSG_DELTA_CALIBRATE_X "Calibra X" +#define MSG_DELTA_CALIBRATE_Y "Calibra Y" +#define MSG_DELTA_CALIBRATE_Z "Calibra Z" +#define MSG_DELTA_CALIBRATE_CENTER "Calibra Center" #endif // LANGUAGE_IT_H diff --git a/Marlin/language_kana.h b/Marlin/language_kana.h index 982723880..251c251d3 100644 --- a/Marlin/language_kana.h +++ b/Marlin/language_kana.h @@ -167,12 +167,10 @@ #define MSG_BED_HEATING "\xcd\xde\xaf\xc4\xde\x20\xb6\xc8\xc2\xc1\xad\xb3" // "Bed Heating." #define MSG_BED_DONE "\xcd\xde\xaf\xc4\xde\x20\xb6\xc8\xc2\xb6\xdd\xd8\xae\xb3" // "Bed done." -#if ENABLED(DELTA_CALIBRATION_MENU) - #define MSG_DELTA_CALIBRATE "\xc3\xde\xd9\xc0\x20\xba\xb3\xbe\xb2" // "Delta Calibration" - #define MSG_DELTA_CALIBRATE_X "X\xbc\xde\xb8\x20\xba\xb3\xbe\xb2" // "Calibrate X" - #define MSG_DELTA_CALIBRATE_Y "Y\xbc\xde\xb8\x20\xba\xb3\xbe\xb2" // "Calibrate Y" - #define MSG_DELTA_CALIBRATE_Z "Z\xbc\xde\xb8\x20\xba\xb3\xbe\xb2" // "Calibrate Z" - #define MSG_DELTA_CALIBRATE_CENTER "\xc1\xad\xb3\xbc\xdd\x20\xba\xb3\xbe\xb2" // "Calibrate Center" -#endif // DELTA_CALIBRATION_MENU +#define MSG_DELTA_CALIBRATE "\xc3\xde\xd9\xc0\x20\xba\xb3\xbe\xb2" // "Delta Calibration" +#define MSG_DELTA_CALIBRATE_X "X\xbc\xde\xb8\x20\xba\xb3\xbe\xb2" // "Calibrate X" +#define MSG_DELTA_CALIBRATE_Y "Y\xbc\xde\xb8\x20\xba\xb3\xbe\xb2" // "Calibrate Y" +#define MSG_DELTA_CALIBRATE_Z "Z\xbc\xde\xb8\x20\xba\xb3\xbe\xb2" // "Calibrate Z" +#define MSG_DELTA_CALIBRATE_CENTER "\xc1\xad\xb3\xbc\xdd\x20\xba\xb3\xbe\xb2" // "Calibrate Center" #endif // LANGUAGE_KANA_H diff --git a/Marlin/language_kana_utf8.h b/Marlin/language_kana_utf8.h index cebe621d7..7c1953c66 100644 --- a/Marlin/language_kana_utf8.h +++ b/Marlin/language_kana_utf8.h @@ -171,12 +171,10 @@ #define MSG_BED_HEATING "ベッド カネツチュウ" // "Bed Heating." #define MSG_BED_DONE "ベッド カネツカンリョウ" // "Bed done." -#if ENABLED(DELTA_CALIBRATION_MENU) - #define MSG_DELTA_CALIBRATE "デルタ コウセイ" // "Delta Calibration" - #define MSG_DELTA_CALIBRATE_X "Xジク コウセイ" // "Calibrate X" - #define MSG_DELTA_CALIBRATE_Y "Yジク コウセイ" // "Calibrate Y" - #define MSG_DELTA_CALIBRATE_Z "Zジク コウセイ" // "Calibrate Z" - #define MSG_DELTA_CALIBRATE_CENTER "チュウシン コウセイ" // "Calibrate Center" -#endif // DELTA_CALIBRATION_MENU +#define MSG_DELTA_CALIBRATE "デルタ コウセイ" // "Delta Calibration" +#define MSG_DELTA_CALIBRATE_X "Xジク コウセイ" // "Calibrate X" +#define MSG_DELTA_CALIBRATE_Y "Yジク コウセイ" // "Calibrate Y" +#define MSG_DELTA_CALIBRATE_Z "Zジク コウセイ" // "Calibrate Z" +#define MSG_DELTA_CALIBRATE_CENTER "チュウシン コウセイ" // "Calibrate Center" #endif // LANGUAGE_KANA_UTF_H diff --git a/Marlin/language_nl.h b/Marlin/language_nl.h index 4ccc7f094..953cc3342 100644 --- a/Marlin/language_nl.h +++ b/Marlin/language_nl.h @@ -169,12 +169,10 @@ #define MSG_LEVEL_BED_CANCEL "Bed level afbr." #define MSG_HOME_OFFSETS_APPLIED "H offset toegep." -#if ENABLED(DELTA_CALIBRATION_MENU) - #define MSG_DELTA_CALIBRATE "Delta Calibratie" - #define MSG_DELTA_CALIBRATE_X "Kalibreer X" - #define MSG_DELTA_CALIBRATE_Y "Kalibreer Y" - #define MSG_DELTA_CALIBRATE_Z "Kalibreer Z" - #define MSG_DELTA_CALIBRATE_CENTER "Kalibreer Midden" -#endif // DELTA_CALIBRATION_MENU +#define MSG_DELTA_CALIBRATE "Delta Calibratie" +#define MSG_DELTA_CALIBRATE_X "Kalibreer X" +#define MSG_DELTA_CALIBRATE_Y "Kalibreer Y" +#define MSG_DELTA_CALIBRATE_Z "Kalibreer Z" +#define MSG_DELTA_CALIBRATE_CENTER "Kalibreer Midden" #endif // LANGUAGE_NL_H diff --git a/Marlin/language_pl.h b/Marlin/language_pl.h index 541774850..71c873048 100644 --- a/Marlin/language_pl.h +++ b/Marlin/language_pl.h @@ -151,13 +151,10 @@ #define MSG_END_HOUR "hours" #define MSG_END_MINUTE "minutes" - -#if ENABLED(DELTA_CALIBRATION_MENU) - #define MSG_DELTA_CALIBRATE "Delta Calibration" - #define MSG_DELTA_CALIBRATE_X "Calibrate X" - #define MSG_DELTA_CALIBRATE_Y "Calibrate Y" - #define MSG_DELTA_CALIBRATE_Z "Calibrate Z" - #define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center" -#endif // DELTA_CALIBRATION_MENU +#define MSG_DELTA_CALIBRATE "Delta Calibration" +#define MSG_DELTA_CALIBRATE_X "Calibrate X" +#define MSG_DELTA_CALIBRATE_Y "Calibrate Y" +#define MSG_DELTA_CALIBRATE_Z "Calibrate Z" +#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center" #endif // LANGUAGE_PL_H diff --git a/Marlin/language_pt-br.h b/Marlin/language_pt-br.h index 605864153..693a6413d 100644 --- a/Marlin/language_pt-br.h +++ b/Marlin/language_pt-br.h @@ -150,7 +150,6 @@ #define MSG_ENDSTOP_ABORT "Fim de Curso" #define MSG_END_HOUR "Horas" #define MSG_END_MINUTE "Minutos" - #define MSG_BED_Z "Base Z" #define MSG_A_TRAVEL "A-movimento" #define MSG_HEATING_FAILED_LCD "Aquecimento falhou" @@ -165,12 +164,10 @@ #define MSG_BED_HEATING "Aquecendo base.." #define MSG_BED_DONE "Base aquecida." -#if ENABLED(DELTA_CALIBRATION_MENU) - #define MSG_DELTA_CALIBRATE "Calibrar Delta" - #define MSG_DELTA_CALIBRATE_X "Calibrar X" - #define MSG_DELTA_CALIBRATE_Y "Calibrar Y" - #define MSG_DELTA_CALIBRATE_Z "Calibrar Z" - #define MSG_DELTA_CALIBRATE_CENTER "Calibrar Centro" -#endif // DELTA_CALIBRATION_MENU +#define MSG_DELTA_CALIBRATE "Calibrar Delta" +#define MSG_DELTA_CALIBRATE_X "Calibrar X" +#define MSG_DELTA_CALIBRATE_Y "Calibrar Y" +#define MSG_DELTA_CALIBRATE_Z "Calibrar Z" +#define MSG_DELTA_CALIBRATE_CENTER "Calibrar Centro" #endif // LANGUAGE_PT_BR_H diff --git a/Marlin/language_pt-br_utf8.h b/Marlin/language_pt-br_utf8.h index ba8076d87..15a618b65 100644 --- a/Marlin/language_pt-br_utf8.h +++ b/Marlin/language_pt-br_utf8.h @@ -150,7 +150,6 @@ #define MSG_ENDSTOP_ABORT "Fim de Curso" #define MSG_END_HOUR "Horas" #define MSG_END_MINUTE "Minutos" - #define MSG_BED_Z "Base Z" #define MSG_A_TRAVEL "A-movimento" #define MSG_HEATING_FAILED_LCD "Aquecimento falhou" @@ -165,12 +164,10 @@ #define MSG_BED_HEATING "Aquecendo base.." #define MSG_BED_DONE "Base aquecida." -#if ENABLED(DELTA_CALIBRATION_MENU) - #define MSG_DELTA_CALIBRATE "Calibrar Delta" - #define MSG_DELTA_CALIBRATE_X "Calibrar X" - #define MSG_DELTA_CALIBRATE_Y "Calibrar Y" - #define MSG_DELTA_CALIBRATE_Z "Calibrar Z" - #define MSG_DELTA_CALIBRATE_CENTER "Calibrar Centro" -#endif // DELTA_CALIBRATION_MENU +#define MSG_DELTA_CALIBRATE "Calibrar Delta" +#define MSG_DELTA_CALIBRATE_X "Calibrar X" +#define MSG_DELTA_CALIBRATE_Y "Calibrar Y" +#define MSG_DELTA_CALIBRATE_Z "Calibrar Z" +#define MSG_DELTA_CALIBRATE_CENTER "Calibrar Centro" #endif // LANGUAGE_PT_BR_UTF_H diff --git a/Marlin/language_pt.h b/Marlin/language_pt.h index 68563413d..31617ee93 100644 --- a/Marlin/language_pt.h +++ b/Marlin/language_pt.h @@ -168,12 +168,10 @@ #define MSG_BED_HEATING "Aquecendo base.." #define MSG_BED_DONE "Base aquecida." -#if ENABLED(DELTA_CALIBRATION_MENU) - #define MSG_DELTA_CALIBRATE "Calibracao Delta" - #define MSG_DELTA_CALIBRATE_X "Calibrar X" - #define MSG_DELTA_CALIBRATE_Y "Calibrar Y" - #define MSG_DELTA_CALIBRATE_Z "Calibrar Z" - #define MSG_DELTA_CALIBRATE_CENTER "Calibrar Centro" -#endif // DELTA_CALIBRATION_MENU +#define MSG_DELTA_CALIBRATE "Calibracao Delta" +#define MSG_DELTA_CALIBRATE_X "Calibrar X" +#define MSG_DELTA_CALIBRATE_Y "Calibrar Y" +#define MSG_DELTA_CALIBRATE_Z "Calibrar Z" +#define MSG_DELTA_CALIBRATE_CENTER "Calibrar Centro" #endif // LANGUAGE_PT_H diff --git a/Marlin/language_pt_utf8.h b/Marlin/language_pt_utf8.h index d4f9bc202..e94fa323e 100644 --- a/Marlin/language_pt_utf8.h +++ b/Marlin/language_pt_utf8.h @@ -168,12 +168,10 @@ #define MSG_BED_HEATING "Aquecendo base.." #define MSG_BED_DONE "Base aquecida." -#if ENABLED(DELTA_CALIBRATION_MENU) - #define MSG_DELTA_CALIBRATE "Calibração Delta" - #define MSG_DELTA_CALIBRATE_X "Calibrar X" - #define MSG_DELTA_CALIBRATE_Y "Calibrar Y" - #define MSG_DELTA_CALIBRATE_Z "Calibrar Z" - #define MSG_DELTA_CALIBRATE_CENTER "Calibrar Centro" -#endif // DELTA_CALIBRATION_MENU +#define MSG_DELTA_CALIBRATE "Calibração Delta" +#define MSG_DELTA_CALIBRATE_X "Calibrar X" +#define MSG_DELTA_CALIBRATE_Y "Calibrar Y" +#define MSG_DELTA_CALIBRATE_Z "Calibrar Z" +#define MSG_DELTA_CALIBRATE_CENTER "Calibrar Centro" #endif // LANGUAGE_PT_UTF_H From fe0fe184aa769d4ecc23e86259036bf9ce337dbf Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 11 Apr 2016 19:42:20 -0700 Subject: [PATCH 2/2] Replace some tabs with spaces --- Marlin/example_configurations/SCARA/Configuration.h | 4 ++-- Marlin/pins_PRINTRBOARD_REVF.h | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 436bf2290..40e20cfd7 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -85,8 +85,8 @@ #define SCARA_offset_y -56 //mm #define SCARA_RAD2DEG 57.2957795 // to convert RAD to degrees -#define THETA_HOMING_OFFSET 0 //calculatated from Calibration Guide and command M360 / M114 see picture in http://reprap.harleystudio.co.za/?page_id=1073 -#define PSI_HOMING_OFFSET 0 // calculatated from Calibration Guide and command M364 / M114 see picture in http://reprap.harleystudio.co.za/?page_id=1073 +#define THETA_HOMING_OFFSET 0 //calculatated from Calibration Guide and command M360 / M114 see picture in http://reprap.harleystudio.co.za/?page_id=1073 +#define PSI_HOMING_OFFSET 0 //calculatated from Calibration Guide and command M364 / M114 see picture in http://reprap.harleystudio.co.za/?page_id=1073 //some helper variables to make kinematics faster #define L1_2 sq(Linkage_1) // do not change diff --git a/Marlin/pins_PRINTRBOARD_REVF.h b/Marlin/pins_PRINTRBOARD_REVF.h index 3120e04e7..bf4e2b4a4 100644 --- a/Marlin/pins_PRINTRBOARD_REVF.h +++ b/Marlin/pins_PRINTRBOARD_REVF.h @@ -90,13 +90,13 @@ // uncomment to enable an I2C based DAC like on the Printrboard REVF #define DAC_STEPPER_CURRENT // Number of channels available for DAC, For Printrboar REVF there are 4 -#define DAC_STEPPER_ORDER {3,2,1,0} +#define DAC_STEPPER_ORDER {3,2,1,0} -#define DAC_STEPPER_SENSE 0.11 -#define DAC_STEPPER_ADDRESS 0 -#define DAC_STEPPER_MAX 3520 -#define DAC_STEPPER_VREF 1 //internal Vref, gain 1x = 2.048V -#define DAC_STEPPER_GAIN 0 +#define DAC_STEPPER_SENSE 0.11 +#define DAC_STEPPER_ADDRESS 0 +#define DAC_STEPPER_MAX 3520 +#define DAC_STEPPER_VREF 1 //internal Vref, gain 1x = 2.048V +#define DAC_STEPPER_GAIN 0 #if DISABLED(SDSUPPORT) // these pins are defined in the SD library if building with SD support