Fix extraneous "Home XYZ First" message

This commit is contained in:
Scott Lahteine
2019-09-25 21:01:29 -05:00
parent 9a209012b5
commit b2e1f77f58
35 changed files with 248 additions and 284 deletions

View File

@@ -35,8 +35,8 @@
#define WELCOME_MSG MACHINE_NAME _UxGT(" spreman.")
#define MSG_MEDIA_INSERTED _UxGT("SD kartica umetnuta")
#define MSG_MEDIA_REMOVED _UxGT("SD kartica uklonjena")
#define MSG_LCD_ENDSTOPS _UxGT("Endstops") // Max length 8 characters
#define MSG_MAIN _UxGT("Main")
//#define MSG_LCD_ENDSTOPS _UxGT("Endstops") // Max length 8 characters
//#define MSG_MAIN _UxGT("Main")
#define MSG_AUTOSTART _UxGT("Auto pokretanje")
#define MSG_DISABLE_STEPPERS _UxGT("Ugasi steppere")
#define MSG_AUTO_HOME _UxGT("Automatski homing")
@@ -63,15 +63,15 @@
#define MSG_COOLDOWN _UxGT("Hlađenje")
#define MSG_SWITCH_PS_ON _UxGT("Uključi napajanje")
#define MSG_SWITCH_PS_OFF _UxGT("Isključi napajanje")
#define MSG_EXTRUDE _UxGT("Extrude")
#define MSG_RETRACT _UxGT("Retract")
//#define MSG_EXTRUDE _UxGT("Extrude")
//#define MSG_RETRACT _UxGT("Retract")
#define MSG_MOVE_AXIS _UxGT("Miči os")
#define MSG_BED_LEVELING _UxGT("Niveliraj bed")
#define MSG_LEVEL_BED _UxGT("Niveliraj bed")
#define MSG_MOVE_X _UxGT("Miči X")
#define MSG_MOVE_Y _UxGT("Miči Y")
#define MSG_MOVE_Z _UxGT("Miči Z")
#define MSG_MOVE_E _UxGT("Extruder")
//#define MSG_MOVE_E _UxGT("Extruder")
#define MSG_MOVE_Z_DIST _UxGT("Miči %smm")
#define MSG_MOVE_01MM _UxGT("Miči 0.1mm")
#define MSG_MOVE_1MM _UxGT("Miči 1mm")
@@ -81,57 +81,57 @@
#define MSG_NOZZLE _UxGT("Dizna")
#define MSG_BED _UxGT("Bed")
#define MSG_FAN_SPEED _UxGT("Brzina ventilatora")
#define MSG_FLOW _UxGT("Flow")
#define MSG_CONTROL _UxGT("Control")
#define MSG_MIN _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Min")
#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
#define MSG_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fact")
#define MSG_AUTOTEMP _UxGT("Autotemp")
#define MSG_LCD_ON _UxGT("On")
#define MSG_LCD_OFF _UxGT("Off")
#define MSG_PID_P _UxGT("PID-P")
#define MSG_PID_I _UxGT("PID-I")
#define MSG_PID_D _UxGT("PID-D")
#define MSG_PID_C _UxGT("PID-C")
//#define MSG_FLOW _UxGT("Flow")
//#define MSG_CONTROL _UxGT("Control")
//#define MSG_MIN _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Min")
//#define MSG_MAX _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Max")
//#define MSG_FACTOR _UxGT(" ") LCD_STR_THERMOMETER _UxGT(" Fact")
//#define MSG_AUTOTEMP _UxGT("Autotemp")
//#define MSG_LCD_ON _UxGT("On")
//#define MSG_LCD_OFF _UxGT("Off")
//#define MSG_PID_P _UxGT("PID-P")
//#define MSG_PID_I _UxGT("PID-I")
//#define MSG_PID_D _UxGT("PID-D")
//#define MSG_PID_C _UxGT("PID-C")
#define MSG_SELECT _UxGT("Odaberi")
#define MSG_ACC _UxGT("Accel")
#define MSG_JERK _UxGT("Jerk")
#if IS_KINEMATIC
#define MSG_VA_JERK _UxGT("Va-jerk")
#define MSG_VB_JERK _UxGT("Vb-jerk")
#define MSG_VC_JERK _UxGT("Vc-jerk")
#else
#define MSG_VA_JERK _UxGT("Vx-jerk")
#define MSG_VB_JERK _UxGT("Vy-jerk")
#define MSG_VC_JERK _UxGT("Vz-jerk")
#endif
#define MSG_VE_JERK _UxGT("Ve-jerk")
#define MSG_VMAX _UxGT("Vmax ")
#define MSG_VMIN _UxGT("Vmin")
#define MSG_VTRAV_MIN _UxGT("VTrav min")
#define MSG_AMAX _UxGT("Amax ")
#define MSG_A_RETRACT _UxGT("A-retract")
#define MSG_A_TRAVEL _UxGT("A-travel")
#define MSG_STEPS_PER_MM _UxGT("Steps/mm")
#if IS_KINEMATIC
#define MSG_ASTEPS _UxGT("Asteps/mm")
#define MSG_BSTEPS _UxGT("Bsteps/mm")
#define MSG_CSTEPS _UxGT("Csteps/mm")
#else
#define MSG_ASTEPS _UxGT("Xsteps/mm")
#define MSG_BSTEPS _UxGT("Ysteps/mm")
#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_ACC _UxGT("Accel")
//#define MSG_JERK _UxGT("Jerk")
//#if IS_KINEMATIC
// #define MSG_VA_JERK _UxGT("Va-jerk")
// #define MSG_VB_JERK _UxGT("Vb-jerk")
// #define MSG_VC_JERK _UxGT("Vc-jerk")
//#else
// #define MSG_VA_JERK _UxGT("Vx-jerk")
// #define MSG_VB_JERK _UxGT("Vy-jerk")
// #define MSG_VC_JERK _UxGT("Vz-jerk")
//#endif
//#define MSG_VE_JERK _UxGT("Ve-jerk")
//#define MSG_VMAX _UxGT("Vmax ")
//#define MSG_VMIN _UxGT("Vmin")
//#define MSG_VTRAV_MIN _UxGT("VTrav min")
//#define MSG_AMAX _UxGT("Amax ")
//#define MSG_A_RETRACT _UxGT("A-retract")
//#define MSG_A_TRAVEL _UxGT("A-travel")
//#define MSG_STEPS_PER_MM _UxGT("Steps/mm")
//#if IS_KINEMATIC
// #define MSG_ASTEPS _UxGT("Asteps/mm")
// #define MSG_BSTEPS _UxGT("Bsteps/mm")
// #define MSG_CSTEPS _UxGT("Csteps/mm")
//#else
// #define MSG_ASTEPS _UxGT("Xsteps/mm")
// #define MSG_BSTEPS _UxGT("Ysteps/mm")
// #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_TEMPERATURE _UxGT("Temperature")
#define MSG_MOTION _UxGT("Gibanje")
#define MSG_FILAMENT _UxGT("Filament")
//#define MSG_FILAMENT _UxGT("Filament")
#define MSG_VOLUMETRIC_ENABLED _UxGT("E in mm3")
#define MSG_FILAMENT_DIAM _UxGT("Fil. Dia.")
#define MSG_CONTRAST _UxGT("Kontrast LCD-a")
@@ -141,52 +141,51 @@
#define MSG_REFRESH _UxGT("Osvježi")
#define MSG_WATCH _UxGT("Info screen")
#define MSG_PREPARE _UxGT("Pripremi")
#define MSG_TUNE _UxGT("Tune")
//#define MSG_TUNE _UxGT("Tune")
#define MSG_PAUSE_PRINT _UxGT("Pauziraj print")
#define MSG_RESUME_PRINT _UxGT("Nastavi print")
#define MSG_STOP_PRINT _UxGT("Zaustavi print")
#define MSG_MEDIA_MENU _UxGT("Printaj s SD kartice")
#define MSG_NO_MEDIA _UxGT("Nema SD kartice")
#define MSG_DWELL _UxGT("Sleep...")
//#define MSG_DWELL _UxGT("Sleep...")
#define MSG_USERWAIT _UxGT("Čekaj korisnika...")
#define MSG_PRINT_ABORTED _UxGT("Print otkazan")
#define MSG_NO_MOVE _UxGT("No move.")
#define MSG_KILLED _UxGT("KILLED. ")
//#define MSG_NO_MOVE _UxGT("No move.")
//#define MSG_KILLED _UxGT("KILLED. ")
#define MSG_STOPPED _UxGT("ZAUSTAVLJEN. ")
#define MSG_CONTROL_RETRACT _UxGT("Retract mm")
#define MSG_CONTROL_RETRACT_SWAP _UxGT("Swap Re.mm")
#define MSG_CONTROL_RETRACTF _UxGT("Retract V")
#define MSG_CONTROL_RETRACT_ZHOP _UxGT("Hop mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRet mm")
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V")
#define MSG_AUTORETRACT _UxGT("AutoRetr.")
//#define MSG_CONTROL_RETRACT _UxGT("Retract mm")
//#define MSG_CONTROL_RETRACT_SWAP _UxGT("Swap Re.mm")
//#define MSG_CONTROL_RETRACTF _UxGT("Retract V")
//#define MSG_CONTROL_RETRACT_ZHOP _UxGT("Hop mm")
//#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm")
//#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRet mm")
//#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V")
//#define MSG_AUTORETRACT _UxGT("AutoRetr.")
#define MSG_FILAMENTCHANGE _UxGT("Promijeni filament")
#define MSG_INIT_MEDIA _UxGT("Init. SD karticu")
#define MSG_CHANGE_MEDIA _UxGT("Promijeni SD karticu")
#define MSG_ZPROBE_OUT _UxGT("Z probe out. bed")
#define MSG_BLTOUCH_SELFTEST _UxGT("BLTouch Self-Test")
#define MSG_BLTOUCH_RESET _UxGT("Reset BLTouch")
#define MSG_HOME _UxGT("Home") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST _UxGT("first")
#define MSG_ZPROBE_ZOFFSET _UxGT("Z Offset")
#define MSG_BABYSTEP_X _UxGT("Babystep X")
#define MSG_BABYSTEP_Y _UxGT("Babystep Y")
#define MSG_BABYSTEP_Z _UxGT("Babystep Z")
#define MSG_ENDSTOP_ABORT _UxGT("Endstop abort")
//#define MSG_ZPROBE_OUT _UxGT("Z probe out. bed")
//#define MSG_BLTOUCH_SELFTEST _UxGT("BLTouch Self-Test")
//#define MSG_BLTOUCH_RESET _UxGT("Reset BLTouch")
//#define MSG_HOME_FIRST _UxGT("Home %s%s%s first")
//#define MSG_ZPROBE_ZOFFSET _UxGT("Z Offset")
//#define MSG_BABYSTEP_X _UxGT("Babystep X")
//#define MSG_BABYSTEP_Y _UxGT("Babystep Y")
//#define MSG_BABYSTEP_Z _UxGT("Babystep Z")
//#define MSG_ENDSTOP_ABORT _UxGT("Endstop abort")
#define MSG_HEATING_FAILED_LCD _UxGT("Grijanje neuspješno")
#define MSG_ERR_REDUNDANT_TEMP _UxGT("Err: REDUNDANT TEMP")
#define MSG_THERMAL_RUNAWAY _UxGT("THERMAL RUNAWAY")
#define MSG_ERR_MAXTEMP _UxGT("Err: MAXTEMP")
#define MSG_ERR_MINTEMP _UxGT("Err: MINTEMP")
#define MSG_ERR_MAXTEMP_BED _UxGT("Err: MAXTEMP BED")
#define MSG_ERR_MINTEMP_BED _UxGT("Err: MINTEMP BED")
#define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
#define MSG_HALTED _UxGT("PRINTER HALTED")
#define MSG_PLEASE_RESET _UxGT("Please reset")
#define MSG_SHORT_DAY _UxGT("d") // One character only
#define MSG_SHORT_HOUR _UxGT("h") // One character only
#define MSG_SHORT_MINUTE _UxGT("m") // One character only
//#define MSG_ERR_REDUNDANT_TEMP _UxGT("Err: REDUNDANT TEMP")
//#define MSG_THERMAL_RUNAWAY _UxGT("THERMAL RUNAWAY")
//#define MSG_ERR_MAXTEMP _UxGT("Err: MAXTEMP")
//#define MSG_ERR_MINTEMP _UxGT("Err: MINTEMP")
//#define MSG_ERR_MAXTEMP_BED _UxGT("Err: MAXTEMP BED")
//#define MSG_ERR_MINTEMP_BED _UxGT("Err: MINTEMP BED")
//#define MSG_ERR_Z_HOMING _UxGT("Home XY first")
//#define MSG_HALTED _UxGT("PRINTER HALTED")
//#define MSG_PLEASE_RESET _UxGT("Please reset")
//#define MSG_SHORT_DAY _UxGT("d") // One character only
//#define MSG_SHORT_HOUR _UxGT("h") // One character only
//#define MSG_SHORT_MINUTE _UxGT("m") // One character only
#define MSG_HEATING _UxGT("Grijanje...")
#define MSG_BED_HEATING _UxGT("Grijanje Bed-a...")
#define MSG_DELTA_CALIBRATE _UxGT("Delta Kalibracija")
@@ -220,34 +219,34 @@
#define MSG_INFO_PRINT_FILAMENT _UxGT("Extrudirano")
#endif
#define MSG_INFO_MIN_TEMP _UxGT("Min Temp")
#define MSG_INFO_MAX_TEMP _UxGT("Max Temp")
//#define MSG_INFO_MIN_TEMP _UxGT("Min Temp")
//#define MSG_INFO_MAX_TEMP _UxGT("Max Temp")
#define MSG_INFO_PSU _UxGT("Napajanje")
#define MSG_DRIVE_STRENGTH _UxGT("Drive Strength")
#define MSG_DAC_PERCENT _UxGT("Driver %")
#define MSG_DAC_EEPROM_WRITE _UxGT("DAC EEPROM Write")
//#define MSG_DRIVE_STRENGTH _UxGT("Drive Strength")
//#define MSG_DAC_PERCENT _UxGT("Driver %")
//#define MSG_DAC_EEPROM_WRITE _UxGT("DAC EEPROM Write")
#define MSG_FILAMENT_CHANGE_OPTION_RESUME _UxGT("Nastavi print")
#if LCD_HEIGHT >= 4
// Up to 3 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("Čekaj početak")
#define MSG_FILAMENT_CHANGE_INIT_2 _UxGT("filamenta")
#define MSG_FILAMENT_CHANGE_INIT_3 _UxGT("promijeni")
#define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("Čekaj")
#define MSG_FILAMENT_CHANGE_UNLOAD_2 _UxGT("filament unload")
#define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("Umetni filament")
#define MSG_FILAMENT_CHANGE_INSERT_2 _UxGT("i pritisni tipku")
#define MSG_FILAMENT_CHANGE_INSERT_3 _UxGT("za nastavak...")
#define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("Pričekaj")
#define MSG_FILAMENT_CHANGE_LOAD_2 _UxGT("filament load")
#define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("Wait for print")
#define MSG_FILAMENT_CHANGE_RESUME_2 _UxGT("to resume")
#define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("Čekaj početak")
#define MSG_FILAMENT_CHANGE_INIT_2 _UxGT("filamenta")
#define MSG_FILAMENT_CHANGE_INIT_3 _UxGT("promijeni")
#define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("Čekaj")
#define MSG_FILAMENT_CHANGE_UNLOAD_2 _UxGT("filament unload")
#define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("Umetni filament")
#define MSG_FILAMENT_CHANGE_INSERT_2 _UxGT("i pritisni tipku")
#define MSG_FILAMENT_CHANGE_INSERT_3 _UxGT("za nastavak...")
#define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("Pričekaj")
#define MSG_FILAMENT_CHANGE_LOAD_2 _UxGT("filament load")
//#define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("Wait for print")
//#define MSG_FILAMENT_CHANGE_RESUME_2 _UxGT("to resume")
#else // LCD_HEIGHT < 4
// Up to 2 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("Pričekaj...")
#define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("Ejecting...")
#define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("Insert and Click")
#define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("Loading...")
#define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("Nastavljam...")
#define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("Pričekaj...")
//#define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("Ejecting...")
//#define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("Insert and Click")
//#define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("Loading...")
#define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("Nastavljam...")
#endif // LCD_HEIGHT < 4