diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 239dc3f9b..f238116c7 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -5,6 +5,7 @@ #include "Configuration_prusa.h" // Firmware version + #define FW_version "3.0.10-12" #define FW_PRUSA3D_MAGIC "PRUSA3DFW" diff --git a/Firmware/language_all.cpp b/Firmware/language_all.cpp index 2ab648e0f..f0707651f 100644 --- a/Firmware/language_all.cpp +++ b/Firmware/language_all.cpp @@ -557,6 +557,7 @@ const char MSG_CALIBRATE_PINDA_CZ[] PROGMEM = "Zkalibrovat"; const char MSG_CALIBRATE_PINDA_IT[] PROGMEM = "Calibrare"; const char MSG_CALIBRATE_PINDA_ES[] PROGMEM = "Calibrar"; const char MSG_CALIBRATE_PINDA_PL[] PROGMEM = "Skalibrowac"; + const char MSG_CALIBRATE_PINDA_DE[] PROGMEM = "PINDA Temp. Kal."; const char MSG_CALIBRATE_PINDA_NL[] PROGMEM = "PINDA Temp. kal."; const char * const MSG_CALIBRATE_PINDA_LANG_TABLE[LANG_NUM] PROGMEM = { @@ -1072,6 +1073,7 @@ const char * const MSG_FIL_ADJUSTING_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_FIL_ADJUSTING_NL }; + const char MSG_FIL_LOADED_CHECK_EN[] PROGMEM = "Is filament loaded?"; const char MSG_FIL_LOADED_CHECK_DE[] PROGMEM = "Ist Filament eingelegt?"; const char MSG_FIL_LOADED_CHECK_NL[] PROGMEM = "Is filament ingestoken?"; @@ -1109,6 +1111,7 @@ const char * const MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION_LANG_TABLE[LANG_NUM] P MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION_EN, MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION_ES, MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION_EN, + MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION_DE, MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION_NL }; diff --git a/Firmware/language_en.h b/Firmware/language_en.h index e13db4e05..a5a1b3eaf 100644 --- a/Firmware/language_en.h +++ b/Firmware/language_en.h @@ -237,6 +237,7 @@ #define(length=20, lines=4) MSG_FILAMENT_LOADING_T2 "Insert filament into extruder 3. Click when done." #define(length=20, lines=4) MSG_FILAMENT_LOADING_T3 "Insert filament into extruder 4. Click when done." #define(length=20, lines=1) MSG_CHANGE_EXTR "Change extruder" + #define(length=20, lines=2) MSG_FIL_LOADED_CHECK "Is filament loaded?" #define(length=20, lines=3) MSG_FIL_TUNING "Rotate the knob to adjust filament." #define(length=20, lines=4) MSG_FIL_ADJUSTING "Adjusting filaments. Please wait." @@ -278,6 +279,7 @@ #define(length=20, lines=1) MSG_PID_BED_RUNNING "PID bed cal. " + #define(length=20, lines=1) MSG_CALIBRATE_PINDA "PINDA Temp. cal." #define(length=20, lines=1) MSG_CALIBRATION_PINDA_MENU "PINDA Temp. cal." #define(length=20, lines=4) MSG_PINDA_NOT_CALIBRATED "PINDA temperature calibration has not been run yet" @@ -286,4 +288,3 @@ #define(length=20, lines=5) MSG_TEMP_CALIBRATION_DONE "PINDA temperature calibration is finished. Click to continue." #define(length=20, lines=1) MSG_TEMP_CALIBRATION_ON "PINDA T.cal. [ON]" #define(length=20, lines=1) MSG_TEMP_CALIBRATION_OFF "PINDA T.cal.[OFF]" - diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 1d09d7001..eb12faa0f 100644 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -243,4 +243,5 @@ char reset_menu(); void lcd_pinda_calibration_menu(); void lcd_calibrate_pinda(); void lcd_temp_calibration_set(); + #endif //ULTRALCD_H \ No newline at end of file diff --git a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h index cc0626cca..0979e643b 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -370,6 +370,7 @@ THERMISTORS SETTINGS #define Z_BABYSTEP_MIN -3999 #define Z_BABYSTEP_MAX 0 + #define PINDA_PREHEAT_X 75 #define PINDA_PREHEAT_Y -3 #define PINDA_PREHEAT_Z 1