From 5becda25c56fe0df0541840ca095b21b3c522001 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 8 Oct 2019 17:37:17 -0500 Subject: [PATCH] Followup to E renumbering --- Marlin/src/lcd/language/language_an.h | 12 +++++------ Marlin/src/lcd/language/language_bg.h | 12 +++++------ Marlin/src/lcd/language/language_ca.h | 12 +++++------ Marlin/src/lcd/language/language_cz.h | 12 +++++------ Marlin/src/lcd/language/language_da.h | 12 +++++------ Marlin/src/lcd/language/language_de.h | 12 +++++------ Marlin/src/lcd/language/language_el-gr.h | 11 +++++----- Marlin/src/lcd/language/language_el.h | 11 +++++----- Marlin/src/lcd/language/language_en.h | 24 +++++++++++----------- Marlin/src/lcd/language/language_es.h | 12 +++++------ Marlin/src/lcd/language/language_eu.h | 12 +++++------ Marlin/src/lcd/language/language_fi.h | 12 +++++------ Marlin/src/lcd/language/language_fr.h | 12 +++++------ Marlin/src/lcd/language/language_gl.h | 12 +++++------ Marlin/src/lcd/language/language_hr.h | 12 +++++------ Marlin/src/lcd/language/language_it.h | 12 +++++------ Marlin/src/lcd/language/language_ko_KR.h | 12 +++++------ Marlin/src/lcd/language/language_nl.h | 12 +++++------ Marlin/src/lcd/language/language_pl.h | 12 +++++------ Marlin/src/lcd/language/language_pt-br.h | 12 +++++------ Marlin/src/lcd/language/language_pt.h | 12 +++++------ Marlin/src/lcd/language/language_ru.h | 12 +++++------ Marlin/src/lcd/language/language_sk.h | 12 +++++------ Marlin/src/lcd/language/language_tr.h | 12 +++++------ Marlin/src/lcd/language/language_uk.h | 12 +++++------ Marlin/src/lcd/language/language_vi.h | 12 +++++------ Marlin/src/lcd/language/language_zh_CN.h | 12 +++++------ Marlin/src/lcd/language/language_zh_TW.h | 12 +++++------ Marlin/src/lcd/menu/menu_advanced.cpp | 2 +- buildroot/share/tests/megaatmega2560-tests | 2 +- 30 files changed, 176 insertions(+), 174 deletions(-) diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h index f3c4372ba7..56c785ab13 100644 --- a/Marlin/src/lcd/language/language_an.h +++ b/Marlin/src/lcd/language/language_an.h @@ -124,12 +124,12 @@ #define MSG_CSTEPS _UxGT("Z trangos/mm") #endif #define MSG_ESTEPS _UxGT("E trangos/mm") -#define MSG_E1STEPS _UxGT("E1 trangos/mm") -#define MSG_E2STEPS _UxGT("E2 trangos/mm") -#define MSG_E3STEPS _UxGT("E3 trangos/mm") -#define MSG_E4STEPS _UxGT("E4 trangos/mm") -#define MSG_E5STEPS _UxGT("E5 trangos/mm") -#define MSG_E6STEPS _UxGT("E6 trangos/mm") +#define MSG_E0_STEPS _UxGT("E1 trangos/mm") +#define MSG_E1_STEPS _UxGT("E2 trangos/mm") +#define MSG_E2_STEPS _UxGT("E3 trangos/mm") +#define MSG_E3_STEPS _UxGT("E4 trangos/mm") +#define MSG_E4_STEPS _UxGT("E5 trangos/mm") +#define MSG_E5_STEPS _UxGT("E6 trangos/mm") #define MSG_TEMPERATURE _UxGT("Temperatura") #define MSG_MOTION _UxGT("Movimiento") #define MSG_FILAMENT _UxGT("Filamento") diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h index 3e95058ba9..8367eb7990 100644 --- a/Marlin/src/lcd/language/language_bg.h +++ b/Marlin/src/lcd/language/language_bg.h @@ -92,12 +92,12 @@ #define MSG_CSTEPS _UxGT("Zстъпки/mm") #endif #define MSG_ESTEPS _UxGT("E стъпки/mm") -#define MSG_E1STEPS _UxGT("E1 стъпки/mm") -#define MSG_E2STEPS _UxGT("E2 стъпки/mm") -#define MSG_E3STEPS _UxGT("E3 стъпки/mm") -#define MSG_E4STEPS _UxGT("E4 стъпки/mm") -#define MSG_E5STEPS _UxGT("E5 стъпки/mm") -#define MSG_E6STEPS _UxGT("E6 стъпки/mm") +#define MSG_E0_STEPS _UxGT("E1 стъпки/mm") +#define MSG_E1_STEPS _UxGT("E2 стъпки/mm") +#define MSG_E2_STEPS _UxGT("E3 стъпки/mm") +#define MSG_E3_STEPS _UxGT("E4 стъпки/mm") +#define MSG_E4_STEPS _UxGT("E5 стъпки/mm") +#define MSG_E5_STEPS _UxGT("E6 стъпки/mm") #define MSG_TEMPERATURE _UxGT("Температура") #define MSG_MOTION _UxGT("Движение") #define MSG_FILAMENT _UxGT("Нишка") diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h index cf7278851e..571d12bd1c 100644 --- a/Marlin/src/lcd/language/language_ca.h +++ b/Marlin/src/lcd/language/language_ca.h @@ -127,12 +127,12 @@ #define MSG_CSTEPS _UxGT("Zpassos/mm") #endif #define MSG_ESTEPS _UxGT("Epassos/mm") -#define MSG_E1STEPS _UxGT("E1passos/mm") -#define MSG_E2STEPS _UxGT("E2passos/mm") -#define MSG_E3STEPS _UxGT("E3passos/mm") -#define MSG_E4STEPS _UxGT("E4passos/mm") -#define MSG_E5STEPS _UxGT("E5passos/mm") -#define MSG_E6STEPS _UxGT("E6passos/mm") +#define MSG_E0_STEPS _UxGT("E1passos/mm") +#define MSG_E1_STEPS _UxGT("E2passos/mm") +#define MSG_E2_STEPS _UxGT("E3passos/mm") +#define MSG_E3_STEPS _UxGT("E4passos/mm") +#define MSG_E4_STEPS _UxGT("E5passos/mm") +#define MSG_E5_STEPS _UxGT("E6passos/mm") #define MSG_TEMPERATURE _UxGT("Temperatura") #define MSG_MOTION _UxGT("Moviment") #define MSG_FILAMENT _UxGT("Filament") diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h index 92a9e0ca83..38a4d0f2bc 100644 --- a/Marlin/src/lcd/language/language_cz.h +++ b/Marlin/src/lcd/language/language_cz.h @@ -258,12 +258,12 @@ #define MSG_CSTEPS _UxGT("Zkroků/mm") #endif #define MSG_ESTEPS _UxGT("Ekroků/mm") -#define MSG_E1STEPS _UxGT("E1kroků/mm") -#define MSG_E2STEPS _UxGT("E2kroků/mm") -#define MSG_E3STEPS _UxGT("E3kroků/mm") -#define MSG_E4STEPS _UxGT("E4kroků/mm") -#define MSG_E5STEPS _UxGT("E5kroků/mm") -#define MSG_E6STEPS _UxGT("E6kroků/mm") +#define MSG_E0_STEPS _UxGT("E1kroků/mm") +#define MSG_E1_STEPS _UxGT("E2kroků/mm") +#define MSG_E2_STEPS _UxGT("E3kroků/mm") +#define MSG_E3_STEPS _UxGT("E4kroků/mm") +#define MSG_E4_STEPS _UxGT("E5kroků/mm") +#define MSG_E5_STEPS _UxGT("E6kroků/mm") #define MSG_TEMPERATURE _UxGT("Teplota") #define MSG_MOTION _UxGT("Pohyb") #define MSG_FILAMENT _UxGT("Filament") diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h index 6a8d48175d..98ed4a0bd1 100644 --- a/Marlin/src/lcd/language/language_da.h +++ b/Marlin/src/lcd/language/language_da.h @@ -124,12 +124,12 @@ #define MSG_CSTEPS _UxGT("Zsteps/mm") #endif #define MSG_ESTEPS _UxGT("Esteps/mm") -#define MSG_E1STEPS _UxGT("E1steps/mm") -#define MSG_E2STEPS _UxGT("E2steps/mm") -#define MSG_E3STEPS _UxGT("E3steps/mm") -#define MSG_E4STEPS _UxGT("E4steps/mm") -#define MSG_E5STEPS _UxGT("E5steps/mm") -#define MSG_E6STEPS _UxGT("E6steps/mm") +#define MSG_E0_STEPS _UxGT("E1steps/mm") +#define MSG_E1_STEPS _UxGT("E2steps/mm") +#define MSG_E2_STEPS _UxGT("E3steps/mm") +#define MSG_E3_STEPS _UxGT("E4steps/mm") +#define MSG_E4_STEPS _UxGT("E5steps/mm") +#define MSG_E5_STEPS _UxGT("E6steps/mm") #define MSG_TEMPERATURE _UxGT("Temperatur") #define MSG_MOTION _UxGT("Bevægelse") #define MSG_FILAMENT _UxGT("Filament") diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index 3c505b60eb..55c5749524 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -270,12 +270,12 @@ #define MSG_CSTEPS _UxGT("Z Steps/mm") #endif #define MSG_ESTEPS _UxGT("E Steps/mm") -#define MSG_E1STEPS _UxGT("E1 Steps/mm") -#define MSG_E2STEPS _UxGT("E2 Steps/mm") -#define MSG_E3STEPS _UxGT("E3 Steps/mm") -#define MSG_E4STEPS _UxGT("E4 Steps/mm") -#define MSG_E5STEPS _UxGT("E5 Steps/mm") -#define MSG_E6STEPS _UxGT("E6 Steps/mm") +#define MSG_E0_STEPS _UxGT("E1 Steps/mm") +#define MSG_E1_STEPS _UxGT("E2 Steps/mm") +#define MSG_E2_STEPS _UxGT("E3 Steps/mm") +#define MSG_E3_STEPS _UxGT("E4 Steps/mm") +#define MSG_E4_STEPS _UxGT("E5 Steps/mm") +#define MSG_E5_STEPS _UxGT("E6 Steps/mm") #define MSG_TEMPERATURE _UxGT("Temperatur") #define MSG_MOTION _UxGT("Bewegung") #define MSG_FILAMENT _UxGT("Filament") diff --git a/Marlin/src/lcd/language/language_el-gr.h b/Marlin/src/lcd/language/language_el-gr.h index 5f7a1d2d36..83754591d0 100644 --- a/Marlin/src/lcd/language/language_el-gr.h +++ b/Marlin/src/lcd/language/language_el-gr.h @@ -123,11 +123,12 @@ #define MSG_CSTEPS _UxGT("Bήματα Z ανά μμ") #endif #define MSG_ESTEPS _UxGT("Bήματα Ε ανά μμ") -#define MSG_E1STEPS _UxGT("Bήματα Ε1 ανά μμ") -#define MSG_E2STEPS _UxGT("Bήματα Ε2 ανά μμ") -#define MSG_E3STEPS _UxGT("Bήματα Ε3 ανά μμ") -#define MSG_E4STEPS _UxGT("Bήματα Ε4 ανά μμ") -#define MSG_E5STEPS _UxGT("Bήματα Ε5 ανά μμ") +#define MSG_E0_STEPS _UxGT("Bήματα Ε1 ανά μμ") +#define MSG_E1_STEPS _UxGT("Bήματα Ε2 ανά μμ") +#define MSG_E2_STEPS _UxGT("Bήματα Ε3 ανά μμ") +#define MSG_E3_STEPS _UxGT("Bήματα Ε4 ανά μμ") +#define MSG_E4_STEPS _UxGT("Bήματα Ε5 ανά μμ") +#define MSG_E5_STEPS _UxGT("Bήματα Ε6 ανά μμ") #define MSG_TEMPERATURE _UxGT("Θερμοκρασία") #define MSG_MOTION _UxGT("Κίνηση") #define MSG_FILAMENT _UxGT("Νήμα") diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h index 37eb4fbe74..75bdfa3ed5 100644 --- a/Marlin/src/lcd/language/language_el.h +++ b/Marlin/src/lcd/language/language_el.h @@ -123,11 +123,12 @@ #define MSG_CSTEPS _UxGT("Bήματα Z ανά μμ") #endif #define MSG_ESTEPS _UxGT("Bήματα Ε ανά μμ") -#define MSG_E1STEPS _UxGT("Bήματα Ε1 ανά μμ") -#define MSG_E2STEPS _UxGT("Bήματα Ε2 ανά μμ") -#define MSG_E3STEPS _UxGT("Bήματα Ε3 ανά μμ") -#define MSG_E4STEPS _UxGT("Bήματα Ε4 ανά μμ") -#define MSG_E5STEPS _UxGT("Bήματα Ε5 ανά μμ") +#define MSG_E0_STEPS _UxGT("Bήματα Ε1 ανά μμ") +#define MSG_E1_STEPS _UxGT("Bήματα Ε2 ανά μμ") +#define MSG_E2_STEPS _UxGT("Bήματα Ε3 ανά μμ") +#define MSG_E3_STEPS _UxGT("Bήματα Ε4 ανά μμ") +#define MSG_E4_STEPS _UxGT("Bήματα Ε5 ανά μμ") +#define MSG_E5_STEPS _UxGT("Bήματα Ε6 ανά μμ") #define MSG_TEMPERATURE _UxGT("Θερμοκρασία") #define MSG_MOTION _UxGT("Κίνηση") #define MSG_FILAMENT _UxGT("Νήμα") diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index d9e5eba5d1..5bd20ec541 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -747,23 +747,23 @@ #ifndef MSG_ESTEPS #define MSG_ESTEPS _UxGT("Esteps/mm") #endif -#ifndef MSG_E1STEPS - #define MSG_E1STEPS _UxGT("E1steps/mm") +#ifndef MSG_E0_STEPS + #define MSG_E0_STEPS _UxGT("E1steps/mm") #endif -#ifndef MSG_E2STEPS - #define MSG_E2STEPS _UxGT("E2steps/mm") +#ifndef MSG_E1_STEPS + #define MSG_E1_STEPS _UxGT("E2steps/mm") #endif -#ifndef MSG_E3STEPS - #define MSG_E3STEPS _UxGT("E3steps/mm") +#ifndef MSG_E2_STEPS + #define MSG_E2_STEPS _UxGT("E3steps/mm") #endif -#ifndef MSG_E4STEPS - #define MSG_E4STEPS _UxGT("E4steps/mm") +#ifndef MSG_E3_STEPS + #define MSG_E3_STEPS _UxGT("E4steps/mm") #endif -#ifndef MSG_E5STEPS - #define MSG_E5STEPS _UxGT("E5steps/mm") +#ifndef MSG_E4_STEPS + #define MSG_E4_STEPS _UxGT("E5steps/mm") #endif -#ifndef MSG_E6STEPS - #define MSG_E6STEPS _UxGT("E6steps/mm") +#ifndef MSG_E5_STEPS + #define MSG_E5_STEPS _UxGT("E6steps/mm") #endif #ifndef MSG_TEMPERATURE #define MSG_TEMPERATURE _UxGT("Temperature") diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h index e38390b3f9..eabf24857e 100644 --- a/Marlin/src/lcd/language/language_es.h +++ b/Marlin/src/lcd/language/language_es.h @@ -271,12 +271,12 @@ #define MSG_CSTEPS _UxGT("Z pasos/mm") #endif #define MSG_ESTEPS _UxGT("E pasos/mm") -#define MSG_E1STEPS _UxGT("E1 pasos/mm") -#define MSG_E2STEPS _UxGT("E2 pasos/mm") -#define MSG_E3STEPS _UxGT("E3 pasos/mm") -#define MSG_E4STEPS _UxGT("E4 pasos/mm") -#define MSG_E5STEPS _UxGT("E5 pasos/mm") -#define MSG_E6STEPS _UxGT("E6 pasos/mm") +#define MSG_E0_STEPS _UxGT("E1 pasos/mm") +#define MSG_E1_STEPS _UxGT("E2 pasos/mm") +#define MSG_E2_STEPS _UxGT("E3 pasos/mm") +#define MSG_E3_STEPS _UxGT("E4 pasos/mm") +#define MSG_E4_STEPS _UxGT("E5 pasos/mm") +#define MSG_E5_STEPS _UxGT("E6 pasos/mm") #define MSG_TEMPERATURE _UxGT("Temperatura") #define MSG_MOTION _UxGT("Movimiento") #define MSG_FILAMENT _UxGT("Filamento") diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h index a77ae8a7fe..6ebddc124e 100644 --- a/Marlin/src/lcd/language/language_eu.h +++ b/Marlin/src/lcd/language/language_eu.h @@ -219,12 +219,12 @@ #define MSG_CSTEPS _UxGT("Z pausoak/mm") #endif #define MSG_ESTEPS _UxGT("E pausoak/mm") -#define MSG_E1STEPS _UxGT("E1 pausoak/mm") -#define MSG_E2STEPS _UxGT("E2 pausoak/mm") -#define MSG_E3STEPS _UxGT("E3 pausoak/mm") -#define MSG_E4STEPS _UxGT("E4 pausoak/mm") -#define MSG_E5STEPS _UxGT("E5 pausoak/mm") -#define MSG_E6STEPS _UxGT("E6 pausoak/mm") +#define MSG_E0_STEPS _UxGT("E1 pausoak/mm") +#define MSG_E1_STEPS _UxGT("E2 pausoak/mm") +#define MSG_E2_STEPS _UxGT("E3 pausoak/mm") +#define MSG_E3_STEPS _UxGT("E4 pausoak/mm") +#define MSG_E4_STEPS _UxGT("E5 pausoak/mm") +#define MSG_E5_STEPS _UxGT("E6 pausoak/mm") #define MSG_TEMPERATURE _UxGT("Tenperatura") #define MSG_MOTION _UxGT("Mugimendua") #define MSG_FILAMENT _UxGT("Harizpia") diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h index 2fbf9e2d18..917496e200 100644 --- a/Marlin/src/lcd/language/language_fi.h +++ b/Marlin/src/lcd/language/language_fi.h @@ -114,12 +114,12 @@ #define MSG_CSTEPS _UxGT("Zsteps/mm") #endif #define MSG_ESTEPS _UxGT("Esteps/mm") -#define MSG_E1STEPS _UxGT("E1steps/mm") -#define MSG_E2STEPS _UxGT("E2steps/mm") -#define MSG_E3STEPS _UxGT("E3steps/mm") -#define MSG_E4STEPS _UxGT("E4steps/mm") -#define MSG_E5STEPS _UxGT("E5steps/mm") -#define MSG_E6STEPS _UxGT("E6steps/mm") +#define MSG_E0_STEPS _UxGT("E1steps/mm") +#define MSG_E1_STEPS _UxGT("E2steps/mm") +#define MSG_E2_STEPS _UxGT("E3steps/mm") +#define MSG_E3_STEPS _UxGT("E4steps/mm") +#define MSG_E4_STEPS _UxGT("E5steps/mm") +#define MSG_E5_STEPS _UxGT("E6steps/mm") #define MSG_TEMPERATURE _UxGT("Lämpötila") #define MSG_MOTION _UxGT("Liike") #define MSG_FILAMENT _UxGT("Filament") diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h index da9a0d4acd..e23c55de94 100644 --- a/Marlin/src/lcd/language/language_fr.h +++ b/Marlin/src/lcd/language/language_fr.h @@ -268,12 +268,12 @@ #define MSG_CSTEPS _UxGT("Z pas/mm") #endif #define MSG_ESTEPS _UxGT("E pas/mm") -#define MSG_E1STEPS _UxGT("E1 pas/mm") -#define MSG_E2STEPS _UxGT("E2 pas/mm") -#define MSG_E3STEPS _UxGT("E3 pas/mm") -#define MSG_E4STEPS _UxGT("E4 pas/mm") -#define MSG_E5STEPS _UxGT("E5 pas/mm") -#define MSG_E6STEPS _UxGT("E6 pas/mm") +#define MSG_E0_STEPS _UxGT("E1 pas/mm") +#define MSG_E1_STEPS _UxGT("E2 pas/mm") +#define MSG_E2_STEPS _UxGT("E3 pas/mm") +#define MSG_E3_STEPS _UxGT("E4 pas/mm") +#define MSG_E4_STEPS _UxGT("E5 pas/mm") +#define MSG_E5_STEPS _UxGT("E6 pas/mm") #define MSG_TEMPERATURE _UxGT("Température") #define MSG_MOTION _UxGT("Mouvement") #define MSG_FILAMENT _UxGT("Filament") diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h index 0de6382e54..c1fcc9a12a 100644 --- a/Marlin/src/lcd/language/language_gl.h +++ b/Marlin/src/lcd/language/language_gl.h @@ -123,12 +123,12 @@ #define MSG_CSTEPS _UxGT("Z pasos/mm") #endif #define MSG_ESTEPS _UxGT("E pasos/mm") -#define MSG_E1STEPS _UxGT("E1 pasos/mm") -#define MSG_E2STEPS _UxGT("E2 pasos/mm") -#define MSG_E3STEPS _UxGT("E3 pasos/mm") -#define MSG_E4STEPS _UxGT("E4 pasos/mm") -#define MSG_E5STEPS _UxGT("E5 pasos/mm") -#define MSG_E6STEPS _UxGT("E6 pasos/mm") +#define MSG_E0_STEPS _UxGT("E1 pasos/mm") +#define MSG_E1_STEPS _UxGT("E2 pasos/mm") +#define MSG_E2_STEPS _UxGT("E3 pasos/mm") +#define MSG_E3_STEPS _UxGT("E4 pasos/mm") +#define MSG_E4_STEPS _UxGT("E5 pasos/mm") +#define MSG_E5_STEPS _UxGT("E6 pasos/mm") #define MSG_TEMPERATURE _UxGT("Temperatura") #define MSG_MOTION _UxGT("Movemento") #define MSG_FILAMENT _UxGT("Filamento") diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h index 6b46d730f2..ef65e09fee 100644 --- a/Marlin/src/lcd/language/language_hr.h +++ b/Marlin/src/lcd/language/language_hr.h @@ -123,12 +123,12 @@ // #define MSG_CSTEPS _UxGT("Zsteps/mm") //#endif //#define MSG_ESTEPS _UxGT("Esteps/mm") -//#define MSG_E1STEPS _UxGT("E1steps/mm") -//#define MSG_E2STEPS _UxGT("E2steps/mm") -//#define MSG_E3STEPS _UxGT("E3steps/mm") -//#define MSG_E4STEPS _UxGT("E4steps/mm") -//#define MSG_E5STEPS _UxGT("E5steps/mm") -//#define MSG_E6STEPS _UxGT("E6steps/mm") +//#define MSG_E0_STEPS _UxGT("E1steps/mm") +//#define MSG_E1_STEPS _UxGT("E2steps/mm") +//#define MSG_E2_STEPS _UxGT("E3steps/mm") +//#define MSG_E3_STEPS _UxGT("E4steps/mm") +//#define MSG_E4_STEPS _UxGT("E5steps/mm") +//#define MSG_E5_STEPS _UxGT("E6steps/mm") #define MSG_TEMPERATURE _UxGT("Temperature") #define MSG_MOTION _UxGT("Gibanje") //#define MSG_FILAMENT _UxGT("Filament") diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index 6590b0cb23..3a0654633c 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -269,12 +269,12 @@ #define MSG_CSTEPS _UxGT("Zpassi/mm") #endif #define MSG_ESTEPS _UxGT("Epassi/mm") -#define MSG_E1STEPS _UxGT("E1passi/mm") -#define MSG_E2STEPS _UxGT("E2passi/mm") -#define MSG_E3STEPS _UxGT("E3passi/mm") -#define MSG_E4STEPS _UxGT("E4passi/mm") -#define MSG_E5STEPS _UxGT("E5passi/mm") -#define MSG_E6STEPS _UxGT("E6passi/mm") +#define MSG_E0_STEPS _UxGT("E1passi/mm") +#define MSG_E1_STEPS _UxGT("E2passi/mm") +#define MSG_E2_STEPS _UxGT("E3passi/mm") +#define MSG_E3_STEPS _UxGT("E4passi/mm") +#define MSG_E4_STEPS _UxGT("E5passi/mm") +#define MSG_E5_STEPS _UxGT("E6passi/mm") #define MSG_TEMPERATURE _UxGT("Temperatura") #define MSG_MOTION _UxGT("Movimento") #define MSG_FILAMENT _UxGT("Filamento") diff --git a/Marlin/src/lcd/language/language_ko_KR.h b/Marlin/src/lcd/language/language_ko_KR.h index 20e35af58b..574490c7f5 100644 --- a/Marlin/src/lcd/language/language_ko_KR.h +++ b/Marlin/src/lcd/language/language_ko_KR.h @@ -231,12 +231,12 @@ //#define MSG_CSTEPS _UxGT("Zsteps/mm") #endif //#define MSG_ESTEPS _UxGT("Esteps/mm") -//#define MSG_E1STEPS _UxGT("E1steps/mm") -//#define MSG_E2STEPS _UxGT("E2steps/mm") -//#define MSG_E3STEPS _UxGT("E3steps/mm") -//#define MSG_E4STEPS _UxGT("E4steps/mm") -//#define MSG_E5STEPS _UxGT("E5steps/mm") -//#define MSG_E6STEPS _UxGT("E6steps/mm") +//#define MSG_E0_STEPS _UxGT("E1steps/mm") +//#define MSG_E1_STEPS _UxGT("E2steps/mm") +//#define MSG_E2_STEPS _UxGT("E3steps/mm") +//#define MSG_E3_STEPS _UxGT("E4steps/mm") +//#define MSG_E4_STEPS _UxGT("E5steps/mm") +//#define MSG_E5_STEPS _UxGT("E6steps/mm") #define MSG_TEMPERATURE _UxGT("온도") #define MSG_MOTION _UxGT("동작") //#define MSG_FILAMENT _UxGT("Filament") diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h index 483b242501..bcfbc73fe8 100644 --- a/Marlin/src/lcd/language/language_nl.h +++ b/Marlin/src/lcd/language/language_nl.h @@ -131,12 +131,12 @@ #define MSG_CSTEPS _UxGT("Zsteps/mm") #endif #define MSG_ESTEPS _UxGT("Esteps/mm") -#define MSG_E1STEPS _UxGT("E1steps/mm") -#define MSG_E2STEPS _UxGT("E2steps/mm") -#define MSG_E3STEPS _UxGT("E3steps/mm") -#define MSG_E4STEPS _UxGT("E4steps/mm") -#define MSG_E5STEPS _UxGT("E5steps/mm") -#define MSG_E6STEPS _UxGT("E6steps/mm") +#define MSG_E0_STEPS _UxGT("E1steps/mm") +#define MSG_E1_STEPS _UxGT("E2steps/mm") +#define MSG_E2_STEPS _UxGT("E3steps/mm") +#define MSG_E3_STEPS _UxGT("E4steps/mm") +#define MSG_E4_STEPS _UxGT("E5steps/mm") +#define MSG_E5_STEPS _UxGT("E6steps/mm") #define MSG_TEMPERATURE _UxGT("Temperatuur") #define MSG_MOTION _UxGT("Beweging") #define MSG_FILAMENT _UxGT("Filament") diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h index 97924a7024..52bb419337 100644 --- a/Marlin/src/lcd/language/language_pl.h +++ b/Marlin/src/lcd/language/language_pl.h @@ -122,12 +122,12 @@ #define MSG_CSTEPS _UxGT("krokiZ/mm") #endif #define MSG_ESTEPS _UxGT("krokiE/mm") -#define MSG_E1STEPS _UxGT("krokiE1/mm") -#define MSG_E2STEPS _UxGT("krokiE2/mm") -#define MSG_E3STEPS _UxGT("krokiE3/mm") -#define MSG_E4STEPS _UxGT("krokiE4/mm") -#define MSG_E5STEPS _UxGT("krokiE5/mm") -#define MSG_E6STEPS _UxGT("krokiE6/mm") +#define MSG_E0_STEPS _UxGT("krokiE1/mm") +#define MSG_E1_STEPS _UxGT("krokiE2/mm") +#define MSG_E2_STEPS _UxGT("krokiE3/mm") +#define MSG_E3_STEPS _UxGT("krokiE4/mm") +#define MSG_E4_STEPS _UxGT("krokiE5/mm") +#define MSG_E5_STEPS _UxGT("krokiE6/mm") #define MSG_TEMPERATURE _UxGT("Temperatura") #define MSG_MOTION _UxGT("Ruch") #define MSG_FILAMENT _UxGT("Filament") diff --git a/Marlin/src/lcd/language/language_pt-br.h b/Marlin/src/lcd/language/language_pt-br.h index d78bd5a138..f6da0b700f 100644 --- a/Marlin/src/lcd/language/language_pt-br.h +++ b/Marlin/src/lcd/language/language_pt-br.h @@ -241,12 +241,12 @@ #define MSG_CSTEPS _UxGT("Passo Z/mm") #endif #define MSG_ESTEPS _UxGT("E/mm") -#define MSG_E1STEPS _UxGT("E1/mm") -#define MSG_E2STEPS _UxGT("E2/mm") -#define MSG_E3STEPS _UxGT("E3/mm") -#define MSG_E4STEPS _UxGT("E4/mm") -#define MSG_E5STEPS _UxGT("E5/mm") -#define MSG_E6STEPS _UxGT("E6/mm") +#define MSG_E0_STEPS _UxGT("E1/mm") +#define MSG_E1_STEPS _UxGT("E2/mm") +#define MSG_E2_STEPS _UxGT("E3/mm") +#define MSG_E3_STEPS _UxGT("E4/mm") +#define MSG_E4_STEPS _UxGT("E5/mm") +#define MSG_E5_STEPS _UxGT("E6/mm") #define MSG_TEMPERATURE _UxGT("Temperatura") #define MSG_MOTION _UxGT("Movimento") #define MSG_FILAMENT _UxGT("Filamento") diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h index 9fde8f89ba..f90999a357 100644 --- a/Marlin/src/lcd/language/language_pt.h +++ b/Marlin/src/lcd/language/language_pt.h @@ -120,12 +120,12 @@ #define MSG_CSTEPS _UxGT("Z passo/mm") #endif #define MSG_ESTEPS _UxGT("E passo/mm") -#define MSG_E1STEPS _UxGT("E1 passo/mm") -#define MSG_E2STEPS _UxGT("E2 passo/mm") -#define MSG_E3STEPS _UxGT("E3 passo/mm") -#define MSG_E4STEPS _UxGT("E4 passo/mm") -#define MSG_E5STEPS _UxGT("E5 passo/mm") -#define MSG_E6STEPS _UxGT("E6 passo/mm") +#define MSG_E0_STEPS _UxGT("E1 passo/mm") +#define MSG_E1_STEPS _UxGT("E2 passo/mm") +#define MSG_E2_STEPS _UxGT("E3 passo/mm") +#define MSG_E3_STEPS _UxGT("E4 passo/mm") +#define MSG_E4_STEPS _UxGT("E5 passo/mm") +#define MSG_E5_STEPS _UxGT("E6 passo/mm") #define MSG_TEMPERATURE _UxGT("Temperatura") #define MSG_MOTION _UxGT("Movimento") #define MSG_FILAMENT _UxGT("Filamento") diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index e825dbe7d0..dc32b8d8e1 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -235,12 +235,12 @@ #define MSG_CSTEPS _UxGT("Zшаг/мм") #endif #define MSG_ESTEPS _UxGT("Eшаг/мм") -#define MSG_E1STEPS _UxGT("E1шаг/мм") -#define MSG_E2STEPS _UxGT("E2шаг/мм") -#define MSG_E3STEPS _UxGT("E3шаг/мм") -#define MSG_E4STEPS _UxGT("E4шаг/мм") -#define MSG_E5STEPS _UxGT("E5шаг/мм") -#define MSG_E6STEPS _UxGT("E6шаг/мм") +#define MSG_E0_STEPS _UxGT("E1шаг/мм") +#define MSG_E1_STEPS _UxGT("E2шаг/мм") +#define MSG_E2_STEPS _UxGT("E3шаг/мм") +#define MSG_E3_STEPS _UxGT("E4шаг/мм") +#define MSG_E4_STEPS _UxGT("E5шаг/мм") +#define MSG_E5_STEPS _UxGT("E6шаг/мм") #define MSG_TEMPERATURE _UxGT("Температура") #define MSG_MOTION _UxGT("Движение") #define MSG_FILAMENT _UxGT("Филамент") diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index 097c24a793..55d2b6e4bf 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -277,12 +277,12 @@ #define MSG_CSTEPS _UxGT("Zkrokov/mm") #endif #define MSG_ESTEPS _UxGT("Ekrokov/mm") -#define MSG_E1STEPS _UxGT("E1krokov/mm") -#define MSG_E2STEPS _UxGT("E2krokov/mm") -#define MSG_E3STEPS _UxGT("E3krokov/mm") -#define MSG_E4STEPS _UxGT("E4krokov/mm") -#define MSG_E5STEPS _UxGT("E5krokov/mm") -#define MSG_E6STEPS _UxGT("E6krokov/mm") +#define MSG_E0_STEPS _UxGT("E1krokov/mm") +#define MSG_E1_STEPS _UxGT("E2krokov/mm") +#define MSG_E2_STEPS _UxGT("E3krokov/mm") +#define MSG_E3_STEPS _UxGT("E4krokov/mm") +#define MSG_E4_STEPS _UxGT("E5krokov/mm") +#define MSG_E5_STEPS _UxGT("E6krokov/mm") #define MSG_TEMPERATURE _UxGT("Teplota") #define MSG_MOTION _UxGT("Pohyb") #define MSG_FILAMENT _UxGT("Filament") diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index 3e025934a7..e45c4cd8b7 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -240,12 +240,12 @@ #define MSG_CSTEPS _UxGT("Z adım/mm") #endif #define MSG_ESTEPS _UxGT("E adım/mm") -#define MSG_E1STEPS _UxGT("E1 adım/mm") -#define MSG_E2STEPS _UxGT("E2 adım/mm") -#define MSG_E3STEPS _UxGT("E3 adım/mm") -#define MSG_E4STEPS _UxGT("E4 adım/mm") -#define MSG_E5STEPS _UxGT("E5 adım/mm") -#define MSG_E6STEPS _UxGT("E6 adım/mm") +#define MSG_E0_STEPS _UxGT("E1 adım/mm") +#define MSG_E1_STEPS _UxGT("E2 adım/mm") +#define MSG_E2_STEPS _UxGT("E3 adım/mm") +#define MSG_E3_STEPS _UxGT("E4 adım/mm") +#define MSG_E4_STEPS _UxGT("E5 adım/mm") +#define MSG_E5_STEPS _UxGT("E6 adım/mm") #define MSG_TEMPERATURE _UxGT("Sıcaklık") #define MSG_MOTION _UxGT("Hareket") #define MSG_FILAMENT _UxGT("Filaman") diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h index b358743be6..12fb53e672 100644 --- a/Marlin/src/lcd/language/language_uk.h +++ b/Marlin/src/lcd/language/language_uk.h @@ -123,12 +123,12 @@ #define MSG_CSTEPS _UxGT("Zкроків/мм") #endif #define MSG_ESTEPS _UxGT("Eкроків/мм") -#define MSG_E1STEPS _UxGT("E1кроків/мм") -#define MSG_E2STEPS _UxGT("E2кроків/мм") -#define MSG_E3STEPS _UxGT("E3кроків/мм") -#define MSG_E4STEPS _UxGT("E4кроків/мм") -#define MSG_E5STEPS _UxGT("E5кроків/мм") -#define MSG_E6STEPS _UxGT("E6кроків/мм") +#define MSG_E0_STEPS _UxGT("E1кроків/мм") +#define MSG_E1_STEPS _UxGT("E2кроків/мм") +#define MSG_E2_STEPS _UxGT("E3кроків/мм") +#define MSG_E3_STEPS _UxGT("E4кроків/мм") +#define MSG_E4_STEPS _UxGT("E5кроків/мм") +#define MSG_E5_STEPS _UxGT("E6кроків/мм") #define MSG_TEMPERATURE _UxGT("Температура") #define MSG_MOTION _UxGT("Рух") #define MSG_FILAMENT _UxGT("Волокно") diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h index 3b8885e707..b1520274fd 100644 --- a/Marlin/src/lcd/language/language_vi.h +++ b/Marlin/src/lcd/language/language_vi.h @@ -238,12 +238,12 @@ #define MSG_CSTEPS _UxGT("BướcZ/mm") #endif #define MSG_ESTEPS _UxGT("BướcE/mm") -#define MSG_E1STEPS _UxGT("BướcE1/mm") -#define MSG_E2STEPS _UxGT("BướcE2/mm") -#define MSG_E3STEPS _UxGT("BướcE3/mm") -#define MSG_E4STEPS _UxGT("BướcE4/mm") -#define MSG_E5STEPS _UxGT("BướcE5/mm") -#define MSG_E6STEPS _UxGT("BướcE6/mm") +#define MSG_E0_STEPS _UxGT("BướcE1/mm") +#define MSG_E1_STEPS _UxGT("BướcE2/mm") +#define MSG_E2_STEPS _UxGT("BướcE3/mm") +#define MSG_E3_STEPS _UxGT("BướcE4/mm") +#define MSG_E4_STEPS _UxGT("BướcE5/mm") +#define MSG_E5_STEPS _UxGT("BướcE6/mm") #define MSG_TEMPERATURE _UxGT("Nhiệt độ") // Temperature #define MSG_MOTION _UxGT("Chuyển động") // Motion #define MSG_FILAMENT _UxGT("Vật liệu in") // dây nhựa diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h index a87f469a0e..ad0b1272df 100644 --- a/Marlin/src/lcd/language/language_zh_CN.h +++ b/Marlin/src/lcd/language/language_zh_CN.h @@ -216,12 +216,12 @@ #define MSG_CSTEPS _UxGT("Z轴步数/mm") //"Zsteps/mm" #endif #define MSG_ESTEPS _UxGT("挤出机步数/mm") //"Esteps/mm" -#define MSG_E1STEPS _UxGT("挤出机1步数/mm") //"E1steps/mm" -#define MSG_E2STEPS _UxGT("挤出机2步数/mm") //"E2steps/mm" -#define MSG_E3STEPS _UxGT("挤出机3步数/mm") //"E3steps/mm" -#define MSG_E4STEPS _UxGT("挤出机4步数/mm") //"E4steps/mm" -#define MSG_E5STEPS _UxGT("挤出机5步数/mm") //"E5steps/mm" -#define MSG_E6STEPS _UxGT("挤出机6步数/mm") //"E6steps/mm" +#define MSG_E0_STEPS _UxGT("挤出机1步数/mm") //"E1steps/mm" +#define MSG_E1_STEPS _UxGT("挤出机2步数/mm") //"E2steps/mm" +#define MSG_E2_STEPS _UxGT("挤出机3步数/mm") //"E3steps/mm" +#define MSG_E3_STEPS _UxGT("挤出机4步数/mm") //"E4steps/mm" +#define MSG_E4_STEPS _UxGT("挤出机5步数/mm") //"E5steps/mm" +#define MSG_E5_STEPS _UxGT("挤出机6步数/mm") //"E6steps/mm" #define MSG_TEMPERATURE _UxGT("温度") //"Temperature" #define MSG_MOTION _UxGT("运动") //"Motion" #define MSG_FILAMENT _UxGT("丝料测容") //"Filament" menu_advanced_filament diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index ce8cda2692..90b7b00758 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -216,12 +216,12 @@ #define MSG_CSTEPS _UxGT("Z軸步數/mm") //"Zsteps/mm" #endif #define MSG_ESTEPS _UxGT("擠出機步數/mm") //"Esteps/mm" -#define MSG_E1STEPS _UxGT("擠出機1步數/mm") //"E1steps/mm" -#define MSG_E2STEPS _UxGT("擠出機2步數/mm") //"E2steps/mm" -#define MSG_E3STEPS _UxGT("擠出機3步數/mm") //"E3steps/mm" -#define MSG_E4STEPS _UxGT("擠出機4步數/mm") //"E4steps/mm" -#define MSG_E5STEPS _UxGT("擠出機5步數/mm") //"E5steps/mm" -#define MSG_E6STEPS _UxGT("擠出機6步數/mm") //"E6steps/mm" +#define MSG_E0_STEPS _UxGT("擠出機1步數/mm") //"E1steps/mm" +#define MSG_E1_STEPS _UxGT("擠出機2步數/mm") //"E2steps/mm" +#define MSG_E2_STEPS _UxGT("擠出機3步數/mm") //"E3steps/mm" +#define MSG_E3_STEPS _UxGT("擠出機4步數/mm") //"E4steps/mm" +#define MSG_E4_STEPS _UxGT("擠出機5步數/mm") //"E5steps/mm" +#define MSG_E5_STEPS _UxGT("擠出機6步數/mm") //"E6steps/mm" #define MSG_TEMPERATURE _UxGT("溫度") //"Temperature" #define MSG_MOTION _UxGT("運作") //"Motion" #define MSG_FILAMENT _UxGT("絲料測容") //"Filament" menu_control_volumetric diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp index d427a38ab0..2b2e5806ac 100644 --- a/Marlin/src/lcd/menu/menu_advanced.cpp +++ b/Marlin/src/lcd/menu/menu_advanced.cpp @@ -530,7 +530,7 @@ void menu_backlash(); EDIT_QSTEPS(C); #if ENABLED(DISTINCT_E_FACTORS) - #define EDIT_ESTEPS(N) EDIT_ITEM_FAST(float51, MSG_E##N##STEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(N)], 5, 9999, [](){ _planner_refresh_e_positioning(N); }) + #define EDIT_ESTEPS(N) EDIT_ITEM_FAST(float51, MSG_E##N##_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(N)], 5, 9999, [](){ _planner_refresh_e_positioning(N); }) EDIT_ITEM_FAST(float51, MSG_ESTEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(active_extruder)], 5, 9999, [](){ planner.refresh_positioning(); }); EDIT_ESTEPS(0); EDIT_ESTEPS(1); diff --git a/buildroot/share/tests/megaatmega2560-tests b/buildroot/share/tests/megaatmega2560-tests index 94d315cb9c..916607d995 100755 --- a/buildroot/share/tests/megaatmega2560-tests +++ b/buildroot/share/tests/megaatmega2560-tests @@ -34,7 +34,7 @@ opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TE PID_PARAMS_PER_HOTEND PID_AUTOTUNE_MENU PID_EDIT_MENU \ NOZZLE_PARK_FEATURE FILAMENT_RUNOUT_SENSOR FILAMENT_RUNOUT_DISTANCE_MM \ ADVANCED_PAUSE_FEATURE FILAMENT_LOAD_UNLOAD_GCODES FILAMENT_UNLOAD_ALL_EXTRUDERS \ - AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST \ + AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DISTINCT_E_FACTORS \ SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE \ BACKLASH_COMPENSATION BACKLASH_GCODE BAUD_RATE_GCODE BEZIER_CURVE_SUPPORT \ FWRETRACT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \