From 3779fa51b53d93ca6f8510b11a728498c7bb5e4a Mon Sep 17 00:00:00 2001 From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Sun, 14 Jan 2024 18:06:46 -0800 Subject: [PATCH] Fix some typos (#2865) --- TFT/src/User/API/Language/language_am.h | 2 +- TFT/src/User/API/Language/language_ca.h | 2 +- TFT/src/User/API/Language/language_en.h | 2 +- TFT/src/User/API/Language/language_es.h | 2 +- TFT/src/User/API/Language/language_gr.h | 2 +- TFT/src/User/API/Language/language_jp.h | 2 +- TFT/src/User/API/Language/language_nl.h | 2 +- TFT/src/User/API/Language/language_pt.h | 2 +- TFT/src/User/API/Language/language_sk.h | 2 +- TFT/src/User/API/Language/language_sl.h | 2 +- TFT/src/User/API/Language/language_tc.h | 2 +- TFT/src/User/API/Settings.c | 2 +- TFT/src/User/API/Settings.h | 2 +- TFT/src/User/Configuration.h | 4 ++-- TFT/src/User/SanityCheck.h | 4 ++++ 15 files changed, 19 insertions(+), 15 deletions(-) diff --git a/TFT/src/User/API/Language/language_am.h b/TFT/src/User/API/Language/language_am.h index 5455f8ad3e..f9b91998ff 100644 --- a/TFT/src/User/API/Language/language_am.h +++ b/TFT/src/User/API/Language/language_am.h @@ -343,7 +343,7 @@ #define STRING_TUNE_EXTRUDER "Tune steps" #define STRING_TUNE_EXT_EXTRUDE_100 "Ext. 100mm" #define STRING_TUNE_EXT_TEMP "Extruder tuning | Heat" - #define STRING_TUNE_EXT_MARK120MM "Mark 120 mm on your fillament.\nPress '%s' when ready.\nMeasure remaining length after extruding." + #define STRING_TUNE_EXT_MARK120MM "Mark 120 mm on your filament.\nPress '%s' when ready.\nMeasure remaining length after extruding." #define STRING_TUNE_EXT_ADJ_ESTEPS "Adjust E-Steps" #define STRING_TUNE_EXT_ESTEPS_SAVED "New E-steps applied.\nDon't forget to save it in EEPROM.\nNew value: %0.2f" #define STRING_TUNE_EXT_MEASURED "Length remaining:" diff --git a/TFT/src/User/API/Language/language_ca.h b/TFT/src/User/API/Language/language_ca.h index b5b6e7de6c..a8c293c163 100644 --- a/TFT/src/User/API/Language/language_ca.h +++ b/TFT/src/User/API/Language/language_ca.h @@ -343,7 +343,7 @@ #define STRING_TUNE_EXTRUDER "Tune steps" #define STRING_TUNE_EXT_EXTRUDE_100 "Ext. 100mm" #define STRING_TUNE_EXT_TEMP "Extruder tuning | Heat" - #define STRING_TUNE_EXT_MARK120MM "Mark 120 mm on your fillament.\nPress '%s' when ready.\nMeasure remaining length after extruding." + #define STRING_TUNE_EXT_MARK120MM "Mark 120 mm on your filament.\nPress '%s' when ready.\nMeasure remaining length after extruding." #define STRING_TUNE_EXT_ADJ_ESTEPS "Adjust E-Steps" #define STRING_TUNE_EXT_ESTEPS_SAVED "New E-steps applied.\nDon't forget to save it in EEPROM.\nNew value: %0.2f" #define STRING_TUNE_EXT_MEASURED "Length remaining:" diff --git a/TFT/src/User/API/Language/language_en.h b/TFT/src/User/API/Language/language_en.h index 2490211f7b..91f2714c67 100644 --- a/TFT/src/User/API/Language/language_en.h +++ b/TFT/src/User/API/Language/language_en.h @@ -343,7 +343,7 @@ #define STRING_TUNE_EXTRUDER "Tune steps" #define STRING_TUNE_EXT_EXTRUDE_100 "Ext. 100mm" #define STRING_TUNE_EXT_TEMP "Extruder tuning | Heat" - #define STRING_TUNE_EXT_MARK120MM "Mark 120 mm on your fillament.\nPress '%s' when ready.\nMeasure remaining length after extruding." + #define STRING_TUNE_EXT_MARK120MM "Mark 120 mm on your filament.\nPress '%s' when ready.\nMeasure remaining length after extruding." #define STRING_TUNE_EXT_ADJ_ESTEPS "Adjust E-Steps" #define STRING_TUNE_EXT_ESTEPS_SAVED "New E-steps applied.\nDon't forget to save it in EEPROM.\nNew value: %0.2f" #define STRING_TUNE_EXT_MEASURED "Length remaining:" diff --git a/TFT/src/User/API/Language/language_es.h b/TFT/src/User/API/Language/language_es.h index 1f9ef496cb..967dd70d76 100644 --- a/TFT/src/User/API/Language/language_es.h +++ b/TFT/src/User/API/Language/language_es.h @@ -343,7 +343,7 @@ #define STRING_TUNE_EXTRUDER "Tune steps" #define STRING_TUNE_EXT_EXTRUDE_100 "Ext. 100mm" #define STRING_TUNE_EXT_TEMP "Extruder tuning | Heat" - #define STRING_TUNE_EXT_MARK120MM "Mark 120 mm on your fillament.\nPress '%s' when ready.\nMeasure remaining length after extruding." + #define STRING_TUNE_EXT_MARK120MM "Mark 120 mm on your filament.\nPress '%s' when ready.\nMeasure remaining length after extruding." #define STRING_TUNE_EXT_ADJ_ESTEPS "Adjust E-Steps" #define STRING_TUNE_EXT_ESTEPS_SAVED "New E-steps applied.\nDon't forget to save it in EEPROM.\nNew value: %0.2f" #define STRING_TUNE_EXT_MEASURED "Length remaining:" diff --git a/TFT/src/User/API/Language/language_gr.h b/TFT/src/User/API/Language/language_gr.h index 450ae0f90a..c3f2415460 100644 --- a/TFT/src/User/API/Language/language_gr.h +++ b/TFT/src/User/API/Language/language_gr.h @@ -343,7 +343,7 @@ #define STRING_TUNE_EXTRUDER "Tune steps" #define STRING_TUNE_EXT_EXTRUDE_100 "Ext. 100mm" #define STRING_TUNE_EXT_TEMP "Extruder tuning | Heat" - #define STRING_TUNE_EXT_MARK120MM "Mark 120 mm on your fillament.\nPress '%s' when ready.\nMeasure remaining length after extruding." + #define STRING_TUNE_EXT_MARK120MM "Mark 120 mm on your filament.\nPress '%s' when ready.\nMeasure remaining length after extruding." #define STRING_TUNE_EXT_ADJ_ESTEPS "Adjust E-Steps" #define STRING_TUNE_EXT_ESTEPS_SAVED "New E-steps applied.\nDon't forget to save it in EEPROM.\nNew value: %0.2f" #define STRING_TUNE_EXT_MEASURED "Length remaining:" diff --git a/TFT/src/User/API/Language/language_jp.h b/TFT/src/User/API/Language/language_jp.h index 7a5bcc76d4..795495b790 100644 --- a/TFT/src/User/API/Language/language_jp.h +++ b/TFT/src/User/API/Language/language_jp.h @@ -343,7 +343,7 @@ #define STRING_TUNE_EXTRUDER "Tune steps" #define STRING_TUNE_EXT_EXTRUDE_100 "Ext. 100mm" #define STRING_TUNE_EXT_TEMP "Extruder tuning | Heat" - #define STRING_TUNE_EXT_MARK120MM "Mark 120 mm on your fillament.\nPress '%s' when ready.\nMeasure remaining length after extruding." + #define STRING_TUNE_EXT_MARK120MM "Mark 120 mm on your filament.\nPress '%s' when ready.\nMeasure remaining length after extruding." #define STRING_TUNE_EXT_ADJ_ESTEPS "Adjust E-Steps" #define STRING_TUNE_EXT_ESTEPS_SAVED "New E-steps applied.\nDon't forget to save it in EEPROM.\nNew value: %0.2f" #define STRING_TUNE_EXT_MEASURED "Length remaining:" diff --git a/TFT/src/User/API/Language/language_nl.h b/TFT/src/User/API/Language/language_nl.h index 7ef6acb20a..4a55305626 100644 --- a/TFT/src/User/API/Language/language_nl.h +++ b/TFT/src/User/API/Language/language_nl.h @@ -343,7 +343,7 @@ #define STRING_TUNE_EXTRUDER "Tune steps" #define STRING_TUNE_EXT_EXTRUDE_100 "Ext. 100mm" #define STRING_TUNE_EXT_TEMP "Extruder tuning | Heat" - #define STRING_TUNE_EXT_MARK120MM "Mark 120 mm on your fillament.\nPress '%s' when ready.\nMeasure remaining length after extruding." + #define STRING_TUNE_EXT_MARK120MM "Mark 120 mm on your filament.\nPress '%s' when ready.\nMeasure remaining length after extruding." #define STRING_TUNE_EXT_ADJ_ESTEPS "Adjust E-Steps" #define STRING_TUNE_EXT_ESTEPS_SAVED "New E-steps applied. Don't forget to save it in EEPROM.\nNew value: %0.2f" #define STRING_TUNE_EXT_MEASURED "Length remaining:" diff --git a/TFT/src/User/API/Language/language_pt.h b/TFT/src/User/API/Language/language_pt.h index e1c8d4b61b..3a5635e385 100644 --- a/TFT/src/User/API/Language/language_pt.h +++ b/TFT/src/User/API/Language/language_pt.h @@ -343,7 +343,7 @@ #define STRING_TUNE_EXTRUDER "Tune steps" #define STRING_TUNE_EXT_EXTRUDE_100 "Ext. 100mm" #define STRING_TUNE_EXT_TEMP "Extruder tuning | Heat" - #define STRING_TUNE_EXT_MARK120MM "Mark 120 mm on your fillament.\nPress '%s' when ready.\nMeasure remaining length after extruding." + #define STRING_TUNE_EXT_MARK120MM "Mark 120 mm on your filament.\nPress '%s' when ready.\nMeasure remaining length after extruding." #define STRING_TUNE_EXT_ADJ_ESTEPS "Adjust E-Steps" #define STRING_TUNE_EXT_ESTEPS_SAVED "New E-steps applied.\nDon't forget to save it in EEPROM.\nNew value: %0.2f" #define STRING_TUNE_EXT_MEASURED "Length remaining:" diff --git a/TFT/src/User/API/Language/language_sk.h b/TFT/src/User/API/Language/language_sk.h index cdf6f0c809..45d6295b17 100644 --- a/TFT/src/User/API/Language/language_sk.h +++ b/TFT/src/User/API/Language/language_sk.h @@ -343,7 +343,7 @@ #define STRING_TUNE_EXTRUDER "Tune steps" #define STRING_TUNE_EXT_EXTRUDE_100 "Ext. 100mm" #define STRING_TUNE_EXT_TEMP "Extruder tuning | Heat" - #define STRING_TUNE_EXT_MARK120MM "Mark 120 mm on your fillament.\nPress '%s' when ready.\nMeasure remaining length after extruding." + #define STRING_TUNE_EXT_MARK120MM "Mark 120 mm on your filament.\nPress '%s' when ready.\nMeasure remaining length after extruding." #define STRING_TUNE_EXT_ADJ_ESTEPS "Adjust E-Steps" #define STRING_TUNE_EXT_ESTEPS_SAVED "New E-steps applied.\nDon't forget to save it in EEPROM.\nNew value: %0.2f" #define STRING_TUNE_EXT_MEASURED "Length remaining:" diff --git a/TFT/src/User/API/Language/language_sl.h b/TFT/src/User/API/Language/language_sl.h index ff6c67962b..eda325177f 100644 --- a/TFT/src/User/API/Language/language_sl.h +++ b/TFT/src/User/API/Language/language_sl.h @@ -343,7 +343,7 @@ #define STRING_TUNE_EXTRUDER "Tune steps" #define STRING_TUNE_EXT_EXTRUDE_100 "Ext. 100mm" #define STRING_TUNE_EXT_TEMP "Extruder tuning | Heat" - #define STRING_TUNE_EXT_MARK120MM "Mark 120 mm on your fillament.\nPress '%s' when ready.\nMeasure remaining length after extruding." + #define STRING_TUNE_EXT_MARK120MM "Mark 120 mm on your filament.\nPress '%s' when ready.\nMeasure remaining length after extruding." #define STRING_TUNE_EXT_ADJ_ESTEPS "Adjust E-Steps" #define STRING_TUNE_EXT_ESTEPS_SAVED "New E-steps applied.\nDon't forget to save it in EEPROM.\nNew value: %0.2f" #define STRING_TUNE_EXT_MEASURED "Length remaining:" diff --git a/TFT/src/User/API/Language/language_tc.h b/TFT/src/User/API/Language/language_tc.h index f4a22e59cb..18074e7d1d 100644 --- a/TFT/src/User/API/Language/language_tc.h +++ b/TFT/src/User/API/Language/language_tc.h @@ -343,7 +343,7 @@ #define STRING_TUNE_EXTRUDER "Tune steps" #define STRING_TUNE_EXT_EXTRUDE_100 "挤出100mm" #define STRING_TUNE_EXT_TEMP "Extruder tuning | Heat" - #define STRING_TUNE_EXT_MARK120MM "Mark 120 mm on your fillament.\nPress '%s' when ready.\nMeasure remaining length after extruding." + #define STRING_TUNE_EXT_MARK120MM "Mark 120 mm on your filament.\nPress '%s' when ready.\nMeasure remaining length after extruding." #define STRING_TUNE_EXT_ADJ_ESTEPS "Adjust E-Steps" #define STRING_TUNE_EXT_ESTEPS_SAVED "New E-steps applied.\nDon't forget to save it in EEPROM.\nNew value: %0.2f" #define STRING_TUNE_EXT_MEASURED "Length remaining:" diff --git a/TFT/src/User/API/Settings.c b/TFT/src/User/API/Settings.c index ac2a480535..3c4ba19a14 100644 --- a/TFT/src/User/API/Settings.c +++ b/TFT/src/User/API/Settings.c @@ -99,7 +99,7 @@ void initSettings(void) infoSettings.probing_z_offset = PROBING_Z_OFFSET; infoSettings.probing_z_raise = PROBING_Z_RAISE; - infoSettings.z_steppers_alignment = Z_STEPPER_ALIGNEMENT; + infoSettings.z_steppers_alignment = Z_STEPPERS_ALIGNMENT; infoSettings.touchmi_sensor = TOUCHMI_SENSOR; // Power Supply Settings (only if connected to TFT controller) diff --git a/TFT/src/User/API/Settings.h b/TFT/src/User/API/Settings.h index 2dfa637a96..27ac1ab6f0 100644 --- a/TFT/src/User/API/Settings.h +++ b/TFT/src/User/API/Settings.h @@ -14,7 +14,7 @@ extern "C" { // Config version support (format YYYYMMDD) // change if new elements/keywords are added/removed/changed in the Configuration.h // this number should match CONFIG_VERSION in Configuration.h -#define CONFIG_SUPPPORT 20230929 +#define CONFIG_SUPPPORT 20231119 #define FONT_FLASH_SIGN 20230821 // (YYYYMMDD) change if fonts require updating #define CONFIG_FLASH_SIGN 20230929 // (YYYYMMDD) change if any keyword(s) in config.ini is added or removed diff --git a/TFT/src/User/Configuration.h b/TFT/src/User/Configuration.h index efc9266f7a..56721c9a5e 100644 --- a/TFT/src/User/Configuration.h +++ b/TFT/src/User/Configuration.h @@ -1,7 +1,7 @@ #ifndef _CONFIGURATION_H_ #define _CONFIGURATION_H_ -#define CONFIG_VERSION 20230929 +#define CONFIG_VERSION 20231119 //==================================================================================================== //=============================== Settings Configurable On config.ini ================================ @@ -732,7 +732,7 @@ * * Options: [disable: 0, enable: 1] */ -#define Z_STEPPER_ALIGNEMENT 0 // Default: 0 +#define Z_STEPPERS_ALIGNMENT 0 // Default: 0 /** * TouchMI Settings (ABL) diff --git a/TFT/src/User/SanityCheck.h b/TFT/src/User/SanityCheck.h index 5af8aae3c7..33ed693627 100644 --- a/TFT/src/User/SanityCheck.h +++ b/TFT/src/User/SanityCheck.h @@ -347,6 +347,10 @@ extern "C" { #endif #endif +#ifdef Z_STEPPER_ALIGNEMENT + #error "Z_STEPPER_ALIGNEMENT is now Z_STEPPERS_ALIGNMENT." +#endif + #ifdef __cplusplus } #endif