Skip to content

M
MarlinKimbra
Commit 200bcf80 authored by MagoKimbra's avatar MagoKimbra
Browse files
Options

Merge remote-tracking branch 'refs/remotes/origin/master' into dev

parents 5c644442 e16d723c
Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 136 deletions
MarlinKimbra/Marlin_main.cpp
View file @ 200bcf80
...@@ -834,7 +834,7 @@ void setup() { ...@@ -834,7 +834,7 @@ void setup() {
if (mcu & 32) ECHO_EM(SERIAL_SOFTWARE_RESET); if (mcu & 32) ECHO_EM(SERIAL_SOFTWARE_RESET);
MCUSR = 0; MCUSR = 0;
ECHO_LM(DB, MSG_MARLIN " " BUILD_VERSION); ECHO_LM(DB, BUILD_VERSION);
#if ENABLED(STRING_DISTRIBUTION_DATE) && ENABLED(STRING_CONFIG_H_AUTHOR) #if ENABLED(STRING_DISTRIBUTION_DATE) && ENABLED(STRING_CONFIG_H_AUTHOR)
ECHO_LM(DB, SERIAL_CONFIGURATION_VER STRING_DISTRIBUTION_DATE SERIAL_AUTHOR STRING_CONFIG_H_AUTHOR); ECHO_LM(DB, SERIAL_CONFIGURATION_VER STRING_DISTRIBUTION_DATE SERIAL_AUTHOR STRING_CONFIG_H_AUTHOR);
......
MarlinKimbra/language/language.h
View file @ 200bcf80
...@@ -60,149 +60,157 @@ ...@@ -60,149 +60,157 @@
#endif #endif
// Serial Console Messages (do not translate those!) // Serial Console Messages (do not translate those!)
#define MSG_MARLIN "MarlinKimbra" #if MECH(CARTESIAN)
#define SERIAL_ENQUEUEING "enqueueing \"" #define SERIAL_M115_REPORT "FIRMWARE_NAME:MK_" SHORT_BUILD_VERSION " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:Mendel EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
#define SERIAL_POWERUP "PowerUp" #elif MECH(COREXY)
#define SERIAL_EXTERNAL_RESET "External Reset" #define SERIAL_M115_REPORT "FIRMWARE_NAME:MK_" SHORT_BUILD_VERSION " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:Core_XY EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
#define SERIAL_BROWNOUT_RESET "Brown out Reset" #elif MECH(COREXZ)
#define SERIAL_WATCHDOG_RESET "Watchdog Reset" #define SERIAL_M115_REPORT "FIRMWARE_NAME:MK_" SHORT_BUILD_VERSION " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:Core_XZ EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
#define SERIAL_SOFTWARE_RESET "Software Reset" #elif MECH(DELTA)
#define SERIAL_AUTHOR " | Author: " #define SERIAL_M115_REPORT "FIRMWARE_NAME:MK_" SHORT_BUILD_VERSION " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:Delta EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
#define SERIAL_CONFIGURATION_VER "Last Updated: " #elif MECH(SCARA)
#define SERIAL_COMPILED "Compiled: " #define SERIAL_M115_REPORT "FIRMWARE_NAME:MK_" SHORT_BUILD_VERSION " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:Scara EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
#define SERIAL_FREE_MEMORY "Free Memory: " #endif
#define SERIAL_PLANNER_BUFFER_BYTES " PlannerBufferBytes: " #define MSG_MARLIN "MarlinKimbra"
#define SERIAL_FILE_SAVED "Done saving file." #define SERIAL_ENQUEUEING "enqueueing \""
#define SERIAL_ERR_LINE_NO "Line Number is not Last Line Number+1, Last Line: " #define SERIAL_POWERUP "PowerUp"
#define SERIAL_ERR_CHECKSUM_MISMATCH "checksum mismatch, Last Line: " #define SERIAL_EXTERNAL_RESET "External Reset"
#define SERIAL_ERR_NO_CHECKSUM "No Checksum with line number, Last Line: " #define SERIAL_BROWNOUT_RESET "Brown out Reset"
#define SERIAL_ERR_NO_LINENUMBER_WITH_CHECKSUM "No Line Number with checksum, Last Line: " #define SERIAL_WATCHDOG_RESET "Watchdog Reset"
#define SERIAL_FILE_PRINTED "Done printing file" #define SERIAL_SOFTWARE_RESET "Software Reset"
#define SERIAL_BEGIN_FILE_LIST "Begin file list" #define SERIAL_AUTHOR " | Author: "
#define SERIAL_END_FILE_LIST "End file list" #define SERIAL_CONFIGURATION_VER "Last Updated: "
#define SERIAL_INVALID_EXTRUDER "Invalid extruder" #define SERIAL_COMPILED "Compiled: "
#define SERIAL_INVALID_SOLENOID "Invalid solenoid" #define SERIAL_FREE_MEMORY "Free Memory: "
#define SERIAL_ERR_NO_THERMISTORS "No thermistors - no temperature" #define SERIAL_PLANNER_BUFFER_BYTES " PlannerBufferBytes: "
#define SERIAL_M115_REPORT "FIRMWARE_NAME:MarlinKimbra_" SHORT_BUILD_VERSION " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n" #define SERIAL_FILE_SAVED "Done saving file."
#define SERIAL_COUNT_X " Count X: " #define SERIAL_ERR_LINE_NO "Line Number is not Last Line Number+1, Last Line: "
#define SERIAL_ERR_KILLED "Printer halted. kill() called!" #define SERIAL_ERR_CHECKSUM_MISMATCH "checksum mismatch, Last Line: "
#define SERIAL_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" #define SERIAL_ERR_NO_CHECKSUM "No Checksum with line number, Last Line: "
#define SERIAL_UNKNOWN_COMMAND "Unknown command: \"" #define SERIAL_ERR_NO_LINENUMBER_WITH_CHECKSUM "No Line Number with checksum, Last Line: "
#define SERIAL_ACTIVE_DRIVER "Active Driver: " #define SERIAL_FILE_PRINTED "Done printing file"
#define SERIAL_ACTIVE_EXTRUDER "Active Extruder: " #define SERIAL_BEGIN_FILE_LIST "Begin file list"
#define SERIAL_ACTIVE_COLOR "Active Color: " #define SERIAL_END_FILE_LIST "End file list"
#define SERIAL_X_MIN "x_min: " #define SERIAL_INVALID_EXTRUDER "Invalid extruder"
#define SERIAL_X_MAX "x_max: " #define SERIAL_INVALID_SOLENOID "Invalid solenoid"
#define SERIAL_Y_MIN "y_min: " #define SERIAL_ERR_NO_THERMISTORS "No thermistors - no temperature"
#define SERIAL_Y_MAX "y_max: " #define SERIAL_COUNT_X " Count X: "
#define SERIAL_Z_MIN "z_min: " #define SERIAL_ERR_KILLED "Printer halted. kill() called!"
#define SERIAL_Z_MAX "z_max: " #define SERIAL_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
#define SERIAL_Z2_MAX "z2_max: " #define SERIAL_UNKNOWN_COMMAND "Unknown command: \""
#define SERIAL_Z_PROBE "z_probe: " #define SERIAL_ACTIVE_DRIVER "Active Driver: "
#define SERIAL_E_MIN "e_min: " #define SERIAL_ACTIVE_EXTRUDER "Active Extruder: "
#define SERIAL_ERR_MATERIAL_INDEX "M145 S<index> out of range (0-2)" #define SERIAL_ACTIVE_COLOR "Active Color: "
#define SERIAL_ERR_M428_TOO_FAR "Too far from reference point" #define SERIAL_X_MIN "x_min: "
#define SERIAL_M119_REPORT "Reporting endstop status" #define SERIAL_X_MAX "x_max: "
#define SERIAL_ENDSTOP_HIT "TRIGGERED" #define SERIAL_Y_MIN "y_min: "
#define SERIAL_ENDSTOP_OPEN "NOT TRIGGERED" #define SERIAL_Y_MAX "y_max: "
#define SERIAL_HOTEND_OFFSET "Hotend offsets:" #define SERIAL_Z_MIN "z_min: "
#define SERIAL_EMPTY_PLANE "Autolevel can only be execute on an actual plane, make sure width and height are not 0!" #define SERIAL_Z_MAX "z_max: "
#define SERIAL_Z2_MAX "z2_max: "
#define SERIAL_FILRUNOUT_PIN "filament_runout_pin: " #define SERIAL_Z_PROBE "z_probe: "
#define SERIAL_E_MIN "e_min: "
#define SERIAL_SD_CANT_OPEN_SUBDIR "Cannot open subdir" #define SERIAL_ERR_MATERIAL_INDEX "M145 S<index> out of range (0-2)"
#define SERIAL_SD_INIT_FAIL "SD init fail" #define SERIAL_ERR_M428_TOO_FAR "Too far from reference point"
#define SERIAL_SD_VOL_INIT_FAIL "volume.init failed" #define SERIAL_M119_REPORT "Reporting endstop status"
#define SERIAL_SD_OPENROOT_FAIL "openRoot failed" #define SERIAL_ENDSTOP_HIT "TRIGGERED"
#define SERIAL_SD_CARD_OK "SD card ok" #define SERIAL_ENDSTOP_OPEN "NOT TRIGGERED"
#define SERIAL_SD_WORKDIR_FAIL "workDir open failed" #define SERIAL_HOTEND_OFFSET "Hotend offsets:"
#define SERIAL_SD_OPEN_FILE_FAIL "open failed, File: " #define SERIAL_EMPTY_PLANE "Autolevel can only be execute on an actual plane, make sure width and height are not 0!"
#define SERIAL_SD_FILE_OPENED "File opened: " #define SERIAL_FILRUNOUT_PIN "filament_runout_pin: "
#define SERIAL_SD_SIZE " Size: " #define SERIAL_SD_CANT_OPEN_SUBDIR "Cannot open subdir"
#define SERIAL_SD_FILE_SELECTED "File selected" #define SERIAL_SD_INIT_FAIL "SD init fail"
#define SERIAL_SD_WRITE_TO_FILE "Writing to file: " #define SERIAL_SD_VOL_INIT_FAIL "volume.init failed"
#define SERIAL_SD_PRINTING_BYTE "SD printing byte " #define SERIAL_SD_OPENROOT_FAIL "openRoot failed"
#define SERIAL_SD_NOT_PRINTING "Not SD printing" #define SERIAL_SD_CARD_OK "SD card ok"
#define SERIAL_SD_ERR_WRITE_TO_FILE "error writing to file" #define SERIAL_SD_WORKDIR_FAIL "workDir open failed"
#define SERIAL_SD_CANT_ENTER_SUBDIR "Cannot enter subdir: " #define SERIAL_SD_OPEN_FILE_FAIL "open failed, File: "
#define SERIAL_SD_FILE_DELETED "File deleted:" #define SERIAL_SD_FILE_OPENED "File opened: "
#define SERIAL_SD_SLASH "/" #define SERIAL_SD_SIZE " Size: "
#define SERIAL_SD_FILE_DELETION_ERR "Deletion failed, File: " #define SERIAL_SD_FILE_SELECTED "File selected"
#define SERIAL_SD_MAX_DEPTH "trying to call sub-gcode files with too many levels. MAX level is:" #define SERIAL_SD_WRITE_TO_FILE "Writing to file: "
#define SERIAL_SD_PRINTING_BYTE "SD printing byte "
#define SERIAL_STEPPER_TOO_HIGH "Steprate too high: " #define SERIAL_SD_NOT_PRINTING "Not SD printing"
#define SERIAL_ENDSTOPS_HIT "endstops hit: " #define SERIAL_SD_ERR_WRITE_TO_FILE "error writing to file"
#define SERIAL_ERR_COLD_EXTRUDE_STOP "cold extrusion prevented" #define SERIAL_SD_CANT_ENTER_SUBDIR "Cannot enter subdir: "
#define SERIAL_ERR_LONG_EXTRUDE_STOP "too long extrusion prevented" #define SERIAL_SD_FILE_DELETED "File deleted:"
#define SERIAL_MICROSTEP_MS1_MS2 "MS1,MS2 Pins" #define SERIAL_SD_SLASH "/"
#define SERIAL_MICROSTEP_X "X:" #define SERIAL_SD_FILE_DELETION_ERR "Deletion failed, File: "
#define SERIAL_MICROSTEP_Y "Y:" #define SERIAL_SD_MAX_DEPTH "trying to call sub-gcode files with too many levels. MAX level is:"
#define SERIAL_MICROSTEP_Z "Z:"
#define SERIAL_MICROSTEP_E0 "E0:" #define SERIAL_STEPPER_TOO_HIGH "Steprate too high: "
#define SERIAL_MICROSTEP_E1 "E1:" #define SERIAL_ENDSTOPS_HIT "endstops hit: "
#define SERIAL_ERR_COLD_EXTRUDE_STOP "cold extrusion prevented"
#define SERIAL_ERR_EEPROM_WRITE "Error writing to EEPROM!" #define SERIAL_ERR_LONG_EXTRUDE_STOP "too long extrusion prevented"
#define SERIAL_MICROSTEP_MS1_MS2 "MS1,MS2 Pins"
#define SERIAL_MICROSTEP_X "X:"
#define SERIAL_MICROSTEP_Y "Y:"
#define SERIAL_MICROSTEP_Z "Z:"
#define SERIAL_MICROSTEP_E0 "E0:"
#define SERIAL_MICROSTEP_E1 "E1:"
#define SERIAL_ERR_EEPROM_WRITE "Error writing to EEPROM!"
// temperature.cpp strings // temperature.cpp strings
#define SERIAL_PID_AUTOTUNE "PID Autotune" #define SERIAL_PID_AUTOTUNE "PID Autotune"
#define SERIAL_PID_AUTOTUNE_START SERIAL_PID_AUTOTUNE " start" #define SERIAL_PID_AUTOTUNE_START SERIAL_PID_AUTOTUNE " start"
#define SERIAL_PID_AUTOTUNE_FAILED SERIAL_PID_AUTOTUNE " failed!" #define SERIAL_PID_AUTOTUNE_FAILED SERIAL_PID_AUTOTUNE " failed!"
#define SERIAL_PID_BAD_EXTRUDER_NUM SERIAL_PID_AUTOTUNE_FAILED " Bad extruder number" #define SERIAL_PID_BAD_EXTRUDER_NUM SERIAL_PID_AUTOTUNE_FAILED " Bad extruder number"
#define SERIAL_PID_TEMP_TOO_HIGH SERIAL_PID_AUTOTUNE_FAILED " Temperature too high" #define SERIAL_PID_TEMP_TOO_HIGH SERIAL_PID_AUTOTUNE_FAILED " Temperature too high"
#define SERIAL_PID_TIMEOUT SERIAL_PID_AUTOTUNE_FAILED " timeout" #define SERIAL_PID_TIMEOUT SERIAL_PID_AUTOTUNE_FAILED " timeout"
#define SERIAL_BIAS " bias: " #define SERIAL_BIAS " bias: "
#define SERIAL_D " d: " #define SERIAL_D " d: "
#define SERIAL_T_MIN " min: " #define SERIAL_T_MIN " min: "
#define SERIAL_T_MAX " max: " #define SERIAL_T_MAX " max: "
#define SERIAL_KU " Ku: " #define SERIAL_KU " Ku: "
#define SERIAL_TU " Tu: " #define SERIAL_TU " Tu: "
#define SERIAL_CLASSIC_PID " Classic PID " #define SERIAL_CLASSIC_PID " Classic PID "
#define SERIAL_KP "Kp: " #define SERIAL_KP "Kp: "
#define SERIAL_KI " Ki: " #define SERIAL_KI " Ki: "
#define SERIAL_KD " Kd: " #define SERIAL_KD " Kd: "
#define SERIAL_B "B:" #define SERIAL_B "B:"
#define SERIAL_T "T:" #define SERIAL_T "T:"
#define SERIAL_AT "@" #define SERIAL_AT "@"
#define SERIAL_BAT "B@:" #define SERIAL_BAT "B@:"
#define SERIAL_W "W:" #define SERIAL_W "W:"
#define SERIAL_PID_AUTOTUNE_FINISHED SERIAL_PID_AUTOTUNE " finished! Put the last Kp, Ki and Kd constants from above into Configuration.h or send command M500 for save in EEPROM the new value!" #define SERIAL_PID_AUTOTUNE_FINISHED SERIAL_PID_AUTOTUNE " finished! Put the last Kp, Ki and Kd constants from above into Configuration.h or send command M500 for save in EEPROM the new value!"
#define SERIAL_PID_DEBUG " PID_DEBUG " #define SERIAL_PID_DEBUG " PID_DEBUG "
#define SERIAL_PID_DEBUG_INPUT ": Input " #define SERIAL_PID_DEBUG_INPUT ": Input "
#define SERIAL_PID_DEBUG_OUTPUT " Output " #define SERIAL_PID_DEBUG_OUTPUT " Output "
#define SERIAL_PID_DEBUG_PTERM " pTerm " #define SERIAL_PID_DEBUG_PTERM " pTerm "
#define SERIAL_PID_DEBUG_ITERM " iTerm " #define SERIAL_PID_DEBUG_ITERM " iTerm "
#define SERIAL_PID_DEBUG_DTERM " dTerm " #define SERIAL_PID_DEBUG_DTERM " dTerm "
#define SERIAL_PID_DEBUG_CTERM " cTerm " #define SERIAL_PID_DEBUG_CTERM " cTerm "
#define SERIAL_INVALID_EXTRUDER_NUM " - Invalid extruder number !" #define SERIAL_INVALID_EXTRUDER_NUM " - Invalid extruder number !"
#define SERIAL_HEATER_BED "bed" #define SERIAL_HEATER_BED "bed"
#define SERIAL_STOPPED_HEATER ", system stopped! Heater_ID: " #define SERIAL_STOPPED_HEATER ", system stopped! Heater_ID: "
//#define SERIAL_REDUNDANCY "Heater switched off. Temperature difference between temp sensors is too high !" //#define SERIAL_REDUNDANCY "Heater switched off. Temperature difference between temp sensors is too high !"
#define SERIAL_T_HEATING_FAILED "Heating failed" #define SERIAL_T_HEATING_FAILED "Heating failed"
#define SERIAL_T_THERMAL_RUNAWAY "Thermal Runaway" #define SERIAL_T_THERMAL_RUNAWAY "Thermal Runaway"
#define SERIAL_T_MAXTEMP "MAXTEMP triggered" #define SERIAL_T_MAXTEMP "MAXTEMP triggered"
#define SERIAL_T_MINTEMP "MINTEMP triggered" #define SERIAL_T_MINTEMP "MINTEMP triggered"
// Endstop // Endstop
#define SERIAL_ENDSTOP_X " X=" #define SERIAL_ENDSTOP_X " X="
#define SERIAL_ENDSTOP_Y " Y=" #define SERIAL_ENDSTOP_Y " Y="
#define SERIAL_ENDSTOP_Z " Z=" #define SERIAL_ENDSTOP_Z " Z="
#define SERIAL_ENDSTOP_E " E=" #define SERIAL_ENDSTOP_E " E="
#define SERIAL_ENDSTOP_PROBE " PROBE=" #define SERIAL_ENDSTOP_PROBE " PROBE="
// Debug // Debug
#define SERIAL_DEBUG_ECHO "DEBUG ECHO ENABLED" #define SERIAL_DEBUG_ECHO "DEBUG ECHO ENABLED"
#define SERIAL_DEBUG_INFO "DEBUG INFO ENABLED" #define SERIAL_DEBUG_INFO "DEBUG INFO ENABLED"
#define SERIAL_DEBUG_ERRORS "DEBUG ERRORS ENABLED" #define SERIAL_DEBUG_ERRORS "DEBUG ERRORS ENABLED"
#define SERIAL_DEBUG_DRYRUN "DEBUG DRYRUN ENABLED" #define SERIAL_DEBUG_DRYRUN "DEBUG DRYRUN ENABLED"
#define SERIAL_DEBUG "DEBUG ENABLED" #define SERIAL_DEBUG "DEBUG ENABLED"
//other //other
#define SERIAL_ERR_HOMING_DIV "The Homing Bump Feedrate Divisor cannot be less than 1" #define SERIAL_ERR_HOMING_DIV "The Homing Bump Feedrate Divisor cannot be less than 1"
#define SERIAL_BED_LEVELLING_BED "Bed" #define SERIAL_BED_LEVELLING_BED "Bed"
#define SERIAL_BED_LEVELLING_X " X: " #define SERIAL_BED_LEVELLING_X " X: "
#define SERIAL_BED_LEVELLING_Y " Y: " #define SERIAL_BED_LEVELLING_Y " Y: "
#define SERIAL_BED_LEVELLING_Z " Z: " #define SERIAL_BED_LEVELLING_Z " Z: "
#if LANGUAGE_CHOICE == 1 // English #if LANGUAGE_CHOICE == 1 // English
#include "language_en.h" #include "language_en.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment