Skip to content

M
MarlinKimbra
Commit 521315e2 authored by MagoKimbra's avatar MagoKimbra
Browse files
Options

Update 4.2.2

parent 9c53b44c
Hide whitespace changes
Inline Side-by-side
Showing with 2569 additions and 2154 deletions
Documentation/GCodes.md
View file @ 521315e2
......@@ -27,7 +27,7 @@
* M3 - S[0-255] Put output in laser beam control
* M4 - Turn on laser beam
* M5 - Turn off laser beam
* M11 - Start printer for pause mode
* M11 - Start/Stop printing serial mode
* M17 - Enable/Power all stepper motors
* M18 - Disable all stepper motors; same as M84
* M20 - List SD card
......@@ -107,6 +107,7 @@
* M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to.
* M503 - print the current settings (from memory not from EEPROM)
* M540 - Use S[0|1] to enable or disable the stop SD card print on endstop hit (requires ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED)
* M595 - Set hotend AD595 offset and gain
* M600 - Pause for filament change X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal]
* M605 - Set dual x-carriage movement mode: Smode [ X<duplication x-offset> Rduplication temp offset ]
* M666 - Set z probe offset or Endstop and delta geometry adjustment. M666 L for list command
......
Documentation/changelog.md
View file @ 521315e2
### Version 4.2.2
* Added the possibility to invert the logic for lcd buttons.
* Language files bugfix.
* Fixed a freeze problem during write operations to the SD.
* Re-enabled by default SDSUPPORT for DISCOUNT displays.
### Version 4.2.1
* SDSUPPORT disabled by default.
* General BugFix.
### Version 4.2.0
* Add Dual Extruder DONDOLO
* Add Dual Extruder DONDOLO.
* Add PID Extrusion Rate Kc in percent.
* New configuration systems (Now you can create a separate file with all configuration and use it in you FW update)
* New namings for file
* Added more documentation inside configuration file
* More checks for feature incompatibility during compilation
* Codeclean
* General bugfix
* Removed legacy support for old configuration (Do not use your old configuration files, namings and position for configuration has changed)
* New configuration systems (Now you can create a separate file with all configuration and use it in you FW update).
* New namings for file.
* Added more documentation inside configuration file.
* More checks for feature incompatibility during compilation.
* Codeclean.
* General bugfix.
* Removed legacy support for old configuration (Do not use your old configuration files, namings and position for configuration has changed).
### Version 4.1.5
* Added dot for SD write operation
* Added statistics menu
* Added an overall configuration file
* Added M70 gcode for calibrate AC721 current sensor
* Added documentation for calibrate AC721 current sensor
* Critical stepper motor frequency bugfix
* Added dot for SD write operation.
* Added statistics menu.
* Added an overall configuration file.
* Added M70 gcode for calibrate AC721 current sensor.
* Added documentation for calibrate AC721 current sensor.
* Critical stepper motor frequency bugfix.
* Introduced more intuitive menu tree.
* Added a menu option to fix loose steps from LCD
* Improved italian translation
* Added a menu option to fix loose steps from LCD.
* Improved italian translation.
* G28 gcode now support the "B" flag that enable you to come back to the last position of the axis before the homing command. (Used for fix loose steps)
* Implemented FAST_PWM_FAN and FAN_SOFT_PWM also for other fan that can be added in configuration_adv file.
* Added the ability to set a min speed to the fan that can be added in configuration_adv file.
* General bugfix
* General bugfix.
### Version 4.1.4
* Add support for Piggy Alligator board
......
MarlinKimbra/Configuration_Basic.h
View file @ 521315e2
......@@ -19,7 +19,7 @@
/***********************************************************************
********************** Serial comunication type ***********************
***********************************************************************/
// SERIAL_PORT selects which serial port should be used for communication with the host.
// SERIAL PORT selects which serial port should be used for communication with the host.
// This allows the connection of wireless adapters (for instance) to non-default port pins.
// Serial port 0 is still used by the Arduino bootloader regardless of this setting.
#define SERIAL_PORT 0
......
MarlinKimbra/Configuration_Cartesian.h
View file @ 521315e2
......@@ -214,7 +214,7 @@
/*****************************************************************************************
************************************** MBL or ABL ***************************************
/*****************************************************************************************
*****************************************************************************************
* *
* Manual Bed Leveling (MBL) or Auto Bed Leveling (ABL) settings *
* Set the rectangle in which to probe in MBL or ABL. *
......@@ -329,7 +329,7 @@
/*****************************************************************************************
******************************** Manual home positions **********************************
/*****************************************************************************************/
*****************************************************************************************/
// The position of the homing switches
//#define MANUAL_HOME_POSITIONS // If defined, MANUAL_*_HOME_POS below will be used
//#define BED_CENTER_AT_0_0 // If defined, the center of the bed is at (X=0, Y=0)
......
MarlinKimbra/Configuration_Feature.h
View file @ 521315e2
......@@ -67,6 +67,7 @@
* ADVANCED FEATURES:
* - Buffer stuff
* - Whatchdog
* - Start / Stop Gcode
*
* Basic-settings can be found in Configuration_Basic.h
* Mechanisms-settings can be found in Configuration_Xxxxxx.h (where Xxxxxx can be: Cartesian - Delta - Core - Scara)
......@@ -1051,6 +1052,8 @@
//#define LCD_SCREEN_ROT_180 //Rotate screen orientation for graphics display by 180 degree clockwise
//#define LCD_SCREEN_ROT_270 //Rotate screen orientation for graphics display by 270 degree clockwise
//#define INVERT_CLICK_BUTTON // Option for invert encoder button logic
//#define INVERT_BACK_BUTTON // Option for invert back button logic if avaible
//#define INVERT_ROTARY_SWITCH // Option for invert rotary encoder
#define ENCODER_RATE_MULTIPLIER // If defined, certain menu edit operations automatically multiply the steps when the encoder is moved quickly
#define ENCODER_10X_STEPS_PER_SEC 75 // If the encoder steps per sec exceeds this value, multiply steps moved x10 to quickly advance the value
......@@ -1086,13 +1089,13 @@
// The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD
// http://panucatt.com
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino
// REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino
//#define VIKI2
//#define miniVIKI
// This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/
//
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino
// REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino
//#define ELB_FULL_GRAPHIC_CONTROLLER
//#define SD_DETECT_INVERTED
......@@ -1107,7 +1110,7 @@
// The RepRapDiscount FULL GRAPHIC Smart Controller (quadratic white PCB)
// http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
//
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino
// REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino
//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
// The RepRapWorld REPRAPWORLD_KEYPAD v1.1
......@@ -1122,11 +1125,13 @@
// The MakerLab Mini Panel with graphic controller and SD support
// http://reprap.org/wiki/Mini_panel
// #define MINIPANEL
//#define MINIPANEL
// Nextion HMI panel
// ==> REMEMBER TO INSTALL Nextion library in your ARDUINO library folder. You can find it in Arduino\libraries\
// REMEMBER TO INSTALL Nextion library in your ARDUINO library folder. You can find it in Arduino/libraries/
//#define NEXTION
// For GFX Visualization enable Nextion GFX
//#define NEXTION_GFX
// I2C Panels
//#define LCD_I2C_SAINSMART_YWROBOT
......@@ -1144,7 +1149,7 @@
//#define LCD_I2C_VIKI
// SSD1306 OLED generic display support
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino
// REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino
//#define U8GLIB_SSD1306
// Shift register panels
......@@ -1493,4 +1498,19 @@
//#define WATCHDOG_RESET_MANUAL
/*****************************************************************************************/
/*****************************************************************************************
********************************* Start - Stop Gcode ************************************
*****************************************************************************************
* *
* Start - Stop Gcode use when Start or Stop printing width M11 command *
* *
*****************************************************************************************/
//#define START_GCODE
#define START_PRINTING_SCRIPT "G28\nG1 Z10 F8000"
//#define STOP_GCODE
#define STOP_PRINTING_SCRIPT "G28\nM107\nM104 T0 S0\nM140 S0\nM84\nM81"
/*****************************************************************************************/
#endif
MarlinKimbra/Configuration_Version.h
View file @ 521315e2
#ifndef CONFIGURATION_VERSION_H
#define CONFIGURATION_VERSION_H
/*
* This file is a placeholder for a file which could be distributed in an archive
* It takes the place of an automatically created "_Version.h" which is generated during the build process
*/
#define CONFIGURATION_VERSION_H
// #error "You must specify the following parameters related to your distribution"
#if true
#define SHORT_BUILD_VERSION "4.2.1 dev"
#define BUILD_VERSION "MarlinKimbra 4.2.2 dev"
#define SHORT_BUILD_VERSION "4.2.2 dev"
#define STRING_DISTRIBUTION_DATE __DATE__ " " __TIME__ // build date and time
// It might also be appropriate to define a location where additional information can be found
#define SOURCE_CODE_URL "https://github.com/MagoKimbra/MarlinKimbra"
#endif
#endif
\ No newline at end of file
MarlinKimbra/Marlin_main.cpp
View file @ 521315e2
......@@ -118,7 +118,7 @@
* M3 - Put S<value> in laser beam control
* M4 - Turn on laser beam
* M5 - Turn off laser beam
* M11 - Start printer for pause mode
* M11 - Start/Stop printing serial mode
* M17 - Enable/Power all stepper motors
* M18 - Disable all stepper motors; same as M84
* M20 - List SD card
......@@ -251,6 +251,7 @@
#endif
bool Running = true;
bool Printing = false;
uint8_t debugLevel = DEBUG_INFO|DEBUG_ERRORS;
......@@ -300,7 +301,7 @@ const int sensitive_pins[] = SENSITIVE_PINS; ///< Sensitive pin list for M42
// Inactivity shutdown
millis_t previous_cmd_ms = 0;
static millis_t max_inactive_time = 0;
static millis_t stepper_inactive_time = DEFAULT_STEPPER_DEACTIVE_TIME * 1000L;
static millis_t stepper_inactive_time = DEFAULT_STEPPER_DEACTIVE_TIME * 1000UL;
millis_t print_job_start_ms = 0; ///< Print job start time
millis_t print_job_stop_ms = 0; ///< Print job stop time
static uint8_t target_extruder;
......@@ -439,7 +440,6 @@ unsigned long printer_usage_seconds;
#if HAS(FILRUNOUT)
static bool filrunoutEnqueued = false;
bool printing = false;
#endif
#if ENABLED(SDSUPPORT)
......@@ -509,31 +509,29 @@ bool setTargetedHotend(int code);
#endif
#ifdef __AVR__ // HAL for Due
#if ENABLED(SDSUPPORT)
#include "SdFatUtil.h"
int freeMemory() { return SdFatUtil::FreeRam(); }
#else
extern "C" {
extern unsigned int __bss_end;
extern unsigned int __heap_start;
extern void *__brkval;
#if ENABLED(SDSUPPORT)
#include "SdFatUtil.h"
int freeMemory() { return SdFatUtil::FreeRam(); }
#else
extern "C" {
extern unsigned int __bss_end;
extern unsigned int __heap_start;
extern void *__brkval;
int freeMemory() {
int free_memory;
int freeMemory() {
int free_memory;
if ((int)__brkval == 0)
free_memory = ((int)&free_memory) - ((int)&__bss_end);
else
free_memory = ((int)&free_memory) - ((int)__brkval);
if ((int)__brkval == 0)
free_memory = ((int)&free_memory) - ((int)&__bss_end);
else
free_memory = ((int)&free_memory) - ((int)__brkval);
return free_memory;
return free_memory;
}
}
}
#endif // !SDSUPPORT
#endif // !SDSUPPORT
#endif
#if ENABLED(M100_FREE_MEMORY_WATCHER)
// top_of_stack() returns the location of a variable on its stack frame. The value returned is above
// the stack once the function returns to the caller.
......@@ -628,7 +626,7 @@ bool enqueuecommand(const char* cmd) {
// This is dangerous if a mixing of serial and this happens
char* command = command_queue[cmd_queue_index_w];
strcpy(command, cmd);
ECHO_SMV(DB, MSG_ENQUEUEING, command);
ECHO_SMV(DB, SERIAL_ENQUEUEING, command);
ECHO_EM("\"");
cmd_queue_index_w = (cmd_queue_index_w + 1) % BUFSIZE;
commands_in_queue++;
......@@ -671,7 +669,6 @@ bool enqueuecommand(const char* cmd) {
}
#endif
#if HAS(PHOTOGRAPH)
void setup_photpin() {
OUT_WRITE(PHOTOGRAPH_PIN, LOW);
......@@ -746,6 +743,7 @@ bool enqueuecommand(const char* cmd) {
#endif
}
#endif
/**
* Led init
*/
......@@ -762,15 +760,14 @@ bool enqueuecommand(const char* cmd) {
#endif
}
#endif
/**
* Led init
*/
#if HAS(Z_PROBE_SLED)
void setup_zprobesled() {
pinMode(SLED_PIN, OUTPUT);
digitalWrite(SLED_PIN, LOW); // turn it off
}
#endif
/**
* Stepper Reset (RigidBoard, et.al.)
*/
......@@ -825,22 +822,22 @@ void setup() {
// Check startup - does nothing if bootloader sets MCUSR to 0
byte mcu = MCUSR;
if (mcu & 1) ECHO_EM(MSG_POWERUP);
if (mcu & 2) ECHO_EM(MSG_EXTERNAL_RESET);
if (mcu & 4) ECHO_EM(MSG_BROWNOUT_RESET);
if (mcu & 8) ECHO_EM(MSG_WATCHDOG_RESET);
if (mcu & 32) ECHO_EM(MSG_SOFTWARE_RESET);
if (mcu & 1) ECHO_EM(SERIAL_POWERUP);
if (mcu & 2) ECHO_EM(SERIAL_EXTERNAL_RESET);
if (mcu & 4) ECHO_EM(SERIAL_BROWNOUT_RESET);
if (mcu & 8) ECHO_EM(SERIAL_WATCHDOG_RESET);
if (mcu & 32) ECHO_EM(SERIAL_SOFTWARE_RESET);
MCUSR = 0;
ECHO_LM(DB, MSG_MARLIN " " BUILD_VERSION);
#if ENABLED(STRING_DISTRIBUTION_DATE) && ENABLED(STRING_CONFIG_H_AUTHOR)
ECHO_LM(DB, MSG_CONFIGURATION_VER STRING_DISTRIBUTION_DATE MSG_AUTHOR STRING_CONFIG_H_AUTHOR);
ECHO_LM(DB, MSG_COMPILED __DATE__);
ECHO_LM(DB, SERIAL_CONFIGURATION_VER STRING_DISTRIBUTION_DATE SERIAL_AUTHOR STRING_CONFIG_H_AUTHOR);
ECHO_LM(DB, SERIAL_COMPILED __DATE__);
#endif // STRING_DISTRIBUTION_DATE
ECHO_SMV(DB, MSG_FREE_MEMORY, freeMemory());
ECHO_EMV(MSG_PLANNER_BUFFER_BYTES, (int)sizeof(block_t)*BLOCK_BUFFER_SIZE);
ECHO_SMV(DB, SERIAL_FREE_MEMORY, freeMemory());
ECHO_EMV(SERIAL_PLANNER_BUFFER_BYTES, (int)sizeof(block_t)*BLOCK_BUFFER_SIZE);
#if ENABLED(SDSUPPORT)
for (int8_t i = 0; i < BUFSIZE; i++) fromsd[i] = false;
......@@ -918,7 +915,7 @@ void loop() {
if (strstr_P(command, PSTR("M29"))) {
// M29 closes the file
card.closeFile();
ECHO_EM(MSG_FILE_SAVED);
ECHO_EM(SERIAL_FILE_SAVED);
}
else {
// Write the string from the read buffer to SD
......@@ -1015,25 +1012,25 @@ void get_command() {
}
gcode_N = strtol(npos + 1, NULL, 10);
if (gcode_N != gcode_LastN + 1 && !M110) {
gcode_line_error(PSTR(MSG_ERR_LINE_NO));
gcode_line_error(PSTR(SERIAL_ERR_LINE_NO));
return;
}
if (apos) {
byte checksum = 0, count = 0;
while (command[count] != '*') checksum ^= command[count++];
if (strtol(apos + 1, NULL, 10) != checksum) {
gcode_line_error(PSTR(MSG_ERR_CHECKSUM_MISMATCH));
gcode_line_error(PSTR(SERIAL_ERR_CHECKSUM_MISMATCH));
return;
}
// if no errors, continue parsing
} else if (npos == command) {
gcode_line_error(PSTR(MSG_ERR_NO_CHECKSUM));
gcode_line_error(PSTR(SERIAL_ERR_NO_CHECKSUM));
return;
}
gcode_LastN = gcode_N;
// if no errors, continue parsing
} else if (apos) { // No '*' without 'N'
gcode_line_error(PSTR(MSG_ERR_NO_LINENUMBER_WITH_CHECKSUM), false);
gcode_line_error(PSTR(SERIAL_ERR_NO_LINENUMBER_WITH_CHECKSUM), false);
return;
}
......@@ -1047,7 +1044,7 @@ void get_command() {
case 1:
case 2:
case 3:
ECHO_LM(ER, MSG_ERR_STOPPED);
ECHO_LM(ER, SERIAL_ERR_STOPPED);
LCD_MESSAGEPGM(MSG_STOPPED);
break;
}
......@@ -1092,7 +1089,7 @@ void get_command() {
serial_count >= (MAX_CMD_SIZE - 1) || n == -1
) {
if (card.eof()) {
ECHO_EM(MSG_FILE_PRINTED);
ECHO_EM(SERIAL_FILE_PRINTED);
print_job_stop_ms = millis();
char time[30];
millis_t t = (print_job_stop_ms - print_job_start_ms) / 1000;
......@@ -1299,7 +1296,7 @@ inline void set_homing_bump_feedrate(AxisEnum axis) {
int hbd = homing_bump_divisor[axis];
if (hbd < 1) {
hbd = 10;
ECHO_LM(ER, MSG_ERR_HOMING_DIV);
ECHO_LM(ER, SERIAL_ERR_HOMING_DIV);
}
feedrate = homing_feedrate[axis] / hbd;
}
......@@ -1557,10 +1554,10 @@ static void clean_up_after_endstop_move() {
#endif
if (verbose_level > 2) {
ECHO_SM(DB, MSG_BED_LEVELLING_BED);
ECHO_MV(MSG_BED_LEVELLING_X, x, 3);
ECHO_MV(MSG_BED_LEVELLING_Y, y, 3);
ECHO_EMV(MSG_BED_LEVELLING_Z, measured_z, 3);
ECHO_SM(DB, SERIAL_BED_LEVELLING_BED);
ECHO_MV(SERIAL_BED_LEVELLING_X, x, 3);
ECHO_MV(SERIAL_BED_LEVELLING_Y, y, 3);
ECHO_EMV(SERIAL_BED_LEVELLING_Z, measured_z, 3);
}
if (debugLevel & DEBUG_INFO) ECHO_LM(DB, "<<< probe_pt");
......@@ -2856,11 +2853,11 @@ static void clean_up_after_endstop_move() {
#if HAS(TEMP_0) || HAS(TEMP_BED) || ENABLED(HEATER_0_USES_MAX6675)
void print_heaterstates() {
#if HAS(TEMP_0) || ENABLED(HEATER_0_USES_MAX6675)
ECHO_MV(MSG_T, degHotend(target_extruder), 1);
ECHO_MV(SERIAL_T, degHotend(target_extruder), 1);
ECHO_MV(" /", degTargetHotend(target_extruder), 1);
#endif
#if HAS(TEMP_BED)
ECHO_MV(" " MSG_B, degBed(), 1);
ECHO_MV(" " SERIAL_B, degBed(), 1);
ECHO_MV(" /", degTargetBed(), 1);
#endif
#if HOTENDS > 1
......@@ -2871,14 +2868,14 @@ static void clean_up_after_endstop_move() {
}
#endif
#if HAS(TEMP_BED)
ECHO_M(" " MSG_BAT);
ECHO_M(" " SERIAL_BAT);
#if ENABLED(BED_WATTS)
ECHO_VM((BED_WATTS * getHeaterPower(-1)) / 127, "W");
#else
ECHO_V(getHeaterPower(-1));
#endif
#endif
ECHO_M(" " MSG_AT ":");
ECHO_M(" " SERIAL_AT ":");
#if ENABLED(HOTEND_WATTS)
ECHO_VM((HOTEND_WATTS * getHeaterPower(target_extruder)) / 127, "W");
#else
......@@ -2886,7 +2883,7 @@ static void clean_up_after_endstop_move() {
#endif
#if HOTENDS > 1
for (int8_t h = 0; h < HOTENDS; ++h) {
ECHO_MV(" " MSG_AT, h);
ECHO_MV(" " SERIAL_AT, h);
ECHO_C(':');
#if ENABLED(EXTRUDER_WATTS)
ECHO_VM((EXTRUDER_WATTS * getHeaterPower(h)) / 127. "W");
......@@ -2922,7 +2919,7 @@ inline void wait_heater() {
/* continue to loop until we have reached the target temp
_and_ until TEMP_RESIDENCY_TIME hasn't passed since we reached it */
while((!cancel_heatup)&&((residency_start_ms == -1) ||
(residency_start_ms >= 0 && (((unsigned int) (millis() - residency_start_ms)) < (TEMP_RESIDENCY_TIME * 1000UL)))) )
(residency_start_ms >= 0 && (((millis_t) (millis() - residency_start_ms)) < (TEMP_RESIDENCY_TIME * 1000UL)))) )
#else
while ( target_direction ? (isHeatingHotend(target_extruder)) : (isCoolingHotend(target_extruder)&&(no_wait_for_cooling==false)) )
#endif //TEMP_RESIDENCY_TIME
......@@ -2933,7 +2930,7 @@ inline void wait_heater() {
print_heaterstates();
#endif
#if ENABLED(TEMP_RESIDENCY_TIME)
ECHO_M(" " MSG_W);
ECHO_M(" " SERIAL_W);
if (residency_start_ms > -1) {
temp_ms = ((TEMP_RESIDENCY_TIME * 1000UL) - (millis() - residency_start_ms)) / 1000UL;
ECHO_EV(temp_ms);
......@@ -2976,7 +2973,6 @@ inline void wait_bed() {
millis_t ms = millis();
if (ms > temp_ms + 1000UL) { //Print Temp Reading every 1 second while heating up.
temp_ms = ms;
float tt = degHotend(active_extruder);
#if HAS(TEMP_0) || HAS(TEMP_BED) || ENABLED(HEATER_0_USES_MAX6675)
print_heaterstates();
ECHO_E;
......@@ -3025,7 +3021,7 @@ void gcode_get_destination() {
}
void unknown_command_error() {
ECHO_SMV(DB, MSG_UNKNOWN_COMMAND, current_command);
ECHO_SMV(DB, SERIAL_UNKNOWN_COMMAND, current_command);
ECHO_M("\"\n");
}
......@@ -4285,7 +4281,6 @@ inline void gcode_G60() {
inline void gcode_G61() {
if (!pos_saved) return;
bool make_move = false;
int slot = 0;
if (code_seen('S')) slot = code_value();
......@@ -4424,21 +4419,38 @@ inline void gcode_G92() {
}
#endif //LASERBEAM
#if HAS(FILRUNOUT)
/**
* M11: Start printing
*/
inline void gcode_M11() {
printing = true;
filrunoutEnqueued = false;
ECHO_LM(DB, "Start Printing, pause pin active.");
ECHO_S(RESUME);
ECHO_E;
/**
* M11: Start/Stop printing serial mode
*/
inline void gcode_M11() {
if (Printing) {
Printing = false;
ECHO_LM(DB, "Stop Printing");
#if ENABLED(STOP_GCODE)
enqueuecommands_P(PSTR(STOP_PRINTING_SCRIPT));
#endif
#if HAS(FILRUNOUT)
filrunoutEnqueued = false;
ECHO_LM(DB, "Filament runout deactivated.");
#endif
}
else {
Printing = true;
ECHO_LM(DB, "Start Printing");
#if ENABLED(START_GCODE)
enqueuecommands_P(PSTR(START_PRINTING_SCRIPT));
#endif
#if HAS(FILRUNOUT)
filrunoutEnqueued = false;
ECHO_LM(DB, "Filament runout activated.");
ECHO_S(RESUME);
ECHO_E;
#endif
#if HAS(POWER_CONSUMPTION_SENSOR)
startpower = power_consumption_hour;
#endif
}
#endif
}
/**
* M17: Enable power on all stepper motors
......@@ -4454,9 +4466,9 @@ inline void gcode_M17() {
* M20: List SD card to serial output
*/
inline void gcode_M20() {
ECHO_EM(MSG_BEGIN_FILE_LIST);
ECHO_EM(SERIAL_BEGIN_FILE_LIST);
card.ls();
ECHO_EM(MSG_END_FILE_LIST);
ECHO_EM(SERIAL_END_FILE_LIST);
}
/**
......@@ -5211,7 +5223,7 @@ inline void gcode_M105() {
ECHO_S(OK);
print_heaterstates();
#else // HASNT(TEMP_0) && HASNT(TEMP_BED)
ECHO_LM(ER, MSG_ERR_NO_THERMISTORS);
ECHO_LM(ER, SERIAL_ERR_NO_THERMISTORS);
#endif
ECHO_E;
......@@ -5269,14 +5281,14 @@ inline void gcode_M109() {
inline void gcode_M111() {
debugLevel = code_seen('S') ? code_value_short() : DEBUG_INFO|DEBUG_COMMUNICATION;
if (debugLevel & DEBUG_ECHO) ECHO_LM(DB, MSG_DEBUG_ECHO);
if (debugLevel & DEBUG_INFO) ECHO_LM(DB, MSG_DEBUG_INFO);
//if (debugLevel & DEBUG_ERRORS) ECHO_LM(DB, MSG_DEBUG_ERRORS);
if (debugLevel & DEBUG_ECHO) ECHO_LM(DB, SERIAL_DEBUG_ECHO);
if (debugLevel & DEBUG_INFO) ECHO_LM(DB, SERIAL_DEBUG_INFO);
//if (debugLevel & DEBUG_ERRORS) ECHO_LM(DB, SERIAL_DEBUG_ERRORS);
if (debugLevel & DEBUG_DRYRUN) {
ECHO_LM(DB, MSG_DEBUG_DRYRUN);
ECHO_LM(DB, SERIAL_DEBUG_DRYRUN);
disable_all_heaters();
}
if (debugLevel & DEBUG_DEBUG) ECHO_LM(DB, MSG_DEBUG);
if (debugLevel & DEBUG_DEBUG) ECHO_LM(DB, SERIAL_DEBUG);
}
/**
......@@ -5294,7 +5306,7 @@ inline void gcode_M114() {
ECHO_MV(" Z:", current_position[Z_AXIS]);
ECHO_MV(" E:", current_position[E_AXIS]);
ECHO_MV(MSG_COUNT_X, st_get_position_mm(X_AXIS));
ECHO_MV(SERIAL_COUNT_X, st_get_position_mm(X_AXIS));
ECHO_MV(" Y:", st_get_position_mm(Y_AXIS));
ECHO_EMV(" Z:", st_get_position_mm(Z_AXIS));
......@@ -5317,7 +5329,7 @@ inline void gcode_M114() {
ECHO_MV(" Z:", current_position[Z_AXIS]);
ECHO_MV(" E:", current_position[E_AXIS]);
ECHO_MV(MSG_COUNT_X, st_get_position_mm(X_AXIS));
ECHO_MV(SERIAL_COUNT_X, st_get_position_mm(X_AXIS));
ECHO_MV(" Y:", st_get_position_mm(Y_AXIS));
ECHO_EMV(" Z:", st_get_position_mm(Z_AXIS));
......@@ -5339,7 +5351,7 @@ inline void gcode_M114() {
* M115: Capabilities string
*/
inline void gcode_M115() {
ECHO_M(MSG_M115_REPORT);
ECHO_M(SERIAL_M115_REPORT);
}
#if ENABLED(ULTIPANEL) || ENABLED(NEXTION)
......@@ -5357,36 +5369,36 @@ inline void gcode_M115() {
* M119: Output endstop states to serial output
*/
inline void gcode_M119() {
ECHO_LV(DB, MSG_M119_REPORT);
ECHO_LV(DB, SERIAL_M119_REPORT);
#if HAS(X_MIN)
ECHO_EMV(MSG_X_MIN, ((READ(X_MIN_PIN)^X_MIN_ENDSTOP_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
ECHO_EMV(SERIAL_X_MIN, ((READ(X_MIN_PIN)^X_MIN_ENDSTOP_INVERTING)?SERIAL_ENDSTOP_HIT:SERIAL_ENDSTOP_OPEN));
#endif
#if HAS(X_MAX)
ECHO_EMV(MSG_X_MAX, ((READ(X_MAX_PIN)^X_MAX_ENDSTOP_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
ECHO_EMV(SERIAL_X_MAX, ((READ(X_MAX_PIN)^X_MAX_ENDSTOP_INVERTING)?SERIAL_ENDSTOP_HIT:SERIAL_ENDSTOP_OPEN));
#endif
#if HAS(Y_MIN)
ECHO_EMV(MSG_Y_MIN, ((READ(Y_MIN_PIN)^Y_MIN_ENDSTOP_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
ECHO_EMV(SERIAL_Y_MIN, ((READ(Y_MIN_PIN)^Y_MIN_ENDSTOP_INVERTING)?SERIAL_ENDSTOP_HIT:SERIAL_ENDSTOP_OPEN));
#endif
#if HAS(Y_MAX)
ECHO_EMV(MSG_Y_MAX, ((READ(Y_MAX_PIN)^Y_MAX_ENDSTOP_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
ECHO_EMV(SERIAL_Y_MAX, ((READ(Y_MAX_PIN)^Y_MAX_ENDSTOP_INVERTING)?SERIAL_ENDSTOP_HIT:SERIAL_ENDSTOP_OPEN));
#endif
#if HAS(Z_MIN)
ECHO_EMV(MSG_Z_MIN, ((READ(Z_MIN_PIN)^Z_MIN_ENDSTOP_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
ECHO_EMV(SERIAL_Z_MIN, ((READ(Z_MIN_PIN)^Z_MIN_ENDSTOP_INVERTING)?SERIAL_ENDSTOP_HIT:SERIAL_ENDSTOP_OPEN));
#endif
#if HAS(Z_MAX)
ECHO_EMV(MSG_Z_MAX, ((READ(Z_MAX_PIN)^Z_MAX_ENDSTOP_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
ECHO_EMV(SERIAL_Z_MAX, ((READ(Z_MAX_PIN)^Z_MAX_ENDSTOP_INVERTING)?SERIAL_ENDSTOP_HIT:SERIAL_ENDSTOP_OPEN));
#endif
#if HAS(Z2_MAX)
ECHO_EMV(MSG_Z2_MAX, ((READ(Z2_MAX_PIN)^Z2_MAX_ENDSTOP_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
ECHO_EMV(SERIAL_Z2_MAX, ((READ(Z2_MAX_PIN)^Z2_MAX_ENDSTOP_INVERTING)?SERIAL_ENDSTOP_HIT:SERIAL_ENDSTOP_OPEN));
#endif
#if HAS(Z_PROBE)
ECHO_EMV(MSG_Z_PROBE, ((READ(Z_PROBE_PIN)^Z_PROBE_ENDSTOP_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
ECHO_EMV(SERIAL_Z_PROBE, ((READ(Z_PROBE_PIN)^Z_PROBE_ENDSTOP_INVERTING)?SERIAL_ENDSTOP_HIT:SERIAL_ENDSTOP_OPEN));
#endif
#if HAS(E_MIN)
ECHO_EMV(MSG_E_MIN, ((READ(E_MIN_PIN)^E_MIN_ENDSTOP_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
ECHO_EMV(SERIAL_E_MIN, ((READ(E_MIN_PIN)^E_MIN_ENDSTOP_INVERTING)?SERIAL_ENDSTOP_HIT:SERIAL_ENDSTOP_OPEN));
#endif
#if HAS(FILRUNOUT)
ECHO_EMV(MSG_FILRUNOUT_PIN, ((READ(FILRUNOUT_PIN)^FILRUNOUT_PIN_INVERTING)?MSG_ENDSTOP_HIT:MSG_ENDSTOP_OPEN));
ECHO_EMV(SERIAL_FILRUNOUT_PIN, ((READ(FILRUNOUT_PIN)^FILRUNOUT_PIN_INVERTING)?SERIAL_ENDSTOP_HIT:SERIAL_ENDSTOP_OPEN));
#endif
ECHO_E;
}
......@@ -5458,7 +5470,7 @@ inline void gcode_M140() {
inline void gcode_M145() {
uint8_t material = code_seen('S') ? code_value_short() : 0;
if (material < 0 || material > 2) {
ECHO_SM(DB, MSG_ERR_MATERIAL_INDEX);
ECHO_SM(DB, SERIAL_ERR_MATERIAL_INDEX);
}
else {
int v;
......@@ -5768,7 +5780,7 @@ inline void gcode_M206() {
if (code_seen('Y')) hotend_offset[Y_AXIS][target_extruder] = code_value();
if (code_seen('Z')) hotend_offset[Z_AXIS][target_extruder] = code_value();
ECHO_SM(DB, MSG_HOTEND_OFFSET);
ECHO_SM(DB, SERIAL_HOTEND_OFFSET);
for (int e = 0; e < HOTENDS; e++) {
ECHO_MV(" ", hotend_offset[X_AXIS][e]);
ECHO_MV(",", hotend_offset[Y_AXIS][e]);
......@@ -6003,7 +6015,7 @@ inline void gcode_M226() {
ECHO_E;
}
else {
ECHO_LM(ER, MSG_INVALID_EXTRUDER);
ECHO_LM(ER, SERIAL_INVALID_EXTRUDER);
}
}
#endif // PIDTEMP
......@@ -6032,7 +6044,6 @@ inline void gcode_M226() {
int h = code_seen('H') ? code_value_short() : 0;
int c = code_seen('C') ? code_value_short() : 5;
float temp = code_seen('S') ? code_value() : (h < 0 ? 70.0 : 150.0);
if (h >= 0 && h < HOTENDS) target_extruder = h;
PID_autotune(temp, h, c);
}
......@@ -6172,7 +6183,7 @@ inline void gcode_M226() {
break;
#endif
default:
ECHO_LM(ER, MSG_INVALID_SOLENOID);
ECHO_LM(ER, SERIAL_INVALID_SOLENOID);
break;
}
}
......@@ -6316,7 +6327,7 @@ inline void gcode_M428() {
new_pos[i] = base;
}
else {
ECHO_LM(ER, MSG_ERR_M428_TOO_FAR);
ECHO_LM(ER, SERIAL_ERR_M428_TOO_FAR);
LCD_ALERTMESSAGEPGM("Err: Too far!");
#if HAS(BUZZER)
enqueuecommands_P(PSTR("M300 S40 P200"));
......@@ -6427,13 +6438,14 @@ inline void gcode_M503() {
return;
}
float lastpos[NUM_AXIS], fr60 = feedrate / 60;
float lastpos[NUM_AXIS];
filament_changing = true;
for (int i = 0; i < NUM_AXIS; i++)
lastpos[i] = destination[i] = current_position[i];
#if MECH(DELTA)
float fr60 = feedrate / 60;
#define RUNPLAN calculate_delta(destination); \
plan_buffer_line(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], destination[E_AXIS], fr60, active_extruder, active_driver);
#else
......@@ -6590,7 +6602,7 @@ inline void gcode_M503() {
case DXC_DUPLICATION_MODE:
if (code_seen('X')) duplicate_hotend_x_offset = max(code_value(), X2_MIN_POS - x_home_pos(0));
if (code_seen('R')) duplicate_extruder_temp_offset = code_value();
ECHO_SM(DB, MSG_HOTEND_OFFSET);
ECHO_SM(DB, SERIAL_HOTEND_OFFSET);
ECHO_MV(" ", hotend_offset[X_AXIS][0]);
ECHO_MV(",", hotend_offset[Y_AXIS][0]);
ECHO_MV(" ", duplicate_hotend_x_offset);
......@@ -6761,8 +6773,8 @@ inline void gcode_M907() {
if (code_seen('C')) {
csteps = code_value() * color_step_moltiplicator;
ECHO_LMV(DB, "csteps: ", csteps);
if (csteps < 0) colorstep(-csteps,false);
if (csteps > 0) colorstep(csteps,true);
if (csteps < 0) colorstep(-csteps, false);
if (csteps > 0) colorstep(csteps, true);
}
}
#endif
......@@ -6772,6 +6784,7 @@ inline void gcode_M907() {
*/
inline void gcode_M999() {
Running = true;
Printing = false;
lcd_reset_alert_level();
//gcode_LastN = Stopped_gcode_LastN;
FlushSerialRequestResend();
......@@ -6783,10 +6796,9 @@ inline void gcode_M999() {
* F[mm/min] Set the movement feedrate
*/
inline void gcode_T(uint8_t tmp_extruder) {
long csteps;
if (tmp_extruder >= EXTRUDERS) {
ECHO_SMV(DB, "T", (int)tmp_extruder);
ECHO_EM(" " MSG_INVALID_EXTRUDER);
ECHO_EM(" " SERIAL_INVALID_EXTRUDER);
}
else {
target_extruder = tmp_extruder;
......@@ -7012,9 +7024,10 @@ inline void gcode_T(uint8_t tmp_extruder) {
}
#endif // E0E1_CHOICE_PIN E0E2_CHOICE_PIN E1E3_CHOICE_PIN
active_extruder = target_extruder;
ECHO_LMV(DB, MSG_ACTIVE_DRIVER, active_driver);
ECHO_LMV(DB, MSG_ACTIVE_EXTRUDER, active_extruder);
ECHO_LMV(DB, SERIAL_ACTIVE_DRIVER, active_driver);
ECHO_LMV(DB, SERIAL_ACTIVE_EXTRUDER, active_extruder);
#elif ENABLED(NPR2)
long csteps;
st_synchronize(); // Finish all movement
if (old_color == 99) {
csteps = (color_position[target_extruder]) * color_step_moltiplicator;
......@@ -7026,7 +7039,7 @@ inline void gcode_T(uint8_t tmp_extruder) {
if (csteps > 0) colorstep(csteps, true);
old_color = active_extruder = target_extruder;
active_driver = 0;
ECHO_LMV(DB, MSG_ACTIVE_COLOR, (int)active_extruder);
ECHO_LMV(DB, SERIAL_ACTIVE_COLOR, (int)active_extruder);
#elif ENABLED(DONDOLO)
st_synchronize();
servo[DONDOLO_SERVO_INDEX].attach(0);
......@@ -7041,11 +7054,11 @@ inline void gcode_T(uint8_t tmp_extruder) {
active_extruder = target_extruder;
active_driver = 0;
set_stepper_direction(true);
ECHO_LMV(DB, MSG_ACTIVE_DRIVER, active_driver);
ECHO_LMV(DB, MSG_ACTIVE_EXTRUDER, active_extruder);
ECHO_LMV(DB, SERIAL_ACTIVE_DRIVER, active_driver);
ECHO_LMV(DB, SERIAL_ACTIVE_EXTRUDER, active_extruder);
#else
active_driver = active_extruder = target_extruder;
ECHO_LMV(DB, MSG_ACTIVE_EXTRUDER, active_extruder);
ECHO_LMV(DB, SERIAL_ACTIVE_EXTRUDER, active_extruder);
#endif // end MKR4 || NPR2 || DONDOLO
#endif // end no DUAL_X_CARRIAGE
......@@ -7192,12 +7205,9 @@ void process_next_command() {
gcode_M5(); break;
#endif //LASERBEAM
#if HAS(FILRUNOUT)
case 11: //M11 - Start printing
gcode_M11(); break;
#endif
case 17: //M17 - Enable/Power all stepper motors
case 11: // M11 - Start/Stop printing serial mode
gcode_M11(); break;
case 17: // M17 - Enable/Power all stepper motors
gcode_M17(); break;
#if ENABLED(SDSUPPORT)
......@@ -7587,12 +7597,12 @@ void clamp_to_software_endstops(float target[3]) {
if (de) {
if (degHotend(active_extruder) < extrude_min_temp) {
curr_e = dest_e; // Behave as if the move really took place, but ignore E part
ECHO_LM(ER, MSG_ERR_COLD_EXTRUDE_STOP);
ECHO_LM(ER, SERIAL_ERR_COLD_EXTRUDE_STOP);
}
#if ENABLED(PREVENT_LENGTHY_EXTRUDE)
if (labs(de) > EXTRUDE_MAXLENGTH) {
curr_e = dest_e; // Behave as if the move really took place, but ignore E part
ECHO_LM(ER, MSG_ERR_LONG_EXTRUDE_STOP);
ECHO_LM(ER, SERIAL_ERR_LONG_EXTRUDE_STOP);
}
#endif
}
......@@ -8072,7 +8082,7 @@ void idle(bool ignore_stepper_queue/*=false*/) {
void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
#if HAS(FILRUNOUT)
if ((printing || IS_SD_PRINTING ) && (READ(FILRUNOUT_PIN) ^ FILRUNOUT_PIN_INVERTING))
if ((Printing || IS_SD_PRINTING) && (READ(FILRUNOUT_PIN) ^ FILRUNOUT_PIN_INVERTING))
filrunout();
#endif
......@@ -8266,7 +8276,7 @@ void kill(const char* lcd_msg) {
SET_INPUT(PS_ON_PIN);
#endif
ECHO_LM(ER, MSG_ERR_KILLED);
ECHO_LM(ER, SERIAL_ERR_KILLED);
// FMC small patch to update the LCD before ending
sei(); // enable interrupts
......@@ -8361,7 +8371,7 @@ void Stop() {
if (IsRunning()) {
Running = false;
Stopped_gcode_LastN = gcode_LastN; // Save last g_code for restart
ECHO_LM(ER, MSG_ERR_STOPPED);
ECHO_LM(ER, SERIAL_ERR_STOPPED);
ECHO_S(PAUSE);
ECHO_E;
LCD_MESSAGEPGM(MSG_STOPPED);
......@@ -8374,7 +8384,7 @@ bool setTargetedHotend(int code) {
target_extruder = code_value_short();
if (target_extruder >= EXTRUDERS) {
ECHO_SMV(ER, "M", code);
ECHO_EMV(" " MSG_INVALID_EXTRUDER, target_extruder);
ECHO_EMV(" " SERIAL_INVALID_EXTRUDER, target_extruder);
return true;
}
}
......
MarlinKimbra/Marlin_main.h
View file @ 521315e2
......@@ -72,6 +72,7 @@ extern uint8_t debugLevel;
extern bool Running;
inline bool IsRunning() { return Running; }
inline bool IsStopped() { return !Running; }
extern bool Printing;
bool enqueuecommand(const char *cmd); //put a single ASCII command at the end of the current buffer or return false when it is full
void enqueuecommands_P(const char *cmd); //put one or many ASCII commands at the end of the current buffer, read from flash
......@@ -80,7 +81,7 @@ void prepare_arc_move(char isclockwise);
void clamp_to_software_endstops(float target[3]);
extern millis_t previous_cmd_ms;
inline void refresh_cmd_timeout();
void refresh_cmd_timeout();
#if ENABLED(FAST_PWM_FAN)
void setPwmFrequency(uint8_t pin, int val);
......
MarlinKimbra/cardreader.cpp
View file @ 521315e2
......@@ -86,7 +86,7 @@ void CardReader::lsDive(const char* prepend, SdFile parent, const char* const ma
SdFile dir;
if (!dir.open(parent, lfilename, O_READ)) {
if (lsAction == LS_SerialPrint) {
ECHO_LMV(ER, MSG_SD_CANT_OPEN_SUBDIR, lfilename);
ECHO_LMV(ER, SERIAL_SD_CANT_OPEN_SUBDIR, lfilename);
}
}
lsDive(path, dir);
......@@ -176,7 +176,7 @@ void CardReader::ls() {
SdFile dir;
if (!dir.open(diveDir, segment, O_READ)) {
ECHO_E;
ECHO_SMV(DB, MSG_SD_CANT_OPEN_SUBDIR, segment);
ECHO_SMV(DB, SERIAL_SD_CANT_OPEN_SUBDIR, segment);
break;
}
......@@ -207,30 +207,30 @@ void CardReader::initsd() {
&& !card.init(SPI_SPEED, LCD_SDSS)
#endif
) {
ECHO_LM(DB, MSG_SD_INIT_FAIL);
ECHO_LM(DB, SERIAL_SD_INIT_FAIL);
}
else if (!volume.init(&card)) {
ECHO_LM(ER, MSG_SD_VOL_INIT_FAIL);
ECHO_LM(ER, SERIAL_SD_VOL_INIT_FAIL);
}
else if (!root.openRoot(&volume)) {
ECHO_LM(ER, MSG_SD_OPENROOT_FAIL);
ECHO_LM(ER, SERIAL_SD_OPENROOT_FAIL);
}
else {
cardOK = true;
ECHO_LM(DB, MSG_SD_CARD_OK);
ECHO_LM(DB, SERIAL_SD_CARD_OK);
}
workDir = root;
curDir = &root;
/*
if (!workDir.openRoot(&volume)) {
ECHO_EM(MSG_SD_WORKDIR_FAIL);
ECHO_EM(SERIAL_SD_WORKDIR_FAIL);
}
*/
}
void CardReader::setroot(bool temporary) {
/*if (!workDir.openRoot(&volume)) {
ECHO_EM(MSG_SD_WORKDIR_FAIL);
ECHO_EM(SERIAL_SD_WORKDIR_FAIL);
}*/
if(temporary) lastDir = workDir;
workDir = root;
......@@ -279,7 +279,7 @@ void CardReader::openFile(char* name, bool read, bool replace_current/*=true*/,
if (file.isOpen()) { //replacing current file by new file, or subfile call
if (!replace_current) {
if (file_subcall_ctr > SD_PROCEDURE_DEPTH - 1) {
ECHO_LMV(ER, MSG_SD_MAX_DEPTH, SD_PROCEDURE_DEPTH);
ECHO_LMV(ER, SERIAL_SD_MAX_DEPTH, SD_PROCEDURE_DEPTH);
kill(PSTR(MSG_KILLED));
return;
}
......@@ -317,7 +317,7 @@ void CardReader::openFile(char* name, bool read, bool replace_current/*=true*/,
subdirname[dirname_end - dirname_start] = 0;
ECHO_EV(subdirname);
if (!myDir.open(curDir, subdirname, O_READ)) {
ECHO_SMV(ER, MSG_SD_OPEN_FILE_FAIL, subdirname);
ECHO_SMV(ER, SERIAL_SD_OPEN_FILE_FAIL, subdirname);
ECHO_EM(".");
return;
} else {
......@@ -337,24 +337,24 @@ void CardReader::openFile(char* name, bool read, bool replace_current/*=true*/,
if (read) {
if (file.open(curDir, fname, O_READ)) {
filesize = file.fileSize();
ECHO_MV(MSG_SD_FILE_OPENED, fname);
ECHO_EMV(MSG_SD_SIZE, filesize);
ECHO_MV(SERIAL_SD_FILE_OPENED, fname);
ECHO_EMV(SERIAL_SD_SIZE, filesize);
sdpos = 0;
ECHO_EM(MSG_SD_FILE_SELECTED);
ECHO_EM(SERIAL_SD_FILE_SELECTED);
getfilename(0, fname);
if(lcd_status) lcd_setstatus(longFilename[0] ? longFilename : fname);
} else {
ECHO_MV(MSG_SD_OPEN_FILE_FAIL, fname);
ECHO_MV(SERIAL_SD_OPEN_FILE_FAIL, fname);
ECHO_PGM(".\n");
}
} else { //write
if (!file.open(curDir, fname, O_CREAT | O_APPEND | O_WRITE | O_TRUNC)) {
ECHO_SMV(ER, MSG_SD_OPEN_FILE_FAIL, fname);
ECHO_SMV(ER, SERIAL_SD_OPEN_FILE_FAIL, fname);
ECHO_EM(".");
} else {
saving = true;
ECHO_LMV(DB, MSG_SD_WRITE_TO_FILE, name);
ECHO_LMV(DB, SERIAL_SD_WRITE_TO_FILE, name);
if (lcd_status) lcd_setstatus(fname);
}
}
......@@ -378,7 +378,7 @@ void CardReader::removeFile(char* name) {
subdirname[dirname_end - dirname_start] = 0;
ECHO_EV(subdirname);
if (!myDir.open(curDir, subdirname, O_READ)) {
ECHO_SMV(DB, MSG_SD_OPEN_FILE_FAIL, subdirname);
ECHO_SMV(DB, SERIAL_SD_OPEN_FILE_FAIL, subdirname);
ECHO_EM(".");
return;
}
......@@ -393,20 +393,20 @@ void CardReader::removeFile(char* name) {
} else // relative path
curDir = &workDir;
if (file.remove(curDir, fname)) {
ECHO_EMV(MSG_SD_FILE_DELETED, fname);
ECHO_EMV(SERIAL_SD_FILE_DELETED, fname);
sdpos = 0;
} else {
ECHO_MV(MSG_SD_FILE_DELETION_ERR, fname);
ECHO_MV(SERIAL_SD_FILE_DELETION_ERR, fname);
ECHO_C('.');
}
}
void CardReader::getStatus() {
if (cardOK) {
ECHO_MV(MSG_SD_PRINTING_BYTE, sdpos);
ECHO_EMV(MSG_SD_SLASH, filesize);
ECHO_MV(SERIAL_SD_PRINTING_BYTE, sdpos);
ECHO_EMV(SERIAL_SD_SLASH, filesize);
} else
ECHO_EM(MSG_SD_NOT_PRINTING);
ECHO_EM(SERIAL_SD_NOT_PRINTING);
}
void CardReader::write_command(char* buf) {
......@@ -423,7 +423,7 @@ void CardReader::write_command(char* buf) {
end[3] = '\0';
file.write(begin);
if (file.writeError) {
ECHO_LM(ER, MSG_SD_ERR_WRITE_TO_FILE);
ECHO_LM(ER, SERIAL_SD_ERR_WRITE_TO_FILE);
}
}
......@@ -538,28 +538,28 @@ void CardReader::unparseKeyLine(const char* key, char* value) {
file.writeError = false;
file.write(key);
if (file.writeError) {
ECHO_LM(ER, MSG_SD_ERR_WRITE_TO_FILE);
ECHO_LM(ER, SERIAL_SD_ERR_WRITE_TO_FILE);
return;
}
file.writeError = false;
file.write("=");
if (file.writeError) {
ECHO_LM(ER, MSG_SD_ERR_WRITE_TO_FILE);
ECHO_LM(ER, SERIAL_SD_ERR_WRITE_TO_FILE);
return;
}
file.writeError = false;
file.write(value);
if (file.writeError) {
ECHO_LM(ER, MSG_SD_ERR_WRITE_TO_FILE);
ECHO_LM(ER, SERIAL_SD_ERR_WRITE_TO_FILE);
return;
}
file.writeError = false;
file.write("\n");
if (file.writeError) {
ECHO_LM(ER, MSG_SD_ERR_WRITE_TO_FILE);
ECHO_LM(ER, SERIAL_SD_ERR_WRITE_TO_FILE);
return;
}
}
......@@ -589,7 +589,7 @@ void CardReader::chdir(const char* relpath) {
SdFile* parent = &root;
if (workDir.isOpen()) parent = &workDir;
if (!newfile.open(*parent, relpath, O_READ)) {
ECHO_LMV(DB, MSG_SD_CANT_ENTER_SUBDIR, relpath);
ECHO_LMV(DB, SERIAL_SD_CANT_ENTER_SUBDIR, relpath);
} else {
if (workDirDepth < MAX_DIR_DEPTH) {
++workDirDepth;
......
MarlinKimbra/comunication.h
View file @ 521315e2
......@@ -26,7 +26,15 @@
#endif // BLUETOOTH
#else
#ifdef __SAM3X8E__
#define MYSERIAL Serial
#if SERIAL_PORT == 0
#define MYSERIAL Serial
#elif SERIAL_PORT == 1
#define MYSERIAL Serial1
#elif SERIAL_PORT == 2
#define MYSERIAL Serial2
#elif SERIAL_PORT == 3
#define MYSERIAL Serial3
#endif
#else
#define MYSERIAL customizedSerial
#endif
......
MarlinKimbra/configuration_store.cpp
View file @ 521315e2
......@@ -121,7 +121,7 @@ void _EEPROM_writeData(int& pos, uint8_t* value, uint8_t size) {
eeprom_write_byte((unsigned char*)pos, *value);
c = eeprom_read_byte((unsigned char*)pos);
if (c != *value) {
ECHO_LM(ER, MSG_ERR_EEPROM_WRITE);
ECHO_LM(ER, SERIAL_ERR_EEPROM_WRITE);
}
pos++;
value++;
......@@ -439,9 +439,9 @@ void Config_RetrieveSettings() {
void Config_ResetDefault() {
float tmp1[] = DEFAULT_AXIS_STEPS_PER_UNIT;
float tmp2[] = DEFAULT_MAX_FEEDRATE;
long tmp3[] = DEFAULT_MAX_ACCELERATION;
long tmp4[] = DEFAULT_RETRACT_ACCELERATION;
long tmp5[] = DEFAULT_EJERK;
float tmp3[] = DEFAULT_MAX_ACCELERATION;
float tmp4[] = DEFAULT_RETRACT_ACCELERATION;
float tmp5[] = DEFAULT_EJERK;
#if ENABLED(PIDTEMP)
float tmp6[] = DEFAULT_Kp;
float tmp7[] = DEFAULT_Ki;
......@@ -907,13 +907,26 @@ void ConfigSD_ResetDefault() {
}
#if ENABLED(SDSUPPORT) && ENABLED(SD_SETTINGS)
static const char *cfgSD_KEY[] = { //Keep this in lexicographical order for better search performance(O(Nlog2(N)) insted of O(N*N)) (if you don't keep this sorted, the algorithm for find the key index won't work, keep attention.)
#if HAS(POWER_CONSUMPTION_SENSOR)
"PWR",
#endif
"TME",
};
enum cfgSD_ENUM { //This need to be in the same order as cfgSD_KEY
#if HAS(POWER_CONSUMPTION_SENSOR)
SD_CFG_PWR,
#endif
SD_CFG_TME,
SD_CFG_END //Leave this always as the last
};
void ConfigSD_StoreSettings() {
if(!IS_SD_INSERTED || card.isFileOpen() || card.sdprinting) return;
set_sd_dot();
delay(500);
card.setroot(true);
card.openFile(CFG_SD_FILE, false, true, false);
card.openFile((char *)CFG_SD_FILE, false, true, false);
char buff[CFG_SD_MAX_VALUE_LEN];
#if HAS(POWER_CONSUMPTION_SENSOR)
ltoa(power_consumption_hour,buff,10);
......@@ -925,19 +938,17 @@ void ConfigSD_ResetDefault() {
card.closeFile(false);
card.setlast();
config_last_update = millis();
delay(500);
unset_sd_dot();
}
void ConfigSD_RetrieveSettings(bool addValue) {
if(!IS_SD_INSERTED || card.isFileOpen() || card.sdprinting || !card.cardOK) return;
set_sd_dot();
delay(500);
char key[CFG_SD_MAX_KEY_LEN], value[CFG_SD_MAX_VALUE_LEN];
int k_idx;
int k_len, v_len;
card.setroot(true);
card.openFile(CFG_SD_FILE, true, true, false);
card.openFile((char *)CFG_SD_FILE, true, true, false);
while(true) {
k_len = CFG_SD_MAX_KEY_LEN;
v_len = CFG_SD_MAX_VALUE_LEN;
......@@ -963,7 +974,6 @@ void ConfigSD_ResetDefault() {
card.closeFile(false);
card.setlast();
config_readed = true;
delay(500);
unset_sd_dot();
}
......
MarlinKimbra/configuration_store.h
View file @ 521315e2
......@@ -23,21 +23,6 @@ FORCE_INLINE void Config_RetrieveSettings() { Config_ResetDefault(); Config_Prin
#endif
#if ENABLED(SDSUPPORT) && ENABLED(SD_SETTINGS)
static const char *cfgSD_KEY[] = { //Keep this in lexicographical order for better search performance(O(Nlog2(N)) insted of O(N*N)) (if you don't keep this sorted, the algorithm for find the key index won't work, keep attention.)
#if HAS(POWER_CONSUMPTION_SENSOR)
"PWR",
#endif
"TME",
};
enum cfgSD_ENUM { //This need to be in the same order as cfgSD_KEY
#if HAS(POWER_CONSUMPTION_SENSOR)
SD_CFG_PWR,
#endif
SD_CFG_TME,
SD_CFG_END //Leave this always as the last
};
void ConfigSD_StoreSettings();
void ConfigSD_RetrieveSettings(bool addValue = false);
int ConfigSD_KeyIndex(char *key);
......
MarlinKimbra/dogm_lcd_implementation.h
View file @ 521315e2
......@@ -25,7 +25,11 @@
#define EN_A BIT(BLEN_A)
#define EN_B BIT(BLEN_B)
#define EN_C BIT(BLEN_C)
#define LCD_CLICKED (buttons&EN_C)
#if ENABLED(INVERT_CLICK_BUTTON)
#define LCD_CLICKED !(buttons&EN_C)
#else
#define LCD_CLICKED (buttons&EN_C)
#endif
#endif
#include <U8glib.h>
......@@ -114,7 +118,6 @@
// LCD selection
#if ENABLED(U8GLIB_ST7920)
//U8GLIB_ST7920_128X64_RRD u8g(0,0,0);
U8GLIB_ST7920_128X64_RRD u8g(0);
#elif ENABLED(MAKRPANEL)
// The MaKrPanel display, ST7565 controller as well
......@@ -315,7 +318,7 @@ static void lcd_implementation_status_screen() {
}
else {
lcd_print(itostr4(power_consumption_hour-startpower));
lcd_print("Wh");
lcd_print((char*)"Wh");
}
#else
uint16_t time = (millis() - print_job_start_ms) / 60000;
......@@ -459,6 +462,7 @@ static void lcd_implementation_drawmenu_generic(bool isSelected, uint8_t row, co
pstr++;
}
while (n--) lcd_print(' ');
lcd_print(pre_char);
u8g.setPrintPos(LCD_PIXEL_WIDTH - DOG_CHAR_WIDTH, (row + 1) * DOG_CHAR_HEIGHT);
lcd_print(post_char);
lcd_print(' ');
......@@ -535,7 +539,6 @@ void lcd_implementation_drawedit(const char* pstr, char* value) {
}
#if ENABLED(SDSUPPORT)
static void _drawmenu_sd(bool isSelected, uint8_t row, const char* pstr, const char* filename, char* const longFilename, bool isDir) {
char c;
uint8_t n = LCD_WIDTH - 1;
......
MarlinKimbra/firmware_test.cpp
View file @ 521315e2
......@@ -35,7 +35,7 @@ void FirmwareTest() {
#if PIN_EXISTS(X_MIN) && (X_HOME_DIR == -1)
if (!READ(X_MIN_PIN)^X_MIN_ENDSTOP_INVERTING) {
ECHO_M("MIN ENDSTOP X: ");
ECHO_EV(MSG_ENDSTOP_OPEN);
ECHO_EV(SERIAL_ENDSTOP_OPEN);
}
else {
ECHO_M("X ENDSTOP ");
......@@ -65,7 +65,7 @@ void FirmwareTest() {
}
if (READ(X_MIN_PIN)^X_MIN_ENDSTOP_INVERTING) {
ECHO_M("MIN ENDSTOP X: ");
ECHO_EV(MSG_ENDSTOP_HIT);
ECHO_EV(SERIAL_ENDSTOP_HIT);
}
else {
ECHO_M("X ");
......@@ -75,7 +75,7 @@ void FirmwareTest() {
#elif PIN_EXISTS(X_MAX) && X_HOME_DIR == 1
if (!READ(X_MAX_PIN)^X_MAX_ENDSTOP_INVERTING) {
ECHO_M("MAX ENDSTOP X: ");
ECHO_EV(MSG_ENDSTOP_OPEN);
ECHO_EV(SERIAL_ENDSTOP_OPEN);
}
else {
ECHO_M("X ENDSTOP ");
......@@ -105,7 +105,7 @@ void FirmwareTest() {
}
if (READ(X_MAX_PIN)^X_MAX_ENDSTOP_INVERTING) {
ECHO_M("MAX ENDSTOP X: ");
ECHO_EV(MSG_ENDSTOP_HIT);
ECHO_EV(SERIAL_ENDSTOP_HIT);
}
else {
ECHO_M("X ");
......@@ -129,7 +129,7 @@ void FirmwareTest() {
#if PIN_EXISTS(Y_MIN) && Y_HOME_DIR == -1
if (!READ(Y_MIN_PIN)^Y_MIN_ENDSTOP_INVERTING) {
ECHO_M("MIN ENDSTOP Y: ");
ECHO_EV(MSG_ENDSTOP_OPEN);
ECHO_EV(SERIAL_ENDSTOP_OPEN);
}
else {
ECHO_M("Y ENDSTOP ");
......@@ -159,7 +159,7 @@ void FirmwareTest() {
}
if (READ(Y_MIN_PIN)^Y_MIN_ENDSTOP_INVERTING) {
ECHO_M("MIN ENDSTOP Y: ");
ECHO_EV(MSG_ENDSTOP_HIT);
ECHO_EV(SERIAL_ENDSTOP_HIT);
}
else {
ECHO_M("Y ");
......@@ -169,7 +169,7 @@ void FirmwareTest() {
#elif PIN_EXISTS(Y_MAX) && Y_HOME_DIR == 1
if (!READ(Y_MAX_PIN)^Y_MAX_ENDSTOP_INVERTING) {
ECHO_M("MAX ENDSTOP Y: ");
ECHO_EV(MSG_ENDSTOP_OPEN);
ECHO_EV(SERIAL_ENDSTOP_OPEN);
}
else {
ECHO_M("Y ENDSTOP ");
......@@ -199,7 +199,7 @@ void FirmwareTest() {
}
if (READ(Y_MAX_PIN)^Y_MAX_ENDSTOP_INVERTING) {
ECHO_M("MAX ENDSTOP Y: ");
ECHO_EV(MSG_ENDSTOP_HIT);
ECHO_EV(SERIAL_ENDSTOP_HIT);
}
else {
ECHO_M("Y ");
......@@ -223,7 +223,7 @@ void FirmwareTest() {
#if PIN_EXISTS(Z_MIN) && Z_HOME_DIR == -1
if (!READ(Z_MIN_PIN)^Z_MIN_ENDSTOP_INVERTING) {
ECHO_M("MIN ENDSTOP Z: ");
ECHO_EV(MSG_ENDSTOP_OPEN);
ECHO_EV(SERIAL_ENDSTOP_OPEN);
}
else {
ECHO_M("Z ENDSTOP ");
......@@ -253,7 +253,7 @@ void FirmwareTest() {
}
if (READ(Z_MIN_PIN)^Z_MIN_ENDSTOP_INVERTING) {
ECHO_M("MIN ENDSTOP Z: ");
ECHO_EV(MSG_ENDSTOP_HIT);
ECHO_EV(SERIAL_ENDSTOP_HIT);
}
else {
ECHO_M("Z ");
......@@ -263,7 +263,7 @@ void FirmwareTest() {
#elif PIN_EXISTS(Z_MAX) && Z_HOME_DIR == 1
if (!READ(Z_MAX_PIN)^Z_MAX_ENDSTOP_INVERTING) {
ECHO_M("MAX ENDSTOP Z: ");
ECHO_EV(MSG_ENDSTOP_OPEN);
ECHO_EV(SERIAL_ENDSTOP_OPEN);
}
else {
ECHO_M("Z ENDSTOP ");
......@@ -293,7 +293,7 @@ void FirmwareTest() {
}
if (READ(Z_MAX_PIN)^Z_MAX_ENDSTOP_INVERTING) {
ECHO_M("MAX ENDSTOP Z: ");
ECHO_EV(MSG_ENDSTOP_HIT);
ECHO_EV(SERIAL_ENDSTOP_HIT);
}
else {
ECHO_M("Z ");
......
MarlinKimbra/language.h
View file @ 521315e2
......@@ -28,28 +28,23 @@
// 18 Japanese utf
// 19 Chinese
#if DISABLED(LANGUAGE_CHOICE)
#define LANGUAGE_CHOICE 7 // Pick your language from the list above
#endif
#define STRINGIFY_(n) #n
#define STRINGIFY(n) STRINGIFY_(n)
#define PROTOCOL_VERSION "1.0"
#if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2)
#define MACHINE_NAME "Ultimaker"
#define SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"
#elif MB(RUMBA)
#define MACHINE_NAME "Rumba"
#elif MB(3DRAG)
#define MACHINE_NAME "3Drag"
#define SOURCE_CODE_URL "http://3dprint.elettronicain.it/"
#elif MB(K8200)
#define MACHINE_NAME "K8200"
#define SOURCE_CODE_URL "https://github.com/CONSULitAS/Marlin-K8200"
#elif MB(5DPRINT)
#define MACHINE_NAME "Makibox"
#elif MB(SAV_MKI)
#define MACHINE_NAME "SAV MkI"
#define SOURCE_CODE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config"
#elif DISABLED(MACHINE_NAME)
#define MACHINE_NAME "3D Printer"
#endif
......@@ -59,184 +54,155 @@
#define MACHINE_NAME CUSTOM_MACHINE_NAME
#endif
#if DISABLED(SOURCE_CODE_URL)
#define SOURCE_CODE_URL "https://github.com/MagoKimbra/MarlinKimbra"
#endif
#if DISABLED(BUILD_VERSION)
#define BUILD_VERSION "V4; MarlinKimbra for 4 extruder"
// LCD Menu Messages
#if !(ENABLED( DISPLAY_CHARSET_HD44780_JAPAN ) || ENABLED( DISPLAY_CHARSET_HD44780_WESTERN ) || ENABLED( DISPLAY_CHARSET_HD44780_CYRILLIC ))
#define DISPLAY_CHARSET_HD44780_JAPAN
#endif
#define STRINGIFY_(n) #n
#define STRINGIFY(n) STRINGIFY_(n)
// Common LCD messages
/* nothing here yet */
// Common serial messages
#define MSG_MARLIN "MarlinKimbra"
// Serial Console Messages (do not translate those!)
#define MSG_ENQUEUEING "enqueueing \""
#define MSG_POWERUP "PowerUp"
#define MSG_EXTERNAL_RESET "External Reset"
#define MSG_BROWNOUT_RESET "Brown out Reset"
#define MSG_WATCHDOG_RESET "Watchdog Reset"
#define MSG_SOFTWARE_RESET "Software Reset"
#define MSG_AUTHOR " | Author: "
#define MSG_CONFIGURATION_VER "Last Updated: "
#define MSG_COMPILED "Compiled: "
#define MSG_FREE_MEMORY "Free Memory: "
#define MSG_PLANNER_BUFFER_BYTES " PlannerBufferBytes: "
#define MSG_FILE_SAVED "Done saving file."
#define MSG_ERR_LINE_NO "Line Number is not Last Line Number+1, Last Line: "
#define MSG_ERR_CHECKSUM_MISMATCH "checksum mismatch, Last Line: "
#define MSG_ERR_NO_CHECKSUM "No Checksum with line number, Last Line: "
#define MSG_ERR_NO_LINENUMBER_WITH_CHECKSUM "No Line Number with checksum, Last Line: "
#define MSG_FILE_PRINTED "Done printing file"
#define MSG_BEGIN_FILE_LIST "Begin file list"
#define MSG_END_FILE_LIST "End file list"
#define MSG_INVALID_EXTRUDER "Invalid extruder"
#define MSG_INVALID_SOLENOID "Invalid solenoid"
#define MSG_ERR_NO_THERMISTORS "No thermistors - no temperature"
#define MSG_M115_REPORT "FIRMWARE_NAME:MarlinKimbra " SHORT_BUILD_VERSION " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
#define MSG_COUNT_X " Count X: "
#define MSG_ERR_KILLED "Printer halted. kill() called!"
#define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
#define MSG_UNKNOWN_COMMAND "Unknown command: \""
#define MSG_ACTIVE_DRIVER "Active Driver: "
#define MSG_ACTIVE_EXTRUDER "Active Extruder: "
#define MSG_ACTIVE_COLOR "Active Color: "
#define MSG_X_MIN "x_min: "
#define MSG_X_MAX "x_max: "
#define MSG_Y_MIN "y_min: "
#define MSG_Y_MAX "y_max: "
#define MSG_Z_MIN "z_min: "
#define MSG_Z_MAX "z_max: "
#define MSG_Z2_MAX "z2_max: "
#define MSG_Z_PROBE "z_probe: "
#define MSG_E_MIN "e_min: "
#define MSG_ERR_MATERIAL_INDEX "M145 S<index> out of range (0-2)"
#define MSG_ERR_M428_TOO_FAR "Too far from reference point"
#define MSG_M119_REPORT "Reporting endstop status"
#define MSG_ENDSTOP_HIT "TRIGGERED"
#define MSG_ENDSTOP_OPEN "NOT TRIGGERED"
#define MSG_HOTEND_OFFSET "Hotend offsets:"
#define MSG_EMPTY_PLANE "Autolevel can only be execute on an actual plane, make sure width and height are not 0!"
#define MSG_FILRUNOUT_PIN "filament_runout_pin: "
#define MSG_SD_CANT_OPEN_SUBDIR "Cannot open subdir"
#define MSG_SD_INIT_FAIL "SD init fail"
#define MSG_SD_VOL_INIT_FAIL "volume.init failed"
#define MSG_SD_OPENROOT_FAIL "openRoot failed"
#define MSG_SD_CARD_OK "SD card ok"
#define MSG_SD_WORKDIR_FAIL "workDir open failed"
#define MSG_SD_OPEN_FILE_FAIL "open failed, File: "
#define MSG_SD_FILE_OPENED "File opened: "
#define MSG_SD_SIZE " Size: "
#define MSG_SD_FILE_SELECTED "File selected"
#define MSG_SD_WRITE_TO_FILE "Writing to file: "
#define MSG_SD_PRINTING_BYTE "SD printing byte "
#define MSG_SD_NOT_PRINTING "Not SD printing"
#define MSG_SD_ERR_WRITE_TO_FILE "error writing to file"
#define MSG_SD_CANT_ENTER_SUBDIR "Cannot enter subdir: "
#define MSG_SD_FILE_DELETED "File deleted:"
#define MSG_SD_SLASH "/"
#define MSG_SD_FILE_DELETION_ERR "Deletion failed, File: "
#define MSG_SD_MAX_DEPTH "trying to call sub-gcode files with too many levels. MAX level is:"
#define MSG_STEPPER_TOO_HIGH "Steprate too high: "
#define MSG_ENDSTOPS_HIT "endstops hit: "
#define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented"
#define MSG_ERR_LONG_EXTRUDE_STOP " too long extrusion prevented"
#define MSG_BABYSTEPPING_X "Babystepping X"
#define MSG_BABYSTEPPING_Y "Babystepping Y"
#define MSG_BABYSTEPPING_Z "Babystepping Z"
#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Error in menu structure"
#define MSG_MICROSTEP_MS1_MS2 "MS1,MS2 Pins"
#define MSG_MICROSTEP_X "X:"
#define MSG_MICROSTEP_Y "Y:"
#define MSG_MICROSTEP_Z "Z:"
#define MSG_MICROSTEP_E0 "E0:"
#define MSG_MICROSTEP_E1 "E1:"
#define MSG_ERR_EEPROM_WRITE "Error writing to EEPROM!"
#define MSG_MARLIN "MarlinKimbra"
#define SERIAL_ENQUEUEING "enqueueing \""
#define SERIAL_POWERUP "PowerUp"
#define SERIAL_EXTERNAL_RESET "External Reset"
#define SERIAL_BROWNOUT_RESET "Brown out Reset"
#define SERIAL_WATCHDOG_RESET "Watchdog Reset"
#define SERIAL_SOFTWARE_RESET "Software Reset"
#define SERIAL_AUTHOR " | Author: "
#define SERIAL_CONFIGURATION_VER "Last Updated: "
#define SERIAL_COMPILED "Compiled: "
#define SERIAL_FREE_MEMORY "Free Memory: "
#define SERIAL_PLANNER_BUFFER_BYTES " PlannerBufferBytes: "
#define SERIAL_FILE_SAVED "Done saving file."
#define SERIAL_ERR_LINE_NO "Line Number is not Last Line Number+1, Last Line: "
#define SERIAL_ERR_CHECKSUM_MISMATCH "checksum mismatch, Last Line: "
#define SERIAL_ERR_NO_CHECKSUM "No Checksum with line number, Last Line: "
#define SERIAL_ERR_NO_LINENUMBER_WITH_CHECKSUM "No Line Number with checksum, Last Line: "
#define SERIAL_FILE_PRINTED "Done printing file"
#define SERIAL_BEGIN_FILE_LIST "Begin file list"
#define SERIAL_END_FILE_LIST "End file list"
#define SERIAL_INVALID_EXTRUDER "Invalid extruder"
#define SERIAL_INVALID_SOLENOID "Invalid solenoid"
#define SERIAL_ERR_NO_THERMISTORS "No thermistors - no temperature"
#define SERIAL_M115_REPORT "FIRMWARE_NAME:MarlinKimbra " SHORT_BUILD_VERSION " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
#define SERIAL_COUNT_X " Count X: "
#define SERIAL_ERR_KILLED "Printer halted. kill() called!"
#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_UNKNOWN_COMMAND "Unknown command: \""
#define SERIAL_ACTIVE_DRIVER "Active Driver: "
#define SERIAL_ACTIVE_EXTRUDER "Active Extruder: "
#define SERIAL_ACTIVE_COLOR "Active Color: "
#define SERIAL_X_MIN "x_min: "
#define SERIAL_X_MAX "x_max: "
#define SERIAL_Y_MIN "y_min: "
#define SERIAL_Y_MAX "y_max: "
#define SERIAL_Z_MIN "z_min: "
#define SERIAL_Z_MAX "z_max: "
#define SERIAL_Z2_MAX "z2_max: "
#define SERIAL_Z_PROBE "z_probe: "
#define SERIAL_E_MIN "e_min: "
#define SERIAL_ERR_MATERIAL_INDEX "M145 S<index> out of range (0-2)"
#define SERIAL_ERR_M428_TOO_FAR "Too far from reference point"
#define SERIAL_M119_REPORT "Reporting endstop status"
#define SERIAL_ENDSTOP_HIT "TRIGGERED"
#define SERIAL_ENDSTOP_OPEN "NOT TRIGGERED"
#define SERIAL_HOTEND_OFFSET "Hotend offsets:"
#define SERIAL_EMPTY_PLANE "Autolevel can only be execute on an actual plane, make sure width and height are not 0!"
#define SERIAL_FILRUNOUT_PIN "filament_runout_pin: "
#define SERIAL_SD_CANT_OPEN_SUBDIR "Cannot open subdir"
#define SERIAL_SD_INIT_FAIL "SD init fail"
#define SERIAL_SD_VOL_INIT_FAIL "volume.init failed"
#define SERIAL_SD_OPENROOT_FAIL "openRoot failed"
#define SERIAL_SD_CARD_OK "SD card ok"
#define SERIAL_SD_WORKDIR_FAIL "workDir open failed"
#define SERIAL_SD_OPEN_FILE_FAIL "open failed, File: "
#define SERIAL_SD_FILE_OPENED "File opened: "
#define SERIAL_SD_SIZE " Size: "
#define SERIAL_SD_FILE_SELECTED "File selected"
#define SERIAL_SD_WRITE_TO_FILE "Writing to file: "
#define SERIAL_SD_PRINTING_BYTE "SD printing byte "
#define SERIAL_SD_NOT_PRINTING "Not SD printing"
#define SERIAL_SD_ERR_WRITE_TO_FILE "error writing to file"
#define SERIAL_SD_CANT_ENTER_SUBDIR "Cannot enter subdir: "
#define SERIAL_SD_FILE_DELETED "File deleted:"
#define SERIAL_SD_SLASH "/"
#define SERIAL_SD_FILE_DELETION_ERR "Deletion failed, File: "
#define SERIAL_SD_MAX_DEPTH "trying to call sub-gcode files with too many levels. MAX level is:"
#define SERIAL_STEPPER_TOO_HIGH "Steprate too high: "
#define SERIAL_ENDSTOPS_HIT "endstops hit: "
#define SERIAL_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented"
#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
#define MSG_PID_AUTOTUNE "PID Autotune"
#define MSG_PID_AUTOTUNE_START MSG_PID_AUTOTUNE " start"
#define MSG_PID_AUTOTUNE_FAILED MSG_PID_AUTOTUNE " failed!"
#define MSG_PID_BAD_EXTRUDER_NUM MSG_PID_AUTOTUNE_FAILED " Bad extruder number"
#define MSG_PID_TEMP_TOO_HIGH MSG_PID_AUTOTUNE_FAILED " Temperature too high"
#define MSG_PID_TIMEOUT MSG_PID_AUTOTUNE_FAILED " timeout"
#define MSG_BIAS " bias: "
#define MSG_D " d: "
#define MSG_T_MIN " min: "
#define MSG_T_MAX " max: "
#define MSG_KU " Ku: "
#define MSG_TU " Tu: "
#define MSG_CLASSIC_PID " Classic PID "
#define MSG_KP "Kp: "
#define MSG_KI " Ki: "
#define MSG_KD " Kd: "
#define MSG_KC " Kc: "
#define MSG_B "B:"
#define MSG_T "T:"
#define MSG_AT "@"
#define MSG_BAT "B@:"
#define MSG_W "W:"
#define MSG_PID_AUTOTUNE_FINISHED MSG_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 MSG_PID_DEBUG " PID_DEBUG "
#define MSG_PID_DEBUG_INPUT ": Input "
#define MSG_PID_DEBUG_OUTPUT " Output "
#define MSG_PID_DEBUG_PTERM " pTerm "
#define MSG_PID_DEBUG_ITERM " iTerm "
#define MSG_PID_DEBUG_DTERM " dTerm "
#define MSG_PID_DEBUG_CTERM " cTerm "
#define MSG_INVALID_EXTRUDER_NUM " - Invalid extruder number !"
#define MSG_HEATER_BED "bed"
#define MSG_STOPPED_HEATER ", system stopped! Heater_ID: "
#define MSG_REDUNDANCY "Heater switched off. Temperature difference between temp sensors is too high !"
#define MSG_T_HEATING_FAILED "Heating failed"
#define MSG_T_THERMAL_RUNAWAY "Thermal Runaway"
#define MSG_T_MAXTEMP "MAXTEMP triggered"
#define MSG_T_MINTEMP "MINTEMP triggered"
// Move
#define MSG_MOVE_X "X"
#define MSG_MOVE_y "Y"
#define MSG_MOVE_Z "Z"
#define MSG_MOVE_E "Extruder"
#define SERIAL_PID_AUTOTUNE "PID Autotune"
#define SERIAL_PID_AUTOTUNE_START SERIAL_PID_AUTOTUNE " start"
#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_TEMP_TOO_HIGH SERIAL_PID_AUTOTUNE_FAILED " Temperature too high"
#define SERIAL_PID_TIMEOUT SERIAL_PID_AUTOTUNE_FAILED " timeout"
#define SERIAL_BIAS " bias: "
#define SERIAL_D " d: "
#define SERIAL_T_MIN " min: "
#define SERIAL_T_MAX " max: "
#define SERIAL_KU " Ku: "
#define SERIAL_TU " Tu: "
#define SERIAL_CLASSIC_PID " Classic PID "
#define SERIAL_KP "Kp: "
#define SERIAL_KI " Ki: "
#define SERIAL_KD " Kd: "
#define SERIAL_B "B:"
#define SERIAL_T "T:"
#define SERIAL_AT "@"
#define SERIAL_BAT "B@:"
#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_DEBUG " PID_DEBUG "
#define SERIAL_PID_DEBUG_INPUT ": Input "
#define SERIAL_PID_DEBUG_OUTPUT " Output "
#define SERIAL_PID_DEBUG_PTERM " pTerm "
#define SERIAL_PID_DEBUG_ITERM " iTerm "
#define SERIAL_PID_DEBUG_DTERM " dTerm "
#define SERIAL_PID_DEBUG_CTERM " cTerm "
#define SERIAL_INVALID_EXTRUDER_NUM " - Invalid extruder number !"
#define SERIAL_HEATER_BED "bed"
#define SERIAL_STOPPED_HEATER ", system stopped! Heater_ID: "
//#define SERIAL_REDUNDANCY "Heater switched off. Temperature difference between temp sensors is too high !"
#define SERIAL_T_HEATING_FAILED "Heating failed"
#define SERIAL_T_THERMAL_RUNAWAY "Thermal Runaway"
#define SERIAL_T_MAXTEMP "MAXTEMP triggered"
#define SERIAL_T_MINTEMP "MINTEMP triggered"
// Endstop
#define MSG_ENDSTOP_X " X:"
#define MSG_ENDSTOP_Y " Y:"
#define MSG_ENDSTOP_Z " Z:"
#define MSG_ENDSTOP_E " E:"
#define MSG_ENDSTOP_ZP " ZP:"
#define MSG_ENDSTOP_XS "X"
#define MSG_ENDSTOP_YS "Y"
#define MSG_ENDSTOP_ZS "Z"
#define MSG_ENDSTOP_ZPS "ZP"
#define MSG_ENDSTOP_ES "E"
#define SERIAL_ENDSTOP_X " X:"
#define SERIAL_ENDSTOP_Y " Y:"
#define SERIAL_ENDSTOP_Z " Z:"
#define SERIAL_ENDSTOP_E " E:"
#define SERIAL_ENDSTOP_PROBE " PROBE:"
// Debug
#define SERIAL_DEBUG_ECHO "DEBUG ECHO ENABLED"
#define SERIAL_DEBUG_INFO "DEBUG INFO ENABLED"
#define SERIAL_DEBUG_ERRORS "DEBUG ERRORS ENABLED"
#define SERIAL_DEBUG_DRYRUN "DEBUG DRYRUN ENABLED"
#define SERIAL_DEBUG "DEBUG ENABLED"
//other
#define MSG_ERR_HOMING_DIV "The Homing Bump Feedrate Divisor cannot be less than 1"
#define MSG_BED_LEVELLING_BED "Bed"
#define MSG_BED_LEVELLING_X " X: "
#define MSG_BED_LEVELLING_Y " Y: "
#define MSG_BED_LEVELLING_Z " Z: "
// LCD Menu Messages
#if !(ENABLED( DISPLAY_CHARSET_HD44780_JAPAN ) || ENABLED( DISPLAY_CHARSET_HD44780_WESTERN ) || ENABLED( DISPLAY_CHARSET_HD44780_CYRILLIC ))
#define DISPLAY_CHARSET_HD44780_JAPAN
#endif
#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_X " X: "
#define SERIAL_BED_LEVELLING_Y " Y: "
#define SERIAL_BED_LEVELLING_Z " Z: "
#include "language_en.h" // English
......@@ -249,6 +215,7 @@
#elif LANGUAGE_CHOICE == 5 // Spanish
#include "language_es.h"
#elif LANGUAGE_CHOICE == 6 // Russian
#define MAPPER_D0D1 // For Cyrillic
#include "language_ru.h"
#elif LANGUAGE_CHOICE == 7 // Italian
#include "language_it.h"
......
MarlinKimbra/language_an.h
View file @ 521315e2
......@@ -8,68 +8,68 @@
#ifndef LANGUAGE_AN_H
#define LANGUAGE_AN_H
#define MAPPER_NON
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1
#define MAPPER_NON // For direct asci codes
#define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
#define WELCOME_MSG MACHINE_NAME " parada."
#define MSG_SD_INSERTED "Tarcheta colocada"
#define MSG_SD_REMOVED "Tarcheta retirada"
#define MSG_SD "SD"
#define MSG_SD_INSERTED MSG_SD " colocada"
#define MSG_SD_REMOVED MSG_SD " retirada"
#define MSG_MAIN "Menu prencipal"
#define MSG_AUTOSTART " Autostart"
#define MSG_DISABLE_STEPPERS "Amortar motors"
#define MSG_AUTO_HOME "Levar a l'orichen"
#define MSG_BED_SETTING "Bed Setting"
#define MSG_LP_INTRO " Leveling bed... Press to start "
#define MSG_LP_1 " Adjust first point & Press the button"
#define MSG_LP_2 " Adjust second point & Press the button"
#define MSG_LP_3 " Adjust third point & Press the button"
#define MSG_LP_4 " Adjust fourth point & Press the button"
#define MSG_LP_5 " Is it ok? Press to end"
#define MSG_LP_6 " BED leveled!"
#define MSG_MBL_SETTING "Manual Bed Leveling"
#define MSG_MBL_BUTTON " Press the button "
#define MSG_MBL_INTRO " Leveling bed... "
#define MSG_MBL_1 " Adjust first point "
#define MSG_MBL_2 " Adjust second point"
#define MSG_MBL_3 " Adjust third point "
#define MSG_MBL_4 " Adjust fourth point"
#define MSG_MBL_5 " Is it ok? "
#define MSG_MBL_6 " BED leveled! "
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_SET_ORIGIN "Establir zero"
#define MSG_PREHEAT_PLA "Precalentar PLA"
#define MSG_PREHEAT_PLA_ALL "Precalentar PLA a"
#define MSG_PREHEAT_PLA_BEDONLY "Prec. PLA Base"
#define MSG_PREHEAT_PLA_SETTINGS "Achustar tem. PLA"
#define MSG_PREHEAT_ABS "Precalentar ABS"
#define MSG_PREHEAT_ABS_ALL "Precalentar ABS a"
#define MSG_PREHEAT_ABS_BEDONLY "Prec. ABS Base"
#define MSG_PREHEAT_ABS_SETTINGS "Achustar tem. ABS"
#define MSG_PREHEAT_GUM "Preheat GUM"
#define MSG_PREHEAT_GUM_ALL "Preheat GUM All"
#define MSG_PREHEAT_GUM_BEDONLY "Preheat GUM Bed"
#define MSG_PREHEAT_GUM_SETTINGS "Preheat GUM conf"
#define MSG_TOO_COLD_FOR_M600 "M600 Hotend too cold to change filament"
#define MSG_ONFOR "On x:"
#define MSG_PWRCONSUMED "P.er:"
#define MSG_PREHEAT "Prec."
#define MSG_CONGIG "conf."
#define MSG_PREHEAT_PLA MSG_PREHEAT " PLA"
#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " All"
#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " Bed"
#define MSG_PREHEAT_PLA_SETTINGS MSG_CONGIG " PLA"
#define MSG_PREHEAT_ABS MSG_PREHEAT " ABS"
#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " All"
#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " Bed"
#define MSG_PREHEAT_ABS_SETTINGS MSG_CONGIG " ABS"
#define MSG_PREHEAT_GUM MSG_PREHEAT " GUM"
#define MSG_PREHEAT_GUM_ALL MSG_PREHEAT_GUM " All"
#define MSG_PREHEAT_GUM_BEDONLY MSG_PREHEAT_GUM " Bed"
#define MSG_PREHEAT_GUM_SETTINGS MSG_CONGIG " GUM"
#define MSG_TOO_COLD_FOR_FILAMENTCHANGE "Hotend too cold to change filament"
#define MSG_COOLDOWN "Enfriar"
#define MSG_SWITCH_PS_ON "Enchegar Fuent"
#define MSG_SWITCH_PS_OFF "Desenchegar Fuent"
#define MSG_EXTRUDE "Extruir"
#define MSG_RETRACT "Retraer"
#define MSG_MOVE_AXIS "Mover Eixes"
#define MSG_PURGE "Purge"
#define MSG_LEVEL_BED "Level bed"
#define MSG_MOVE_X "Move X"
#define MSG_MOVE_Y "Move Y"
#define MSG_MOVE_Z "Move Z"
#define MSG_MOVE_E "Extruder"
#define MSG_MOVE_01MM "Move 0.1mm"
#define MSG_MOVE_1MM "Move 1mm"
#define MSG_MOVE_10MM "Move 10mm"
#define MSG_SPEED "Velocidat"
#define MSG_NOZZLE "Nozzle"
#define MSG_BED "Base"
#define MSG_FAN_SPEED "Ixoriador"
#define MSG_FLOW "Fluxo"
#define MSG_CONTROL "Control"
#define MSG_STATS "Statistics"
#define MSG_FIX_LOSE_STEPS "Fix axis steps"
#define MSG_MIN LCD_STR_THERMOMETER " Min"
#define MSG_MAX LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR LCD_STR_THERMOMETER " Fact"
#define MSG_IDLEOOZING "Anti oozing"
#define MSG_AUTOTEMP "Autotemp"
#define MSG_ON "On"
#define MSG_OFF "Off"
#define MSG_ON "ON "
#define MSG_OFF "OFF"
#define MSG_PID_P "PID-P"
#define MSG_PID_I "PID-I"
#define MSG_PID_D "PID-D"
......@@ -80,29 +80,38 @@
#define MSG_VXY_JERK "Vxy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ves-jerk"
#define MSG_VMAX "Vmax"
#define MSG_X "x"
#define MSG_Y "y"
#define MSG_Z "z"
#define MSG_E "e"
#define MSG_VMAX "Vmax "
#define MSG_X "X"
#define MSG_Y "Y"
#define MSG_Z "Z"
#define MSG_E "E"
#define MSG_MOVE "Move"
#define MSG_MOVE_AXIS MSG_MOVE " axis"
#define MSG_MOVE_X MSG_MOVE " " MSG_X
#define MSG_MOVE_Y MSG_MOVE " " MSG_Y
#define MSG_MOVE_Z MSG_MOVE " " MSG_Z
#define MSG_MOVE_01MM MSG_MOVE " 0.1mm"
#define MSG_MOVE_1MM MSG_MOVE " 1mm"
#define MSG_MOVE_10MM MSG_MOVE " 10mm"
#define MSG_MOVE_E "Extruder"
#define MSG_VMIN "Vmin"
#define MSG_VTRAV_MIN "VTrav min"
#define MSG_AMAX "Amax"
#define MSG_AMAX "Amax "
#define MSG_A_RETRACT "A-retrac."
#define MSG_A_TRAVEL "A-travel"
#define MSG_XSTEPS "X trangos/mm"
#define MSG_YSTEPS "Y trangos/mm"
#define MSG_ZSTEPS "Z trangos/mm"
#define MSG_E0STEPS "E0 steps/mm"
#define MSG_E1STEPS "E1 steps/mm"
#define MSG_E2STEPS "E2 steps/mm"
#define MSG_E3STEPS "E3 steps/mm"
#define MSG_XSTEPS MSG_X " trangos/mm"
#define MSG_YSTEPS MSG_Y " trangos/mm"
#define MSG_ZSTEPS MSG_Z " trangos/mm"
#define MSG_E0STEPS MSG_E "0 trangos/mm"
#define MSG_E1STEPS MSG_E "1 trangos/mm"
#define MSG_E2STEPS MSG_E "2 trangos/mm"
#define MSG_E3STEPS MSG_E "3 trangos/mm"
#define MSG_TEMPERATURE "Temperatura"
#define MSG_MOTION "Movimiento"
#define MSG_VOLUMETRIC "Filament"
#define MSG_VOLUMETRIC_ENABLED "E in mm3"
#define MSG_FILAMENT "Filament"
#define MSG_VOLUMETRIC_ENABLED MSG_E " in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER "Fil. Dia."
#define MSG_CONTRAST "Contrast"
#define MSG_CONTRAST "LCD Contrast"
#define MSG_STORE_EPROM "Alzar Memoria"
#define MSG_LOAD_EPROM "Cargar Memoria"
#define MSG_RESTORE_FAILSAFE "Rest. d'emerchen."
......@@ -113,8 +122,8 @@
#define MSG_PAUSE_PRINT "Pausar impresion"
#define MSG_RESUME_PRINT "Contin. impresion"
#define MSG_STOP_PRINT "Detener Impresion"
#define MSG_CARD_MENU "Menu de SD"
#define MSG_NO_CARD "No i hai tarcheta"
#define MSG_CARD_MENU "Menu de " MSG_SD
#define MSG_NO_CARD "No i hai " MSG_SD
#define MSG_DWELL "Reposo..."
#define MSG_USERWAIT "Asperan. ordines"
#define MSG_RESUMING "Contin. impresion"
......@@ -123,7 +132,7 @@
#define MSG_KILLED "ATURADA D'EMERCH."
#define MSG_STOPPED "ATURADA."
#define MSG_CONTROL_RETRACT "Retraer mm"
#define MSG_CONTROL_RETRACT_SWAP "Swap Retraer mm"
#define MSG_CONTROL_RETRACT_SWAP "Swap Re. mm"
#define MSG_CONTROL_RETRACTF "Retraer F"
#define MSG_CONTROL_RETRACT_ZLIFT "Devantar mm"
#define MSG_CONTROL_RETRACT_RECOVER "DesRet +mm"
......@@ -131,45 +140,54 @@
#define MSG_CONTROL_RETRACT_RECOVERF "DesRet F"
#define MSG_AUTORETRACT "AutoRetr."
#define MSG_FILAMENTCHANGE "Cambear"
#define MSG_INIT_SDCARD "Encetan. tarcheta"
#define MSG_CNG_SDCARD "Cambiar tarcheta"
#define MSG_INIT_SDCARD "Encetan. " MSG_SD
#define MSG_CNG_SDCARD "Cambiar " MSG_SD
#define MSG_ZPROBE_OUT "Z probe out. bed"
#define MSG_POSITION_UNKNOWN "Home X/Y before Z"
#define MSG_ZPROBE_ZOFFSET "Z Offset"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_BABYSTEP "Babystep"
#define MSG_BABYSTEP_X MSG_BABYSTEP " " MSG_X
#define MSG_BABYSTEP_Y MSG_BABYSTEP " " MSG_Y
#define MSG_BABYSTEP_Z MSG_BABYSTEP " " MSG_Z
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_HEATING_FAILED_LCD "Heating failed"
#define MSG_ERR_REDUNDANT_TEMP "Err: REDUNDANT TEMP ERROR"
#define MSG_ERR_REDUNDANT_TEMP "REDUNDANT TEMP ERROR"
#define MSG_THERMAL_RUNAWAY "THERMAL RUNAWAY"
#define MSG_ERR_MAXTEMP "Err: MAXTEMP"
#define MSG_ERR_MINTEMP "Err: MINTEMP"
#define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED"
#define MSG_ERR_MINTEMP_BED "Err: MINTEMP BED"
#define MSG_HOTEND_AD595 "HOTEND AD595 Offset & Gain"
#define MSG_ERR_MAXTEMP "MAXTEMP ERROR"
#define MSG_ERR_MINTEMP "MINTEMP ERROR"
#define MSG_ERR_MAXTEMP_BED "MAXTEMP BED ERROR"
#define MSG_ERR_MINTEMP_BED "MINTEMP BED ERROR"
#define MSG_END_DAY "days"
#define MSG_END_HOUR "hours"
#define MSG_END_MINUTE "minutes"
// Debug
#define MSG_DEBUG_ECHO "DEBUG ECHO ENABLED"
#define MSG_DEBUG_INFO "DEBUG INFO ENABLED"
#define MSG_DEBUG_ERRORS "DEBUG ERRORS ENABLED"
#define MSG_DEBUG_DRYRUN "DEBUG DRYRUN ENABLED"
#define MSG_ENDSTOPS_HIT "endstops hit: "
#define MSG_BABYSTEPPING "Babystepping"
#define MSG_BABYSTEPPING_X MSG_BABYSTEPPING " " MSG_X
#define MSG_BABYSTEPPING_Y MSG_BABYSTEPPING " " MSG_Y
#define MSG_BABYSTEPPING_Z MSG_BABYSTEPPING " " MSG_Z
#define MSG_ENDSTOP_XS MSG_X
#define MSG_ENDSTOP_YS MSG_Y
#define MSG_ENDSTOP_ZS MSG_Z
#define MSG_ENDSTOP_ZPS MSG_Z "P"
#define MSG_ENDSTOP_ES MSG_E
// Calibrate Delta
#if MECH(DELTA)
#define MSG_DELTA_CALIBRATE "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X "Calibrate X"
#define MSG_DELTA_CALIBRATE_Y "Calibrate Y"
#define MSG_DELTA_CALIBRATE_Z "Calibrate Z"
#define MSG_DELTA_CALIBRATE_X "Calibrate " MSG_X
#define MSG_DELTA_CALIBRATE_Y "Calibrate " MSG_Y
#define MSG_DELTA_CALIBRATE_Z "Calibrate " MSG_Z
#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center"
#endif // DELTA
// Scara
#if MECH(SCARA)
#define MSG_XSCALE "X Scale"
#define MSG_YSCALE "Y Scale"
#define MSG_SCALE "Scale"
#define MSG_XSCALE MSG_X " " MSG_SCALE
#define MSG_YSCALE MSG_Y " " MSG_SCALE
#endif
#define MSG_HEATING "Heating..."
......@@ -180,10 +198,10 @@
// Extra
#define MSG_LASER "Laser Preset"
#define MSG_CONFIG "Configuration"
#define MSG_E_BOWDEN_LENGTH "Extrude " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH "Retract " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_E_BOWDEN_LENGTH MSG_EXTRUDE " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH MSG_RETRACT " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM MSG_PURGE " " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM MSG_RETRACT " " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_SAVED_POS "Saved position"
#define MSG_RESTORING_POS "Restoring position"
#define MSG_INVALID_POS_SLOT "Invalid slot, total slots: "
......@@ -205,10 +223,10 @@
#define MSG_FWTEST_04 "Start check MOTOR"
#define MSG_FWTEST_ATTENTION "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
#define MSG_FWTEST_END "Finish Test. Disable FIRMWARE_TEST and recompile."
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#endif // FIRMWARE_TEST
#endif // LANGUAGE_AN_H
MarlinKimbra/language_bg.h
View file @ 521315e2
......@@ -7,54 +7,66 @@
*/
#ifndef LANGUAGE_BG_H
#define LANGUAGE_BG_H
#define MAPPER_D0D1 // For Cyrillic
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_5
#define WELCOME_MSG MACHINE_NAME " Готов."
#define MSG_SD_INSERTED "Картата е поставена"
#define MSG_SD_REMOVED "Картата е извадена"
#define MSG_SD "SD"
#define MSG_SD_INSERTED MSG_SD " поставена"
#define MSG_SD_REMOVED MSG_SD " извадена"
#define MSG_MAIN "Меню"
#define MSG_AUTOSTART "Автостарт"
#define MSG_DISABLE_STEPPERS "Изкл. двигатели"
#define MSG_AUTO_HOME "Паркиране"
#define MSG_MBL_SETTING "Manual Bed Leveling"
#define MSG_MBL_BUTTON " Press the button "
#define MSG_MBL_INTRO " Leveling bed... "
#define MSG_MBL_1 " Adjust first point "
#define MSG_MBL_2 " Adjust second point"
#define MSG_MBL_3 " Adjust third point "
#define MSG_MBL_4 " Adjust fourth point"
#define MSG_MBL_5 " Is it ok? "
#define MSG_MBL_6 " BED leveled! "
#define MSG_SET_HOME_OFFSETS "Задай Начало"
#define MSG_SET_ORIGIN "Изходна точка"
#define MSG_PREHEAT_PLA "Подгряване PLA"
#define MSG_PREHEAT_PLA_N "Подгряване PLA"
#define MSG_PREHEAT_PLA_ALL "Подгр. PLA Всички"
#define MSG_PREHEAT_PLA_BEDONLY "Подгр. PLA Легло"
#define MSG_PREHEAT_PLA_SETTINGS "Настройки PLA"
#define MSG_PREHEAT_ABS "Подгряване ABS"
#define MSG_PREHEAT_ABS_N "Подгряване ABS"
#define MSG_PREHEAT_ABS_ALL "Подгр. ABS Всички"
#define MSG_PREHEAT_ABS_BEDONLY "Подгр. ABS Легло"
#define MSG_PREHEAT_ABS_SETTINGS "Настройки ABS"
#define MSG_ONFOR "On x:"
#define MSG_PWRCONSUMED "P.er:"
#define MSG_PREHEAT "Подгр."
#define MSG_CONGIG "Настр."
#define MSG_PREHEAT_PLA MSG_PREHEAT " PLA"
#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " All"
#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " Bed"
#define MSG_PREHEAT_PLA_SETTINGS MSG_CONGIG " PLA"
#define MSG_PREHEAT_ABS MSG_PREHEAT " ABS"
#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " All"
#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " Bed"
#define MSG_PREHEAT_ABS_SETTINGS MSG_CONGIG " ABS"
#define MSG_PREHEAT_GUM MSG_PREHEAT " GUM"
#define MSG_PREHEAT_GUM_ALL MSG_PREHEAT_GUM " All"
#define MSG_PREHEAT_GUM_BEDONLY MSG_PREHEAT_GUM " Bed"
#define MSG_PREHEAT_GUM_SETTINGS MSG_CONGIG " GUM"
#define MSG_TOO_COLD_FOR_FILAMENTCHANGE "Hotend too cold to change filament"
#define MSG_COOLDOWN "Охлаждане"
#define MSG_SWITCH_PS_ON "Вкл. захранване"
#define MSG_SWITCH_PS_OFF "Изкл. захранване"
#define MSG_EXTRUDE "Екструзия"
#define MSG_RETRACT "Откат"
#define MSG_MOVE_AXIS "Движение по ос"
#define MSG_MOVE_X "Движение по X"
#define MSG_MOVE_Y "Движение по Y"
#define MSG_MOVE_Z "Движение по Z"
#define MSG_MOVE_E "Екструдер"
#define MSG_MOVE_01MM "Премести с 0.1mm"
#define MSG_MOVE_1MM "Премести с 1mm"
#define MSG_MOVE_10MM "Премести с 10mm"
#define MSG_PURGE "Purge"
#define MSG_LEVEL_BED "Нивелиране"
#define MSG_SPEED "Скорост"
#define MSG_NOZZLE LCD_STR_THERMOMETER " Дюза"
#define MSG_BED LCD_STR_THERMOMETER " Легло"
#define MSG_NOZZLE "Дюза"
#define MSG_BED "Легло"
#define MSG_FAN_SPEED "Вентилатор"
#define MSG_FLOW "Поток"
#define MSG_CONTROL "Управление"
#define MSG_STATS "Statistics"
#define MSG_FIX_LOSE_STEPS "Fix axis steps"
#define MSG_MIN LCD_STR_THERMOMETER " Минимум"
#define MSG_MAX LCD_STR_THERMOMETER " Максимум"
#define MSG_FACTOR LCD_STR_THERMOMETER " Фактор"
#define MSG_IDLEOOZING "Anti oozing"
#define MSG_AUTOTEMP "Авто-темп."
#define MSG_ON "Вкл. "
#define MSG_OFF "Изкл. "
......@@ -73,22 +85,31 @@
#define MSG_Y "Y"
#define MSG_Z "Z"
#define MSG_E "E"
#define MSG_MOVE "Move"
#define MSG_MOVE_AXIS MSG_MOVE " axis"
#define MSG_MOVE_X "Движение по " MSG_X
#define MSG_MOVE_Y "Движение по " MSG_Y
#define MSG_MOVE_Z "Движение по " MSG_Z
#define MSG_MOVE_01MM "Премести с 0.1mm"
#define MSG_MOVE_1MM "Премести с 1mm"
#define MSG_MOVE_10MM "Премести с 10mm"
#define MSG_MOVE_E "Екструдер"
#define MSG_VMIN "Vmin"
#define MSG_VTRAV_MIN "VTrav min"
#define MSG_AMAX "Amax "
#define MSG_A_RETRACT "A-откат"
#define MSG_A_TRAVEL "A-travel"
#define MSG_XSTEPS "X стъпки/mm"
#define MSG_YSTEPS "Y стъпки/mm"
#define MSG_ZSTEPS "Z стъпки/mm"
#define MSG_E0STEPS "E0steps/mm"
#define MSG_E1STEPS "E1steps/mm"
#define MSG_E2STEPS "E2steps/mm"
#define MSG_E3STEPS "E3steps/mm"
#define MSG_XSTEPS MSG_X " стъпки/mm"
#define MSG_YSTEPS MSG_Y " стъпки/mm"
#define MSG_ZSTEPS MSG_Z " стъпки/mm"
#define MSG_E0STEPS MSG_E "0 стъпки/mm"
#define MSG_E1STEPS MSG_E "1 стъпки/mm"
#define MSG_E2STEPS MSG_E "2 стъпки/mm"
#define MSG_E3STEPS MSG_E "3 стъпки/mm"
#define MSG_TEMPERATURE "Температура"
#define MSG_MOTION "Движение"
#define MSG_FILAMENT "Нишка"
#define MSG_VOLUMETRIC_ENABLED "E in mm3"
#define MSG_VOLUMETRIC_ENABLED MSG_E " in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER "Диам. нишка"
#define MSG_CONTRAST "LCD контраст"
#define MSG_STORE_EPROM "Запази в EPROM"
......@@ -101,8 +122,8 @@
#define MSG_PAUSE_PRINT "Пауза"
#define MSG_RESUME_PRINT "Възобнови печата"
#define MSG_STOP_PRINT "Спри печата"
#define MSG_CARD_MENU "Меню карта"
#define MSG_NO_CARD "Няма карта"
#define MSG_CARD_MENU "Меню " MSG_SD
#define MSG_NO_CARD "Няма " MSG_SD
#define MSG_DWELL "Почивка..."
#define MSG_USERWAIT "Изчакване"
#define MSG_RESUMING "Продълж. печата"
......@@ -112,53 +133,61 @@
#define MSG_STOPPED "СПРЯНО."
#define MSG_CONTROL_RETRACT "Откат mm"
#define MSG_CONTROL_RETRACT_SWAP "Смяна Откат mm"
#define MSG_CONTROL_RETRACTF "Откат V"
#define MSG_CONTROL_RETRACTF "Откат F"
#define MSG_CONTROL_RETRACT_ZLIFT "Скок mm"
#define MSG_CONTROL_RETRACT_RECOVER "Възврат +mm"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "Смяна Възврат +mm"
#define MSG_CONTROL_RETRACT_RECOVERF "Възврат V"
#define MSG_CONTROL_RETRACT_RECOVERF "Възврат F"
#define MSG_AUTORETRACT "Автоoткат"
#define MSG_FILAMENTCHANGE "Смяна нишка"
#define MSG_INIT_SDCARD "Иниц. SD-Карта"
#define MSG_CNG_SDCARD "Смяна SD-Карта"
#define MSG_INIT_SDCARD "Иниц. " MSG_SD
#define MSG_CNG_SDCARD "Смяна " MSG_SD
#define MSG_ZPROBE_OUT "Z-сондата е извадена"
#define MSG_POSITION_UNKNOWN "Задайте X/Y преди Z"
#define MSG_ZPROBE_ZOFFSET "Z Отстояние"
#define MSG_BABYSTEP "Babystep"
#define MSG_BABYSTEP_X "Министъпка X"
#define MSG_BABYSTEP_Y "Министъпка Y"
#define MSG_BABYSTEP_Z "Министъпка Z"
#define MSG_BABYSTEP "Министъпка"
#define MSG_BABYSTEP_X MSG_BABYSTEP " " MSG_X
#define MSG_BABYSTEP_Y MSG_BABYSTEP " " MSG_Y
#define MSG_BABYSTEP_Z MSG_BABYSTEP " " MSG_Z
#define MSG_ENDSTOP_ABORT "Стоп Кр.Изключватели"
#define MSG_HEATING_FAILED_LCD "Heating failed"
#define MSG_ERR_REDUNDANT_TEMP "Err: REDUNDANT TEMP ERROR"
#define MSG_ERR_REDUNDANT_TEMP "REDUNDANT TEMP ERROR"
#define MSG_THERMAL_RUNAWAY "THERMAL RUNAWAY"
#define MSG_ERR_MAXTEMP "Err: MAXTEMP"
#define MSG_ERR_MINTEMP "Err: MINTEMP"
#define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED"
#define MSG_ERR_MINTEMP_BED "Err: MINTEMP BED"
#define MSG_HOTEND_AD595 "HOTEND AD595 Offset & Gain"
#define MSG_ERR_MAXTEMP "MAXTEMP ERROR"
#define MSG_ERR_MINTEMP "MINTEMP ERROR"
#define MSG_ERR_MAXTEMP_BED "MAXTEMP BED ERROR"
#define MSG_ERR_MINTEMP_BED "MINTEMP BED ERROR"
#define MSG_END_DAY "days"
#define MSG_END_HOUR "часа"
#define MSG_END_MINUTE "минути"
// Debug
#define MSG_DEBUG_ECHO "DEBUG ECHO ENABLED"
#define MSG_DEBUG_INFO "DEBUG INFO ENABLED"
#define MSG_DEBUG_ERRORS "DEBUG ERRORS ENABLED"
#define MSG_DEBUG_DRYRUN "DEBUG DRYRUN ENABLED"
#define MSG_ENDSTOPS_HIT "endstops hit: "
#define MSG_BABYSTEPPING "Babystepping"
#define MSG_BABYSTEPPING_X MSG_BABYSTEPPING " " MSG_X
#define MSG_BABYSTEPPING_Y MSG_BABYSTEPPING " " MSG_Y
#define MSG_BABYSTEPPING_Z MSG_BABYSTEPPING " " MSG_Z
#define MSG_ENDSTOP_XS MSG_X
#define MSG_ENDSTOP_YS MSG_Y
#define MSG_ENDSTOP_ZS MSG_Z
#define MSG_ENDSTOP_ZPS MSG_Z "P"
#define MSG_ENDSTOP_ES MSG_E
// Calibrate Delta
#if MECH(DELTA)
#define MSG_DELTA_CALIBRATE "Делта Калибровка"
#define MSG_DELTA_CALIBRATE_X "Калибровка X"
#define MSG_DELTA_CALIBRATE_Y "Калибровка Y"
#define MSG_DELTA_CALIBRATE_Z "Калибровка Z"
#define MSG_DELTA_CALIBRATE_CENTER "Калибровка Център"
#define MSG_DELTA_CALIBRATE "Делта Калибровка"
#define MSG_DELTA_CALIBRATE_X "Калибровка " MSG_X
#define MSG_DELTA_CALIBRATE_Y "Калибровка " MSG_Y
#define MSG_DELTA_CALIBRATE_Z "Калибровка " MSG_Z
#define MSG_DELTA_CALIBRATE_CENTER "Калибровка Център"
#endif // DELTA
// Scara
#if MECH(SCARA)
#define MSG_XSCALE "X Scale"
#define MSG_YSCALE "Y Scale"
#define MSG_SCALE "Scale"
#define MSG_XSCALE MSG_X " " MSG_SCALE
#define MSG_YSCALE MSG_Y " " MSG_SCALE
#endif
#define MSG_HEATING "Heating..."
......@@ -169,10 +198,10 @@
// Extra
#define MSG_LASER "Laser Preset"
#define MSG_CONFIG "Configuration"
#define MSG_E_BOWDEN_LENGTH "Extrude " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH "Retract " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_E_BOWDEN_LENGTH MSG_EXTRUDE " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH MSG_RETRACT " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM MSG_PURGE " " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM MSG_RETRACT " " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_SAVED_POS "Saved position"
#define MSG_RESTORING_POS "Restoring position"
#define MSG_INVALID_POS_SLOT "Invalid slot, total slots: "
......@@ -194,10 +223,10 @@
#define MSG_FWTEST_04 "Start check MOTOR"
#define MSG_FWTEST_ATTENTION "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
#define MSG_FWTEST_END "Finish Test. Disable FIRMWARE_TEST and recompile."
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#endif // FIRMWARE_TEST
#endif // LANGUAGE_BG_H
MarlinKimbra/language_ca.h
View file @ 521315e2
......@@ -8,68 +8,68 @@
#ifndef LANGUAGE_CA_H
#define LANGUAGE_CA_H
//#define MAPPER_NON
#define MAPPER_C2C3 // because of "ó"
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define MAPPER_C2C3 // because of "ó"
#define DISPLAY_CHARSET_ISO10646_1
#define WELCOME_MSG MACHINE_NAME " preparada."
#define MSG_SD_INSERTED "SD detectada."
#define MSG_SD_REMOVED "SD expulsada."
#define MSG_SD "SD"
#define MSG_SD_INSERTED MSG_SD " detectada."
#define MSG_SD_REMOVED MSG_SD " expulsada."
#define MSG_MAIN "Menu principal"
#define MSG_AUTOSTART "Inici automatic"
#define MSG_DISABLE_STEPPERS "Apagar motors"
#define MSG_AUTO_HOME "Home global"
#define MSG_BED_SETTING "Bed Setting"
#define MSG_LP_INTRO " Leveling bed... Press to start "
#define MSG_LP_1 " Adjust first point & Press the button"
#define MSG_LP_2 " Adjust second point & Press the button"
#define MSG_LP_3 " Adjust third point & Press the button"
#define MSG_LP_4 " Adjust fourth point & Press the button"
#define MSG_LP_5 " Is it ok? Press to end"
#define MSG_LP_6 " BED leveled!"
#define MSG_MBL_SETTING "Manual Bed Leveling"
#define MSG_MBL_BUTTON " Press the button "
#define MSG_MBL_INTRO " Leveling bed... "
#define MSG_MBL_1 " Adjust first point "
#define MSG_MBL_2 " Adjust second point"
#define MSG_MBL_3 " Adjust third point "
#define MSG_MBL_4 " Adjust fourth point"
#define MSG_MBL_5 " Is it ok? "
#define MSG_MBL_6 " BED leveled! "
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_SET_ORIGIN "Establir origen"
#define MSG_PREHEAT_PLA "Preescalfar PLA"
#define MSG_PREHEAT_PLA_ALL "Preesc. tot PLA All"
#define MSG_PREHEAT_PLA_BEDONLY "Preesc. llit PLA"
#define MSG_PREHEAT_PLA_SETTINGS "Configuració PLA"
#define MSG_PREHEAT_ABS "Preescalfar ABS"
#define MSG_PREHEAT_ABS_ALL "Preheat ABS All"
#define MSG_PREHEAT_ABS_BEDONLY "Preesc. llit ABS"
#define MSG_PREHEAT_ABS_SETTINGS "Configuració ABS"
#define MSG_PREHEAT_GUM "Preheat GUM"
#define MSG_PREHEAT_GUM_ALL "Preheat GUM All"
#define MSG_PREHEAT_GUM_BEDONLY "Preheat GUM Bed"
#define MSG_PREHEAT_GUM_SETTINGS "Preheat GUM conf"
#define MSG_TOO_COLD_FOR_M600 "M600 Hotend too cold to change filament"
#define MSG_ONFOR "On x:"
#define MSG_PWRCONSUMED "P.er:"
#define MSG_PREHEAT "Preesc."
#define MSG_CONFIG "Configuració
#define MSG_PREHEAT_PLA MSG_PREHEAT " PLA"
#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " All"
#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " llit"
#define MSG_PREHEAT_PLA_SETTINGS "PLA " MSG_CONFIG
#define MSG_PREHEAT_ABS MSG_PREHEAT " ABS"
#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " All"
#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " llit"
#define MSG_PREHEAT_ABS_SETTINGS "ABS " MSG_CONFIG
#define MSG_PREHEAT_GUM MSG_PREHEAT " GUM"
#define MSG_PREHEAT_GUM_ALL MSG_PREHEAT_GUM " All"
#define MSG_PREHEAT_GUM_BEDONLY MSG_PREHEAT_GUM " Bed"
#define MSG_PREHEAT_GUM_SETTINGS "GUM " MSG_CONFIG
#define MSG_TOO_COLD_FOR_FILAMENTCHANGE "Hotend too cold to change filament"
#define MSG_COOLDOWN "Refredar"
#define MSG_SWITCH_PS_ON "Switch power on"
#define MSG_SWITCH_PS_OFF "Switch power off"
#define MSG_EXTRUDE "Extruir"
#define MSG_RETRACT "Refredar"
#define MSG_MOVE_AXIS "Moure eixos"
#define MSG_MOVE_X "Moure X"
#define MSG_MOVE_Y "Moure Y"
#define MSG_MOVE_Z "Moure Z"
#define MSG_MOVE_E "Extrusor"
#define MSG_MOVE_01MM "Moure 0.1mm"
#define MSG_MOVE_1MM "Moure 1mm"
#define MSG_MOVE_10MM "Moure 10mm"
#define MSG_PURGE "Purge"
#define MSG_LEVEL_BED "Level bed"
#define MSG_SPEED "Velocitat"
#define MSG_NOZZLE "Nozzle"
#define MSG_BED "Llit"
#define MSG_FAN_SPEED "Vel. Ventilador"
#define MSG_FLOW "Fluxe"
#define MSG_CONTROL "Control"
#define MSG_MIN " \002 Min"
#define MSG_MAX " \002 Max"
#define MSG_FACTOR " \002 Fact"
#define MSG_STATS "Statistics"
#define MSG_FIX_LOSE_STEPS "Fix axis steps"
#define MSG_MIN LCD_STR_THERMOMETER " Min"
#define MSG_MAX LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR LCD_STR_THERMOMETER " Fact"
#define MSG_IDLEOOZING "Anti oozing"
#define MSG_AUTOTEMP "Autotemp"
#define MSG_ON "On "
#define MSG_OFF "Off"
#define MSG_ON "ON "
#define MSG_OFF "OFF"
#define MSG_PID_P "PID-P"
#define MSG_PID_I "PID-I"
#define MSG_PID_D "PID-D"
......@@ -81,26 +81,35 @@
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX "Vmax "
#define MSG_X "x"
#define MSG_Y "y"
#define MSG_Z "z"
#define MSG_E "e"
#define MSG_X "X"
#define MSG_Y "Y"
#define MSG_Z "Z"
#define MSG_E "E"
#define MSG_MOVE "Move"
#define MSG_MOVE_AXIS MSG_MOVE " eixos"
#define MSG_MOVE_X MSG_MOVE " " MSG_X
#define MSG_MOVE_Y MSG_MOVE " " MSG_Y
#define MSG_MOVE_Z MSG_MOVE " " MSG_Z
#define MSG_MOVE_01MM MSG_MOVE " 0.1mm"
#define MSG_MOVE_1MM MSG_MOVE " 1mm"
#define MSG_MOVE_10MM MSG_MOVE " 10mm"
#define MSG_MOVE_E "Extrusor"
#define MSG_VMIN "Vmin"
#define MSG_VTRAV_MIN "VTrav min"
#define MSG_AMAX "Amax "
#define MSG_A_RETRACT "A-retract"
#define MSG_A_TRAVEL "A-travel"
#define MSG_XSTEPS "X passos/mm"
#define MSG_YSTEPS "Y passos/mm"
#define MSG_ZSTEPS "Z passos/mm"
#define MSG_E0STEPS "E0 passos/mm"
#define MSG_E1STEPS "E1 passos/mm"
#define MSG_E2STEPS "E2 passos/mm"
#define MSG_E3STEPS "E3 passos/mm"
#define MSG_XSTEPS MSG_X " passos/mm"
#define MSG_YSTEPS MSG_Y " passos/mm"
#define MSG_ZSTEPS MSG_Z " passos/mm"
#define MSG_E0STEPS MSG_E "0 passos/mm"
#define MSG_E1STEPS MSG_E "1 passos/mm"
#define MSG_E2STEPS MSG_E "2 passos/mm"
#define MSG_E3STEPS MSG_E "3 passos/mm"
#define MSG_TEMPERATURE "Temperatura"
#define MSG_MOTION "Moviment"
#define MSG_VOLUMETRIC "Filament"
#define MSG_VOLUMETRIC_ENABLED "E in mm3"
#define MSG_VOLUMETRIC_ENABLED MSG_E " in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER "Fil. Dia."
#define MSG_CONTRAST "Contrast de LCD"
#define MSG_STORE_EPROM "Desar a memoria"
......@@ -113,8 +122,8 @@
#define MSG_PAUSE_PRINT "Pausa imp."
#define MSG_RESUME_PRINT "Reprendre imp."
#define MSG_STOP_PRINT "Parar inp."
#define MSG_CARD_MENU "Imprimir de SD"
#define MSG_NO_CARD "-Sense targeta SD"
#define MSG_CARD_MENU "Imprimir de " MSG_SD
#define MSG_NO_CARD "Sense targeta " MSG_SD
#define MSG_DWELL "Repos..."
#define MSG_USERWAIT "Esperant usuari.."
#define MSG_RESUMING "Reprenent imp."
......@@ -123,7 +132,7 @@
#define MSG_KILLED "PARADA DE EMERG. "
#define MSG_STOPPED "ATURAT. "
#define MSG_CONTROL_RETRACT "Retreure mm"
#define MSG_CONTROL_RETRACT_SWAP "Swap Retreure mm"
#define MSG_CONTROL_RETRACT_SWAP "Swap Re. mm"
#define MSG_CONTROL_RETRACTF "Retreure F"
#define MSG_CONTROL_RETRACT_ZLIFT "Aixecar mm"
#define MSG_CONTROL_RETRACT_RECOVER "DesRet +mm"
......@@ -131,45 +140,54 @@
#define MSG_CONTROL_RETRACT_RECOVERF "DesRet F"
#define MSG_AUTORETRACT "AutoRetr."
#define MSG_FILAMENTCHANGE "Canviar filament"
#define MSG_INIT_SDCARD "Iniciant SD"
#define MSG_CNG_SDCARD "Canviar SD"
#define MSG_INIT_SDCARD "Iniciant " MSG_SD
#define MSG_CNG_SDCARD "Canviar " MSG_SD
#define MSG_ZPROBE_OUT "Z probe out. bed"
#define MSG_POSITION_UNKNOWN "Home X/Y abans Z"
#define MSG_ZPROBE_ZOFFSET "Z Offset"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_BABYSTEP "Babystep"
#define MSG_BABYSTEP_X MSG_BABYSTEP " " MSG_X
#define MSG_BABYSTEP_Y MSG_BABYSTEP " " MSG_Y
#define MSG_BABYSTEP_Z MSG_BABYSTEP " " MSG_Z
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_HEATING_FAILED_LCD "Heating failed"
#define MSG_ERR_REDUNDANT_TEMP "Err: REDUNDANT TEMP ERROR"
#define MSG_ERR_REDUNDANT_TEMP "REDUNDANT TEMP ERROR"
#define MSG_THERMAL_RUNAWAY "THERMAL RUNAWAY"
#define MSG_ERR_MAXTEMP "Err: MAXTEMP"
#define MSG_ERR_MINTEMP "Err: MINTEMP"
#define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED"
#define MSG_ERR_MINTEMP_BED "Err: MINTEMP BED"
#define MSG_HOTEND_AD595 "HOTEND AD595 Offset & Gain"
#define MSG_ERR_MAXTEMP "MAXTEMP ERROR"
#define MSG_ERR_MINTEMP "MINTEMP ERROR"
#define MSG_ERR_MAXTEMP_BED "MAXTEMP BED ERROR"
#define MSG_ERR_MINTEMP_BED "MINTEMP BED ERROR"
#define MSG_END_DAY "days"
#define MSG_END_HOUR "hours"
#define MSG_END_MINUTE "minutes"
// Debug
#define MSG_DEBUG_ECHO "DEBUG ECHO ENABLED"
#define MSG_DEBUG_INFO "DEBUG INFO ENABLED"
#define MSG_DEBUG_ERRORS "DEBUG ERRORS ENABLED"
#define MSG_DEBUG_DRYRUN "DEBUG DRYRUN ENABLED"
#define MSG_ENDSTOPS_HIT "endstops hit: "
#define MSG_BABYSTEPPING "Babystepping"
#define MSG_BABYSTEPPING_X MSG_BABYSTEPPING " " MSG_X
#define MSG_BABYSTEPPING_Y MSG_BABYSTEPPING " " MSG_Y
#define MSG_BABYSTEPPING_Z MSG_BABYSTEPPING " " MSG_Z
#define MSG_ENDSTOP_XS MSG_X
#define MSG_ENDSTOP_YS MSG_Y
#define MSG_ENDSTOP_ZS MSG_Z
#define MSG_ENDSTOP_ZPS MSG_Z "P"
#define MSG_ENDSTOP_ES MSG_E
// Calibrate Delta
#if MECH(DELTA)
#define MSG_DELTA_CALIBRATE "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X "Calibrate X"
#define MSG_DELTA_CALIBRATE_Y "Calibrate Y"
#define MSG_DELTA_CALIBRATE_Z "Calibrate Z"
#define MSG_DELTA_CALIBRATE_X "Calibrate " MSG_X
#define MSG_DELTA_CALIBRATE_Y "Calibrate " MSG_Y
#define MSG_DELTA_CALIBRATE_Z "Calibrate " MSG_Z
#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center"
#endif // DELTA
// Scara
#if MECH(SCARA)
#define MSG_XSCALE "X Scale"
#define MSG_YSCALE "Y Scale"
#define MSG_SCALE "Scale"
#define MSG_XSCALE MSG_X " " MSG_SCALE
#define MSG_YSCALE MSG_Y " " MSG_SCALE
#endif
#define MSG_HEATING "Heating..."
......@@ -180,10 +198,10 @@
// Extra
#define MSG_LASER "Laser Preset"
#define MSG_CONFIG "Configuration"
#define MSG_E_BOWDEN_LENGTH "Extrude " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH "Retract " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_E_BOWDEN_LENGTH MSG_EXTRUDE " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH MSG_RETRACT " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM MSG_PURGE " " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM MSG_RETRACT " " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_SAVED_POS "Saved position"
#define MSG_RESTORING_POS "Restoring position"
#define MSG_INVALID_POS_SLOT "Invalid slot, total slots: "
......@@ -205,10 +223,10 @@
#define MSG_FWTEST_04 "Start check MOTOR"
#define MSG_FWTEST_ATTENTION "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
#define MSG_FWTEST_END "Finish Test. Disable FIRMWARE_TEST and recompile."
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#endif // FIRMWARE_TEST
#endif // LANGUAGE_EN_H
#endif // LANGUAGE_CA_H
MarlinKimbra/language_cn.h
View file @ 521315e2
......@@ -2,16 +2,18 @@
* Chinese
*
* LCD Menu Messages
* Se also documentation/LCDLanguageFont.md
* See also documentation/LCDLanguageFont.md
*
*/
#ifndef LANGUAGE_CN_H
#define LANGUAGE_CN_H
#define MAPPER_NON // For direct asci codes
#define MAPPER_NON // For direct asci codes
#define DISPLAY_CHARSET_ISO10646_CN
#define WELCOME_MSG "\xa4\xa5\xa6\xa7"
#define MSG_SD "SD"
#define MSG_SD_INSERTED "\xa8\xa9\xaa\xab"
#define MSG_SD_REMOVED "\xa8\xa9\xac\xad"
#define MSG_MAIN "\xae\xaf\xb0"
......@@ -31,33 +33,28 @@
#define MSG_SET_ORIGIN "\xbe\xbf\xbc\xbd"
#define MSG_ONFOR "On x:"
#define MSG_PWRCONSUMED "P.er:"
#define MSG_PREHEAT_PLA "\xc3\xc4 PLA"
#define MSG_PREHEAT "\xc3\xc4"
#define MSG_CONFIG "\xbe\xbf"
#define MSG_PREHEAT_PLA MSG_PREHEAT " PLA"
#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " \xc5\xc6"
#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " \xc4\xc7"
#define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA " \xbe\xbf"
#define MSG_PREHEAT_ABS "\xc3\xc4 ABS"
#define MSG_PREHEAT_PLA_SETTINGS "PLA " MSG_CONFIG
#define MSG_PREHEAT_ABS MSG_PREHEAT " ABS"
#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " \xc5\xc6"
#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " \xbe\xc6"
#define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS " \xbe\xbf"
#define MSG_PREHEAT_GUM "Preheat GUM"
#define MSG_PREHEAT_GUM_ALL "Preheat GUM All"
#define MSG_PREHEAT_GUM_BEDONLY "Preheat GUM Bed"
#define MSG_PREHEAT_GUM_SETTINGS "Preheat GUM conf"
#define MSG_PREHEAT_ABS_SETTINGS "ABS " MSG_CONFIG
#define MSG_PREHEAT_GUM MSG_PREHEAT " GUM"
#define MSG_PREHEAT_GUM_ALL MSG_PREHEAT_GUM " \xc5\xc6"
#define MSG_PREHEAT_GUM_BEDONLY MSG_PREHEAT_GUM " \xc4\xc7"
#define MSG_PREHEAT_GUM_SETTINGS "GUM " MSG_CONFIG
#define MSG_TOO_COLD_FOR_FILAMENTCHANGE "Hotend too cold to change filament"
#define MSG_COOLDOWN "\xc8\xc9"
#define MSG_SWITCH_PS_ON "\xb9\xcb\xca\xb3"
#define MSG_SWITCH_PS_OFF "\xb9\xcb\xb5\xb6"
#define MSG_EXTRUDE "\xcc\xad"
#define MSG_RETRACT "\xbb\xcd"
#define MSG_MOVE_AXIS "\xc1\xb2\xce"
#define MSG_PURGE "Purge"
#define MSG_LEVEL_BED "\xcf\xe0\xc4\xc7"
#define MSG_MOVE_X "\xc1\xb2 X"
#define MSG_MOVE_Y "\xc1\xb2 Y"
#define MSG_MOVE_Z "\xc1\xb2 Z"
#define MSG_MOVE_E "\xcc\xad\xba"
#define MSG_MOVE_01MM "\xc1\xb2 0.1mm"
#define MSG_MOVE_1MM "\xc1\xb2 1mm"
#define MSG_MOVE_10MM "\xc1\xb2 10mm"
#define MSG_SPEED "\xd1\xd2"
#define MSG_NOZZLE "\xd3\xd4"
#define MSG_BED "\xc4\xc7"
......@@ -71,8 +68,8 @@
#define MSG_FACTOR LCD_STR_THERMOMETER " \xdd\xde"
#define MSG_IDLEOOZING "Anti oozing"
#define MSG_AUTOTEMP "\xb1\xb2\xd8\xc9"
#define MSG_ON "\xb3 " // intentional space to shift wide symbol to the left
#define MSG_OFF "\xb5 " // intentional space to shift wide symbol to the left
#define MSG_ON "\xb3 "
#define MSG_OFF "\xb5 "
#define MSG_PID_P "PID-P"
#define MSG_PID_I "PID-I"
#define MSG_PID_D "PID-D"
......@@ -84,26 +81,35 @@
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX "Vmax "
#define MSG_X "x"
#define MSG_Y "y"
#define MSG_Z "z"
#define MSG_E "e"
#define MSG_X "X"
#define MSG_Y "Y"
#define MSG_Z "Z"
#define MSG_E "E"
#define MSG_MOVE "\xc1\xb2"
#define MSG_MOVE_AXIS MSG_MOVE " \xce"
#define MSG_MOVE_X MSG_MOVE " " MSG_X
#define MSG_MOVE_Y MSG_MOVE " " MSG_Y
#define MSG_MOVE_Z MSG_MOVE " " MSG_Z
#define MSG_MOVE_01MM MSG_MOVE " 0.1mm"
#define MSG_MOVE_1MM MSG_MOVE " 1mm"
#define MSG_MOVE_10MM MSG_MOVE " 10mm"
#define MSG_MOVE_E "\xcc\xad\xba"
#define MSG_VMIN "Vmin"
#define MSG_VTRAV_MIN "VTrav min"
#define MSG_AMAX "Amax "
#define MSG_A_RETRACT "A-retract"
#define MSG_A_TRAVEL "A-travel"
#define MSG_XSTEPS "Xsteps/mm"
#define MSG_YSTEPS "Ysteps/mm"
#define MSG_ZSTEPS "Zsteps/mm"
#define MSG_E0STEPS "E0steps/mm"
#define MSG_E1STEPS "E1steps/mm"
#define MSG_E2STEPS "E2steps/mm"
#define MSG_E3STEPS "E3steps/mm"
#define MSG_XSTEPS MSG_X " steps/mm"
#define MSG_YSTEPS MSG_Y " steps/mm"
#define MSG_ZSTEPS MSG_Z " steps/mm"
#define MSG_E0STEPS MSG_E "0 steps/mm"
#define MSG_E1STEPS MSG_E "1 steps/mm"
#define MSG_E2STEPS MSG_E "2 steps/mm"
#define MSG_E3STEPS MSG_E "3 steps/mm"
#define MSG_TEMPERATURE "\xc9\xd2"
#define MSG_MOTION "\xdf\xb2"
#define MSG_FILAMENT "Filament"
#define MSG_VOLUMETRIC_ENABLED "E in mm3"
#define MSG_VOLUMETRIC_ENABLED MSG_E " in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER "Fil. Dia."
#define MSG_CONTRAST "LCD contrast"
#define MSG_STORE_EPROM "Store memory"
......@@ -126,54 +132,62 @@
#define MSG_KILLED "KILLED. "
#define MSG_STOPPED "STOPPED. "
#define MSG_CONTROL_RETRACT "Retract mm"
#define MSG_CONTROL_RETRACT_SWAP "Swap Re.mm"
#define MSG_CONTROL_RETRACTF "Retract V"
#define MSG_CONTROL_RETRACT_SWAP "Swap Re. mm"
#define MSG_CONTROL_RETRACTF "Retract F"
#define MSG_CONTROL_RETRACT_ZLIFT "Hop mm"
#define MSG_CONTROL_RETRACT_RECOVER "UnRet +mm"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "S UnRet+mm"
#define MSG_CONTROL_RETRACT_RECOVERF "UnRet V"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "Swap UnRet +mm"
#define MSG_CONTROL_RETRACT_RECOVERF "UnRet F"
#define MSG_AUTORETRACT "AutoRetr."
#define MSG_FILAMENTCHANGE "Change filament"
#define MSG_INIT_SDCARD "Init. SD card"
#define MSG_CNG_SDCARD "Change SD card"
#define MSG_INIT_SDCARD "Init. " MSG_SD
#define MSG_CNG_SDCARD "Change " MSG_SD
#define MSG_ZPROBE_OUT "Z probe out. bed"
#define MSG_POSITION_UNKNOWN "Home X/Y before Z"
#define MSG_ZPROBE_ZOFFSET "Z Offset"
#define MSG_BABYSTEP "Babystep"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_BABYSTEP_X MSG_BABYSTEP " " MSG_X
#define MSG_BABYSTEP_Y MSG_BABYSTEP " " MSG_Y
#define MSG_BABYSTEP_Z MSG_BABYSTEP " " MSG_Z
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_HEATING_FAILED_LCD "Heating failed"
#define MSG_ERR_REDUNDANT_TEMP "Err: REDUNDANT TEMP ERROR"
#define MSG_ERR_REDUNDANT_TEMP "REDUNDANT TEMP ERROR"
#define MSG_THERMAL_RUNAWAY "THERMAL RUNAWAY"
#define MSG_ERR_MAXTEMP "Err: MAXTEMP"
#define MSG_ERR_MINTEMP "Err: MINTEMP"
#define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED"
#define MSG_ERR_MINTEMP_BED "Err: MINTEMP BED"
#define MSG_HOTEND_AD595 "HOTEND AD595 Offset & Gain"
#define MSG_ERR_MAXTEMP "MAXTEMP ERROR"
#define MSG_ERR_MINTEMP "MINTEMP ERROR"
#define MSG_ERR_MAXTEMP_BED "MAXTEMP BED ERROR"
#define MSG_ERR_MINTEMP_BED "MINTEMP BED ERROR"
#define MSG_END_DAY "days"
#define MSG_END_HOUR "hours"
#define MSG_END_MINUTE "minutes"
// Debug
#define MSG_DEBUG_ECHO "DEBUG ECHO ENABLED"
#define MSG_DEBUG_INFO "DEBUG INFO ENABLED"
#define MSG_DEBUG_ERRORS "DEBUG ERRORS ENABLED"
#define MSG_DEBUG_DRYRUN "DEBUG DRYRUN ENABLED"
#define MSG_ENDSTOPS_HIT "endstops hit: "
#define MSG_BABYSTEPPING "Babystepping"
#define MSG_BABYSTEPPING_X MSG_BABYSTEPPING " " MSG_X
#define MSG_BABYSTEPPING_Y MSG_BABYSTEPPING " " MSG_Y
#define MSG_BABYSTEPPING_Z MSG_BABYSTEPPING " " MSG_Z
#define MSG_ENDSTOP_XS MSG_X
#define MSG_ENDSTOP_YS MSG_Y
#define MSG_ENDSTOP_ZS MSG_Z
#define MSG_ENDSTOP_ZPS MSG_Z "P"
#define MSG_ENDSTOP_ES MSG_E
// Calibrate Delta
#if MECH(DELTA)
#define MSG_DELTA_CALIBRATE "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X "Calibrate X"
#define MSG_DELTA_CALIBRATE_Y "Calibrate Y"
#define MSG_DELTA_CALIBRATE_Z "Calibrate Z"
#define MSG_DELTA_CALIBRATE_X "Calibrate " MSG_X
#define MSG_DELTA_CALIBRATE_Y "Calibrate " MSG_Y
#define MSG_DELTA_CALIBRATE_Z "Calibrate " MSG_Z
#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center"
#endif // DELTA
// Scara
#if MECH(SCARA)
#define MSG_XSCALE "X Scale"
#define MSG_YSCALE "Y Scale"
#define MSG_SCALE "Scale"
#define MSG_XSCALE MSG_X " " MSG_SCALE
#define MSG_YSCALE MSG_Y " " MSG_SCALE
#endif
#define MSG_HEATING "Heating..."
......@@ -184,10 +198,10 @@
// Extra
#define MSG_LASER "Laser Preset"
#define MSG_CONFIG "Configuration"
#define MSG_E_BOWDEN_LENGTH "Extrude " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH "Retract " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_E_BOWDEN_LENGTH MSG_EXTRUDE " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH MSG_RETRACT " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM MSG_PURGE " " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM MSG_RETRACT " " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_SAVED_POS "Saved position"
#define MSG_RESTORING_POS "Restoring position"
#define MSG_INVALID_POS_SLOT "Invalid slot, total slots: "
......@@ -209,10 +223,10 @@
#define MSG_FWTEST_04 "Start check MOTOR"
#define MSG_FWTEST_ATTENTION "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
#define MSG_FWTEST_END "Finish Test. Disable FIRMWARE_TEST and recompile."
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#endif // FIRMWARE_TEST
#endif // LANGUAGE_CN_H
MarlinKimbra/language_da.h
View file @ 521315e2
......@@ -11,13 +11,15 @@
#define MAPPER_C2C3
#define DISPLAY_CHARSET_ISO10646_1
#define WELCOME_MSG MACHINE_NAME " er klar"
#define MSG_SD_INSERTED "Kort isat"
#define MSG_SD_REMOVED "Kort fjernet"
#define MSG_SD "Kort"
#define MSG_SD_INSERTED MSG_SD " isat"
#define MSG_SD_REMOVED MSG_SD " fjernet"
#define MSG_MAIN "Main"
#define MSG_AUTOSTART "Autostart"
#define MSG_DISABLE_STEPPERS "Disable steppers"
#define MSG_AUTO_HOME "Home" // G28
#define MSG_AUTO_HOME "Auto home"
#define MSG_MBL_SETTING "Manual Bed Leveling"
#define MSG_MBL_BUTTON " Press the button "
#define MSG_MBL_INTRO " Leveling bed... "
......@@ -31,78 +33,84 @@
#define MSG_SET_ORIGIN "Set origin"
#define MSG_ONFOR "On x:"
#define MSG_PWRCONSUMED "P.er:"
#define MSG_DISABLE_STEPPERS "Slå stepper fra"
#define MSG_SET_HOME_OFFSETS "Sæt home offsets"
#define MSG_SET_ORIGIN "Sæt origin"
#define MSG_PREHEAT "Forvarm"
#define MSG_CONFIG "conf."
#define MSG_PREHEAT_PLA MSG_PREHEAT " PLA"
#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " Alle"
#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " Bed"
#define MSG_PREHEAT_PLA_SETTINGS "PLA " MSG_CONFIG
#define MSG_PREHEAT_ABS MSG_PREHEAT " ABS"
#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " Alle"
#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " Bed"
#define MSG_PREHEAT_ABS_SETTINGS "ABS " MSG_CONFIG
#define MSG_PREHEAT_GUM MSG_PREHEAT " GUM"
#define MSG_PREHEAT_GUM_ALL MSG_PREHEAT_GUM " Alle"
#define MSG_PREHEAT_GUM_BEDONLY MSG_PREHEAT_GUM " Bed"
#define MSG_PREHEAT_GUM_SETTINGS "GUM " MSG_CONFIG
#define MSG_TOO_COLD_FOR_FILAMENTCHANGE "Hotend too cold to change filament"
#define MSG_COOLDOWN "Afkøl"
#define MSG_SWITCH_PS_ON "Slå strøm til"
#define MSG_SWITCH_PS_OFF "Slå strøm fra"
#define MSG_PREHEAT_PLA "Forvarm PLA"
#define MSG_PREHEAT_PLA_N "Forvarm PLA "
#define MSG_PREHEAT_PLA_ALL "Forvarm PLA Alle"
#define MSG_PREHEAT_PLA_BEDONLY "Forvarm PLA Bed"
#define MSG_PREHEAT_PLA_SETTINGS "Forvarm PLA conf"
#define MSG_PREHEAT_ABS "Forvarm ABS"
#define MSG_PREHEAT_ABS_N "Forvarm ABS "
#define MSG_PREHEAT_ABS_ALL "Forvarm ABS Alle"
#define MSG_PREHEAT_ABS_BEDONLY "Forvarm ABS Bed"
#define MSG_PREHEAT_ABS_SETTINGS "Forvarm ABS conf"
#define MSG_EXTRUDE "Extruder"
#define MSG_COOLDOWN "Afkøl"
#define MSG_RETRACT "Retract"
#define MSG_MOVE_AXIS "Flyt akser"
#define MSG_PURGE "Purge"
#define MSG_LEVEL_BED "Level bed"
#define MSG_MOVE_X "Flyt X"
#define MSG_MOVE_Y "Flyt Y"
#define MSG_MOVE_Z "Flyt Z"
#define MSG_MOVE_E "Extruder"
#define MSG_MOVE_01MM "Flyt 0.1mm"
#define MSG_MOVE_1MM "Flyt 1mm"
#define MSG_MOVE_10MM "Flyt 10mm"
#define MSG_SPEED "Hastighed"
#define MSG_NOZZLE "Dyse"
#define MSG_NOZZLE1 "Dyse2"
#define MSG_NOZZLE2 "Dyse3"
#define MSG_BED "Plade"
#define MSG_FAN_SPEED "Blæser hastighed"
#define MSG_FLOW "Flow"
#define MSG_FLOW0 "Flow 0"
#define MSG_FLOW1 "Flow 1"
#define MSG_FLOW2 "Flow 2"
#define MSG_CONTROL "Kontrol"
#define MSG_MIN " \002 Min"
#define MSG_MAX " \002 Max"
#define MSG_FACTOR " \002 Fact"
#define MSG_STATS "Statistics"
#define MSG_FIX_LOSE_STEPS "Fix axis steps"
#define MSG_MIN LCD_STR_THERMOMETER " Min"
#define MSG_MAX LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR LCD_STR_THERMOMETER " Fact"
#define MSG_IDLEOOZING "Anti oozing"
#define MSG_AUTOTEMP "Autotemp"
#define MSG_ON "On "
#define MSG_OFF "Off"
#define MSG_ON "ON "
#define MSG_OFF "OFF"
#define MSG_PID_P "PID-P"
#define MSG_PID_I "PID-I"
#define MSG_PID_D "PID-D"
#define MSG_PID_C "PID-C"
#define MSG_H1 " H1"
#define MSG_H2 " H2"
#define MSG_H3 " H3"
#define MSG_ACC "Accel"
#define MSG_VXY_JERK "Vxy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX "Vmax "
#define MSG_X "x"
#define MSG_Y "y"
#define MSG_Z "z"
#define MSG_E "e"
#define MSG_X "X"
#define MSG_Y "Y"
#define MSG_Z "Z"
#define MSG_E "E"
#define MSG_MOVE "Flyt"
#define MSG_MOVE_AXIS MSG_MOVE " akser"
#define MSG_MOVE_X MSG_MOVE " " MSG_X
#define MSG_MOVE_Y MSG_MOVE " " MSG_Y
#define MSG_MOVE_Z MSG_MOVE " " MSG_Z
#define MSG_MOVE_01MM MSG_MOVE " 0.1mm"
#define MSG_MOVE_1MM MSG_MOVE " 1mm"
#define MSG_MOVE_10MM MSG_MOVE " 10mm"
#define MSG_MOVE_E "Extruder"
#define MSG_VMIN "Vmin"
#define MSG_VTRAV_MIN "VTrav min"
#define MSG_AMAX "Amax "
#define MSG_A_RETRACT "A-retract"
#define MSG_XSTEPS "Xsteps/mm"
#define MSG_YSTEPS "Ysteps/mm"
#define MSG_ZSTEPS "Zsteps/mm"
#define MSG_ESTEPS "Esteps/mm"
#define MSG_A_TRAVEL "A-travel"
#define MSG_XSTEPS MSG_X " steps/mm"
#define MSG_YSTEPS MSG_Y " steps/mm"
#define MSG_ZSTEPS MSG_Z " steps/mm"
#define MSG_E0STEPS MSG_E "0 steps/mm"
#define MSG_E1STEPS MSG_E "1 steps/mm"
#define MSG_E2STEPS MSG_E "2 steps/mm"
#define MSG_E3STEPS MSG_E "3 steps/mm"
#define MSG_TEMPERATURE "Temperatur"
#define MSG_MOTION "Motion"
#define MSG_VOLUMETRIC "Filament"
#define MSG_VOLUMETRIC_ENABLED "E in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER_0 "Fil. Dia. 1"
#define MSG_FILAMENT_SIZE_EXTRUDER_1 "Fil. Dia. 2"
#define MSG_FILAMENT_SIZE_EXTRUDER_2 "Fil. Dia. 3"
#define MSG_FILAMENT "Filament"
#define MSG_VOLUMETRIC_ENABLED MSG_E " in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER "Fil. Dia."
#define MSG_CONTRAST "LCD kontrast"
#define MSG_STORE_EPROM "Gem i EEPROM"
#define MSG_LOAD_EPROM "Hent fra EEPROM"
......@@ -125,55 +133,75 @@
#define MSG_STOPPED "STOPPED. "
#define MSG_CONTROL_RETRACT "Tilbagetraek mm"
#define MSG_CONTROL_RETRACT_SWAP "Skift Re.mm"
#define MSG_CONTROL_RETRACTF "Tilbagetræk V"
#define MSG_CONTROL_RETRACTF "Tilbagetræk F"
#define MSG_CONTROL_RETRACT_ZLIFT "Hop mm"
#define MSG_CONTROL_RETRACT_RECOVER "UnRet +mm"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "S UnRet+mm"
#define MSG_CONTROL_RETRACT_RECOVERF "UnRet V"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "Swap UnRet +mm"
#define MSG_CONTROL_RETRACT_RECOVERF "UnRet F"
#define MSG_AUTORETRACT "AutoRetr."
#define MSG_ZPROBE_OUT "Probe udenfor plade"
#define MSG_FILAMENTCHANGE "Skift filament"
#define MSG_INIT_SDCARD "Init. SD card"
#define MSG_CNG_SDCARD "Skift SD kort"
#define MSG_ZPROBE_OUT "Probe udenfor plade"
#define MSG_POSITION_UNKNOWN "Home X/Y før Z"
#define MSG_ZPROBE_ZOFFSET "Z Offset"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_END_HOUR "Timer"
#define MSG_END_MINUTE "Minutter"
#define MSG_HEATING "Opvarmer..."
#define MSG_HEATING_COMPLETE "Opvarmet"
#define MSG_BED_HEATING "Opvarmer plade"
#define MSG_BED_DONE "Plade opvarmet"
#define MSG_BABYSTEP "Babystep"
#define MSG_BABYSTEP_X MSG_BABYSTEP " " MSG_X
#define MSG_BABYSTEP_Y MSG_BABYSTEP " " MSG_Y
#define MSG_BABYSTEP_Z MSG_BABYSTEP " " MSG_Z
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_HEATING_FAILED_LCD "Heating failed"
#define MSG_ERR_REDUNDANT_TEMP "REDUNDANT TEMP ERROR"
#define MSG_THERMAL_RUNAWAY "THERMAL RUNAWAY"
#define MSG_HOTEND_AD595 "HOTEND AD595 Offset & Gain"
#define MSG_ERR_MAXTEMP "MAXTEMP ERROR"
#define MSG_ERR_MINTEMP "MINTEMP ERROR"
#define MSG_ERR_MAXTEMP_BED "MAXTEMP BED ERROR"
#define MSG_ERR_MINTEMP_BED "MINTEMP BED ERROR"
#define MSG_END_DAY "days"
#define MSG_END_HOUR "timer"
#define MSG_END_MINUTE "minutter"
#define MSG_ENDSTOPS_HIT "endstops hit: "
#define MSG_BABYSTEPPING "Babystepping"
#define MSG_BABYSTEPPING_X MSG_BABYSTEPPING " " MSG_X
#define MSG_BABYSTEPPING_Y MSG_BABYSTEPPING " " MSG_Y
#define MSG_BABYSTEPPING_Z MSG_BABYSTEPPING " " MSG_Z
#define MSG_ENDSTOP_XS MSG_X
#define MSG_ENDSTOP_YS MSG_Y
#define MSG_ENDSTOP_ZS MSG_Z
#define MSG_ENDSTOP_ZPS MSG_Z "P"
#define MSG_ENDSTOP_ES MSG_E
// Calibrate Delta
#if MECH(DELTA)
#define MSG_DELTA_CALIBRATE "Delta Kalibrering"
#define MSG_DELTA_CALIBRATE_X "Kalibrer X"
#define MSG_DELTA_CALIBRATE_Y "Kalibrer Y"
#define MSG_DELTA_CALIBRATE_Z "Kalibrer Z"
#define MSG_DELTA_CALIBRATE_CENTER "Kalibrerings Center"
#define MSG_DELTA_CALIBRATE_X "Calibrate " MSG_X
#define MSG_DELTA_CALIBRATE_Y "Calibrate " MSG_Y
#define MSG_DELTA_CALIBRATE_Z "Calibrate " MSG_Z
#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center"
#endif // DELTA
// Scara
#if MECH(SCARA)
#define MSG_XSCALE "X Scale"
#define MSG_YSCALE "Y Scale"
#define MSG_SCALE "Scale"
#define MSG_XSCALE MSG_X " " MSG_SCALE
#define MSG_YSCALE MSG_Y " " MSG_SCALE
#endif
#define MSG_HEATING "Heating..."
#define MSG_HEATING_COMPLETE "Heating done."
#define MSG_BED_HEATING "Bed Heating."
#define MSG_BED_DONE "Bed done."
#define MSG_HEATING "Opvarmer..."
#define MSG_HEATING_COMPLETE "Opvarmet"
#define MSG_BED_HEATING "Opvarmer plade"
#define MSG_BED_DONE "Plade opvarmet"
// Extra
#define MSG_LASER "Laser Preset"
#define MSG_CONFIG "Configuration"
#define MSG_E_BOWDEN_LENGTH "Extrude " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH "Retract " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_E_BOWDEN_LENGTH MSG_EXTRUDE " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH MSG_RETRACT " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM MSG_PURGE " " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM MSG_RETRACT " " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_SAVED_POS "Saved position"
#define MSG_RESTORING_POS "Restoring position"
#define MSG_INVALID_POS_SLOT "Invalid slot, total slots: "
......@@ -195,10 +223,10 @@
#define MSG_FWTEST_04 "Start check MOTOR"
#define MSG_FWTEST_ATTENTION "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
#define MSG_FWTEST_END "Finish Test. Disable FIRMWARE_TEST and recompile."
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#endif // FIRMWARE_TEST
#endif // LANGUAGE_DA_H
MarlinKimbra/language_de.h
View file @ 521315e2
......@@ -9,61 +9,60 @@
#define LANGUAGE_DE_H
#define MAPPER_C2C3
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1
#define WELCOME_MSG MACHINE_NAME " Bereit."
#define MSG_SD_INSERTED "SDKarte erkannt."
#define MSG_SD_REMOVED "SDKarte entfernt."
#define MSG_SD "SDKarte"
#define MSG_SD_INSERTED MSG_SD " erkannt."
#define MSG_SD_REMOVED MSG_SD " entfernt."
#define MSG_MAIN "Hauptmenü"
#define MSG_AUTOSTART "Autostart"
#define MSG_DISABLE_STEPPERS "Motoren Aus" // M84
#define MSG_AUTO_HOME "Home" // G28
#define MSG_BED_SETTING "Bed Setting"
#define MSG_LP_INTRO " Leveling bed... Press to start "
#define MSG_LP_1 " Adjust first point & Press the button"
#define MSG_LP_2 " Adjust second point & Press the button"
#define MSG_LP_3 " Adjust third point & Press the button"
#define MSG_LP_4 " Adjust fourth point & Press the button"
#define MSG_LP_5 " Is it ok? Press to end"
#define MSG_LP_6 " BED leveled!"
#define MSG_DISABLE_STEPPERS "Motoren Aus"
#define MSG_AUTO_HOME "Auto home"
#define MSG_MBL_SETTING "Manual Bed Leveling"
#define MSG_MBL_BUTTON " Press the button "
#define MSG_MBL_INTRO " Leveling bed... "
#define MSG_MBL_1 " Adjust first point "
#define MSG_MBL_2 " Adjust second point"
#define MSG_MBL_3 " Adjust third point "
#define MSG_MBL_4 " Adjust fourth point"
#define MSG_MBL_5 " Is it ok? "
#define MSG_MBL_6 " BED leveled! "
#define MSG_SET_HOME_OFFSETS "Setze Home hier"
#define MSG_SET_ORIGIN "Setze Null hier" //"G92 X0 Y0 Z0" commented out in ultralcd.cpp
#define MSG_PREHEAT_PLA "Vorwärmen PLA"
#define MSG_PREHEAT_PLA_ALL "Vorw. PLA Alle"
#define MSG_PREHEAT_PLA_BEDONLY "Vorw. PLA Bett"
#define MSG_PREHEAT_PLA_SETTINGS "Vorwärm. PLA Ein."
#define MSG_PREHEAT_ABS "Vorwärmen ABS"
#define MSG_PREHEAT_ABS_ALL "Vorw. ABS Alle"
#define MSG_PREHEAT_ABS_BEDONLY "Vorw. ABS Bett"
#define MSG_PREHEAT_ABS_SETTINGS "Vorwärm. ABS Ein."
#define MSG_PREHEAT_ABS_SETTINGS "Preheat ABS conf"
#define MSG_PREHEAT_GUM "Preheat GUM"
#define MSG_PREHEAT_GUM_ALL "Preheat GUM All"
#define MSG_PREHEAT_GUM_BEDONLY "Preheat GUM Bed"
#define MSG_PREHEAT_GUM_SETTINGS "Preheat GUM conf"
#define MSG_TOO_COLD_FOR_M600 "M600 Hotend too cold to change filament"
#define MSG_SET_ORIGIN "Setze Null hier"
#define MSG_ONFOR "On x:"
#define MSG_PWRCONSUMED "P.er:"
#define MSG_PREHEAT "Vorwärmen"
#define MSG_CONFIG "conf."
#define MSG_PREHEAT_PLA MSG_PREHEAT " PLA"
#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " All"
#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " Bed"
#define MSG_PREHEAT_PLA_SETTINGS "PLA " MSG_CONFIG
#define MSG_PREHEAT_ABS MSG_PREHEAT " ABS"
#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " All"
#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " Bed"
#define MSG_PREHEAT_ABS_SETTINGS "ABS " MSG_CONFIG
#define MSG_PREHEAT_GUM MSG_PREHEAT " GUM"
#define MSG_PREHEAT_GUM_ALL MSG_PREHEAT_GUM " All"
#define MSG_PREHEAT_GUM_BEDONLY MSG_PREHEAT_GUM " Bed"
#define MSG_PREHEAT_GUM_SETTINGS "GUM " MSG_CONFIG
#define MSG_TOO_COLD_FOR_FILAMENTCHANGE "Hotend too cold to change filament"
#define MSG_COOLDOWN "Abkühlen"
#define MSG_SWITCH_PS_ON "Netzteil Ein"
#define MSG_SWITCH_PS_OFF "Netzteil Aus"
#define MSG_EXTRUDE "Extrude"
#define MSG_RETRACT "Retract"
#define MSG_MOVE_AXIS "Bewegen"
#define MSG_PURGE "Purge"
#define MSG_LEVEL_BED "Level bed"
#define MSG_MOVE_X "X"
#define MSG_MOVE_Y "Y"
#define MSG_MOVE_Z "Z"
#define MSG_MOVE_E "E"
#define MSG_MOVE_01MM " 0.1 mm"
#define MSG_MOVE_1MM " 1.0 mm"
#define MSG_MOVE_10MM "10.0 mm"
#define MSG_SPEED "Geschw."
#define MSG_NOZZLE "Düse"
#define MSG_BED "Bett"
#define MSG_FAN_SPEED "Lüftergeschw."
#define MSG_FLOW "Fluss"
#define MSG_CONTROL "Einstellungen"
#define MSG_STATS "Statistics"
#define MSG_FIX_LOSE_STEPS "Fix axis steps"
#define MSG_MIN LCD_STR_THERMOMETER " Min"
#define MSG_MAX LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR LCD_STR_THERMOMETER " Faktor"
......@@ -71,37 +70,46 @@
#define MSG_AUTOTEMP "AutoTemp"
#define MSG_ON "Ein"
#define MSG_OFF "Aus"
#define MSG_PID_P "PID P"
#define MSG_PID_I "PID I"
#define MSG_PID_D "PID D"
#define MSG_PID_P "PID-P"
#define MSG_PID_I "PID-I"
#define MSG_PID_D "PID-D"
#define MSG_H1 " H1"
#define MSG_H2 " H2"
#define MSG_H3 " H3"
#define MSG_ACC "Accel"
#define MSG_VXY_JERK "Vxy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk "
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX "Vmax "
#define MSG_X "X"
#define MSG_Y "Y"
#define MSG_Z "Z"
#define MSG_E "E"
#define MSG_MOVE "Bewegen"
#define MSG_MOVE_AXIS MSG_MOVE " axis"
#define MSG_MOVE_X MSG_MOVE " " MSG_X
#define MSG_MOVE_Y MSG_MOVE " " MSG_Y
#define MSG_MOVE_Z MSG_MOVE " " MSG_Z
#define MSG_MOVE_01MM MSG_MOVE " 0.1mm"
#define MSG_MOVE_1MM MSG_MOVE " 1mm"
#define MSG_MOVE_10MM MSG_MOVE " 10mm"
#define MSG_MOVE_E "Extruder"
#define MSG_VMIN "Vmin"
#define MSG_VTRAV_MIN "VTrav min"
#define MSG_AMAX "Amax "
#define MSG_A_RETRACT "A-retract"
#define MSG_A_TRAVEL "A-travel"
#define MSG_XSTEPS "X steps/mm"
#define MSG_YSTEPS "Y steps/mm"
#define MSG_ZSTEPS "Z steps/mm"
#define MSG_E0STEPS "E0 steps/mm"
#define MSG_E1STEPS "E1 steps/mm"
#define MSG_E2STEPS "E2 steps/mm"
#define MSG_E3STEPS "E3 steps/mm"
#define MSG_XSTEPS MSG_X " steps/mm"
#define MSG_YSTEPS MSG_Y " steps/mm"
#define MSG_ZSTEPS MSG_Z " steps/mm"
#define MSG_E0STEPS MSG_E "0 steps/mm"
#define MSG_E1STEPS MSG_E "1 steps/mm"
#define MSG_E2STEPS MSG_E "2 steps/mm"
#define MSG_E3STEPS MSG_E "3 steps/mm"
#define MSG_TEMPERATURE "Temperatur"
#define MSG_MOTION "Bewegung"
#define MSG_VOLUMETRIC "Filament"
#define MSG_VOLUMETRIC_ENABLED "E in mm3"
#define MSG_FILAMENT "Filament"
#define MSG_VOLUMETRIC_ENABLED MSG_E " in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER "Fil. Dia."
#define MSG_CONTRAST "LCD contrast"
#define MSG_STORE_EPROM "EPROM speichern"
......@@ -125,52 +133,61 @@
#define MSG_STOPPED "ANGEHALTEN."
#define MSG_CONTROL_RETRACT "Retract mm"
#define MSG_CONTROL_RETRACT_SWAP "Wechs. Retract mm"
#define MSG_CONTROL_RETRACTF "Retract V"
#define MSG_CONTROL_RETRACTF "Retract F"
#define MSG_CONTROL_RETRACT_ZLIFT "Hop mm"
#define MSG_CONTROL_RETRACT_RECOVER "UnRet +mm"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "Wechs. UnRet +mm"
#define MSG_CONTROL_RETRACT_RECOVERF "UnRet V"
#define MSG_CONTROL_RETRACT_RECOVERF "UnRet F"
#define MSG_AUTORETRACT "AutoRetr."
#define MSG_FILAMENTCHANGE "Filament wechseln"
#define MSG_INIT_SDCARD "SDKarte erkennen"// Manually initialize the SD-card via user interface
#define MSG_CNG_SDCARD "SDKarte erkennen"// SD-card changed by user. For machines with no autocarddetect. Both send "M21"
#define MSG_INIT_SDCARD "SDKarte erkennen"
#define MSG_CNG_SDCARD "SDKarte erkennen"
#define MSG_ZPROBE_OUT "Sensor ausserhalb"
#define MSG_POSITION_UNKNOWN "X/Y vor Z Homen."
#define MSG_ZPROBE_ZOFFSET "Z Offset"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_BABYSTEP "Babystep"
#define MSG_BABYSTEP_X MSG_BABYSTEP " " MSG_X
#define MSG_BABYSTEP_Y MSG_BABYSTEP " " MSG_Y
#define MSG_BABYSTEP_Z MSG_BABYSTEP " " MSG_Z
#define MSG_ENDSTOP_ABORT "Endstop Abbr. Ein"
#define MSG_HEATING_FAILED_LCD "Heating failed"
#define MSG_ERR_REDUNDANT_TEMP "Err: REDUNDANT TEMP ERROR"
#define MSG_THERMAL_RUNAWAY "THERMAL RUNAWAY"
#define MSG_ERR_MAXTEMP "Err: MAXTEMP"
#define MSG_ERR_MINTEMP "Err: MINTEMP"
#define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED"
#define MSG_ERR_MINTEMP_BED "Err: MINTEMP BED"
#define MSG_HOTEND_AD595 "HOTEND AD595 Offset & Gain"
#define MSG_ERR_MAXTEMP "MAXTEMP ERROR"
#define MSG_ERR_MINTEMP "MINTEMP ERROR"
#define MSG_ERR_MAXTEMP_BED "MAXTEMP BED ERROR"
#define MSG_ERR_MINTEMP_BED "MINTEMP BED ERROR"
#define MSG_END_DAY "tage"
#define MSG_END_HOUR "uur"
#define MSG_END_MINUTE "minuten"
// Debug
#define MSG_DEBUG_ECHO "DEBUG ECHO ENABLED"
#define MSG_DEBUG_INFO "DEBUG INFO ENABLED"
#define MSG_DEBUG_ERRORS "DEBUG ERRORS ENABLED"
#define MSG_DEBUG_DRYRUN "DEBUG DRYRUN ENABLED"
#define MSG_ENDSTOPS_HIT "endstops hit: "
#define MSG_BABYSTEPPING "Babystepping"
#define MSG_BABYSTEPPING_X MSG_BABYSTEPPING " " MSG_X
#define MSG_BABYSTEPPING_Y MSG_BABYSTEPPING " " MSG_Y
#define MSG_BABYSTEPPING_Z MSG_BABYSTEPPING " " MSG_Z
#define MSG_ENDSTOP_XS MSG_X
#define MSG_ENDSTOP_YS MSG_Y
#define MSG_ENDSTOP_ZS MSG_Z
#define MSG_ENDSTOP_ZPS MSG_Z "P"
#define MSG_ENDSTOP_ES MSG_E
// Calibrate Delta
#if MECH(DELTA)
#define MSG_DELTA_CALIBRATE "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X "Calibrate X"
#define MSG_DELTA_CALIBRATE_Y "Calibrate Y"
#define MSG_DELTA_CALIBRATE_Z "Calibrate Z"
#define MSG_DELTA_CALIBRATE_X "Calibrate " MSG_X
#define MSG_DELTA_CALIBRATE_Y "Calibrate " MSG_Y
#define MSG_DELTA_CALIBRATE_Z "Calibrate " MSG_Z
#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center"
#endif // DELTA
// Scara
#if MECH(SCARA)
#define MSG_XSCALE "X Scale"
#define MSG_YSCALE "Y Scale"
#define MSG_SCALE "Scale"
#define MSG_XSCALE MSG_X " " MSG_SCALE
#define MSG_YSCALE MSG_Y " " MSG_SCALE
#endif
#define MSG_HEATING "Heating..."
......@@ -181,10 +198,10 @@
// Extra
#define MSG_LASER "Laser Preset"
#define MSG_CONFIG "Configuration"
#define MSG_E_BOWDEN_LENGTH "Extrude " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH "Retract " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_E_BOWDEN_LENGTH MSG_EXTRUDE " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH MSG_RETRACT " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM MSG_PURGE " " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM MSG_RETRACT " " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_SAVED_POS "Saved position"
#define MSG_RESTORING_POS "Restoring position"
#define MSG_INVALID_POS_SLOT "Invalid slot, total slots: "
......@@ -206,10 +223,10 @@
#define MSG_FWTEST_04 "Start check MOTOR"
#define MSG_FWTEST_ATTENTION "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
#define MSG_FWTEST_END "Finish Test. Disable FIRMWARE_TEST and recompile."
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#endif // FIRMWARE_TEST
#endif // LANGUAGE_DE_H
MarlinKimbra/language_en.h
View file @ 521315e2
......@@ -8,18 +8,14 @@
#ifndef LANGUAGE_EN_H
#define LANGUAGE_EN_H
#if DISABLED(MAPPER_NON) && DISABLED(MAPPER_C2C3) && DISABLED(MAPPER_D0D1) && DISABLED(MAPPER_D0D1_MOD) && DISABLED(MAPPER_E382E383)
#define MAPPER_NON // For direct asci codes
#endif
#define MAPPER_NON // For direct asci codes
#define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
//#define SIMULATE_ROMFONT //Comment in to see what is seen on the character based displays
#if DISABLED(SIMULATE_ROMFONT) && DISABLED(DISPLAY_CHARSET_ISO10646_1) && DISABLED(DISPLAY_CHARSET_ISO10646_5) && DISABLED(DISPLAY_CHARSET_ISO10646_KANA) && DISABLED(DISPLAY_CHARSET_ISO10646_CN)
#define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
#endif
#define WELCOME_MSG MACHINE_NAME " ready."
#define MSG_SD_INSERTED "Card inserted"
#define MSG_SD_REMOVED "Card removed"
#define MSG_SD "SD"
#define MSG_SD_INSERTED MSG_SD " inserted"
#define MSG_SD_REMOVED MSG_SD " removed"
#define MSG_MAIN "Main"
#define MSG_AUTOSTART "Autostart"
#define MSG_DISABLE_STEPPERS "Disable steppers"
......@@ -37,33 +33,28 @@
#define MSG_SET_ORIGIN "Set origin"
#define MSG_ONFOR "On x:"
#define MSG_PWRCONSUMED "P.er:"
#define MSG_PREHEAT_PLA "Preheat PLA"
#define MSG_PREHEAT_PLA_ALL "Preheat PLA All"
#define MSG_PREHEAT_PLA_BEDONLY "Preheat PLA Bed"
#define MSG_PREHEAT_PLA_SETTINGS "Preheat PLA conf"
#define MSG_PREHEAT_ABS "Preheat ABS"
#define MSG_PREHEAT_ABS_ALL "Preheat ABS All"
#define MSG_PREHEAT_ABS_BEDONLY "Preheat ABS Bed"
#define MSG_PREHEAT_ABS_SETTINGS "Preheat ABS conf"
#define MSG_PREHEAT_GUM "Preheat GUM"
#define MSG_PREHEAT_GUM_ALL "Preheat GUM All"
#define MSG_PREHEAT_GUM_BEDONLY "Preheat GUM Bed"
#define MSG_PREHEAT_GUM_SETTINGS "Preheat GUM conf"
#define MSG_PREHEAT "Preheat"
#define MSG_CONFIG "conf."
#define MSG_PREHEAT_PLA MSG_PREHEAT " PLA"
#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " All"
#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " Bed"
#define MSG_PREHEAT_PLA_SETTINGS "PLA " MSG_CONFIG
#define MSG_PREHEAT_ABS MSG_PREHEAT " ABS"
#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " All"
#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " Bed"
#define MSG_PREHEAT_ABS_SETTINGS "ABS " MSG_CONFIG
#define MSG_PREHEAT_GUM MSG_PREHEAT " GUM"
#define MSG_PREHEAT_GUM_ALL MSG_PREHEAT_GUM " All"
#define MSG_PREHEAT_GUM_BEDONLY MSG_PREHEAT_GUM " Bed"
#define MSG_PREHEAT_GUM_SETTINGS "GUM " MSG_CONFIG
#define MSG_TOO_COLD_FOR_FILAMENTCHANGE "Hotend too cold to change filament"
#define MSG_COOLDOWN "Cooldown"
#define MSG_SWITCH_PS_ON "Switch power on"
#define MSG_SWITCH_PS_OFF "Switch power off"
#define MSG_EXTRUDE "Extrude"
#define MSG_RETRACT "Retract"
#define MSG_MOVE_AXIS "Move axis"
#define MSG_PURGE "Purge"
#define MSG_LEVEL_BED "Level bed"
#define MSG_MOVE_X "Move X"
#define MSG_MOVE_Y "Move Y"
#define MSG_MOVE_Z "Move Z"
#define MSG_MOVE_E "Extruder"
#define MSG_MOVE_01MM "Move 0.1mm"
#define MSG_MOVE_1MM "Move 1mm"
#define MSG_MOVE_10MM "Move 10mm"
#define MSG_SPEED "Speed"
#define MSG_NOZZLE "Nozzle"
#define MSG_BED "Bed"
......@@ -77,8 +68,8 @@
#define MSG_FACTOR LCD_STR_THERMOMETER " Fact"
#define MSG_IDLEOOZING "Anti oozing"
#define MSG_AUTOTEMP "Autotemp"
#define MSG_ON "On "
#define MSG_OFF "Off"
#define MSG_ON "ON "
#define MSG_OFF "OFF"
#define MSG_PID_P "PID-P"
#define MSG_PID_I "PID-I"
#define MSG_PID_D "PID-D"
......@@ -94,22 +85,31 @@
#define MSG_Y "Y"
#define MSG_Z "Z"
#define MSG_E "E"
#define MSG_MOVE "Move"
#define MSG_MOVE_AXIS MSG_MOVE " axis"
#define MSG_MOVE_X MSG_MOVE " " MSG_X
#define MSG_MOVE_Y MSG_MOVE " " MSG_Y
#define MSG_MOVE_Z MSG_MOVE " " MSG_Z
#define MSG_MOVE_01MM MSG_MOVE " 0.1mm"
#define MSG_MOVE_1MM MSG_MOVE " 1mm"
#define MSG_MOVE_10MM MSG_MOVE " 10mm"
#define MSG_MOVE_E "Extruder"
#define MSG_VMIN "Vmin"
#define MSG_VTRAV_MIN "VTrav min"
#define MSG_AMAX "Amax "
#define MSG_A_RETRACT "A-retract"
#define MSG_A_TRAVEL "A-travel"
#define MSG_XSTEPS "X steps/mm"
#define MSG_YSTEPS "Y steps/mm"
#define MSG_ZSTEPS "Z steps/mm"
#define MSG_E0STEPS "E0steps/mm"
#define MSG_E1STEPS "E1steps/mm"
#define MSG_E2STEPS "E2steps/mm"
#define MSG_E3STEPS "E3steps/mm"
#define MSG_XSTEPS MSG_X " steps/mm"
#define MSG_YSTEPS MSG_Y " steps/mm"
#define MSG_ZSTEPS MSG_Z " steps/mm"
#define MSG_E0STEPS MSG_E "0 steps/mm"
#define MSG_E1STEPS MSG_E "1 steps/mm"
#define MSG_E2STEPS MSG_E "2 steps/mm"
#define MSG_E3STEPS MSG_E "3 steps/mm"
#define MSG_TEMPERATURE "Temperature"
#define MSG_MOTION "Motion"
#define MSG_FILAMENT "Filament"
#define MSG_VOLUMETRIC_ENABLED "E in mm3"
#define MSG_VOLUMETRIC_ENABLED MSG_E " in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER "Fil. Dia."
#define MSG_CONTRAST "LCD contrast"
#define MSG_STORE_EPROM "Store memory"
......@@ -122,8 +122,8 @@
#define MSG_PAUSE_PRINT "Pause print"
#define MSG_RESUME_PRINT "Resume print"
#define MSG_STOP_PRINT "Stop print"
#define MSG_CARD_MENU "Print from SD"
#define MSG_NO_CARD "No SD card"
#define MSG_CARD_MENU "Print from " MSG_SD
#define MSG_NO_CARD "No " MSG_SD
#define MSG_DWELL "Sleep..."
#define MSG_USERWAIT "Wait for user..."
#define MSG_RESUMING "Resuming print"
......@@ -132,16 +132,16 @@
#define MSG_KILLED "KILLED. "
#define MSG_STOPPED "STOPPED. "
#define MSG_CONTROL_RETRACT "Retract mm"
#define MSG_CONTROL_RETRACT_SWAP "Swap Re.mm"
#define MSG_CONTROL_RETRACTF "Retract V"
#define MSG_CONTROL_RETRACT_SWAP "Swap Re. mm"
#define MSG_CONTROL_RETRACTF "Retract F"
#define MSG_CONTROL_RETRACT_ZLIFT "Hop mm"
#define MSG_CONTROL_RETRACT_RECOVER "UnRet +mm"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "S UnRet+mm"
#define MSG_CONTROL_RETRACT_RECOVERF "UnRet V"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "Swap UnRet +mm"
#define MSG_CONTROL_RETRACT_RECOVERF "UnRet F"
#define MSG_AUTORETRACT "AutoRetr."
#define MSG_FILAMENTCHANGE "Change filament"
#define MSG_INIT_SDCARD "Init. SD card"
#define MSG_CNG_SDCARD "Change SD card"
#define MSG_INIT_SDCARD "Init. " MSG_SD
#define MSG_CNG_SDCARD "Change " MSG_SD
#define MSG_ZPROBE_OUT "Z probe out. bed"
#define MSG_POSITION_UNKNOWN "Home X/Y before Z"
#define MSG_ZPROBE_ZOFFSET "Z Offset"
......@@ -151,37 +151,43 @@
#define MSG_BABYSTEP_Z MSG_BABYSTEP " " MSG_Z
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_HEATING_FAILED_LCD "Heating failed"
#define MSG_ERR_REDUNDANT_TEMP "Err: REDUNDANT TEMP ERROR"
#define MSG_ERR_REDUNDANT_TEMP "REDUNDANT TEMP ERROR"
#define MSG_THERMAL_RUNAWAY "THERMAL RUNAWAY"
#define MSG_HOTEND_AD595 "HOTEND AD595 Offset & Gain"
#define MSG_ERR_MAXTEMP "Err: MAXTEMP"
#define MSG_ERR_MINTEMP "Err: MINTEMP"
#define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED"
#define MSG_ERR_MINTEMP_BED "Err: MINTEMP BED"
#define MSG_ERR_MAXTEMP "MAXTEMP ERROR"
#define MSG_ERR_MINTEMP "MINTEMP ERROR"
#define MSG_ERR_MAXTEMP_BED "MAXTEMP BED ERROR"
#define MSG_ERR_MINTEMP_BED "MINTEMP BED ERROR"
#define MSG_END_DAY "days"
#define MSG_END_HOUR "hours"
#define MSG_END_MINUTE "minutes"
// Debug
#define MSG_DEBUG_ECHO "DEBUG ECHO ENABLED"
#define MSG_DEBUG_INFO "DEBUG INFO ENABLED"
#define MSG_DEBUG_ERRORS "DEBUG ERRORS ENABLED"
#define MSG_DEBUG_DRYRUN "DEBUG DRYRUN ENABLED"
#define MSG_DEBUG "DEBUG ENABLED"
#define MSG_ENDSTOPS_HIT "endstops hit: "
#define MSG_BABYSTEPPING "Babystepping"
#define MSG_BABYSTEPPING_X MSG_BABYSTEPPING " " MSG_X
#define MSG_BABYSTEPPING_Y MSG_BABYSTEPPING " " MSG_Y
#define MSG_BABYSTEPPING_Z MSG_BABYSTEPPING " " MSG_Z
#define MSG_ENDSTOP_XS MSG_X
#define MSG_ENDSTOP_YS MSG_Y
#define MSG_ENDSTOP_ZS MSG_Z
#define MSG_ENDSTOP_ZPS MSG_Z "P"
#define MSG_ENDSTOP_ES MSG_E
// Calibrate Delta
#if MECH(DELTA)
#define MSG_DELTA_CALIBRATE "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X "Calibrate X"
#define MSG_DELTA_CALIBRATE_Y "Calibrate Y"
#define MSG_DELTA_CALIBRATE_Z "Calibrate Z"
#define MSG_DELTA_CALIBRATE_X "Calibrate " MSG_X
#define MSG_DELTA_CALIBRATE_Y "Calibrate " MSG_Y
#define MSG_DELTA_CALIBRATE_Z "Calibrate " MSG_Z
#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center"
#endif // DELTA
// Scara
#if MECH(SCARA)
#define MSG_XSCALE "X Scale"
#define MSG_YSCALE "Y Scale"
#define MSG_SCALE "Scale"
#define MSG_XSCALE MSG_X " " MSG_SCALE
#define MSG_YSCALE MSG_Y " " MSG_SCALE
#endif
#define MSG_HEATING "Heating..."
......@@ -192,10 +198,10 @@
// Extra
#define MSG_LASER "Laser Preset"
#define MSG_CONFIG "Configuration"
#define MSG_E_BOWDEN_LENGTH "Extrude " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH "Retract " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_E_BOWDEN_LENGTH MSG_EXTRUDE " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH MSG_RETRACT " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM MSG_PURGE " " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM MSG_RETRACT " " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_SAVED_POS "Saved position"
#define MSG_RESTORING_POS "Restoring position"
#define MSG_INVALID_POS_SLOT "Invalid slot, total slots: "
......@@ -217,10 +223,10 @@
#define MSG_FWTEST_04 "Start check MOTOR"
#define MSG_FWTEST_ATTENTION "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
#define MSG_FWTEST_END "Finish Test. Disable FIRMWARE_TEST and recompile."
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#endif // FIRMWARE_TEST
#endif // LANGUAGE_EN_H
MarlinKimbra/language_es.h
View file @ 521315e2
......@@ -8,68 +8,68 @@
#ifndef LANGUAGE_ES_H
#define LANGUAGE_ES_H
#define MAPPER_NON
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1
#define MAPPER_NON // For direct asci codes
#define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
#define WELCOME_MSG MACHINE_NAME " lista."
#define MSG_SD_INSERTED "Tarjeta colocada"
#define MSG_SD_REMOVED "Tarjeta retirada"
#define MSG_SD "Tarjeta"
#define MSG_SD_INSERTED MSG_SD " colocada"
#define MSG_SD_REMOVED MSG_SD " retirada"
#define MSG_MAIN "Menu principal"
#define MSG_AUTOSTART " Autostart"
#define MSG_AUTOSTART "Autostart"
#define MSG_DISABLE_STEPPERS "Apagar motores"
#define MSG_AUTO_HOME "Llevar al origen"
#define MSG_BED_SETTING "Bed Setting"
#define MSG_LP_INTRO " Leveling bed... Press to start "
#define MSG_LP_1 " Adjust first point & Press the button"
#define MSG_LP_2 " Adjust second point & Press the button"
#define MSG_LP_3 " Adjust third point & Press the button"
#define MSG_LP_4 " Adjust fourth point & Press the button"
#define MSG_LP_5 " Is it ok? Press to end"
#define MSG_LP_6 " BED leveled!"
#define MSG_MBL_SETTING "Manual Bed Leveling"
#define MSG_MBL_BUTTON " Press the button "
#define MSG_MBL_INTRO " Leveling bed... "
#define MSG_MBL_1 " Adjust first point "
#define MSG_MBL_2 " Adjust second point"
#define MSG_MBL_3 " Adjust third point "
#define MSG_MBL_4 " Adjust fourth point"
#define MSG_MBL_5 " Is it ok? "
#define MSG_MBL_6 " BED leveled! "
#define MSG_SET_HOME_OFFSETS "Ajustar offsets"
#define MSG_SET_ORIGIN "Establecer cero"
#define MSG_PREHEAT_PLA "Precalentar PLA"
#define MSG_PREHEAT_PLA_ALL "Precal. PLA Todo"
#define MSG_PREHEAT_PLA_BEDONLY "Precal. PLA Base"
#define MSG_PREHEAT_PLA_SETTINGS "Ajustar temp. PLA"
#define MSG_PREHEAT_ABS "Precalentar ABS"
#define MSG_PREHEAT_ABS_ALL "Precal. ABS Todo"
#define MSG_PREHEAT_ABS_BEDONLY "Precal. ABS Base"
#define MSG_PREHEAT_ABS_SETTINGS "Ajustar temp. ABS"
#define MSG_PREHEAT_GUM "Preheat GUM"
#define MSG_PREHEAT_GUM_ALL "Preheat GUM All"
#define MSG_PREHEAT_GUM_BEDONLY "Preheat GUM Bed"
#define MSG_PREHEAT_GUM_SETTINGS "Preheat GUM conf"
#define MSG_TOO_COLD_FOR_M600 "M600 Hotend too cold to change filament"
#define MSG_ONFOR "On x:"
#define MSG_PWRCONSUMED "P.er:"
#define MSG_PREHEAT "Precalentar"
#define MSG_CONFIG "conf."
#define MSG_PREHEAT_PLA MSG_PREHEAT " PLA"
#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " All"
#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " Bed"
#define MSG_PREHEAT_PLA_SETTINGS "PLA " MSG_CONFIG
#define MSG_PREHEAT_ABS MSG_PREHEAT " ABS"
#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " All"
#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " Bed"
#define MSG_PREHEAT_ABS_SETTINGS "ABS " MSG_CONFIG
#define MSG_PREHEAT_GUM MSG_PREHEAT " GUM"
#define MSG_PREHEAT_GUM_ALL MSG_PREHEAT_GUM " All"
#define MSG_PREHEAT_GUM_BEDONLY MSG_PREHEAT_GUM " Bed"
#define MSG_PREHEAT_GUM_SETTINGS "GUM " MSG_CONFIG
#define MSG_TOO_COLD_FOR_FILAMENTCHANGE "Hotend too cold to change filament"
#define MSG_COOLDOWN "Enfriar"
#define MSG_SWITCH_PS_ON "Encender"
#define MSG_SWITCH_PS_OFF "Apagar"
#define MSG_EXTRUDE "Extruir"
#define MSG_RETRACT "Retraer"
#define MSG_MOVE_AXIS "Mover ejes"
#define MSG_PURGE "Purge"
#define MSG_LEVEL_BED "Level bed"
#define MSG_MOVE_X "Mover X"
#define MSG_MOVE_Y "Mover Y"
#define MSG_MOVE_Z "Mover Z"
#define MSG_MOVE_E "Extrusor"
#define MSG_MOVE_01MM "Mover 0.1mm"
#define MSG_MOVE_1MM "Mover 1mm"
#define MSG_MOVE_10MM "Mover 10mm"
#define MSG_SPEED "Velocidad"
#define MSG_NOZZLE "Nozzle"
#define MSG_BED "Base"
#define MSG_FAN_SPEED "Ventilador"
#define MSG_FLOW "Flujo"
#define MSG_CONTROL "Control"
#define MSG_STATS "Statistics"
#define MSG_FIX_LOSE_STEPS "Fix axis steps"
#define MSG_MIN LCD_STR_THERMOMETER " Min"
#define MSG_MAX LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR LCD_STR_THERMOMETER " Fact"
#define MSG_IDLEOOZING "Anti oozing"
#define MSG_AUTOTEMP "Autotemp"
#define MSG_ON "On "
#define MSG_OFF "Off"
#define MSG_ON "ON "
#define MSG_OFF "OFF"
#define MSG_PID_P "PID-P"
#define MSG_PID_I "PID-I"
#define MSG_PID_D "PID-D"
......@@ -85,22 +85,31 @@
#define MSG_Y "Y"
#define MSG_Z "Z"
#define MSG_E "E"
#define MSG_MOVE "Mover"
#define MSG_MOVE_AXIS MSG_MOVE " axis"
#define MSG_MOVE_X MSG_MOVE " " MSG_X
#define MSG_MOVE_Y MSG_MOVE " " MSG_Y
#define MSG_MOVE_Z MSG_MOVE " " MSG_Z
#define MSG_MOVE_01MM MSG_MOVE " 0.1mm"
#define MSG_MOVE_1MM MSG_MOVE " 1mm"
#define MSG_MOVE_10MM MSG_MOVE " 10mm"
#define MSG_MOVE_E "Extruder"
#define MSG_VMIN "Vmin"
#define MSG_VTRAV_MIN "Vvacio min"
#define MSG_AMAX "Amax"
#define MSG_A_RETRACT "A-retrac."
#define MSG_A_TRAVEL "A-travel"
#define MSG_XSTEPS "X pasos/mm"
#define MSG_YSTEPS "Y pasos/mm"
#define MSG_ZSTEPS "Z pasos/mm"
#define MSG_E0STEPS "E0 pasos/mm"
#define MSG_E1STEPS "E1 pasos/mm"
#define MSG_E2STEPS "E2 pasos/mm"
#define MSG_E3STEPS "E3 pasos/mm"
#define MSG_XSTEPS MSG_X " steps/mm"
#define MSG_YSTEPS MSG_Y " steps/mm"
#define MSG_ZSTEPS MSG_Z " steps/mm"
#define MSG_E0STEPS MSG_E "0 steps/mm"
#define MSG_E1STEPS MSG_E "1 steps/mm"
#define MSG_E2STEPS MSG_E "2 steps/mm"
#define MSG_E3STEPS MSG_E "3 steps/mm"
#define MSG_TEMPERATURE "Temperatura"
#define MSG_MOTION "Movimiento"
#define MSG_VOLUMETRIC "Filament"
#define MSG_VOLUMETRIC_ENABLED "E in mm3"
#define MSG_VOLUMETRIC_ENABLED MSG_E " in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER "Fil. Dia."
#define MSG_CONTRAST "Contraste"
#define MSG_STORE_EPROM "Guardar memoria"
......@@ -136,40 +145,49 @@
#define MSG_ZPROBE_OUT "sonda Z fuera"
#define MSG_POSITION_UNKNOWN "Reiniciar X/Y y Z"
#define MSG_ZPROBE_ZOFFSET "Offset Z"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_BABYSTEP "Babystep"
#define MSG_BABYSTEP_X MSG_BABYSTEP " " MSG_X
#define MSG_BABYSTEP_Y MSG_BABYSTEP " " MSG_Y
#define MSG_BABYSTEP_Z MSG_BABYSTEP " " MSG_Z
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_HEATING_FAILED_LCD "Heating failed"
#define MSG_ERR_REDUNDANT_TEMP "Err: REDUNDANT TEMP ERROR"
#define MSG_ERR_REDUNDANT_TEMP "REDUNDANT TEMP ERROR"
#define MSG_THERMAL_RUNAWAY "THERMAL RUNAWAY"
#define MSG_ERR_MAXTEMP "Err: MAXTEMP"
#define MSG_ERR_MINTEMP "Err: MINTEMP"
#define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED"
#define MSG_ERR_MINTEMP_BED "Err: MINTEMP BED"
#define MSG_HOTEND_AD595 "HOTEND AD595 Offset & Gain"
#define MSG_ERR_MAXTEMP "MAXTEMP ERROR"
#define MSG_ERR_MINTEMP "MINTEMP ERROR"
#define MSG_ERR_MAXTEMP_BED "MAXTEMP BED ERROR"
#define MSG_ERR_MINTEMP_BED "MINTEMP BED ERROR"
#define MSG_END_DAY "days"
#define MSG_END_HOUR "hours"
#define MSG_END_MINUTE "minutes"
// Debug
#define MSG_DEBUG_ECHO "DEBUG ECHO ENABLED"
#define MSG_DEBUG_INFO "DEBUG INFO ENABLED"
#define MSG_DEBUG_ERRORS "DEBUG ERRORS ENABLED"
#define MSG_DEBUG_DRYRUN "DEBUG DRYRUN ENABLED"
#define MSG_ENDSTOPS_HIT "endstops hit: "
#define MSG_BABYSTEPPING "Babystepping"
#define MSG_BABYSTEPPING_X MSG_BABYSTEPPING " " MSG_X
#define MSG_BABYSTEPPING_Y MSG_BABYSTEPPING " " MSG_Y
#define MSG_BABYSTEPPING_Z MSG_BABYSTEPPING " " MSG_Z
#define MSG_ENDSTOP_XS MSG_X
#define MSG_ENDSTOP_YS MSG_Y
#define MSG_ENDSTOP_ZS MSG_Z
#define MSG_ENDSTOP_ZPS MSG_Z "P"
#define MSG_ENDSTOP_ES MSG_E
// Calibrate Delta
#if MECH(DELTA)
#define MSG_DELTA_CALIBRATE "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X "Calibrate X"
#define MSG_DELTA_CALIBRATE_Y "Calibrate Y"
#define MSG_DELTA_CALIBRATE_Z "Calibrate Z"
#define MSG_DELTA_CALIBRATE_X "Calibrate " MSG_X
#define MSG_DELTA_CALIBRATE_Y "Calibrate " MSG_Y
#define MSG_DELTA_CALIBRATE_Z "Calibrate " MSG_Z
#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center"
#endif // DELTA
// Scara
#if MECH(SCARA)
#define MSG_XSCALE "X Scale"
#define MSG_YSCALE "Y Scale"
#define MSG_SCALE "Scale"
#define MSG_XSCALE MSG_X " " MSG_SCALE
#define MSG_YSCALE MSG_Y " " MSG_SCALE
#endif
#define MSG_HEATING "Heating..."
......@@ -180,10 +198,10 @@
// Extra
#define MSG_LASER "Laser Preset"
#define MSG_CONFIG "Configuration"
#define MSG_E_BOWDEN_LENGTH "Extrude " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH "Retract " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_E_BOWDEN_LENGTH MSG_EXTRUDE " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH MSG_RETRACT " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM MSG_PURGE " " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM MSG_RETRACT " " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_SAVED_POS "Saved position"
#define MSG_RESTORING_POS "Restoring position"
#define MSG_INVALID_POS_SLOT "Invalid slot, total slots: "
......@@ -205,10 +223,10 @@
#define MSG_FWTEST_04 "Start check MOTOR"
#define MSG_FWTEST_ATTENTION "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
#define MSG_FWTEST_END "Finish Test. Disable FIRMWARE_TEST and recompile."
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#endif // FIRMWARE_TEST
#endif // LANGUAGE_ES_H
MarlinKimbra/language_eu.h
View file @ 521315e2
......@@ -8,94 +8,108 @@
#ifndef LANGUAGE_EU_H
#define LANGUAGE_EU_H
#define MAPPER_NON
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1
#define MAPPER_NON // For direct asci codes
#define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
#define WELCOME_MSG MACHINE_NAME " prest."
#define MSG_SD_INSERTED "Txartela sartuta"
#define MSG_SD_REMOVED "Txartela kenduta"
#define MSG_SD "Txartela"
#define MSG_SD_INSERTED MSG_SD " sartuta"
#define MSG_SD_REMOVED MSG_SD " kenduta"
#define MSG_MAIN "Menu nagusia"
#define MSG_AUTOSTART "Auto hasiera"
#define MSG_DISABLE_STEPPERS "Itzali motoreak"
#define MSG_AUTO_HOME "Hasierara joan"
#define MSG_BED_SETTING "Bed Setting"
#define MSG_LP_INTRO " Leveling bed... Press to start "
#define MSG_LP_1 " Adjust first point & Press the button"
#define MSG_LP_2 " Adjust second point & Press the button"
#define MSG_LP_3 " Adjust third point & Press the button"
#define MSG_LP_4 " Adjust fourth point & Press the button"
#define MSG_LP_5 " Is it ok? Press to end"
#define MSG_LP_6 " BED leveled!"
#define MSG_MBL_SETTING "Manual Bed Leveling"
#define MSG_MBL_BUTTON " Press the button "
#define MSG_MBL_INTRO " Leveling bed... "
#define MSG_MBL_1 " Adjust first point "
#define MSG_MBL_2 " Adjust second point"
#define MSG_MBL_3 " Adjust third point "
#define MSG_MBL_4 " Adjust fourth point"
#define MSG_MBL_5 " Is it ok? "
#define MSG_MBL_6 " BED leveled! "
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_SET_ORIGIN "Hasiera ipini"
#define MSG_PREHEAT_PLA "Aurreberotu PLA"
#define MSG_PREHEAT_PLA_ALL "Berotu PLA Guztia"
#define MSG_PREHEAT_PLA_BEDONLY "Berotu PLA Ohea"
#define MSG_PREHEAT_PLA_SETTINGS "Berotu PLA Konfig"
#define MSG_PREHEAT_ABS "Aurreberotu ABS"
#define MSG_PREHEAT_ABS_ALL "Berotu ABS Guztia"
#define MSG_PREHEAT_ABS_BEDONLY "Berotu ABS Ohea"
#define MSG_PREHEAT_ABS_SETTINGS "Berotu ABS Konfig"
#define MSG_PREHEAT_GUM "Preheat GUM"
#define MSG_PREHEAT_GUM_ALL "Preheat GUM All"
#define MSG_PREHEAT_GUM_BEDONLY "Preheat GUM Bed"
#define MSG_PREHEAT_GUM_SETTINGS "Preheat GUM conf"
#define MSG_ONFOR "On x:"
#define MSG_PWRCONSUMED "P.er:"
#define MSG_PREHEAT "Berotu"
#define MSG_CONFIG "Konfig"
#define MSG_PREHEAT_PLA MSG_PREHEAT " PLA"
#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " Guztia"
#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " Ohea"
#define MSG_PREHEAT_PLA_SETTINGS "PLA " MSG_CONFIG
#define MSG_PREHEAT_ABS MSG_PREHEAT " ABS"
#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " Guztia"
#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " Ohea"
#define MSG_PREHEAT_ABS_SETTINGS "ABS " MSG_CONFIG
#define MSG_PREHEAT_GUM MSG_PREHEAT " GUM"
#define MSG_PREHEAT_GUM_ALL MSG_PREHEAT_GUM " Guztia"
#define MSG_PREHEAT_GUM_BEDONLY MSG_PREHEAT_GUM " Ohea"
#define MSG_PREHEAT_GUM_SETTINGS "GUM " MSG_CONFIG
#define MSG_TOO_COLD_FOR_FILAMENTCHANGE "Hotend too cold to change filament"
#define MSG_COOLDOWN "Hoztu"
#define MSG_SWITCH_PS_ON "Energia piztu"
#define MSG_SWITCH_PS_OFF "Energia itzali"
#define MSG_EXTRUDE "Estruitu"
#define MSG_RETRACT "Atzera eragin"
#define MSG_MOVE_AXIS "Ardatzak mugitu"
#define MSG_MOVE_X "Mugitu X"
#define MSG_MOVE_Y "Mugitu Y"
#define MSG_MOVE_Z "Mugitu Z"
#define MSG_MOVE_E "Estrusorea"
#define MSG_MOVE_01MM "Mugitu 0.1mm"
#define MSG_MOVE_1MM "Mugitu 1mm"
#define MSG_MOVE_10MM "Mugitu 10mm"
#define MSG_PURGE "Purge"
#define MSG_LEVEL_BED "Level bed"
#define MSG_SPEED "Abiadura"
#define MSG_NOZZLE "Pita"
#define MSG_BED "Ohea"
#define MSG_FAN_SPEED "Haizagailua"
#define MSG_FLOW "Fluxua"
#define MSG_CONTROL "Kontrola"
#define MSG_MIN " " LCD_STR_THERMOMETER " Min"
#define MSG_MAX " " LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR " " LCD_STR_THERMOMETER " Fact"
#define MSG_STATS "Statistics"
#define MSG_FIX_LOSE_STEPS "Fix axis steps"
#define MSG_MIN LCD_STR_THERMOMETER " Min"
#define MSG_MAX LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR LCD_STR_THERMOMETER " Fact"
#define MSG_IDLEOOZING "Anti oozing"
#define MSG_AUTOTEMP "Auto tenperatura"
#define MSG_ON "On "
#define MSG_OFF "Off"
#define MSG_ON "ON "
#define MSG_OFF "OFF"
#define MSG_PID_P "PID-P"
#define MSG_PID_I "PID-I"
#define MSG_PID_D "PID-D"
#define MSG_H1 " H1"
#define MSG_H2 " H2"
#define MSG_H3 " H3"
#define MSG_ACC "Azelerazioa"
#define MSG_VXY_JERK "Vxy-astindua"
#define MSG_VZ_JERK "Vz-astindua"
#define MSG_VE_JERK "Ve-astindua"
#define MSG_VMAX "Vmax "
#define MSG_X "x"
#define MSG_Y "y"
#define MSG_Z "z"
#define MSG_E "e"
#define MSG_X "X"
#define MSG_Y "Y"
#define MSG_Z "Z"
#define MSG_E "E"
#define MSG_MOVE "Mugitu"
#define MSG_MOVE_AXIS MSG_MOVE " ardatzak"
#define MSG_MOVE_X MSG_MOVE " " MSG_X
#define MSG_MOVE_Y MSG_MOVE " " MSG_Y
#define MSG_MOVE_Z MSG_MOVE " " MSG_Z
#define MSG_MOVE_01MM MSG_MOVE " 0.1mm"
#define MSG_MOVE_1MM MSG_MOVE " 1mm"
#define MSG_MOVE_10MM MSG_MOVE " 10mm"
#define MSG_MOVE_E "Estrusorea"
#define MSG_VMIN "Vmin"
#define MSG_VTRAV_MIN "VTrav min"
#define MSG_AMAX "Amax "
#define MSG_A_RETRACT "A-retrakt"
#define MSG_A_TRAVEL "A-travel"
#define MSG_XSTEPS "X pausoak/mm"
#define MSG_YSTEPS "Y pausoak/mm"
#define MSG_ZSTEPS "Z pausoak/mm"
#define MSG_E0STEPS "E pausoak/mm"
#define MSG_E1STEPS "E1 pausoak/mm"
#define MSG_E2STEPS "E2 pausoak/mm"
#define MSG_E3STEPS "E3 pausoak/mm"
#define MSG_XSTEPS MSG_X " pausoak/mm"
#define MSG_YSTEPS MSG_Y " pausoak/mm"
#define MSG_ZSTEPS MSG_Z " pausoak/mm"
#define MSG_E0STEPS MSG_E "0 pausoak/mm"
#define MSG_E1STEPS MSG_E "1 pausoak/mm"
#define MSG_E2STEPS MSG_E "2 pausoak/mm"
#define MSG_E3STEPS MSG_E "3 pausoak/mm"
#define MSG_TEMPERATURE "Tenperatura"
#define MSG_MOTION "Mugimendua"
#define MSG_VOLUMETRIC "Filament"
#define MSG_VOLUMETRIC_ENABLED "E in mm" STR_h3
#define MSG_FILAMENT "Filament"
#define MSG_VOLUMETRIC_ENABLED MSG_E " in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER "Fil. Dia."
#define MSG_CONTRAST "LCD kontrastea"
#define MSG_STORE_EPROM "Gorde memoria"
......@@ -131,39 +145,68 @@
#define MSG_ZPROBE_OUT "Z ohe hasiera"
#define MSG_POSITION_UNKNOWN "Posizio ezezaguna"
#define MSG_ZPROBE_ZOFFSET "Z konpentsatu"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_BABYSTEP "Babystep"
#define MSG_BABYSTEP_X MSG_BABYSTEP " " MSG_X
#define MSG_BABYSTEP_Y MSG_BABYSTEP " " MSG_Y
#define MSG_BABYSTEP_Z MSG_BABYSTEP " " MSG_Z
#define MSG_ENDSTOP_ABORT "Endstop deuseztat"
#define MSG_HEATING_FAILED_LCD "Heating failed"
#define MSG_ERR_REDUNDANT_TEMP "Err: REDUNDANT TEMP ERROR"
#define MSG_ERR_REDUNDANT_TEMP "REDUNDANT TEMP ERROR"
#define MSG_THERMAL_RUNAWAY "THERMAL RUNAWAY"
#define MSG_ERR_MAXTEMP "Err: MAXTEMP"
#define MSG_ERR_MINTEMP "Err: MINTEMP"
#define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED"
#define MSG_HOTEND_AD595 "HOTEND AD595 Offset & Gain"
#define MSG_ERR_MAXTEMP "MAXTEMP ERROR"
#define MSG_ERR_MINTEMP "MINTEMP ERROR"
#define MSG_ERR_MAXTEMP_BED "MAXTEMP BED ERROR"
#define MSG_ERR_MINTEMP_BED "MINTEMP BED ERROR"
#define MSG_END_DAY "days"
#define MSG_END_HOUR "hours"
#define MSG_END_MINUTE "minutes"
#define MSG_ENDSTOPS_HIT "endstops hit: "
#define MSG_BABYSTEPPING "Babystepping"
#define MSG_BABYSTEPPING_X MSG_BABYSTEPPING " " MSG_X
#define MSG_BABYSTEPPING_Y MSG_BABYSTEPPING " " MSG_Y
#define MSG_BABYSTEPPING_Z MSG_BABYSTEPPING " " MSG_Z
#define MSG_ENDSTOP_XS MSG_X
#define MSG_ENDSTOP_YS MSG_Y
#define MSG_ENDSTOP_ZS MSG_Z
#define MSG_ENDSTOP_ZPS MSG_Z "P"
#define MSG_ENDSTOP_ES MSG_E
// Calibrate Delta
#if MECH(DELTA)
#define MSG_DELTA_CALIBRATE "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X "Calibrate X"
#define MSG_DELTA_CALIBRATE_Y "Calibrate Y"
#define MSG_DELTA_CALIBRATE_Z "Calibrate Z"
#define MSG_DELTA_CALIBRATE_X "Calibrate " MSG_X
#define MSG_DELTA_CALIBRATE_Y "Calibrate " MSG_Y
#define MSG_DELTA_CALIBRATE_Z "Calibrate " MSG_Z
#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center"
#endif // DELTA
// Scara
#if MECH(SCARA)
#define MSG_XSCALE "X Scale"
#define MSG_YSCALE "Y Scale"
#define MSG_SCALE "Scale"
#define MSG_XSCALE MSG_X " " MSG_SCALE
#define MSG_YSCALE MSG_Y " " MSG_SCALE
#endif
#define MSG_HEATING "Heating..."
#define MSG_HEATING_COMPLETE "Heating done."
#define MSG_BED_HEATING "Bed Heating."
#define MSG_BED_DONE "Bed done."
// Extra
#define MSG_LASER "Laser Preset"
#define MSG_CONFIG "Configuration"
#define MSG_BAUDRATE "Baudrate"
#define MSG_E_BOWDEN_LENGTH "Extrude " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH "Retract " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_E_BOWDEN_LENGTH MSG_EXTRUDE " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH MSG_RETRACT " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM MSG_PURGE " " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM MSG_RETRACT " " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_SAVED_POS "Saved position"
#define MSG_RESTORING_POS "Restoring position"
#define MSG_INVALID_POS_SLOT "Invalid slot, total slots: "
// Firmware Test
#if ENABLED(FIRMWARE_TEST)
#define MSG_FWTEST_YES "Put the Y command to go next"
#define MSG_FWTEST_NO "Put the N command to go next"
......@@ -180,10 +223,10 @@
#define MSG_FWTEST_04 "Start check MOTOR"
#define MSG_FWTEST_ATTENTION "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
#define MSG_FWTEST_END "Finish Test. Disable FIRMWARE_TEST and recompile."
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#endif // FIRMWARE_TEST
#endif // LANGUAGE_EU_H
MarlinKimbra/language_fi.h
View file @ 521315e2
......@@ -9,105 +9,119 @@
#define LANGUAGE_FI_H
#define MAPPER_C2C3
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1
#define WELCOME_MSG MACHINE_NAME " valmis."
#define MSG_SD_INSERTED "Kortti asetettu"
#define MSG_SD_REMOVED "Kortti poistettu"
#define MSG_SD "Kortti"
#define MSG_SD_INSERTED MSG_SD " asetettu"
#define MSG_SD_REMOVED MSG_SD " poistettu"
#define MSG_MAIN "Palaa"
#define MSG_AUTOSTART "Automaatti"
#define MSG_DISABLE_STEPPERS "Vapauta moottorit"
#define MSG_AUTO_HOME "Aja referenssiin"
#define MSG_BED_SETTING "Bed Setting"
#define MSG_LP_INTRO " Leveling bed... Press to start "
#define MSG_LP_1 " Adjust first point & Press the button"
#define MSG_LP_2 " Adjust second point & Press the button"
#define MSG_LP_3 " Adjust third point & Press the button"
#define MSG_LP_4 " Adjust fourth point & Press the button"
#define MSG_LP_5 " Is it ok? Press to end"
#define MSG_LP_6 " BED leveled!"
#define MSG_MBL_SETTING "Manual Bed Leveling"
#define MSG_MBL_BUTTON " Press the button "
#define MSG_MBL_INTRO " Leveling bed... "
#define MSG_MBL_1 " Adjust first point "
#define MSG_MBL_2 " Adjust second point"
#define MSG_MBL_3 " Adjust third point "
#define MSG_MBL_4 " Adjust fourth point"
#define MSG_MBL_5 " Is it ok? "
#define MSG_MBL_6 " BED leveled! "
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_SET_ORIGIN "Aseta origo"
#define MSG_PREHEAT_PLA "Esil" STR_ae "mmit" STR_ae " PLA"
#define MSG_PREHEAT_PLA_ALL "Esil" STR_ae ". PLA Kaikki"
#define MSG_PREHEAT_PLA_BEDONLY "Esil" STR_ae ". PLA Alusta"
#define MSG_PREHEAT_PLA_SETTINGS "Esil" STR_ae "mm. PLA konf"
#define MSG_PREHEAT_ABS "Esil" STR_ae "mmit" STR_ae " ABS"
#define MSG_PREHEAT_ABS_ALL "Esil" STR_ae ". ABS Kaikki"
#define MSG_PREHEAT_ABS_BEDONLY "Esil" STR_ae ". ABS Alusta"
#define MSG_PREHEAT_ABS_SETTINGS "Esil" STR_ae "mm. ABS konf"
#define MSG_PREHEAT_GUM "Esil" STR_ae "mmit" STR_ae " GUM"
#define MSG_PREHEAT_GUM_ALL "Esil" STR_ae ". GUM Kaikki"
#define MSG_PREHEAT_GUM_BEDONLY "Esil" STR_ae ". GUM Alusta"
#define MSG_PREHEAT_GUM_SETTINGS "Esil" STR_ae "mm. GUM konf"
#define MSG_COOLDOWN "J" STR_ae "" STR_ae "hdyt" STR_ae ""
#define MSG_SWITCH_PS_ON "Virta p" STR_ae "" STR_ae "lle"
#define MSG_ONFOR "On x:"
#define MSG_PWRCONSUMED "P.er:"
#define MSG_PREHEAT "Preheat"
#define MSG_CONFIG "conf."
#define MSG_PREHEAT_PLA MSG_PREHEAT " PLA"
#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " All"
#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " Bed"
#define MSG_PREHEAT_PLA_SETTINGS "PLA " MSG_CONFIG
#define MSG_PREHEAT_ABS MSG_PREHEAT " ABS"
#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " All"
#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " Bed"
#define MSG_PREHEAT_ABS_SETTINGS "ABS " MSG_CONFIG
#define MSG_PREHEAT_GUM MSG_PREHEAT " GUM"
#define MSG_PREHEAT_GUM_ALL MSG_PREHEAT_GUM " All"
#define MSG_PREHEAT_GUM_BEDONLY MSG_PREHEAT_GUM " Bed"
#define MSG_PREHEAT_GUM_SETTINGS "GUM " MSG_CONFIG
#define MSG_TOO_COLD_FOR_FILAMENTCHANGE "Hotend too cold to change filament"
#define MSG_COOLDOWN "Jäähdytä"
#define MSG_SWITCH_PS_ON "Virta päälle"
#define MSG_SWITCH_PS_OFF "Virta pois"
#define MSG_EXTRUDE "Pursota"
#define MSG_RETRACT "Ved" STR_ae " takaisin"
#define MSG_MOVE_AXIS "Liikuta akseleita"
#define MSG_MOVE_X "Liikuta X"
#define MSG_MOVE_Y "Liikuta Y"
#define MSG_MOVE_Z "Liikuta Z"
#define MSG_MOVE_E "Extruder"
#define MSG_MOVE_01MM "Liikuta 0.1mm"
#define MSG_MOVE_1MM "Liikuta 1mm"
#define MSG_MOVE_10MM "Liikuta 10mm"
#define MSG_RETRACT "Vedä takaisin"
#define MSG_PURGE "Purge"
#define MSG_LEVEL_BED "Level bed"
#define MSG_SPEED "Nopeus"
#define MSG_NOZZLE "Suutin"
#define MSG_BED "Alusta"
#define MSG_FAN_SPEED "Tuul. nopeus"
#define MSG_FLOW "Virtaus"
#define MSG_CONTROL "Kontrolli"
#define MSG_STATS "Statistics"
#define MSG_FIX_LOSE_STEPS "Fix axis steps"
#define MSG_MIN LCD_STR_THERMOMETER " Min"
#define MSG_MAX LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR LCD_STR_THERMOMETER " Kerr"
#define MSG_IDLEOOZING "Anti oozing"
#define MSG_AUTOTEMP "Autotemp"
#define MSG_ON "On "
#define MSG_OFF "Off"
#define MSG_ON "ON "
#define MSG_OFF "OFF"
#define MSG_PID_P "PID-P"
#define MSG_PID_I "PID-I"
#define MSG_PID_D "PID-D"
#define MSG_H1 " H1"
#define MSG_H2 " H2"
#define MSG_H3 " H3"
#define MSG_ACC "Kiihtyv"
#define MSG_VXY_JERK "Vxy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX "Vmax "
#define MSG_X "x"
#define MSG_Y "y"
#define MSG_Z "z"
#define MSG_E "e"
#define MSG_X "X"
#define MSG_Y "Y"
#define MSG_Z "Z"
#define MSG_E "E"
#define MSG_MOVE "Liikuta"
#define MSG_MOVE_AXIS MSG_MOVE " akseleita"
#define MSG_MOVE_X MSG_MOVE " " MSG_X
#define MSG_MOVE_Y MSG_MOVE " " MSG_Y
#define MSG_MOVE_Z MSG_MOVE " " MSG_Z
#define MSG_MOVE_01MM MSG_MOVE " 0.1mm"
#define MSG_MOVE_1MM MSG_MOVE " 1mm"
#define MSG_MOVE_10MM MSG_MOVE " 10mm"
#define MSG_MOVE_E "Extruder"
#define MSG_VMIN "Vmin"
#define MSG_VTRAV_MIN "VLiike min"
#define MSG_AMAX "Amax "
#define MSG_A_RETRACT "A-peruuta"
#define MSG_A_TRAVEL "A-travel"
#define MSG_XSTEPS "X steps/mm"
#define MSG_YSTEPS "Y steps/mm"
#define MSG_ZSTEPS "Z steps/mm"
#define MSG_E0STEPS "E0 steps/mm"
#define MSG_E1STEPS "E1 steps/mm"
#define MSG_E2STEPS "E2 steps/mm"
#define MSG_E3STEPS "E3 steps/mm"
#define MSG_TEMPERATURE "L" STR_ae "mp" STR_oe "tila"
#define MSG_XSTEPS MSG_X " steps/mm"
#define MSG_YSTEPS MSG_Y " steps/mm"
#define MSG_ZSTEPS MSG_Z " steps/mm"
#define MSG_E0STEPS MSG_E "0 steps/mm"
#define MSG_E1STEPS MSG_E "1 steps/mm"
#define MSG_E2STEPS MSG_E "2 steps/mm"
#define MSG_E3STEPS MSG_E "3 steps/mm"
#define MSG_TEMPERATURE "Temperature"
#define MSG_MOTION "Liike"
#define MSG_VOLUMETRIC "Filament"
#define MSG_VOLUMETRIC_ENABLED "E in mm" STR_h3
#define MSG_FILAMENT "Filament"
#define MSG_VOLUMETRIC_ENABLED MSG_E " in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER "Fil. Dia."
#define MSG_CONTRAST "LCD kontrasti"
#define MSG_STORE_EPROM "Tallenna muistiin"
#define MSG_LOAD_EPROM "Lataa muistista"
#define MSG_RESTORE_FAILSAFE "Palauta oletus"
#define MSG_REFRESH "P" STR_ae "ivit" STR_ae ""
#define MSG_REFRESH "Päivitä"
#define MSG_WATCH "Seuraa"
#define MSG_PREPARE "Valmistele"
#define MSG_TUNE "S" STR_ae "" STR_ae "d" STR_ae ""
#define MSG_PAUSE_PRINT "Keskeyt" STR_ae " tulostus"
#define MSG_TUNE "Säädä"
#define MSG_PAUSE_PRINT "Keskeytä tulostus"
#define MSG_RESUME_PRINT "Jatka tulostusta"
#define MSG_STOP_PRINT "Pys" STR_ae "yt" STR_ae " tulostus"
#define MSG_STOP_PRINT "Pysäytä tulostus"
#define MSG_CARD_MENU "Korttivalikko"
#define MSG_NO_CARD "Ei korttia"
#define MSG_DWELL "Nukkumassa..."
......@@ -117,53 +131,82 @@
#define MSG_NO_MOVE "Ei liiketta."
#define MSG_KILLED "KILLED. "
#define MSG_STOPPED "STOPPED. "
#define MSG_CONTROL_RETRACT "Ved" STR_ae " mm"
#define MSG_CONTROL_RETRACT_SWAP "Va. Ved" STR_ae " mm"
#define MSG_CONTROL_RETRACTF "Ved" STR_ae " V"
#define MSG_CONTROL_RETRACT "Vedä mm"
#define MSG_CONTROL_RETRACT_SWAP "Va. Vedä mm"
#define MSG_CONTROL_RETRACTF "Vedä V"
#define MSG_CONTROL_RETRACT_ZLIFT "Z mm"
#define MSG_CONTROL_RETRACT_RECOVER "UnRet +mm"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "Va. UnRet +mm"
#define MSG_CONTROL_RETRACT_RECOVERF "UnRet V"
#define MSG_AUTORETRACT "AutoVeto."
#define MSG_FILAMENTCHANGE "Change filament"
#define MSG_INIT_SDCARD "Init. SD-Card"
#define MSG_CNG_SDCARD "Change SD-Card"
#define MSG_INIT_SDCARD "Init. " MSG_SD
#define MSG_CNG_SDCARD "Change " MSG_SD
#define MSG_ZPROBE_OUT "Z probe out. bed"
#define MSG_POSITION_UNKNOWN "Home X/Y before Z"
#define MSG_ZPROBE_ZOFFSET "Z Offset"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_BABYSTEP "Babystep"
#define MSG_BABYSTEP_X MSG_BABYSTEP " " MSG_X
#define MSG_BABYSTEP_Y MSG_BABYSTEP " " MSG_Y
#define MSG_BABYSTEP_Z MSG_BABYSTEP " " MSG_Z
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_HEATING_FAILED_LCD "Heating failed"
#define MSG_ERR_REDUNDANT_TEMP "Err: REDUNDANT TEMP ERROR"
#define MSG_ERR_REDUNDANT_TEMP "REDUNDANT TEMP ERROR"
#define MSG_THERMAL_RUNAWAY "THERMAL RUNAWAY"
#define MSG_ERR_MAXTEMP "Err: MAXTEMP"
#define MSG_ERR_MINTEMP "Err: MINTEMP"
#define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED"
#define MSG_HOTEND_AD595 "HOTEND AD595 Offset & Gain"
#define MSG_ERR_MAXTEMP "MAXTEMP ERROR"
#define MSG_ERR_MINTEMP "MINTEMP ERROR"
#define MSG_ERR_MAXTEMP_BED "MAXTEMP BED ERROR"
#define MSG_ERR_MINTEMP_BED "MINTEMP BED ERROR"
#define MSG_END_DAY "days"
#define MSG_END_HOUR "hours"
#define MSG_END_MINUTE "minutes"
#define MSG_ENDSTOPS_HIT "endstops hit: "
#define MSG_BABYSTEPPING "Babystepping"
#define MSG_BABYSTEPPING_X MSG_BABYSTEPPING " " MSG_X
#define MSG_BABYSTEPPING_Y MSG_BABYSTEPPING " " MSG_Y
#define MSG_BABYSTEPPING_Z MSG_BABYSTEPPING " " MSG_Z
#define MSG_ENDSTOP_XS MSG_X
#define MSG_ENDSTOP_YS MSG_Y
#define MSG_ENDSTOP_ZS MSG_Z
#define MSG_ENDSTOP_ZPS MSG_Z "P"
#define MSG_ENDSTOP_ES MSG_E
// Calibrate Delta
#if MECH(DELTA)
#define MSG_DELTA_CALIBRATE "Delta Kalibrointi"
#define MSG_DELTA_CALIBRATE_X "Kalibroi X"
#define MSG_DELTA_CALIBRATE_Y "Kalibroi Y"
#define MSG_DELTA_CALIBRATE_Z "Kalibroi Z"
#define MSG_DELTA_CALIBRATE_X "Kalibroi " MSG_X
#define MSG_DELTA_CALIBRATE_Y "Kalibroi " MSG_Y
#define MSG_DELTA_CALIBRATE_Z "Kalibroi " MSG_Z
#define MSG_DELTA_CALIBRATE_CENTER "Kalibroi Center"
#endif // DELTA
// Scara
#if MECH(SCARA)
#define MSG_XSCALE "X Scale"
#define MSG_YSCALE "Y Scale"
#define MSG_SCALE "Scale"
#define MSG_XSCALE MSG_X " " MSG_SCALE
#define MSG_YSCALE MSG_Y " " MSG_SCALE
#endif
#define MSG_HEATING "Heating..."
#define MSG_HEATING_COMPLETE "Heating done."
#define MSG_BED_HEATING "Bed Heating."
#define MSG_BED_DONE "Bed done."
// Extra
#define MSG_LASER "Laser Preset"
#define MSG_CONFIG "Configuration"
#define MSG_BAUDRATE "Baudrate"
#define MSG_E_BOWDEN_LENGTH "Extrude " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH "Retract " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_E_BOWDEN_LENGTH MSG_EXTRUDE " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH MSG_RETRACT " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM MSG_PURGE " " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM MSG_RETRACT " " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_SAVED_POS "Saved position"
#define MSG_RESTORING_POS "Restoring position"
#define MSG_INVALID_POS_SLOT "Invalid slot, total slots: "
// Firmware Test
#if ENABLED(FIRMWARE_TEST)
#define MSG_FWTEST_YES "Put the Y command to go next"
#define MSG_FWTEST_NO "Put the N command to go next"
......@@ -180,10 +223,10 @@
#define MSG_FWTEST_04 "Start check MOTOR"
#define MSG_FWTEST_ATTENTION "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
#define MSG_FWTEST_END "Finish Test. Disable FIRMWARE_TEST and recompile."
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#endif // FIRMWARE_TEST
#endif // LANGUAGE_FI_H
MarlinKimbra/language_fr.h
View file @ 521315e2
......@@ -8,63 +8,64 @@
#ifndef LANGUAGE_FR_H
#define LANGUAGE_FR_H
#define MAPPER_NON
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1
#define MAPPER_NON // For direct asci codes
#define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
#define WELCOME_MSG MACHINE_NAME " prete."
#define MSG_SD_INSERTED "Carte inseree"
#define MSG_SD_REMOVED "Carte retiree"
#define MSG_SD "Carte"
#define MSG_SD_INSERTED MSG_SD " inseree"
#define MSG_SD_REMOVED MSG_SD " retiree"
#define MSG_MAIN "Menu principal"
#define MSG_AUTOSTART "Demarrage auto"
#define MSG_DISABLE_STEPPERS "Arreter moteurs"
#define MSG_AUTO_HOME "Home auto."
#define MSG_BED_SETTING "Bed Setting"
#define MSG_LP_INTRO " Leveling bed... Press to start "
#define MSG_LP_1 " Adjust first point & Press the button"
#define MSG_LP_2 " Adjust second point & Press the button"
#define MSG_LP_3 " Adjust third point & Press the button"
#define MSG_LP_4 " Adjust fourth point & Press the button"
#define MSG_LP_5 " Is it ok? Press to end"
#define MSG_LP_6 " BED leveled!"
#define MSG_MBL_SETTING "Manual Bed Leveling"
#define MSG_MBL_BUTTON " Press the button "
#define MSG_MBL_INTRO " Leveling bed... "
#define MSG_MBL_1 " Adjust first point "
#define MSG_MBL_2 " Adjust second point"
#define MSG_MBL_3 " Adjust third point "
#define MSG_MBL_4 " Adjust fourth point"
#define MSG_MBL_5 " Is it ok? "
#define MSG_MBL_6 " BED leveled! "
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_SET_ORIGIN "Regler origine"
#define MSG_PREHEAT_PLA "Prechauffage PLA"
#define MSG_PREHEAT_PLA_ALL "Prech. PLA Tout"
#define MSG_PREHEAT_PLA_BEDONLY "Prech. PLA Plateau"
#define MSG_PREHEAT_PLA_SETTINGS "Regl. prech. PLA"
#define MSG_PREHEAT_ABS "Prechauffage ABS"
#define MSG_PREHEAT_ABS_ALL "Prech. ABS Tout"
#define MSG_PREHEAT_ABS_BEDONLY "Prech. ABS Plateau"
#define MSG_PREHEAT_ABS_SETTINGS "Regl. prech. ABS"
#define MSG_PREHEAT_GUM "Preheat GUM"
#define MSG_PREHEAT_GUM_ALL "Preheat GUM All"
#define MSG_PREHEAT_GUM_BEDONLY "Preheat GUM Bed"
#define MSG_PREHEAT_GUM_SETTINGS "Preheat GUM conf"
#define MSG_ONFOR "On x:"
#define MSG_PWRCONSUMED "P.er:"
#define MSG_PREHEAT "Prech."
#define MSG_CONFIG "conf."
#define MSG_PREHEAT_PLA MSG_PREHEAT " PLA"
#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " Tout"
#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " Plateau"
#define MSG_PREHEAT_PLA_SETTINGS "PLA " MSG_CONFIG
#define MSG_PREHEAT_ABS MSG_PREHEAT " ABS"
#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " Tout"
#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " Plateau"
#define MSG_PREHEAT_ABS_SETTINGS "ABS " MSG_CONFIG
#define MSG_PREHEAT_GUM MSG_PREHEAT " GUM"
#define MSG_PREHEAT_GUM_ALL MSG_PREHEAT_GUM " Tout"
#define MSG_PREHEAT_GUM_BEDONLY MSG_PREHEAT_GUM " Plateau"
#define MSG_PREHEAT_GUM_SETTINGS "GUM " MSG_CONFIG
#define MSG_TOO_COLD_FOR_FILAMENTCHANGE "Hotend too cold to change filament"
#define MSG_COOLDOWN "Refroidir"
#define MSG_SWITCH_PS_ON "Allumer alim."
#define MSG_SWITCH_PS_OFF "Eteindre alim."
#define MSG_EXTRUDE "Extrusion"
#define MSG_RETRACT "Retraction"
#define MSG_MOVE_AXIS "Deplacer un axe"
#define MSG_MOVE_X "Depl. X"
#define MSG_MOVE_Y "Depl. Y"
#define MSG_MOVE_Z "Depl. Z"
#define MSG_MOVE_E "Extruder"
#define MSG_MOVE_01MM "Depl. 0.1mm"
#define MSG_MOVE_1MM "Depl. 1mm"
#define MSG_MOVE_10MM "Depl. 10mm"
#define MSG_SPEED " Vitesse"
#define MSG_PURGE "Purge"
#define MSG_LEVEL_BED "Level bed"
#define MSG_SPEED "Vitesse"
#define MSG_NOZZLE "Buse"
#define MSG_BED "Plateau"
#define MSG_FAN_SPEED "Vite. ventilateur"
#define MSG_FLOW "Flux"
#define MSG_CONTROL "Controler"
#define MSG_MIN " " LCD_STR_THERMOMETER " Min"
#define MSG_MAX " " LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR " " LCD_STR_THERMOMETER " Facteur"
#define MSG_STATS "Statistics"
#define MSG_FIX_LOSE_STEPS "Fix axis steps"
#define MSG_MIN LCD_STR_THERMOMETER " Min"
#define MSG_MAX LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR LCD_STR_THERMOMETER " Facteur"
#define MSG_IDLEOOZING "Anti oozing"
#define MSG_AUTOTEMP "Temp. Auto."
#define MSG_ON "Marche "
......@@ -72,31 +73,43 @@
#define MSG_PID_P "PID-P"
#define MSG_PID_I "PID-I"
#define MSG_PID_D "PID-D"
#define MSG_H1 " H1"
#define MSG_H2 " H2"
#define MSG_H3 " H3"
#define MSG_ACC "Accel"
#define MSG_VXY_JERK "Vxy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX "Vmax "
#define MSG_X "x"
#define MSG_Y "y"
#define MSG_Z "z"
#define MSG_E "e"
#define MSG_X "X"
#define MSG_Y "Y"
#define MSG_Z "Z"
#define MSG_E "E"
#define MSG_MOVE "Depl."
#define MSG_MOVE_AXIS MSG_MOVE " axis"
#define MSG_MOVE_X MSG_MOVE " " MSG_X
#define MSG_MOVE_Y MSG_MOVE " " MSG_Y
#define MSG_MOVE_Z MSG_MOVE " " MSG_Z
#define MSG_MOVE_01MM MSG_MOVE " 0.1mm"
#define MSG_MOVE_1MM MSG_MOVE " 1mm"
#define MSG_MOVE_10MM MSG_MOVE " 10mm"
#define MSG_MOVE_E "Extruder"
#define MSG_VMIN "Vmin"
#define MSG_VTRAV_MIN "Vdepl min"
#define MSG_AMAX "Amax "
#define MSG_A_RETRACT "A-retract"
#define MSG_A_TRAVEL "A-travel"
#define MSG_XSTEPS "X pas/mm"
#define MSG_YSTEPS "Y pas/mm"
#define MSG_ZSTEPS "Z pas/mm"
#define MSG_E0STEPS "E0 pas/mm"
#define MSG_E1STEPS "E1 pas/mm"
#define MSG_E2STEPS "E2 pas/mm"
#define MSG_E3STEPS "E3 pas/mm"
#define MSG_XSTEPS MSG_X " pas/mm"
#define MSG_YSTEPS MSG_Y " pas/mm"
#define MSG_ZSTEPS MSG_Z " pas/mm"
#define MSG_E0STEPS MSG_E "0 pas/mm"
#define MSG_E1STEPS MSG_E "1 pas/mm"
#define MSG_E2STEPS MSG_E "2 pas/mm"
#define MSG_E3STEPS MSG_E "3 pas/mm"
#define MSG_TEMPERATURE "Temperature"
#define MSG_MOTION "Mouvement"
#define MSG_VOLUMETRIC "Filament"
#define MSG_VOLUMETRIC_ENABLED "E in mm3"
#define MSG_FILAMENT "Filament"
#define MSG_VOLUMETRIC_ENABLED MSG_E " in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER "Fil. Dia."
#define MSG_CONTRAST "Contraste LCD"
#define MSG_STORE_EPROM "Sauver config"
......@@ -132,41 +145,68 @@
#define MSG_ZPROBE_OUT "Z sonde exte. lit"
#define MSG_POSITION_UNKNOWN "Rev. dans XY av.Z"
#define MSG_ZPROBE_ZOFFSET "Offset Z"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_BABYSTEP "Babystep"
#define MSG_BABYSTEP_X MSG_BABYSTEP " " MSG_X
#define MSG_BABYSTEP_Y MSG_BABYSTEP " " MSG_Y
#define MSG_BABYSTEP_Z MSG_BABYSTEP " " MSG_Z
#define MSG_ENDSTOP_ABORT "Butee abandon"
#define MSG_HEATING_FAILED_LCD "Heating failed"
#define MSG_ERR_REDUNDANT_TEMP "REDUNDANT TEMP ERROR"
#define MSG_THERMAL_RUNAWAY "THERMAL RUNAWAY"
#define MSG_HOTEND_AD595 "HOTEND AD595 Offset & Gain"
#define MSG_ERR_MAXTEMP "MAXTEMP ERROR"
#define MSG_ERR_MINTEMP "MINTEMP ERROR"
#define MSG_ERR_MAXTEMP_BED "MAXTEMP BED ERROR"
#define MSG_ERR_MINTEMP_BED "MINTEMP BED ERROR"
#define MSG_END_DAY "days"
#define MSG_END_HOUR "heures"
#define MSG_END_MINUTE "minutes"
#define MSG_HEATING_FAILED_LCD "Heating failed"
#define MSG_ERR_REDUNDANT_TEMP "Err: REDUNDANT TEMP ERROR"
#define MSG_THERMAL_RUNAWAY "THERMAL RUNAWAY"
#define MSG_ERR_MAXTEMP "Err: MAXTEMP"
#define MSG_ERR_MINTEMP "Err: MINTEMP"
#define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED"
#define MSG_ENDSTOPS_HIT "endstops hit: "
#define MSG_BABYSTEPPING "Babystepping"
#define MSG_BABYSTEPPING_X MSG_BABYSTEPPING " " MSG_X
#define MSG_BABYSTEPPING_Y MSG_BABYSTEPPING " " MSG_Y
#define MSG_BABYSTEPPING_Z MSG_BABYSTEPPING " " MSG_Z
#define MSG_ENDSTOP_XS MSG_X
#define MSG_ENDSTOP_YS MSG_Y
#define MSG_ENDSTOP_ZS MSG_Z
#define MSG_ENDSTOP_ZPS MSG_Z "P"
#define MSG_ENDSTOP_ES MSG_E
// Calibrate Delta
#if MECH(DELTA)
#define MSG_DELTA_CALIBRATE "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X "Calibrate X"
#define MSG_DELTA_CALIBRATE_Y "Calibrate Y"
#define MSG_DELTA_CALIBRATE_Z "Calibrate Z"
#define MSG_DELTA_CALIBRATE_X "Calibrate " MSG_X
#define MSG_DELTA_CALIBRATE_Y "Calibrate " MSG_Y
#define MSG_DELTA_CALIBRATE_Z "Calibrate " MSG_Z
#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center"
#endif // DELTA
// Scara
#if MECH(SCARA)
#define MSG_XSCALE "X Scale"
#define MSG_YSCALE "Y Scale"
#define MSG_SCALE "Scale"
#define MSG_XSCALE MSG_X " " MSG_SCALE
#define MSG_YSCALE MSG_Y " " MSG_SCALE
#endif
#define MSG_HEATING "Heating..."
#define MSG_HEATING_COMPLETE "Heating done."
#define MSG_BED_HEATING "Bed Heating."
#define MSG_BED_DONE "Bed done."
// Extra
#define MSG_LASER "Laser Preset"
#define MSG_CONFIG "Configuration"
#define MSG_BAUDRATE "Baudrate"
#define MSG_E_BOWDEN_LENGTH "Extrude " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH "Retract " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_E_BOWDEN_LENGTH MSG_EXTRUDE " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH MSG_RETRACT " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM MSG_PURGE " " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM MSG_RETRACT " " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_SAVED_POS "Saved position"
#define MSG_RESTORING_POS "Restoring position"
#define MSG_INVALID_POS_SLOT "Invalid slot, total slots: "
// Firmware Test
#if ENABLED(FIRMWARE_TEST)
#define MSG_FWTEST_YES "Put the Y command to go next"
#define MSG_FWTEST_NO "Put the N command to go next"
......@@ -183,10 +223,10 @@
#define MSG_FWTEST_04 "Start check MOTOR"
#define MSG_FWTEST_ATTENTION "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
#define MSG_FWTEST_END "Finish Test. Disable FIRMWARE_TEST and recompile."
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#endif // FIRMWARE_TEST
#endif // LANGUAGE_FR_H
MarlinKimbra/language_it.h
View file @ 521315e2
......@@ -8,14 +8,14 @@
#ifndef LANGUAGE_IT_H
#define LANGUAGE_IT_H
#define MAPPER_NON
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1
#define MAPPER_NON // For direct asci codes
#define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
#define WELCOME_MSG MACHINE_NAME " pronta."
#define MSG_SD_INSERTED "SD Card inserita"
#define MSG_SD_REMOVED "SD Card rimossa"
#define MSG_SD "SD"
#define MSG_SD_INSERTED MSG_SD " inserita"
#define MSG_SD_REMOVED MSG_SD " rimossa"
#define MSG_MAIN "Menu principale"
#define MSG_AUTOSTART "Autostart"
#define MSG_DISABLE_STEPPERS "Disabilita Motori"
......@@ -33,6 +33,8 @@
#define MSG_SET_ORIGIN "Imposta Origine"
#define MSG_ONFOR "On x:"
#define MSG_PWRCONSUMED "P.za:"
#define MSG_PREHEAT "Preriscalda"
#define MSG_CONFIG "conf."
#define MSG_PREHEAT_PLA "Preriscalda PLA"
#define MSG_PREHEAT_PLA_ALL "Prer. PLA Tutto"
#define MSG_PREHEAT_PLA_BEDONLY "Prer. PLA Piatto"
......@@ -51,15 +53,8 @@
#define MSG_SWITCH_PS_OFF "Spegni aliment."
#define MSG_EXTRUDE "Estrudi"
#define MSG_RETRACT "Ritrai"
#define MSG_MOVE_AXIS "Muovi Asse"
#define MSG_PURGE "Purge"
#define MSG_LEVEL_BED "Liv. piatto"
#define MSG_MOVE_X "Muovi X"
#define MSG_MOVE_Y "Muovi Y"
#define MSG_MOVE_Z "Muovi Z"
#define MSG_MOVE_E "Estrusore"
#define MSG_MOVE_01MM "Muovi di 0.1mm"
#define MSG_MOVE_1MM "Muovi di 1mm"
#define MSG_MOVE_10MM "Muovi di 10mm"
#define MSG_SPEED "Velocita"
#define MSG_NOZZLE "Ugello"
#define MSG_BED "Piatto"
......@@ -67,6 +62,7 @@
#define MSG_FLOW "Flusso"
#define MSG_CONTROL "Controllo"
#define MSG_STATS "Statistiche"
#define MSG_FIX_LOSE_STEPS "Fix axis steps"
#define MSG_MIN LCD_STR_THERMOMETER " Min"
#define MSG_MAX LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR LCD_STR_THERMOMETER " Fact"
......@@ -83,28 +79,37 @@
#define MSG_ACC "Accel"
#define MSG_VXY_JERK "Vxy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk "
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX "Vmax "
#define MSG_X "X"
#define MSG_Y "Y"
#define MSG_Z "Z"
#define MSG_E "E"
#define MSG_MOVE "Muovi"
#define MSG_MOVE_AXIS MSG_MOVE " asse"
#define MSG_MOVE_X MSG_MOVE " " MSG_X
#define MSG_MOVE_Y MSG_MOVE " " MSG_Y
#define MSG_MOVE_Z MSG_MOVE " " MSG_Z
#define MSG_MOVE_01MM MSG_MOVE " 0.1mm"
#define MSG_MOVE_1MM MSG_MOVE " 1mm"
#define MSG_MOVE_10MM MSG_MOVE " 10mm"
#define MSG_MOVE_E "Estrusore"
#define MSG_VMIN "Vmin"
#define MSG_VTRAV_MIN "VTrav min"
#define MSG_AMAX "Amax "
#define MSG_A_RETRACT "A-retract "
#define MSG_A_RETRACT "A-retract"
#define MSG_A_TRAVEL "A-travel"
#define MSG_XSTEPS "X steps/mm"
#define MSG_YSTEPS "Y steps/mm"
#define MSG_ZSTEPS "Z steps/mm"
#define MSG_E0STEPS "E0steps/mm"
#define MSG_E1STEPS "E1steps/mm"
#define MSG_E2STEPS "E2steps/mm"
#define MSG_E3STEPS "E3steps/mm"
#define MSG_XSTEPS MSG_X " steps/mm"
#define MSG_YSTEPS MSG_Y " steps/mm"
#define MSG_ZSTEPS MSG_Z " steps/mm"
#define MSG_E0STEPS MSG_E "0 steps/mm"
#define MSG_E1STEPS MSG_E "1 steps/mm"
#define MSG_E2STEPS MSG_E "2 steps/mm"
#define MSG_E3STEPS MSG_E "3 steps/mm"
#define MSG_TEMPERATURE "Temperatura"
#define MSG_MOTION "Movimento"
#define MSG_FILAMENT "Filamento"
#define MSG_VOLUMETRIC_ENABLED "E in mm"
#define MSG_VOLUMETRIC_ENABLED MSG_E " in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER "Diam. filo"
#define MSG_CONTRAST "Contrasto LCD"
#define MSG_STORE_EPROM "Salva in EEPROM"
......@@ -146,22 +151,28 @@
#define MSG_BABYSTEP_Z MSG_BABYSTEP " " MSG_Z
#define MSG_ENDSTOP_ABORT "Finecorsa abort."
#define MSG_HEATING_FAILED_LCD "Riscaldamento fallito"
#define MSG_ERR_REDUNDANT_TEMP "Err: REDUNDANT TEMP ERROR"
#define MSG_ERR_REDUNDANT_TEMP "REDUNDANT TEMP ERROR"
#define MSG_THERMAL_RUNAWAY "THERMAL RUNAWAY"
#define MSG_ERR_MAXTEMP "Err: MAXTEMP"
#define MSG_ERR_MINTEMP "Err: MINTEMP"
#define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED"
#define MSG_ERR_MINTEMP_BED "Err: MINTEMP BED"
#define MSG_HOTEND_AD595 "HOTEND AD595 Offset & Gain"
#define MSG_ERR_MAXTEMP "MAXTEMP ERROR"
#define MSG_ERR_MINTEMP "MINTEMP ERROR"
#define MSG_ERR_MAXTEMP_BED "MAXTEMP BED ERROR"
#define MSG_ERR_MINTEMP_BED "MINTEMP BED ERROR"
#define MSG_END_DAY "giorni"
#define MSG_END_HOUR "ore"
#define MSG_END_MINUTE "minuti"
// Debug
#define MSG_DEBUG_ECHO "DEBUG RIPETI ABILITATO"
#define MSG_DEBUG_INFO "DEBUG INFO ABILITATO"
#define MSG_DEBUG_ERRORS "DEBUG ERRORI ABILITATO"
#define MSG_DEBUG_DRYRUN "DEBUG STAMPA A VUOTO ABILITATO"
#define MSG_DEBUG "DEBUG ABILITATO"
#define MSG_ENDSTOPS_HIT "endstops hit: "
#define MSG_BABYSTEPPING "Babystepping"
#define MSG_BABYSTEPPING_X MSG_BABYSTEPPING " " MSG_X
#define MSG_BABYSTEPPING_Y MSG_BABYSTEPPING " " MSG_Y
#define MSG_BABYSTEPPING_Z MSG_BABYSTEPPING " " MSG_Z
#define MSG_ENDSTOP_XS MSG_X
#define MSG_ENDSTOP_YS MSG_Y
#define MSG_ENDSTOP_ZS MSG_Z
#define MSG_ENDSTOP_ZPS MSG_Z "P"
#define MSG_ENDSTOP_ES MSG_E
// Calibrate Delta
#if MECH(DELTA)
......@@ -174,8 +185,9 @@
// Scara
#if MECH(SCARA)
#define MSG_XSCALE "X Scale"
#define MSG_YSCALE "Y Scale"
#define MSG_SCALE "Scale"
#define MSG_XSCALE MSG_X " " MSG_SCALE
#define MSG_YSCALE MSG_Y " " MSG_SCALE
#endif
#define MSG_HEATING "Riscaldamento..."
......@@ -211,10 +223,10 @@
#define MSG_FWTEST_04 "Inizio controllo MOTORI"
#define MSG_FWTEST_ATTENTION "ATTENZIONE! Controlla che i tre assi siano a piu' di 5 mm dagli endstop!"
#define MSG_FWTEST_END "Test finito. Disabilitare FIRMWARE_TEST e ricompilare."
#define MSG_FWTEST_INTO "in "
#define MSG_FWTEST_ERROR "ERRORE"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "non definito"
#define MSG_FWTEST_INTO "in "
#define MSG_FWTEST_ERROR "ERRORE"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "non definito"
#endif // FIRMWARE_TEST
#endif // LANGUAGE_IT_H
MarlinKimbra/language_kana.h
View file @ 521315e2
......@@ -5,61 +5,73 @@
* See also documentation/LCDLanguageFont.md
*
*/
#ifndef LANGUAGE_KANA_H
#define LANGUAGE_KANA_H
#define MAPPER_NON
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_KANA
// 片仮名表示定義
#define WELCOME_MSG MACHINE_NAME " ready."
#define MSG_SD "SD"
#define MSG_SD_INSERTED "\xb6\xb0\xc4\xde\x20\xbf\xb3\xc6\xad\xb3\xbb\xda\xcf\xbc\xc0" // "Card inserted"
#define MSG_SD_REMOVED "\xb6\xb0\xc4\xde\xb6xde\xb1\xd8\xcf\xbe\xdd" // "Card removed"
#define MSG_MAIN "\xd2\xb2\xdd" // "Main"
#define MSG_AUTOSTART "\xbc\xde\xc4\xde\xb3\xb6\xb2\xbc" // "Autostart"
#define MSG_DISABLE_STEPPERS "\xd3\xb0\xc0\xb0\xc3\xde\xdd\xb9\xde\xdd\x20\xb5\xcc" // "Disable steppers"
#define MSG_AUTO_HOME "\xb9\xde\xdd\xc3\xdd\xc6\xb2\xc4\xde\xb3" // "Auto home"
#define MSG_MBL_SETTING "Manual Bed Leveling"
#define MSG_MBL_BUTTON " Press the button "
#define MSG_MBL_INTRO " Leveling bed... "
#define MSG_MBL_1 " Adjust first point "
#define MSG_MBL_2 " Adjust second point"
#define MSG_MBL_3 " Adjust third point "
#define MSG_MBL_4 " Adjust fourth point"
#define MSG_MBL_5 " Is it ok? "
#define MSG_MBL_6 " BED leveled! "
#define MSG_SET_HOME_OFFSETS "\xb7\xbc\xde\xad\xdd\xb5\xcc\xbe\xaf\xc4\xbe\xaf\xc3\xb2" // "Set home offsets"
#define MSG_SET_ORIGIN "\xb7\xbc\xde\xad\xdd\xbe\xaf\xc4" // "Set origin"
#define MSG_PREHEAT_PLA "PLA \xd6\xc8\xc2" // "Preheat PLA"
#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
#define MSG_ONFOR "On x:"
#define MSG_PWRCONSUMED "P.er:"
#define MSG_PREHEAT "Preheat"
#define MSG_CONFIG "conf."
#define MSG_PREHEAT_PLA "PLA \xd6\xc8\xc2"
#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " \xbd\xcd\xde\xc3" // " All"
#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " \xcd\xde\xaf\xc4\xde" // "Bed"
#define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA " \xbe\xaf\xc3\xb2" // "conf"
#define MSG_PREHEAT_ABS "ABS \xd6\xc8\xc2" // "Preheat ABS"
#define MSG_PREHEAT_ABS_N MSG_PREHEAT_ABS " "
#define MSG_PREHEAT_ABS "ABS \xd6\xc8\xc2"
#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " \xbd\xcd\xde\xc3" // " All"
#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " \xcd\xde\xaf\xc4\xde" // "Bed"
#define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS " \xbe\xaf\xc3\xb2" // "conf"
#define MSG_PREHEAT_GUM "Preheat GUM"
#define MSG_PREHEAT_GUM_ALL "Preheat GUM All"
#define MSG_PREHEAT_GUM_BEDONLY "Preheat GUM Bed"
#define MSG_PREHEAT_GUM_SETTINGS "Preheat GUM conf"
#define MSG_TOO_COLD_FOR_FILAMENTCHANGE "Hotend too cold to change filament"
#define MSG_COOLDOWN "\xb6\xc8\xc2\xc3\xb2\xbc" // "Cooldown"
#define MSG_SWITCH_PS_ON "\xc3\xde\xdd\xb9\xdd\xde\x20\xb5\xdd" // "Switch power on"
#define MSG_SWITCH_PS_OFF "\xc3\xde\xdd\xb9\xdd\xde\x20\xb5\xcc" // "Switch power off"
#define MSG_EXTRUDE "\xb5\xbc\xc0\xde\xbc" // "Extrude"
#define MSG_RETRACT "\xd8\xc4\xd7\xb8\xc4" // "Retract"
#define MSG_MOVE_AXIS "\xbc\xde\xb8\xb2\xc4\xde\xb3" // "Move axis"
#define MSG_MOVE_X "X\xbc\xde\xb8\x20\xb2\xc4\xde\xb3" // "Move X"
#define MSG_MOVE_Y "Y\xbc\xde\xb8\x20\xb2\xc4\xde\xb3" // "Move Y"
#define MSG_MOVE_Z "Z\xbc\xde\xb8\x20\xb2\xc4\xde\xb3" // "Move Z"
#define MSG_MOVE_E "\xb4\xb8\xbd\xc4\xd9\xb0\xc0\xde\xb0" // "Extruder"
#define MSG_MOVE_01MM "0.1mm \xb2\xc4\xde\xb3" // "Move 0.1mm"
#define MSG_MOVE_1MM " 1mm \xb2\xc4\xde\xb3" // "Move 1mm"
#define MSG_MOVE_10MM " 10mm \xb2\xc4\xde\xb3" // "Move 10mm"
#define MSG_PURGE "Purge"
#define MSG_LEVEL_BED "Level bed"
#define MSG_SPEED "\xbd\xcb\xdf\xb0\xc4\xde" // "Speed"
#define MSG_NOZZLE "\xc9\xbd\xde\xd9" // "Nozzle"
#define MSG_BED "\xcd\xde\xaf\xc4\xde" // "Bed"
#define MSG_FAN_SPEED "\xcc\xa7\xdd\xbf\xb8\xc4\xde" // "Fan speed"
#define MSG_FLOW "\xb5\xb8\xd8\xd8\xae\xb3" // "Flow"
#define MSG_CONTROL "\xba\xdd\xc4\xdb\xb0\xd9" // "Control"
#define MSG_STATS "Statistics"
#define MSG_FIX_LOSE_STEPS "Fix axis steps"
#define MSG_MIN LCD_STR_THERMOMETER " Min"
#define MSG_MAX LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR LCD_STR_THERMOMETER " Fact"
#define MSG_IDLEOOZING "Anti oozing"
#define MSG_AUTOTEMP "\xbc\xde\xc4\xde\xb3\xb5\xdd\xc4\xde" // "Autotemp"
#define MSG_ON "On "
#define MSG_OFF "Off"
#define MSG_ON "ON "
#define MSG_OFF "OFF"
#define MSG_PID_P "PID-P"
#define MSG_PID_I "PID-I"
#define MSG_PID_D "PID-D"
......@@ -75,26 +87,32 @@
#define MSG_Y "Y"
#define MSG_Z "Z"
#define MSG_E "E"
#define MSG_MOVE "Move"
#define MSG_MOVE_AXIS "\xbc\xde\xb8\xb2\xc4\xde\xb3" // "Move axis"
#define MSG_MOVE_X "X\xbc\xde\xb8\x20\xb2\xc4\xde\xb3" // "Move X"
#define MSG_MOVE_Y "Y\xbc\xde\xb8\x20\xb2\xc4\xde\xb3" // "Move Y"
#define MSG_MOVE_Z "Z\xbc\xde\xb8\x20\xb2\xc4\xde\xb3" // "Move Z"
#define MSG_MOVE_01MM "0.1mm \xb2\xc4\xde\xb3" // "Move 0.1mm"
#define MSG_MOVE_1MM " 1mm \xb2\xc4\xde\xb3" // "Move 1mm"
#define MSG_MOVE_10MM " 10mm \xb2\xc4\xde\xb3" // "Move 10mm"
#define MSG_MOVE_E "\xb4\xb8\xbd\xc4\xd9\xb0\xc0\xde\xb0" // "Extruder"
#define MSG_VMIN "Vmin"
#define MSG_VTRAV_MIN "VTrav min"
#define MSG_AMAX "Amax "
#define MSG_A_RETRACT "A-retract"
#define MSG_A_TRAVEL "A-travel"
#define MSG_XSTEPS "Xsteps/mm"
#define MSG_YSTEPS "Ysteps/mm"
#define MSG_ZSTEPS "Zsteps/mm"
#define MSG_E0STEPS "E0steps/mm"
#define MSG_E1STEPS "E1steps/mm"
#define MSG_E2STEPS "E2steps/mm"
#define MSG_E3STEPS "E3steps/mm"
#define MSG_XSTEPS MSG_X " steps/mm"
#define MSG_YSTEPS MSG_Y " steps/mm"
#define MSG_ZSTEPS MSG_Z " steps/mm"
#define MSG_E0STEPS MSG_E "0 steps/mm"
#define MSG_E1STEPS MSG_E "1 steps/mm"
#define MSG_E2STEPS MSG_E "2 steps/mm"
#define MSG_E3STEPS MSG_E "3 steps/mm"
#define MSG_TEMPERATURE "\xb5\xdd\xc4\xde" // "Temperature"
#define MSG_MOTION "\xb3\xba\xde\xb7\xbe\xaf\xc3\xb2" // "Motion"
#define MSG_FILAMENT "\xcc\xa8\xd7\xd2\xdd\xc4" // "Filament"
#define MSG_VOLUMETRIC_ENABLED "E in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER_0 "Fil. Dia. 1"
#define MSG_FILAMENT_SIZE_EXTRUDER_1 "Fil. Dia. 2"
#define MSG_FILAMENT_SIZE_EXTRUDER_2 "Fil. Dia. 3"
#define MSG_FILAMENT_SIZE_EXTRUDER_3 "Fil. Dia. 4"
#define MSG_VOLUMETRIC_ENABLED MSG_E " in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER "Fil. Dia."
#define MSG_CONTRAST "LCD\xba\xdd\xc4\xd7\xbd\xc4" // "LCD contrast"
#define MSG_STORE_EPROM "\xd2\xd3\xd8\xcd\xb6\xb8\xc9\xb3" // "Store memory"
#define MSG_LOAD_EPROM "\xd2\xd3\xd8\xb6\xd7\xd6\xd0\ba\xd0" // "Load memory"
......@@ -117,62 +135,61 @@
#define MSG_STOPPED "\xc3\xb2\xbc\xbc\xcf\xbc\xc0" // "STOPPED. "
#define MSG_CONTROL_RETRACT "Retract mm"
#define MSG_CONTROL_RETRACT_SWAP "Swap Re.mm"
#define MSG_CONTROL_RETRACTF "Retract V"
#define MSG_CONTROL_RETRACTF "Retract F"
#define MSG_CONTROL_RETRACT_ZLIFT "Hop mm"
#define MSG_CONTROL_RETRACT_RECOVER "UnRet +mm"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "S UnRet+mm"
#define MSG_CONTROL_RETRACT_RECOVERF "UnRet V"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "S UnRet +mm"
#define MSG_CONTROL_RETRACT_RECOVERF "UnRet F"
#define MSG_AUTORETRACT "AutoRetr."
#define MSG_FILAMENTCHANGE "\xcc\xa8\xd7\xd2\xdd\xc4\xba\xb3\xb6\xdd" // "Change filament"
#define MSG_INIT_SDCARD "SD\xb6\xb0\xc4\xde\xbb\xb2\xd6\xd0\xba\xd0" // "Init. SD card"
#define MSG_CNG_SDCARD "SD\xb6\xb0\xc4\xde\xba\xb3\xb6\xdd" // "Change SD card"
#define MSG_ZPROBE_OUT "Z\xcc\xdf\xdb\xb0\xcc\xde \xcd\xde\xaf\xc4\xee\xb6\xde\xb2" // "Z probe out. bed"
#define MSG_POSITION_UNKNOWN "\xb9\xde\xdd\xc3\xdd\xcaXY\xb2\xc4\xde\xb3\xba\xdeZ" // "Home X/Y before Z"
#define MSG_POSITION_UNKNOWN "\xb9\xde\xdd\xc3\xdd\xcaXY\xb2\xc4\xde\xb3\xba\xdeZ" // "Home X/Y before Z"
#define MSG_ZPROBE_ZOFFSET "Z\xb5\xcc\xbe\xaf\xc4" // "Z Offset"
#define MSG_BABYSTEP "Babystep"
#define MSG_BABYSTEP_X "\xcb\xde\xc4\xde\xb3 X" // "Babystep X"
#define MSG_BABYSTEP_Y "\xcb\xde\xc4\xde\xb3 Y" // "Babystep Y"
#define MSG_BABYSTEP_Z "\xcb\xde\xc4\xde\xb3 Z" // "Babystep Z"
#define MSG_BABYSTEP ""\xcb\xde\xc4\xde\xb3"
#define MSG_BABYSTEP_X MSG_BABYSTEP " " MSG_X
#define MSG_BABYSTEP_Y MSG_BABYSTEP " " MSG_Y
#define MSG_BABYSTEP_Z MSG_BABYSTEP " " MSG_Z
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_HEATING_FAILED_LCD "Heating failed"
#define MSG_ERR_REDUNDANT_TEMP "Err: REDUNDANT TEMP ERROR"
#define MSG_ERR_REDUNDANT_TEMP "REDUNDANT TEMP ERROR"
#define MSG_THERMAL_RUNAWAY "THERMAL RUNAWAY"
#define MSG_ERR_MAXTEMP "Err: MAXTEMP"
#define MSG_ERR_MINTEMP "Err: MINTEMP"
#define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED"
#define MSG_ERR_MINTEMP_BED "Err: MINTEMP BED"
#define MSG_HOTEND_AD595 "HOTEND AD595 Offset & Gain"
#define MSG_ERR_MAXTEMP "MAXTEMP ERROR"
#define MSG_ERR_MINTEMP "MINTEMP ERROR"
#define MSG_ERR_MAXTEMP_BED "MAXTEMP BED ERROR"
#define MSG_ERR_MINTEMP_BED "MINTEMP BED ERROR"
#define MSG_END_DAY "days"
#define MSG_END_HOUR "hours"
#define MSG_END_MINUTE "minutes"
/* These are from language.h. PLEASE DON'T TRANSLATE! All translatable messages can be found in language_en.h
#define MSG_HEATING "\xb6\xc8\xc2\xc1\xad\xb3..." // "Heating..."
#define MSG_HEATING_COMPLETE "\xb6\xc8\xc2\xb6\xdd\xd8x\xae\xb3" // "Heating done."
#define MSG_BED_HEATING "\xcd\xde\xaf\xc4\xde\xb6\xc8\xc2\xc1\xad\xb3" // "Bed Heating."
#define MSG_BED_DONE "\xcd\xde\xaf\xc4\xde\xb6\xc8\xc2\xb6\xdd\xd8x\xae\xb3" // "Bed done."
#define MSG_ENDSTOPS_HIT "endstops hit: "
^ typho
*/
#define MSG_BABYSTEPPING "Babystepping"
#define MSG_BABYSTEPPING_X MSG_BABYSTEPPING " " MSG_X
#define MSG_BABYSTEPPING_Y MSG_BABYSTEPPING " " MSG_Y
#define MSG_BABYSTEPPING_Z MSG_BABYSTEPPING " " MSG_Z
// Debug
#define MSG_DEBUG_ECHO "DEBUG ECHO ENABLED"
#define MSG_DEBUG_INFO "DEBUG INFO ENABLED"
#define MSG_DEBUG_ERRORS "DEBUG ERRORS ENABLED"
#define MSG_DEBUG_DRYRUN "DEBUG DRYRUN ENABLED"
#define MSG_ENDSTOP_XS MSG_X
#define MSG_ENDSTOP_YS MSG_Y
#define MSG_ENDSTOP_ZS MSG_Z
#define MSG_ENDSTOP_ZPS MSG_Z "P"
#define MSG_ENDSTOP_ES MSG_E
// Calibrate Delta
#if MECH(DELTA)
#define MSG_DELTA_CALIBRATE "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X "Calibrate X"
#define MSG_DELTA_CALIBRATE_Y "Calibrate Y"
#define MSG_DELTA_CALIBRATE_Z "Calibrate Z"
#define MSG_DELTA_CALIBRATE_X "Calibrate " MSG_X
#define MSG_DELTA_CALIBRATE_Y "Calibrate " MSG_Y
#define MSG_DELTA_CALIBRATE_Z "Calibrate " MSG_Z
#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center"
#endif // DELTA
// Scara
#if MECH(SCARA)
#define MSG_XSCALE "X Scale"
#define MSG_YSCALE "Y Scale"
#define MSG_SCALE "Scale"
#define MSG_XSCALE MSG_X " " MSG_SCALE
#define MSG_YSCALE MSG_Y " " MSG_SCALE
#endif
#define MSG_HEATING "Heating..."
......@@ -183,10 +200,10 @@
// Extra
#define MSG_LASER "Laser Preset"
#define MSG_CONFIG "Configuration"
#define MSG_E_BOWDEN_LENGTH "Extrude " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH "Retract " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_E_BOWDEN_LENGTH MSG_EXTRUDE " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH MSG_RETRACT " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM MSG_PURGE " " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM MSG_RETRACT " " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_SAVED_POS "Saved position"
#define MSG_RESTORING_POS "Restoring position"
#define MSG_INVALID_POS_SLOT "Invalid slot, total slots: "
......@@ -208,10 +225,10 @@
#define MSG_FWTEST_04 "Start check MOTOR"
#define MSG_FWTEST_ATTENTION "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
#define MSG_FWTEST_END "Finish Test. Disable FIRMWARE_TEST and recompile."
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#endif // FIRMWARE_TEST
#endif // LANGUAGE_KANA_H
MarlinKimbra/language_kana_utf8.h
View file @ 521315e2
......@@ -5,65 +5,76 @@
* See also documentation/LCDLanguageFont.md
*
*/
#ifndef LANGUAGE_KANA_UTF_H
#define LANGUAGE_KANA_UTF_H
#define MAPPER_E382E383
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_KANA
// This is very crude replacement of the codes used in language_kana.h from somebody who really does not know what he is doing.
// Just to show the potential benefit of unicode.
// This translation can be improved by using the full charset of unicode codeblock U+30A0 to U+30FF.
// 片仮名表示定義
#define WELCOME_MSG MACHINE_NAME " ready."
#define MSG_SD "SD"
#define MSG_SD_INSERTED "セード ンウニユウアレマシタ" // "Card inserted"
#define MSG_SD_REMOVED "セードゼアリマセン" // "Card removed"
#define MSG_MAIN "ナイン" // "Main"
#define MSG_AUTOSTART "ヅドウセイシ" // "Autostart"
#define MSG_DISABLE_STEPPERS "モーターデンゲン オフ" // "Disable steppers"
#define MSG_AUTO_HOME "ゲンテンニイドウ" // "Auto home"
#define MSG_MBL_SETTING "Manual Bed Leveling"
#define MSG_MBL_BUTTON " Press the button "
#define MSG_MBL_INTRO " Leveling bed... "
#define MSG_MBL_1 " Adjust first point "
#define MSG_MBL_2 " Adjust second point"
#define MSG_MBL_3 " Adjust third point "
#define MSG_MBL_4 " Adjust fourth point"
#define MSG_MBL_5 " Is it ok? "
#define MSG_MBL_6 " BED leveled! "
#define MSG_SET_HOME_OFFSETS "キヅユンオフセツトセツテイ" // "Set home offsets"
#define MSG_SET_ORIGIN "キヅユンセツト" // "Set origin"
#define MSG_ONFOR "On x:"
#define MSG_PWRCONSUMED "P.er:"
#define MSG_PREHEAT "Preheat"
#define MSG_CONFIG "conf."
#define MSG_PREHEAT_PLA "PLA ヨネシ" // "Preheat PLA"
#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " スベテ" // " All"
#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " ベツド" // "Bed"
#define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA " セツテイ" // "conf"
#define MSG_PREHEAT_ABS "ABS ヨネシ" // "Preheat ABS"
#define MSG_PREHEAT_ABS_N MSG_PREHEAT_ABS " "
#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " スベテ" // " All"
#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " ベツド" // "Bed"
#define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS " セツテイ" // "conf"
#define MSG_PREHEAT_GUM MSG_PREHEAT " GUM"
#define MSG_PREHEAT_GUM_ALL MSG_PREHEAT_GUM " All"
#define MSG_PREHEAT_GUM_BEDONLY MSG_PREHEAT_GUM " Bed"
#define MSG_PREHEAT_GUM_SETTINGS "GUM " MSG_CONFIG
#define MSG_TOO_COLD_FOR_FILAMENTCHANGE "Hotend too cold to change filament"
#define MSG_COOLDOWN "セネシテイシ" // "Cooldown"
#define MSG_SWITCH_PS_ON "デンケゾ オン" // "Switch power on"
#define MSG_SWITCH_PS_OFF "デンケゾ オフ" // "Switch power off"
#define MSG_EXTRUDE "オシダシ" // "Extrude"
#define MSG_RETRACT "リトラケト" // "Retract"
#define MSG_MOVE_AXIS "ヅケイドウ" // "Move axis"
#define MSG_MOVE_X "Xヅケ イドウ" // "Move X"
#define MSG_MOVE_Y "Yヅケ イドウ" // "Move Y"
#define MSG_MOVE_Z "Zヅケ イドウ" // "Move Z"
#define MSG_MOVE_E "エケストルーダー" // "Extruder"
#define MSG_MOVE_01MM "0.1mm イドウ" // "Move 0.1mm"
#define MSG_MOVE_1MM " 1mm イドウ" // "Move 1mm"
#define MSG_MOVE_10MM " 10mm イドウ" // "Move 10mm"
#define MSG_PURGE "Purge"
#define MSG_LEVEL_BED "Level bed"
#define MSG_SPEED "スヒ゜ード" // "Speed"
#define MSG_NOZZLE "ノズル" // "Nozzle"
#define MSG_BED "ベツド" // "Bed"
#define MSG_FAN_SPEED "ファンンケド" // "Fan speed"
#define MSG_FLOW "オケリリョウ" // "Flow"
#define MSG_CONTROL "コントロール" // "Control"
#define MSG_STATS "Statistics"
#define MSG_FIX_LOSE_STEPS "Fix axis steps"
#define MSG_MIN LCD_STR_THERMOMETER " Min"
#define MSG_MAX LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR LCD_STR_THERMOMETER " Fact"
#define MSG_IDLEOOZING "Anti oozing"
#define MSG_AUTOTEMP "ヅドウオンド" // "Autotemp"
#define MSG_ON "On "
#define MSG_OFF "Off"
#define MSG_ON "ON "
#define MSG_OFF "OFF"
#define MSG_PID_P "PID-P"
#define MSG_PID_I "PID-I"
#define MSG_PID_D "PID-D"
......@@ -79,6 +90,15 @@
#define MSG_Y "Y"
#define MSG_Z "Z"
#define MSG_E "E"
#define MSG_MOVE "Move"
#define MSG_MOVE_AXIS "ヅケイドウ" // "Move axis"
#define MSG_MOVE_X "Xヅケ イドウ" // "Move X"
#define MSG_MOVE_Y "Yヅケ イドウ" // "Move Y"
#define MSG_MOVE_Z "Zヅケ イドウ" // "Move Z"
#define MSG_MOVE_01MM "0.1mm イドウ" // "Move 0.1mm"
#define MSG_MOVE_1MM " 1mm イドウ" // "Move 1mm"
#define MSG_MOVE_10MM " 10mm イドウ" // "Move 10mm"
#define MSG_MOVE_E "エケストルーダー" // "Extruder"
#define MSG_VMIN "Vmin"
#define MSG_VTRAV_MIN "VTrav min"
#define MSG_AMAX "Amax "
......@@ -93,12 +113,9 @@
#define MSG_E3STEPS "E3steps/mm"
#define MSG_TEMPERATURE "オンド" // "Temperature"
#define MSG_MOTION "ウゴキセツテイ" // "Motion"
#define MSG_VOLUMETRIC "フィラナント" // "Filament"
#define MSG_VOLUMETRIC_ENABLED "E in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER_0 "Fil. Dia. 1"
#define MSG_FILAMENT_SIZE_EXTRUDER_1 "Fil. Dia. 2"
#define MSG_FILAMENT_SIZE_EXTRUDER_2 "Fil. Dia. 3"
#define MSG_FILAMENT_SIZE_EXTRUDER_3 "Fil. Dia. 4"
#define MSG_FILAMENT "フィラナント" // "Filament"
#define MSG_VOLUMETRIC_ENABLED MSG_E " in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER "Fil. Dia."
#define MSG_CONTRAST "LCDコントラスト" // "LCD contrast"
#define MSG_STORE_EPROM "ナモリヘセケノウ" // "Store memory"
#define MSG_LOAD_EPROM "ナモリセラヨミbaミ" // "Load memory"
......@@ -121,11 +138,11 @@
#define MSG_STOPPED "テイシシマシタ" // "STOPPED. "
#define MSG_CONTROL_RETRACT "Retract mm"
#define MSG_CONTROL_RETRACT_SWAP "Swap Re.mm"
#define MSG_CONTROL_RETRACTF "Retract V"
#define MSG_CONTROL_RETRACTF "Retract F"
#define MSG_CONTROL_RETRACT_ZLIFT "Hop mm"
#define MSG_CONTROL_RETRACT_RECOVER "UnRet +mm"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "S UnRet+mm"
#define MSG_CONTROL_RETRACT_RECOVERF "UnRet V"
#define MSG_CONTROL_RETRACT_RECOVERF "UnRet F"
#define MSG_AUTORETRACT "AutoRetr."
#define MSG_FILAMENTCHANGE "フィラナントコウセン" // "Change filament"
#define MSG_INIT_SDCARD "SDセードアイヨミコミ" // "Init. SD card"
......@@ -139,35 +156,43 @@
#define MSG_BABYSTEP_Z "ゼドウ Z" // "Babystep Z"
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_HEATING_FAILED_LCD "Heating failed"
#define MSG_ERR_REDUNDANT_TEMP "Err: REDUNDANT TEMP ERROR"
#define MSG_ERR_REDUNDANT_TEMP "REDUNDANT TEMP ERROR"
#define MSG_THERMAL_RUNAWAY "THERMAL RUNAWAY"
#define MSG_ERR_MAXTEMP "Err: MAXTEMP"
#define MSG_ERR_MINTEMP "Err: MINTEMP"
#define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED"
#define MSG_ERR_MINTEMP_BED "Err: MINTEMP BED"
#define MSG_HOTEND_AD595 "HOTEND AD595 Offset & Gain"
#define MSG_ERR_MAXTEMP "MAXTEMP ERROR"
#define MSG_ERR_MINTEMP "MINTEMP ERROR"
#define MSG_ERR_MAXTEMP_BED "MAXTEMP BED ERROR"
#define MSG_ERR_MINTEMP_BED "MINTEMP BED ERROR"
#define MSG_END_DAY "days"
#define MSG_END_HOUR "hours"
#define MSG_END_MINUTE "minutes"
// Debug
#define MSG_DEBUG_ECHO "DEBUG ECHO ENABLED"
#define MSG_DEBUG_INFO "DEBUG INFO ENABLED"
#define MSG_DEBUG_ERRORS "DEBUG ERRORS ENABLED"
#define MSG_DEBUG_DRYRUN "DEBUG DRYRUN ENABLED"
#define MSG_ENDSTOPS_HIT "endstops hit: "
#define MSG_BABYSTEPPING "Babystepping"
#define MSG_BABYSTEPPING_X MSG_BABYSTEPPING " " MSG_X
#define MSG_BABYSTEPPING_Y MSG_BABYSTEPPING " " MSG_Y
#define MSG_BABYSTEPPING_Z MSG_BABYSTEPPING " " MSG_Z
#define MSG_ENDSTOP_XS MSG_X
#define MSG_ENDSTOP_YS MSG_Y
#define MSG_ENDSTOP_ZS MSG_Z
#define MSG_ENDSTOP_ZPS MSG_Z "P"
#define MSG_ENDSTOP_ES MSG_E
// Calibrate Delta
#if MECH(DELTA)
#define MSG_DELTA_CALIBRATE "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X "Calibrate X"
#define MSG_DELTA_CALIBRATE_Y "Calibrate Y"
#define MSG_DELTA_CALIBRATE_Z "Calibrate Z"
#define MSG_DELTA_CALIBRATE_X "Calibrate " MSG_X
#define MSG_DELTA_CALIBRATE_Y "Calibrate " MSG_Y
#define MSG_DELTA_CALIBRATE_Z "Calibrate " MSG_Z
#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center"
#endif // DELTA
// Scara
#if MECH(SCARA)
#define MSG_XSCALE "X Scale"
#define MSG_YSCALE "Y Scale"
#define MSG_SCALE "Scale"
#define MSG_XSCALE MSG_X " " MSG_SCALE
#define MSG_YSCALE MSG_Y " " MSG_SCALE
#endif
#define MSG_HEATING "Heating..."
......@@ -178,10 +203,10 @@
// Extra
#define MSG_LASER "Laser Preset"
#define MSG_CONFIG "Configuration"
#define MSG_E_BOWDEN_LENGTH "Extrude " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH "Retract " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_E_BOWDEN_LENGTH MSG_EXTRUDE " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH MSG_RETRACT " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM MSG_PURGE " " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM MSG_RETRACT " " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_SAVED_POS "Saved position"
#define MSG_RESTORING_POS "Restoring position"
#define MSG_INVALID_POS_SLOT "Invalid slot, total slots: "
......@@ -203,10 +228,10 @@
#define MSG_FWTEST_04 "Start check MOTOR"
#define MSG_FWTEST_ATTENTION "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
#define MSG_FWTEST_END "Finish Test. Disable FIRMWARE_TEST and recompile."
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#endif // FIRMWARE_TEST
#endif // LANGUAGE_KANA_UTF_H
MarlinKimbra/language_nl.h
View file @ 521315e2
......@@ -8,28 +8,33 @@
#ifndef LANGUAGE_NL_H
#define LANGUAGE_NL_H
#define MAPPER_NON
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1
#define MAPPER_NON // For direct asci codes
#define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
#define WELCOME_MSG MACHINE_NAME " gereed."
#define MSG_SD_INSERTED "Kaart ingestoken"
#define MSG_SD_REMOVED "Kaart verwijderd"
#define MSG_SD "Kaart"
#define MSG_SD_INSERTED MSG_SD " ingestoken"
#define MSG_SD_REMOVED MSG_SD " verwijderd"
#define MSG_MAIN "Main"
#define MSG_AUTOSTART "Autostart"
#define MSG_DISABLE_STEPPERS "Motoren uit"
#define MSG_AUTO_HOME "Auto home"
#define MSG_BED_SETTING "Bed Setting"
#define MSG_LP_INTRO " Leveling bed... Press to start "
#define MSG_LP_1 " Adjust first point & Press the button"
#define MSG_LP_2 " Adjust second point & Press the button"
#define MSG_LP_3 " Adjust third point & Press the button"
#define MSG_LP_4 " Adjust fourth point & Press the button"
#define MSG_LP_5 " Is it ok? Press to end"
#define MSG_LP_6 " BED leveled!"
#define MSG_MBL_SETTING "Manual Bed Leveling"
#define MSG_MBL_BUTTON " Press the button "
#define MSG_MBL_INTRO " Leveling bed... "
#define MSG_MBL_1 " Adjust first point "
#define MSG_MBL_2 " Adjust second point"
#define MSG_MBL_3 " Adjust third point "
#define MSG_MBL_4 " Adjust fourth point"
#define MSG_MBL_5 " Is it ok? "
#define MSG_MBL_6 " BED leveled! "
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_SET_ORIGIN "Nulpunt instellen"
#define MSG_ONFOR "On x:"
#define MSG_PWRCONSUMED "P.er:"
#define MSG_PREHEAT "Preheat"
#define MSG_CONFIG "conf."
#define MSG_PREHEAT_PLA "PLA voorverwarmen"
#define MSG_PREHEAT_PLA_ALL "PLA voorverw. aan"
#define MSG_PREHEAT_PLA_BEDONLY "PLA voorverw. Bed"
......@@ -38,32 +43,29 @@
#define MSG_PREHEAT_ABS_ALL "ABS voorverw. aan"
#define MSG_PREHEAT_ABS_BEDONLY "ABS voorverw. Bed"
#define MSG_PREHEAT_ABS_SETTINGS "ABS verw. conf"
#define MSG_PREHEAT_GUM "Preheat GUM"
#define MSG_PREHEAT_GUM_ALL "Preheat GUM All"
#define MSG_PREHEAT_GUM_BEDONLY "Preheat GUM Bed"
#define MSG_PREHEAT_GUM_SETTINGS "Preheat GUM conf"
#define MSG_PREHEAT_GUM MSG_PREHEAT " GUM"
#define MSG_PREHEAT_GUM_ALL MSG_PREHEAT_GUM " All"
#define MSG_PREHEAT_GUM_BEDONLY MSG_PREHEAT_GUM " Bed"
#define MSG_PREHEAT_GUM_SETTINGS "GUM " MSG_CONFIG
#define MSG_TOO_COLD_FOR_FILAMENTCHANGE "Hotend too cold to change filament"
#define MSG_COOLDOWN "Afkoelen"
#define MSG_SWITCH_PS_ON "Stroom aan"
#define MSG_SWITCH_PS_OFF "Stroom uit"
#define MSG_EXTRUDE "Extrude"
#define MSG_RETRACT "Retract"
#define MSG_MOVE_AXIS "As verplaatsen"
#define MSG_MOVE_X "Verplaats X"
#define MSG_MOVE_Y "Verplaats Y"
#define MSG_MOVE_Z "Verplaats Z"
#define MSG_MOVE_E "Extruder"
#define MSG_MOVE_01MM "Verplaats 0.1mm"
#define MSG_MOVE_1MM "Verplaats 1mm"
#define MSG_MOVE_10MM "Verplaats 10mm"
#define MSG_PURGE "Purge"
#define MSG_LEVEL_BED "Level bed"
#define MSG_SPEED "Snelheid"
#define MSG_NOZZLE "Nozzle"
#define MSG_BED "Bed"
#define MSG_FAN_SPEED "Fan snelheid"
#define MSG_FLOW "Flow"
#define MSG_CONTROL "Control"
#define MSG_MIN " " LCD_STR_THERMOMETER " Min"
#define MSG_MAX " " LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR " " LCD_STR_THERMOMETER " Fact"
#define MSG_STATS "Statistics"
#define MSG_FIX_LOSE_STEPS "Fix axis steps"
#define MSG_MIN LCD_STR_THERMOMETER " Min"
#define MSG_MAX LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR LCD_STR_THERMOMETER " Fact"
#define MSG_IDLEOOZING "Anti oozing"
#define MSG_AUTOTEMP "Autotemp"
#define MSG_ON "Aan "
......@@ -71,31 +73,43 @@
#define MSG_PID_P "PID-P"
#define MSG_PID_I "PID-I"
#define MSG_PID_D "PID-D"
#define MSG_H1 " H1"
#define MSG_H2 " H2"
#define MSG_H3 " H3"
#define MSG_ACC "Versn"
#define MSG_VXY_JERK "Vxy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX "Vmax "
#define MSG_X "x"
#define MSG_Y "y"
#define MSG_Z "z"
#define MSG_E "e"
#define MSG_X "X"
#define MSG_Y "Y"
#define MSG_Z "Z"
#define MSG_E "E"
#define MSG_MOVE "Verplaats"
#define MSG_MOVE_AXIS MSG_MOVE " as"
#define MSG_MOVE_X MSG_MOVE " " MSG_X
#define MSG_MOVE_Y MSG_MOVE " " MSG_Y
#define MSG_MOVE_Z MSG_MOVE " " MSG_Z
#define MSG_MOVE_01MM MSG_MOVE " 0.1mm"
#define MSG_MOVE_1MM MSG_MOVE " 1mm"
#define MSG_MOVE_10MM MSG_MOVE " 10mm"
#define MSG_MOVE_E "Extruder"
#define MSG_VMIN "Vmin"
#define MSG_VTRAV_MIN "VTrav min"
#define MSG_AMAX "Amax "
#define MSG_A_RETRACT "A-retract"
#define MSG_A_TRAVEL "A-travel"
#define MSG_XSTEPS "X steps/mm"
#define MSG_YSTEPS "Y steps/mm"
#define MSG_ZSTEPS "Z steps/mm"
#define MSG_E0STEPS "E0 steps/mm"
#define MSG_E1STEPS "E1 steps/mm"
#define MSG_E2STEPS "E2 steps/mm"
#define MSG_E3STEPS "E3 steps/mm"
#define MSG_XSTEPS MSG_X " steps/mm"
#define MSG_YSTEPS MSG_Y " steps/mm"
#define MSG_ZSTEPS MSG_Z " steps/mm"
#define MSG_E0STEPS MSG_E "0 steps/mm"
#define MSG_E1STEPS MSG_E "1 steps/mm"
#define MSG_E2STEPS MSG_E "2 steps/mm"
#define MSG_E3STEPS MSG_E "3 steps/mm"
#define MSG_TEMPERATURE "Temperatuur"
#define MSG_MOTION "Beweging"
#define MSG_VOLUMETRIC "Filament"
#define MSG_VOLUMETRIC_ENABLED "E in mm" STR_h3
#define MSG_FILAMENT "Filament"
#define MSG_VOLUMETRIC_ENABLED MSG_E " in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER "Fil. Dia."
#define MSG_CONTRAST "LCD contrast"
#define MSG_STORE_EPROM "Geheugen opslaan"
......@@ -131,39 +145,68 @@
#define MSG_ZPROBE_OUT "Z probe uit. bed"
#define MSG_POSITION_UNKNOWN "Home X/Y voor Z"
#define MSG_ZPROBE_ZOFFSET "Z Offset"
#define MSG_BABYSTEP_X "Babystap X"
#define MSG_BABYSTEP_Y "Babystap Y"
#define MSG_BABYSTEP_Z "Babystap Z"
#define MSG_BABYSTEP "Babystep"
#define MSG_BABYSTEP_X MSG_BABYSTEP " " MSG_X
#define MSG_BABYSTEP_Y MSG_BABYSTEP " " MSG_Y
#define MSG_BABYSTEP_Z MSG_BABYSTEP " " MSG_Z
#define MSG_ENDSTOP_ABORT "Endstop afbr."
#define MSG_HEATING_FAILED_LCD "Heating failed"
#define MSG_ERR_REDUNDANT_TEMP "Err: REDUNDANT TEMP ERROR"
#define MSG_ERR_REDUNDANT_TEMP "REDUNDANT TEMP ERROR"
#define MSG_THERMAL_RUNAWAY "THERMAL RUNAWAY"
#define MSG_ERR_MAXTEMP "Err: MAXTEMP"
#define MSG_ERR_MINTEMP "Err: MINTEMP"
#define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED"
#define MSG_HOTEND_AD595 "HOTEND AD595 Offset & Gain"
#define MSG_ERR_MAXTEMP "MAXTEMP ERROR"
#define MSG_ERR_MINTEMP "MINTEMP ERROR"
#define MSG_ERR_MAXTEMP_BED "MAXTEMP BED ERROR"
#define MSG_ERR_MINTEMP_BED "MINTEMP BED ERROR"
#define MSG_END_DAY "days"
#define MSG_END_HOUR "hours"
#define MSG_END_MINUTE "minutes"
#define MSG_ENDSTOPS_HIT "endstops hit: "
#define MSG_BABYSTEPPING "Babystepping"
#define MSG_BABYSTEPPING_X MSG_BABYSTEPPING " " MSG_X
#define MSG_BABYSTEPPING_Y MSG_BABYSTEPPING " " MSG_Y
#define MSG_BABYSTEPPING_Z MSG_BABYSTEPPING " " MSG_Z
#define MSG_ENDSTOP_XS MSG_X
#define MSG_ENDSTOP_YS MSG_Y
#define MSG_ENDSTOP_ZS MSG_Z
#define MSG_ENDSTOP_ZPS MSG_Z "P"
#define MSG_ENDSTOP_ES MSG_E
// Calibrate Delta
#if MECH(DELTA)
#define MSG_DELTA_CALIBRATE "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X "Calibrate X"
#define MSG_DELTA_CALIBRATE_Y "Calibrate Y"
#define MSG_DELTA_CALIBRATE_Z "Calibrate Z"
#define MSG_DELTA_CALIBRATE_X "Calibrate " MSG_X
#define MSG_DELTA_CALIBRATE_Y "Calibrate " MSG_Y
#define MSG_DELTA_CALIBRATE_Z "Calibrate " MSG_Z
#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center"
#endif // DELTA
// Scara
#if MECH(SCARA)
#define MSG_XSCALE "X Scale"
#define MSG_YSCALE "Y Scale"
#define MSG_SCALE "Scale"
#define MSG_XSCALE MSG_X " " MSG_SCALE
#define MSG_YSCALE MSG_Y " " MSG_SCALE
#endif
#define MSG_HEATING "Heating..."
#define MSG_HEATING_COMPLETE "Heating done."
#define MSG_BED_HEATING "Bed Heating."
#define MSG_BED_DONE "Bed done."
// Extra
#define MSG_LASER "Laser Preset"
#define MSG_CONFIG "Configuration"
#define MSG_BAUDRATE "Baudrate"
#define MSG_E_BOWDEN_LENGTH "Extrude " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH "Retract " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_E_BOWDEN_LENGTH MSG_EXTRUDE " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH MSG_RETRACT " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM MSG_PURGE " " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM MSG_RETRACT " " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_SAVED_POS "Saved position"
#define MSG_RESTORING_POS "Restoring position"
#define MSG_INVALID_POS_SLOT "Invalid slot, total slots: "
// Firmware Test
#if ENABLED(FIRMWARE_TEST)
#define MSG_FWTEST_YES "Put the Y command to go next"
#define MSG_FWTEST_NO "Put the N command to go next"
......@@ -180,10 +223,10 @@
#define MSG_FWTEST_04 "Start check MOTOR"
#define MSG_FWTEST_ATTENTION "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
#define MSG_FWTEST_END "Finish Test. Disable FIRMWARE_TEST and recompile."
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#endif // FIRMWARE_TEST
#endif // LANGUAGE_NL_H
MarlinKimbra/language_pl.h
View file @ 521315e2
......@@ -8,28 +8,33 @@
#ifndef LANGUAGE_PL_H
#define LANGUAGE_PL_H
#define MAPPER_NON
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1
#define MAPPER_NON // For direct asci codes
#define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
#define WELCOME_MSG MACHINE_NAME " gotowy."
#define MSG_SD_INSERTED "Karta wlozona"
#define MSG_SD_REMOVED "Karta usunieta"
#define MSG_SD "SD"
#define MSG_SD_INSERTED MSG_SD " wlozona"
#define MSG_SD_REMOVED MSG_SD " usunieta"
#define MSG_MAIN "Menu glowne"
#define MSG_AUTOSTART "Autostart"
#define MSG_DISABLE_STEPPERS "Wylacz silniki"
#define MSG_AUTO_HOME "Auto. poz. zerowa"
#define MSG_BED_SETTING "Bed Setting"
#define MSG_LP_INTRO " Leveling bed... Press to start "
#define MSG_LP_1 " Adjust first point & Press the button"
#define MSG_LP_2 " Adjust second point & Press the button"
#define MSG_LP_3 " Adjust third point & Press the button"
#define MSG_LP_4 " Adjust fourth point & Press the button"
#define MSG_LP_5 " Is it ok? Press to end"
#define MSG_LP_6 " BED leveled!"
#define MSG_MBL_SETTING "Manual Bed Leveling"
#define MSG_MBL_BUTTON " Press the button "
#define MSG_MBL_INTRO " Leveling bed... "
#define MSG_MBL_1 " Adjust first point "
#define MSG_MBL_2 " Adjust second point"
#define MSG_MBL_3 " Adjust third point "
#define MSG_MBL_4 " Adjust fourth point"
#define MSG_MBL_5 " Is it ok? "
#define MSG_MBL_6 " BED leveled! "
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_SET_ORIGIN "Ustaw punkt zero"
#define MSG_ONFOR "On x:"
#define MSG_PWRCONSUMED "P.er:"
#define MSG_PREHEAT "Preheat"
#define MSG_CONFIG "conf."
#define MSG_PREHEAT_PLA "Rozgrzej PLA"
#define MSG_PREHEAT_PLA_ALL "Roz. PLA Wszystko"
#define MSG_PREHEAT_PLA_BEDONLY "Rozgrzej PLA Loze"
......@@ -42,28 +47,25 @@
#define MSG_PREHEAT_GUM_ALL "Preheat GUM All"
#define MSG_PREHEAT_GUM_BEDONLY "Preheat GUM Bed"
#define MSG_PREHEAT_GUM_SETTINGS "Preheat GUM conf"
#define MSG_TOO_COLD_FOR_FILAMENTCHANGE "Hotend too cold to change filament"
#define MSG_COOLDOWN "Chlodzenie"
#define MSG_SWITCH_PS_ON "Wlacz zasilacz"
#define MSG_SWITCH_PS_OFF "Wylacz zasilacz"
#define MSG_EXTRUDE "Ekstruzja"
#define MSG_RETRACT "Cofanie"
#define MSG_MOVE_AXIS "Ruch osi"
#define MSG_MOVE_X "Przesun w X"
#define MSG_MOVE_Y "Przesun w Y"
#define MSG_MOVE_Z "Przesun w Z"
#define MSG_MOVE_E "Ekstruzja"
#define MSG_MOVE_01MM "Przesuwaj co .1mm"
#define MSG_MOVE_1MM "Przesuwaj co 1mm"
#define MSG_MOVE_10MM "Przesuwaj co 10mm"
#define MSG_PURGE "Purge"
#define MSG_LEVEL_BED "Level bed"
#define MSG_SPEED "Predkosc"
#define MSG_NOZZLE "Dysza"
#define MSG_BED "Loze"
#define MSG_FAN_SPEED "Obroty wiatraka"
#define MSG_FLOW "Przeplyw"
#define MSG_CONTROL "Ustawienia"
#define MSG_MIN " " LCD_STR_THERMOMETER " Min"
#define MSG_MAX " " LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR " " LCD_STR_THERMOMETER " Fact"
#define MSG_STATS "Statistics"
#define MSG_FIX_LOSE_STEPS "Fix axis steps"
#define MSG_MIN LCD_STR_THERMOMETER " Min"
#define MSG_MAX LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR LCD_STR_THERMOMETER " Fact"
#define MSG_IDLEOOZING "Anti oozing"
#define MSG_AUTOTEMP "Auto. temperatura"
#define MSG_ON "Wl. "
......@@ -71,31 +73,43 @@
#define MSG_PID_P "PID-P"
#define MSG_PID_I "PID-I"
#define MSG_PID_D "PID-D"
#define MSG_H1 " H1"
#define MSG_H2 " H2"
#define MSG_H3 " H3"
#define MSG_ACC "Przyspieszenie"
#define MSG_VXY_JERK "Zryw Vxy"
#define MSG_VZ_JERK "Zryw Vz"
#define MSG_VE_JERK "Zryw Ve"
#define MSG_VMAX "Vmax"
#define MSG_X "x"
#define MSG_Y "y"
#define MSG_Z "z"
#define MSG_E "e"
#define MSG_X "X"
#define MSG_Y "Y"
#define MSG_Z "Z"
#define MSG_E "E"
#define MSG_MOVE "Move"
#define MSG_MOVE_AXIS "Ruch osi"
#define MSG_MOVE_X "Przesun w " MSG_X
#define MSG_MOVE_Y "Przesun w " MSG_Y
#define MSG_MOVE_Z "Przesun w " MSG_Z
#define MSG_MOVE_01MM "Przesuwaj co .1mm"
#define MSG_MOVE_1MM "Przesuwaj co 1mm"
#define MSG_MOVE_10MM "Przesuwaj co 10mm"
#define MSG_MOVE_E "Ekstruzja"
#define MSG_VMIN "Vmin"
#define MSG_VTRAV_MIN "Vskok min"
#define MSG_AMAX "Amax"
#define MSG_A_RETRACT "A-wycofanie"
#define MSG_A_TRAVEL "A-travel"
#define MSG_XSTEPS "krokiX/mm"
#define MSG_YSTEPS "krokiY/mm"
#define MSG_ZSTEPS "krokiZ/mm"
#define MSG_E0STEPS "E0 steps/mm"
#define MSG_E1STEPS "E1 steps/mm"
#define MSG_E2STEPS "E2 steps/mm"
#define MSG_E3STEPS "E3 steps/mm"
#define MSG_XSTEPS MSG_X "roki/mm"
#define MSG_YSTEPS MSG_Y "roki/mm"
#define MSG_ZSTEPS MSG_Z "roki/mm"
#define MSG_E0STEPS MSG_E "0 kroki/mm"
#define MSG_E1STEPS MSG_E "1 kroki/mm"
#define MSG_E2STEPS MSG_E "2 kroki/mm"
#define MSG_E3STEPS MSG_E "3 kroki/mm"
#define MSG_TEMPERATURE "Temperatura"
#define MSG_MOTION "Ruch"
#define MSG_VOLUMETRIC "Filament"
#define MSG_VOLUMETRIC_ENABLED "E in mm" STR_h3
#define MSG_FILAMENT "Filament"
#define MSG_VOLUMETRIC_ENABLED MSG_E " in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER "Fil. Dia."
#define MSG_CONTRAST "Kontrast LCD"
#define MSG_STORE_EPROM "Zapisz w pamieci"
......@@ -108,8 +122,8 @@
#define MSG_PAUSE_PRINT "Pauza"
#define MSG_RESUME_PRINT "Wznowienie"
#define MSG_STOP_PRINT "Stop"
#define MSG_CARD_MENU "Menu karty SD"
#define MSG_NO_CARD "Brak karty"
#define MSG_CARD_MENU "Menu " MSG_SD
#define MSG_NO_CARD "Brak " MSG_SD
#define MSG_DWELL "Uspij..."
#define MSG_USERWAIT "Oczekiwanie..."
#define MSG_RESUMING "Wznawianie druku"
......@@ -126,44 +140,73 @@
#define MSG_CONTROL_RETRACT_RECOVERF "Cof. wycof. V"
#define MSG_AUTORETRACT "Auto. wycofanie"
#define MSG_FILAMENTCHANGE "Zmien filament"
#define MSG_INIT_SDCARD "Inicjal. karty SD"
#define MSG_CNG_SDCARD "Zmiana karty SD"
#define MSG_INIT_SDCARD "Inicjal. " MSG_SD
#define MSG_CNG_SDCARD "Zmiana " MSG_SD
#define MSG_ZPROBE_OUT "Sonda Z za lozem"
#define MSG_POSITION_UNKNOWN "Wroc w XY przed Z"
#define MSG_ZPROBE_ZOFFSET "Offset Z"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_BABYSTEP "Babystep"
#define MSG_BABYSTEP_X MSG_BABYSTEP " " MSG_X
#define MSG_BABYSTEP_Y MSG_BABYSTEP " " MSG_Y
#define MSG_BABYSTEP_Z MSG_BABYSTEP " " MSG_Z
#define MSG_ENDSTOP_ABORT "Blad wyl. kranc."
#define MSG_HEATING_FAILED_LCD "Heating failed"
#define MSG_ERR_REDUNDANT_TEMP "Err: REDUNDANT TEMP ERROR"
#define MSG_ERR_REDUNDANT_TEMP "REDUNDANT TEMP ERROR"
#define MSG_THERMAL_RUNAWAY "THERMAL RUNAWAY"
#define MSG_ERR_MAXTEMP "Err: MAXTEMP"
#define MSG_ERR_MINTEMP "Err: MINTEMP"
#define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED"
#define MSG_HOTEND_AD595 "HOTEND AD595 Offset & Gain"
#define MSG_ERR_MAXTEMP "MAXTEMP ERROR"
#define MSG_ERR_MINTEMP "MINTEMP ERROR"
#define MSG_ERR_MAXTEMP_BED "MAXTEMP BED ERROR"
#define MSG_ERR_MINTEMP_BED "MINTEMP BED ERROR"
#define MSG_END_DAY "days"
#define MSG_END_HOUR "hours"
#define MSG_END_MINUTE "minutes"
#define MSG_ENDSTOPS_HIT "endstops hit: "
#define MSG_BABYSTEPPING "Babystepping"
#define MSG_BABYSTEPPING_X MSG_BABYSTEPPING " " MSG_X
#define MSG_BABYSTEPPING_Y MSG_BABYSTEPPING " " MSG_Y
#define MSG_BABYSTEPPING_Z MSG_BABYSTEPPING " " MSG_Z
#define MSG_ENDSTOP_XS MSG_X
#define MSG_ENDSTOP_YS MSG_Y
#define MSG_ENDSTOP_ZS MSG_Z
#define MSG_ENDSTOP_ZPS MSG_Z "P"
#define MSG_ENDSTOP_ES MSG_E
// Calibrate Delta
#if MECH(DELTA)
#define MSG_DELTA_CALIBRATE "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X "Calibrate X"
#define MSG_DELTA_CALIBRATE_Y "Calibrate Y"
#define MSG_DELTA_CALIBRATE_Z "Calibrate Z"
#define MSG_DELTA_CALIBRATE_X "Calibrate " MSG_X
#define MSG_DELTA_CALIBRATE_Y "Calibrate " MSG_Y
#define MSG_DELTA_CALIBRATE_Z "Calibrate " MSG_Z
#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center"
#endif // DELTA
// Scara
#if MECH(SCARA)
#define MSG_XSCALE "X Scale"
#define MSG_YSCALE "Y Scale"
#define MSG_SCALE "Scale"
#define MSG_XSCALE MSG_X " " MSG_SCALE
#define MSG_YSCALE MSG_Y " " MSG_SCALE
#endif
#define MSG_HEATING "Heating..."
#define MSG_HEATING_COMPLETE "Heating done."
#define MSG_BED_HEATING "Bed Heating."
#define MSG_BED_DONE "Bed done."
// Extra
#define MSG_LASER "Laser Preset"
#define MSG_CONFIG "Configuration"
#define MSG_BAUDRATE "Baudrate"
#define MSG_E_BOWDEN_LENGTH "Extrude " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH "Retract " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_E_BOWDEN_LENGTH MSG_EXTRUDE " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH MSG_RETRACT " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM MSG_PURGE " " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM MSG_RETRACT " " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_SAVED_POS "Saved position"
#define MSG_RESTORING_POS "Restoring position"
#define MSG_INVALID_POS_SLOT "Invalid slot, total slots: "
// Firmware Test
#if ENABLED(FIRMWARE_TEST)
#define MSG_FWTEST_YES "Put the Y command to go next"
#define MSG_FWTEST_NO "Put the N command to go next"
......@@ -180,10 +223,10 @@
#define MSG_FWTEST_04 "Start check MOTOR"
#define MSG_FWTEST_ATTENTION "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
#define MSG_FWTEST_END "Finish Test. Disable FIRMWARE_TEST and recompile."
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#endif // FIRMWARE_TEST
#endif // LANGUAGE_PL_H
MarlinKimbra/language_pt-br.h
View file @ 521315e2
......@@ -8,170 +8,205 @@
#ifndef LANGUAGE_PT_BR_H
#define LANGUAGE_PT_BR_H
#if !( ENABLED(MAPPER_NON)|| ENABLED(MAPPER_C2C3)|| ENABLED(MAPPER_D0D1)|| ENABLED(MAPPER_D0D1_MOD)|| ENABLED(MAPPER_E382E383) )
#define MAPPER_NON // For direct asci codes
#endif
#define MAPPER_NON // For direct asci codes
#define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
//#define SIMULATE_ROMFONT //Comment in to see what is seen on the character based displays
#if !( ENABLED(SIMULATE_ROMFONT)|| ENABLED(DISPLAY_CHARSET_ISO10646_1)|| ENABLED(DISPLAY_CHARSET_ISO10646_5)|| ENABLED(DISPLAY_CHARSET_ISO10646_KANA) )
#define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
#endif
#define WELCOME_MSG MACHINE_NAME " pronto."
#define MSG_SD_INSERTED "Cartao inserido"
#define MSG_SD_REMOVED "Cartao removido"
#define MSG_MAIN " Menu principal"
#define MSG_SD "SD"
#define MSG_SD_INSERTED MSG_SD " inserido"
#define MSG_SD_REMOVED MSG_SD " removido"
#define MSG_MAIN "Menu principal"
#define MSG_AUTOSTART "Autostart"
#define MSG_DISABLE_STEPPERS " Apagar motores"
#define MSG_DISABLE_STEPPERS "Apagar motores"
#define MSG_AUTO_HOME "Ir para origen"
#define MSG_BED_SETTING "Bed Setting"
#define MSG_LP_INTRO " Leveling bed... Press to start "
#define MSG_LP_1 " Adjust first point & Press the button"
#define MSG_LP_2 " Adjust second point & Press the button"
#define MSG_LP_3 " Adjust third point & Press the button"
#define MSG_LP_4 " Adjust fourth point & Press the button"
#define MSG_LP_5 " Is it ok? Press to end"
#define MSG_LP_6 " BED leveled!"
#define MSG_MBL_SETTING "Manual Bed Leveling"
#define MSG_MBL_BUTTON " Press the button "
#define MSG_MBL_INTRO " Leveling bed... "
#define MSG_MBL_1 " Adjust first point "
#define MSG_MBL_2 " Adjust second point"
#define MSG_MBL_3 " Adjust third point "
#define MSG_MBL_4 " Adjust fourth point"
#define MSG_MBL_5 " Is it ok? "
#define MSG_MBL_6 " BED leveled! "
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_SET_ORIGIN "Estabelecer orig."
#define MSG_PREHEAT_PLA "Pre-aquecer PLA"
#define MSG_PREHEAT_PLA_ALL "Pre-aq. PLA Tudo"
#define MSG_PREHEAT_PLA_BEDONLY "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
#define MSG_PREHEAT_PLA_SETTINGS "PLA setting"
#define MSG_PREHEAT_ABS "Pre-aquecer ABS"
#define MSG_PREHEAT_ABS_ALL "Pre-aq. ABS Tudo"
#define MSG_PREHEAT_ABS_BEDONLY "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
#define MSG_PREHEAT_ABS_SETTINGS "ABS setting"
#define MSG_PREHEAT_GUM "Preheat GUM"
#define MSG_PREHEAT_GUM_ALL "Preheat GUM All"
#define MSG_PREHEAT_GUM_BEDONLY "Preheat GUM Bed"
#define MSG_PREHEAT_GUM_SETTINGS "Preheat GUM conf"
#define MSG_ONFOR "On x:"
#define MSG_PWRCONSUMED "P.er:"
#define MSG_PREHEAT "Pre-aq."
#define MSG_CONFIG "setting"
#define MSG_PREHEAT_PLA MSG_PREHEAT " PLA"
#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " Tudo"
#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " Base"
#define MSG_PREHEAT_PLA_SETTINGS "PLA " MSG_CONFIG
#define MSG_PREHEAT_ABS MSG_PREHEAT " ABS"
#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " Tudo"
#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " Base"
#define MSG_PREHEAT_ABS_SETTINGS "ABS " MSG_CONFIG
#define MSG_PREHEAT_GUM MSG_PREHEAT " GUM"
#define MSG_PREHEAT_GUM_ALL MSG_PREHEAT_GUM " Tudo"
#define MSG_PREHEAT_GUM_BEDONLY MSG_PREHEAT_GUM " Base"
#define MSG_PREHEAT_GUM_SETTINGS "GUM " MSG_CONFIG
#define MSG_TOO_COLD_FOR_FILAMENTCHANGE "Hotend too cold to change filament"
#define MSG_COOLDOWN "Esfriar"
#define MSG_SWITCH_PS_ON "Switch Power On"
#define MSG_SWITCH_PS_OFF "Switch Power Off"
#define MSG_EXTRUDE "Extrudar"
#define MSG_RETRACT "Retrair"
#define MSG_MOVE_AXIS "Mover eixo"
#define MSG_MOVE_X "Move X"
#define MSG_MOVE_Y "Move Y"
#define MSG_MOVE_Z "Move Z"
#define MSG_MOVE_E "Extruder"
#define MSG_MOVE_01MM "Move 0.1mm"
#define MSG_MOVE_1MM "Move 1mm"
#define MSG_MOVE_10MM "Move 10mm"
#define MSG_PURGE "Purge"
#define MSG_LEVEL_BED "Level bed"
#define MSG_SPEED "Velocidade"
#define MSG_NOZZLE "Nozzle"
#define MSG_BED "Base"
#define MSG_FAN_SPEED "Velocidade vento."
#define MSG_FLOW "Fluxo"
#define MSG_CONTROL "Controle"
#define MSG_MIN " "LCD_STR_THERMOMETER " Min"
#define MSG_MAX " "LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR " "LCD_STR_THERMOMETER " Fact"
#define MSG_STATS "Statistics"
#define MSG_FIX_LOSE_STEPS "Fix axis steps"
#define MSG_MIN LCD_STR_THERMOMETER " Min"
#define MSG_MAX LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR LCD_STR_THERMOMETER " Fact"
#define MSG_IDLEOOZING "Anti oozing"
#define MSG_AUTOTEMP "Autotemp"
#define MSG_ON "On "
#define MSG_OFF "Off"
#define MSG_ON "ON "
#define MSG_OFF "OFF"
#define MSG_PID_P "PID-P"
#define MSG_PID_I "PID-I"
#define MSG_PID_D "PID-D"
#define MSG_E2 " E2"
#define MSG_E3 " E3"
#define MSG_E4 " E4"
#define MSG_H1 " H1"
#define MSG_H2 " H2"
#define MSG_H3 " H3"
#define MSG_ACC "Accel"
#define MSG_VXY_JERK "Vxy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX "Vmax "
#define MSG_X "x"
#define MSG_Y "y"
#define MSG_Z "z"
#define MSG_E "e"
#define MSG_X "X"
#define MSG_Y "Y"
#define MSG_Z "Z"
#define MSG_E "E"
#define MSG_MOVE "Move"
#define MSG_MOVE_AXIS MSG_MOVE " eixo"
#define MSG_MOVE_X MSG_MOVE " " MSG_X
#define MSG_MOVE_Y MSG_MOVE " " MSG_Y
#define MSG_MOVE_Z MSG_MOVE " " MSG_Z
#define MSG_MOVE_01MM MSG_MOVE " 0.1mm"
#define MSG_MOVE_1MM MSG_MOVE " 1mm"
#define MSG_MOVE_10MM MSG_MOVE " 10mm"
#define MSG_MOVE_E "Extruder"
#define MSG_VMIN "Vmin"
#define MSG_VTRAV_MIN "VTrav min"
#define MSG_AMAX "Amax "
#define MSG_A_RETRACT "A-retract"
#define MSG_A_TRAVEL "A-travel"
#define MSG_XSTEPS "Xpasso/mm"
#define MSG_YSTEPS "Ypasso/mm"
#define MSG_ZSTEPS "Zpasso/mm"
#define MSG_ESTEPS "E0 passo/mm"
#define MSG_E1STEPS "E1 steps/mm"
#define MSG_E2STEPS "E2 steps/mm"
#define MSG_E3STEPS "E3 steps/mm"
#define MSG_XSTEPS MSG_X " passo/mm"
#define MSG_YSTEPS MSG_Y " passo/mm"
#define MSG_ZSTEPS MSG_Z " passo/mm"
#define MSG_E0STEPS MSG_E "0 passo/mm"
#define MSG_E1STEPS MSG_E "1 passo/mm"
#define MSG_E2STEPS MSG_E "2 passo/mm"
#define MSG_E3STEPS MSG_E "3 passo/mm"
#define MSG_TEMPERATURE "Temperatura"
#define MSG_MOTION "Movimento"
#define MSG_VOLUMETRIC "Filament"
#define MSG_VOLUMETRIC_ENABLED "E in mm3"
#define MSG_FILAMENT "Filament"
#define MSG_VOLUMETRIC_ENABLED MSG_E " in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER "Fil. Dia."
#define MSG_CONTRAST "Contrast"
#define MSG_CONTRAST "LCD Contrast"
#define MSG_STORE_EPROM "Guardar memoria"
#define MSG_LOAD_EPROM "Carregar memoria"
#define MSG_RESTORE_FAILSAFE "Rest. de emergen."
#define MSG_REFRESH LCD_STR_REFRESH " Recarregar"
#define MSG_REFRESH "Recarregar"
#define MSG_WATCH "Monitorar"
#define MSG_PREPARE "Preparar"
#define MSG_TUNE "Tune"
#define MSG_PAUSE_PRINT "Pausar impressao"
#define MSG_RESUME_PRINT "Resumir impressao"
#define MSG_STOP_PRINT "Parar impressao"
#define MSG_CARD_MENU "Menu cartao SD"
#define MSG_NO_CARD "Sem cartao SD"
#define MSG_CARD_MENU "Menu cartao " MSG_SD
#define MSG_NO_CARD "Sem cartao " MSG_SD
#define MSG_DWELL "Repouso..."
#define MSG_USERWAIT "Esperando ordem"
#define MSG_RESUMING "Resuming print"
#define MSG_PRINT_ABORTED "Print aborted"
#define MSG_NO_MOVE "Sem movimento"
#define MSG_KILLED "PARADA DE EMERG."
#define MSG_KILLED "PARADA DE EMERG. "
#define MSG_STOPPED "PARADA. "
#define MSG_CONTROL_RETRACT " Retrair mm"
#define MSG_CONTROL_RETRACT "Retrair mm"
#define MSG_CONTROL_RETRACT_SWAP "Troca Retrair mm"
#define MSG_CONTROL_RETRACTF " Retrair V"
#define MSG_CONTROL_RETRACT_ZLIFT " Levantar mm"
#define MSG_CONTROL_RETRACT_RECOVER " DesRet +mm"
#define MSG_CONTROL_RETRACTF "Retrair F"
#define MSG_CONTROL_RETRACT_ZLIFT "Levantar mm"
#define MSG_CONTROL_RETRACT_RECOVER "DesRet +mm"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "Troca DesRet +mm"
#define MSG_CONTROL_RETRACT_RECOVERF " DesRet V"
#define MSG_AUTORETRACT " AutoRetr."
#define MSG_CONTROL_RETRACT_RECOVERF "DesRet F"
#define MSG_AUTORETRACT "AutoRetr."
#define MSG_FILAMENTCHANGE "Change filament"
#define MSG_INIT_SDCARD "Init. SD-Card"
#define MSG_CNG_SDCARD "Change SD-Card"
#define MSG_INIT_SDCARD "Init. " MSG_SD
#define MSG_CNG_SDCARD "Change " MSG_SD
#define MSG_ZPROBE_OUT "Son. fora da mesa"
#define MSG_POSITION_UNKNOWN "XY antes de Z"
#define MSG_ZPROBE_ZOFFSET "Z Offset"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_BABYSTEP "Babystep"
#define MSG_BABYSTEP_X MSG_BABYSTEP " " MSG_X
#define MSG_BABYSTEP_Y MSG_BABYSTEP " " MSG_Y
#define MSG_BABYSTEP_Z MSG_BABYSTEP " " MSG_Z
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_END_HOUR "horas"
#define MSG_END_MINUTE "minutos"
#define MSG_HEATING_FAILED_LCD "Heating failed"
#define MSG_ERR_REDUNDANT_TEMP "Err: REDUNDANT TEMP ERROR"
#define MSG_ERR_REDUNDANT_TEMP "REDUNDANT TEMP ERROR"
#define MSG_THERMAL_RUNAWAY "THERMAL RUNAWAY"
#define MSG_ERR_MAXTEMP "Err: MAXTEMP"
#define MSG_ERR_MINTEMP "Err: MINTEMP"
#define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED"
#define MSG_HOTEND_AD595 "HOTEND AD595 Offset & Gain"
#define MSG_ERR_MAXTEMP "MAXTEMP ERROR"
#define MSG_ERR_MINTEMP "MINTEMP ERROR"
#define MSG_ERR_MAXTEMP_BED "MAXTEMP BED ERROR"
#define MSG_ERR_MINTEMP_BED "MINTEMP BED ERROR"
#define MSG_END_DAY "days"
#define MSG_END_HOUR "hours"
#define MSG_END_MINUTE "minutes"
#define MSG_ENDSTOPS_HIT "endstops hit: "
#define MSG_BABYSTEPPING "Babystepping"
#define MSG_BABYSTEPPING_X MSG_BABYSTEPPING " " MSG_X
#define MSG_BABYSTEPPING_Y MSG_BABYSTEPPING " " MSG_Y
#define MSG_BABYSTEPPING_Z MSG_BABYSTEPPING " " MSG_Z
#define MSG_ENDSTOP_XS MSG_X
#define MSG_ENDSTOP_YS MSG_Y
#define MSG_ENDSTOP_ZS MSG_Z
#define MSG_ENDSTOP_ZPS MSG_Z "P"
#define MSG_ENDSTOP_ES MSG_E
// Calibrate Delta
#if MECH(DELTA)
#define MSG_DELTA_CALIBRATE "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X "Calibrate X"
#define MSG_DELTA_CALIBRATE_Y "Calibrate Y"
#define MSG_DELTA_CALIBRATE_Z "Calibrate Z"
#define MSG_DELTA_CALIBRATE_X "Calibrate " MSG_X
#define MSG_DELTA_CALIBRATE_Y "Calibrate " MSG_Y
#define MSG_DELTA_CALIBRATE_Z "Calibrate " MSG_Z
#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center"
#endif // DELTA
// Scara
#if MECH(SCARA)
#define MSG_XSCALE "X Scale"
#define MSG_YSCALE "Y Scale"
#define MSG_SCALE "Scale"
#define MSG_XSCALE MSG_X " " MSG_SCALE
#define MSG_YSCALE MSG_Y " " MSG_SCALE
#endif
#define MSG_HEATING "Heating..."
#define MSG_HEATING_COMPLETE "Heating done."
#define MSG_BED_HEATING "Bed Heating."
#define MSG_BED_DONE "Bed done."
// Extra
#define MSG_LASER "Laser Preset"
#define MSG_CONFIG "Configuration"
#define MSG_E_BOWDEN_LENGTH "Extrude " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH "Retract " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_E_BOWDEN_LENGTH MSG_EXTRUDE " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH MSG_RETRACT " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM MSG_PURGE " " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM MSG_RETRACT " " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_SAVED_POS "Saved position"
#define MSG_RESTORING_POS "Restoring position"
#define MSG_INVALID_POS_SLOT "Invalid slot, total slots: "
// Firmware Test
#if ENABLED(FIRMWARE_TEST)
#define MSG_FWTEST_YES "Put the Y command to go next"
#define MSG_FWTEST_NO "Put the N command to go next"
......@@ -188,10 +223,10 @@
#define MSG_FWTEST_04 "Start check MOTOR"
#define MSG_FWTEST_ATTENTION "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
#define MSG_FWTEST_END "Finish Test. Disable FIRMWARE_TEST and recompile."
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#endif // FIRMWARE_TEST
#endif // LANGUAGE_PT_BR_H
MarlinKimbra/language_pt.h
View file @ 521315e2
......@@ -8,108 +8,122 @@
#ifndef LANGUAGE_PT_H
#define LANGUAGE_PT_H
#define MAPPER_NON
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1
#define MAPPER_NON // For direct asci codes
#define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
#define WELCOME_MSG MACHINE_NAME " pronto."
#define MSG_SD_INSERTED "Cartao inserido"
#define MSG_SD_REMOVED "Cartao removido"
#define MSG_MAIN " Menu principal"
#define MSG_SD "SD"
#define MSG_SD_INSERTED MSG_SD " inserido"
#define MSG_SD_REMOVED MSG_SD " removido"
#define MSG_MAIN "Menu principal"
#define MSG_AUTOSTART "Autostart"
#define MSG_DISABLE_STEPPERS " Desligar motores"
#define MSG_DISABLE_STEPPERS "Desligar motores"
#define MSG_AUTO_HOME "Ir para home"
#define MSG_BED_SETTING "Bed Setting"
#define MSG_LP_INTRO " Leveling bed... Press to start "
#define MSG_LP_1 " Adjust first point & Press the button"
#define MSG_LP_2 " Adjust second point & Press the button"
#define MSG_LP_3 " Adjust third point & Press the button"
#define MSG_LP_4 " Adjust fourth point & Press the button"
#define MSG_LP_5 " Is it ok? Press to end"
#define MSG_LP_6 " BED leveled!"
#define MSG_MBL_SETTING "Manual Bed Leveling"
#define MSG_MBL_BUTTON " Press the button "
#define MSG_MBL_INTRO " Leveling bed... "
#define MSG_MBL_1 " Adjust first point "
#define MSG_MBL_2 " Adjust second point"
#define MSG_MBL_3 " Adjust third point "
#define MSG_MBL_4 " Adjust fourth point"
#define MSG_MBL_5 " Is it ok? "
#define MSG_MBL_6 " BED leveled! "
#define MSG_SET_HOME_OFFSETS "Def. home offsets"
#define MSG_SET_ORIGIN "Estabelecer orig."
#define MSG_PREHEAT_PLA "Pre-aquecer PLA"
#define MSG_PREHEAT_PLA_ALL "Pre-aq. PLA Tudo"
#define MSG_PREHEAT_PLA_BEDONLY "Pre-aq. PLA \002Base"
#define MSG_PREHEAT_PLA_SETTINGS "PLA definicoes"
#define MSG_PREHEAT_ABS "Pre-aquecer ABS"
#define MSG_PREHEAT_ABS_ALL "Pre-aq. ABS Tudo"
#define MSG_PREHEAT_ABS_BEDONLY "Pre-aq. ABS \002Base"
#define MSG_PREHEAT_ABS_SETTINGS "ABS definicoes"
#define MSG_PREHEAT_GUM "Pre-aquecer GUM"
#define MSG_PREHEAT_GUM_ALL "Pre-aquecer GUM Tudo"
#define MSG_PREHEAT_GUM_BEDONLY "Pre-aquecer GUM \002Base"
#define MSG_PREHEAT_GUM_SETTINGS "GUM definicoes"
#define MSG_ONFOR "On x:"
#define MSG_PWRCONSUMED "P.er:"
#define MSG_PREHEAT "Pre-aq."
#define MSG_CONFIG "definicoes"
#define MSG_PREHEAT_PLA MSG_PREHEAT " PLA"
#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " Tudo"
#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " Base"
#define MSG_PREHEAT_PLA_SETTINGS "PLA " MSG_CONFIG
#define MSG_PREHEAT_ABS MSG_PREHEAT " ABS"
#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " Tudo"
#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " Base"
#define MSG_PREHEAT_ABS_SETTINGS "ABS " MSG_CONFIG
#define MSG_PREHEAT_GUM MSG_PREHEAT " GUM"
#define MSG_PREHEAT_GUM_ALL MSG_PREHEAT_GUM " Tudo"
#define MSG_PREHEAT_GUM_BEDONLY MSG_PREHEAT_GUM " Base"
#define MSG_PREHEAT_GUM_SETTINGS "GUM " MSG_CONFIG
#define MSG_TOO_COLD_FOR_FILAMENTCHANGE "Hotend too cold to change filament"
#define MSG_COOLDOWN "Arrefecer"
#define MSG_SWITCH_PS_ON "Ligar"
#define MSG_SWITCH_PS_OFF "Desligar"
#define MSG_EXTRUDE "Extrudir"
#define MSG_RETRACT "Retrair"
#define MSG_MOVE_AXIS "Mover eixo \x7E"
#define MSG_MOVE_X "Mover X"
#define MSG_MOVE_Y "Mover Y"
#define MSG_MOVE_Z "Mover Z"
#define MSG_MOVE_E "Extrusor"
#define MSG_MOVE_01MM "Mover 0.1mm"
#define MSG_MOVE_1MM "Mover 1mm"
#define MSG_MOVE_10MM "Mover 10mm"
#define MSG_PURGE "Purge"
#define MSG_LEVEL_BED "Level bed"
#define MSG_SPEED "Velocidade"
#define MSG_NOZZLE "Bico"
#define MSG_BED "Base"
#define MSG_FAN_SPEED "Velocidade do ar."
#define MSG_FLOW "Fluxo"
#define MSG_CONTROL "Control"
#define MSG_MIN " " LCD_STR_THERMOMETER " Min"
#define MSG_MAX " " LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR " " LCD_STR_THERMOMETER " Fact"
#define MSG_STATS "Statistics"
#define MSG_FIX_LOSE_STEPS "Fix axis steps"
#define MSG_MIN LCD_STR_THERMOMETER " Min"
#define MSG_MAX LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR LCD_STR_THERMOMETER " Fact"
#define MSG_IDLEOOZING "Anti oozing"
#define MSG_AUTOTEMP "Autotemp"
#define MSG_ON "On "
#define MSG_OFF "Off"
#define MSG_ON "ON "
#define MSG_OFF "OFF"
#define MSG_PID_P "PID-P"
#define MSG_PID_I "PID-I"
#define MSG_PID_D "PID-D"
#define MSG_H1 " H1"
#define MSG_H2 " H2"
#define MSG_H3 " H3"
#define MSG_ACC "Acc"
#define MSG_VXY_JERK "Vxy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX " Vmax "
#define MSG_X "x"
#define MSG_Y "y"
#define MSG_Z "z"
#define MSG_E "e"
#define MSG_VMAX "Vmax "
#define MSG_X "X"
#define MSG_Y "Y"
#define MSG_Z "Z"
#define MSG_E "E"
#define MSG_MOVE "Mover"
#define MSG_MOVE_AXIS "Mover eixo"
#define MSG_MOVE_X MSG_MOVE " " MSG_X
#define MSG_MOVE_Y MSG_MOVE " " MSG_Y
#define MSG_MOVE_Z MSG_MOVE " " MSG_Z
#define MSG_MOVE_01MM MSG_MOVE " 0.1mm"
#define MSG_MOVE_1MM MSG_MOVE " 1mm"
#define MSG_MOVE_10MM MSG_MOVE " 10mm"
#define MSG_MOVE_E "Extrusor"
#define MSG_VMIN "Vmin"
#define MSG_VTRAV_MIN "VTrav min"
#define MSG_AMAX "Amax "
#define MSG_A_RETRACT "A-retract"
#define MSG_A_TRAVEL "A-travel"
#define MSG_XSTEPS "Xpasso/mm"
#define MSG_YSTEPS "Ypasso/mm"
#define MSG_ZSTEPS "Zpasso/mm"
#define MSG_E0STEPS "E0 passo/mm"
#define MSG_E1STEPS "E1 passo/mm"
#define MSG_E2STEPS "E2 passo/mm"
#define MSG_E3STEPS "E3 passo/mm"
#define MSG_XSTEPS MSG_X " passo/mm"
#define MSG_YSTEPS MSG_Y " passo/mm"
#define MSG_ZSTEPS MSG_Z " passo/mm"
#define MSG_E0STEPS MSG_E "0 passo/mm"
#define MSG_E1STEPS MSG_E "1 passo/mm"
#define MSG_E2STEPS MSG_E "2 passo/mm"
#define MSG_E3STEPS MSG_E "3 passo/mm"
#define MSG_TEMPERATURE "Temperatura"
#define MSG_MOTION "Movimento"
#define MSG_VOLUMETRIC "Filamento"
#define MSG_VOLUMETRIC_ENABLED "E in mm" STR_h3
#define MSG_FILAMENT "Filament"
#define MSG_VOLUMETRIC_ENABLED MSG_E " in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER "Fil. Diam."
#define MSG_CONTRAST "Contraste"
#define MSG_CONTRAST "LCD Contraste"
#define MSG_STORE_EPROM "Guardar na memoria"
#define MSG_LOAD_EPROM "Carregar da memoria"
#define MSG_RESTORE_FAILSAFE "Rest. de emergen."
#define MSG_REFRESH "\004Recarregar"
#define MSG_WATCH "Monitorar \003"
#define MSG_PREPARE "Preparar \x7E"
#define MSG_TUNE "Afinar \x7E"
#define MSG_REFRESH "Recarregar"
#define MSG_WATCH "Monitorar"
#define MSG_PREPARE "Preparar"
#define MSG_TUNE "Afinar"
#define MSG_PAUSE_PRINT "Pausar impressao"
#define MSG_RESUME_PRINT "Resumir impressao"
#define MSG_STOP_PRINT "Parar impressao"
#define MSG_CARD_MENU "Menu cartao SD"
#define MSG_NO_CARD "Sem cartao SD"
#define MSG_CARD_MENU "Menu " MSG_SD
#define MSG_NO_CARD "Sem " MSG_SD
#define MSG_DWELL "Repouso..."
#define MSG_USERWAIT "A espera de ordem"
#define MSG_RESUMING "Resumir impressao"
......@@ -117,53 +131,82 @@
#define MSG_NO_MOVE "Sem movimento"
#define MSG_KILLED "INTRRP. DE EMERG."
#define MSG_STOPPED "PARADO. "
#define MSG_CONTROL_RETRACT " Retrair mm"
#define MSG_CONTROL_RETRACT "Retrair mm"
#define MSG_CONTROL_RETRACT_SWAP "Troca Retrair mm"
#define MSG_CONTROL_RETRACTF " Retrair V"
#define MSG_CONTROL_RETRACT_ZLIFT " Levantar mm"
#define MSG_CONTROL_RETRACT_RECOVER " DesRet +mm"
#define MSG_CONTROL_RETRACTF "Retrair F"
#define MSG_CONTROL_RETRACT_ZLIFT "Levantar mm"
#define MSG_CONTROL_RETRACT_RECOVER "DesRet +mm"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "Troca DesRet +mm"
#define MSG_CONTROL_RETRACT_RECOVERF " DesRet V"
#define MSG_AUTORETRACT " AutoRetr."
#define MSG_CONTROL_RETRACT_RECOVERF "DesRet F"
#define MSG_AUTORETRACT "AutoRetr."
#define MSG_FILAMENTCHANGE "Trocar filamento"
#define MSG_INIT_SDCARD "Inic. SD-Card"
#define MSG_CNG_SDCARD "Trocar SD-Card"
#define MSG_INIT_SDCARD "Inic. " MSG_SD
#define MSG_CNG_SDCARD "Trocar " MSG_SD
#define MSG_ZPROBE_OUT "Sens. fora da Base"
#define MSG_POSITION_UNKNOWN "XY antes de Z"
#define MSG_ZPROBE_ZOFFSET "Z Offset"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_BABYSTEP "Babystep"
#define MSG_BABYSTEP_X MSG_BABYSTEP " " MSG_X
#define MSG_BABYSTEP_Y MSG_BABYSTEP " " MSG_Y
#define MSG_BABYSTEP_Z MSG_BABYSTEP " " MSG_Z
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_HEATING_FAILED_LCD "Heating failed"
#define MSG_ERR_REDUNDANT_TEMP "Err: REDUNDANT TEMP ERROR"
#define MSG_ERR_REDUNDANT_TEMP "REDUNDANT TEMP ERROR"
#define MSG_THERMAL_RUNAWAY "THERMAL RUNAWAY"
#define MSG_ERR_MAXTEMP "Err: MAXTEMP"
#define MSG_ERR_MINTEMP "Err: MINTEMP"
#define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED"
#define MSG_HOTEND_AD595 "HOTEND AD595 Offset & Gain"
#define MSG_ERR_MAXTEMP "MAXTEMP ERROR"
#define MSG_ERR_MINTEMP "MINTEMP ERROR"
#define MSG_ERR_MAXTEMP_BED "MAXTEMP BED ERROR"
#define MSG_ERR_MINTEMP_BED "MINTEMP BED ERROR"
#define MSG_END_DAY "days"
#define MSG_END_HOUR "hours"
#define MSG_END_MINUTE "minutes"
#define MSG_ENDSTOPS_HIT "endstops hit: "
#define MSG_BABYSTEPPING "Babystepping"
#define MSG_BABYSTEPPING_X MSG_BABYSTEPPING " " MSG_X
#define MSG_BABYSTEPPING_Y MSG_BABYSTEPPING " " MSG_Y
#define MSG_BABYSTEPPING_Z MSG_BABYSTEPPING " " MSG_Z
#define MSG_ENDSTOP_XS MSG_X
#define MSG_ENDSTOP_YS MSG_Y
#define MSG_ENDSTOP_ZS MSG_Z
#define MSG_ENDSTOP_ZPS MSG_Z "P"
#define MSG_ENDSTOP_ES MSG_E
// Calibrate Delta
#if MECH(DELTA)
#define MSG_DELTA_CALIBRATE "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X "Calibrate X"
#define MSG_DELTA_CALIBRATE_Y "Calibrate Y"
#define MSG_DELTA_CALIBRATE_Z "Calibrate Z"
#define MSG_DELTA_CALIBRATE_X "Calibrate " MSG_X
#define MSG_DELTA_CALIBRATE_Y "Calibrate " MSG_Y
#define MSG_DELTA_CALIBRATE_Z "Calibrate " MSG_Z
#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center"
#endif // DELTA
// Scara
#if MECH(SCARA)
#define MSG_XSCALE "X Scale"
#define MSG_YSCALE "Y Scale"
#define MSG_SCALE "Scale"
#define MSG_XSCALE MSG_X " " MSG_SCALE
#define MSG_YSCALE MSG_Y " " MSG_SCALE
#endif
#define MSG_HEATING "Heating..."
#define MSG_HEATING_COMPLETE "Heating done."
#define MSG_BED_HEATING "Bed Heating."
#define MSG_BED_DONE "Bed done."
// Extra
#define MSG_LASER "Laser Preset"
#define MSG_CONFIG "Configuration"
#define MSG_BAUDRATE "Baudrate"
#define MSG_E_BOWDEN_LENGTH "Extrude " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH "Retract " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_E_BOWDEN_LENGTH MSG_EXTRUDE " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH MSG_RETRACT " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM MSG_PURGE " " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM MSG_RETRACT " " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_SAVED_POS "Saved position"
#define MSG_RESTORING_POS "Restoring position"
#define MSG_INVALID_POS_SLOT "Invalid slot, total slots: "
// Firmware Test
#if ENABLED(FIRMWARE_TEST)
#define MSG_FWTEST_YES "Put the Y command to go next"
#define MSG_FWTEST_NO "Put the N command to go next"
......@@ -180,10 +223,10 @@
#define MSG_FWTEST_04 "Start check MOTOR"
#define MSG_FWTEST_ATTENTION "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
#define MSG_FWTEST_END "Finish Test. Disable FIRMWARE_TEST and recompile."
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#endif // FIRMWARE_TEST
#endif // LANGUAGE_PT_H
MarlinKimbra/language_ru.h
View file @ 521315e2
......@@ -9,61 +9,63 @@
#define LANGUAGE_RU_H
#define MAPPER_D0D1 // For Cyrillic
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_5
#define WELCOME_MSG MACHINE_NAME " Готов."
#define MSG_SD_INSERTED "Карта вставлена"
#define MSG_SD_REMOVED "Карта извлечена"
#define MSG_SD "Карта"
#define MSG_SD_INSERTED MSG_SD " вставлена"
#define MSG_SD_REMOVED MSG_SD " извлечена"
#define MSG_MAIN "Меню"
#define MSG_AUTOSTART "Автостарт"
#define MSG_DISABLE_STEPPERS "Выкл. двигатели"
#define MSG_AUTO_HOME "Парковка"
#define MSG_BED_SETTING "Bed Setting"
#define MSG_LP_INTRO " Leveling bed... Press to start "
#define MSG_LP_1 " Adjust first point & Press the button"
#define MSG_LP_2 " Adjust second point & Press the button"
#define MSG_LP_3 " Adjust third point & Press the button"
#define MSG_LP_4 " Adjust fourth point & Press the button"
#define MSG_LP_5 " Is it ok? Press to end"
#define MSG_LP_6 " BED leveled!"
#define MSG_MBL_SETTING "Manual Bed Leveling"
#define MSG_MBL_BUTTON " Press the button "
#define MSG_MBL_INTRO " Leveling bed... "
#define MSG_MBL_1 " Adjust first point "
#define MSG_MBL_2 " Adjust second point"
#define MSG_MBL_3 " Adjust third point "
#define MSG_MBL_4 " Adjust fourth point"
#define MSG_MBL_5 " Is it ok? "
#define MSG_MBL_6 " BED leveled! "
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_SET_ORIGIN "Запомнить ноль"
#define MSG_PREHEAT_PLA "Преднагрев PLA"
#define MSG_PREHEAT_PLA_ALL "Преднаг. PLA все"
#define MSG_PREHEAT_PLA_BEDONLY "Пред. PLA Кровать"
#define MSG_PREHEAT_PLA_SETTINGS "Настройки PLA"
#define MSG_PREHEAT_ABS "Преднагрев ABS"
#define MSG_PREHEAT_ABS_ALL "Преднаг. ABS все "
#define MSG_PREHEAT_ABS_BEDONLY "Пред. ABS Кровать"
#define MSG_PREHEAT_ABS_SETTINGS "Настройки ABS"
#define MSG_PREHEAT_GUM "Preheat GUM"
#define MSG_PREHEAT_GUM_ALL "Preheat GUM All"
#define MSG_PREHEAT_GUM_BEDONLY "Preheat GUM Bed"
#define MSG_PREHEAT_GUM_SETTINGS "Preheat GUM conf"
#define MSG_ONFOR "On x:"
#define MSG_PWRCONSUMED "P.er:"
#define MSG_PREHEAT "Преднаг"
#define MSG_CONFIG "Настрой."
#define MSG_PREHEAT_PLA MSG_PREHEAT " PLA"
#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " все"
#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " Кровать"
#define MSG_PREHEAT_PLA_SETTINGS MSG_CONFIG " PLA"
#define MSG_PREHEAT_ABS MSG_PREHEAT " ABS"
#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " все "
#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " Кровать"
#define MSG_PREHEAT_ABS_SETTINGS MSG_CONFIG " ABS"
#define MSG_PREHEAT_GUM MSG_PREHEAT " GUM"
#define MSG_PREHEAT_GUM_ALL MSG_PREHEAT_GUM " All"
#define MSG_PREHEAT_GUM_BEDONLY MSG_PREHEAT_GUM " Bed"
#define MSG_PREHEAT_GUM_SETTINGS MSG_CONFIG " GUM"
#define MSG_TOO_COLD_FOR_FILAMENTCHANGE "Hotend too cold to change filament"
#define MSG_COOLDOWN "Охлаждение"
#define MSG_SWITCH_PS_ON "Switch Power On"
#define MSG_SWITCH_PS_OFF "Switch Power Off"
#define MSG_EXTRUDE "Экструзия"
#define MSG_RETRACT "Откат"
#define MSG_MOVE_AXIS "Движение по осям"
#define MSG_MOVE_X "Move X"
#define MSG_MOVE_Y "Move Y"
#define MSG_MOVE_Z "Move Z"
#define MSG_MOVE_E "Extruder"
#define MSG_MOVE_01MM "Move 0.1mm"
#define MSG_MOVE_1MM "Move 1mm"
#define MSG_MOVE_10MM "Move 10mm"
#define MSG_PURGE "Purge"
#define MSG_LEVEL_BED "Level bed"
#define MSG_SPEED "Скорость:"
#define MSG_NOZZLE "Фильера:"
#define MSG_BED "Кровать:"
#define MSG_FAN_SPEED "Куллер:"
#define MSG_FLOW "Поток:"
#define MSG_CONTROL "Настройки"
#define MSG_MIN " " LCD_STR_THERMOMETER "Минимум"
#define MSG_MAX " " LCD_STR_THERMOMETER "Максимум"
#define MSG_FACTOR " " LCD_STR_THERMOMETER "Фактор"
#define MSG_STATS "Statistics"
#define MSG_FIX_LOSE_STEPS "Fix axis steps"
#define MSG_MIN LCD_STR_THERMOMETER " Минимум"
#define MSG_MAX LCD_STR_THERMOMETER " Максимум"
#define MSG_FACTOR LCD_STR_THERMOMETER " Фактор"
#define MSG_IDLEOOZING "Anti oozing"
#define MSG_AUTOTEMP "Autotemp"
#define MSG_ON "Вкл."
......@@ -71,31 +73,43 @@
#define MSG_PID_P "PID-P"
#define MSG_PID_I "PID-I"
#define MSG_PID_D "PID-D"
#define MSG_H1 " H1"
#define MSG_H2 " H2"
#define MSG_H3 " H3"
#define MSG_ACC "Acc"
#define MSG_VXY_JERK "Vxy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX "Vmax "
#define MSG_X "x"
#define MSG_Y "y"
#define MSG_Z "z"
#define MSG_E "e"
#define MSG_X "X"
#define MSG_Y "Y"
#define MSG_Z "Z"
#define MSG_E "E"
#define MSG_MOVE "Move"
#define MSG_MOVE_AXIS MSG_MOVE " axis"
#define MSG_MOVE_X MSG_MOVE " " MSG_X
#define MSG_MOVE_Y MSG_MOVE " " MSG_Y
#define MSG_MOVE_Z MSG_MOVE " " MSG_Z
#define MSG_MOVE_01MM MSG_MOVE " 0.1mm"
#define MSG_MOVE_1MM MSG_MOVE " 1mm"
#define MSG_MOVE_10MM MSG_MOVE " 10mm"
#define MSG_MOVE_E "Extruder"
#define MSG_VMIN "Vmin"
#define MSG_VTRAV_MIN "VTrav min"
#define MSG_AMAX "Amax "
#define MSG_A_RETRACT "A-retract"
#define MSG_A_TRAVEL "A-travel"
#define MSG_XSTEPS "X шаг/mm"
#define MSG_YSTEPS "Y шаг/mm"
#define MSG_ZSTEPS "Z шаг/mm"
#define MSG_E0STEPS "E0 шаг/mm"
#define MSG_E1STEPS "E1 шаг/mm"
#define MSG_E2STEPS "E2 шаг/mm"
#define MSG_E3STEPS "E3 шаг/mm"
#define MSG_XSTEPS MSG_X " шаг/mm"
#define MSG_YSTEPS MSG_Y " шаг/mm"
#define MSG_ZSTEPS MSG_Z " шаг/mm"
#define MSG_E0STEPS MSG_E "0 шаг/mm"
#define MSG_E1STEPS MSG_E "1 шаг/mm"
#define MSG_E2STEPS MSG_E "2 шаг/mm"
#define MSG_E3STEPS MSG_E "3 шаг/mm"
#define MSG_TEMPERATURE "Температура"
#define MSG_MOTION "Скорости"
#define MSG_VOLUMETRIC "Filament"
#define MSG_VOLUMETRIC_ENABLED "E in mm" STR_h3
#define MSG_FILAMENT "Filament"
#define MSG_VOLUMETRIC_ENABLED MSG_E " in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER "Fil. Dia."
#define MSG_CONTRAST "LCD contrast"
#define MSG_STORE_EPROM "Сохранить в EPROM"
......@@ -108,8 +122,8 @@
#define MSG_PAUSE_PRINT "Продолжить печать"
#define MSG_RESUME_PRINT "возобн. печать"
#define MSG_STOP_PRINT "Остановить печать"
#define MSG_CARD_MENU "Меню карты"
#define MSG_NO_CARD "Нет карты"
#define MSG_CARD_MENU "Меню " MSG_SD
#define MSG_NO_CARD "Нет " MSG_SD
#define MSG_DWELL "Сон..."
#define MSG_USERWAIT "Ожиданиие"
#define MSG_RESUMING "Resuming print"
......@@ -117,53 +131,82 @@
#define MSG_NO_MOVE "Нет движения."
#define MSG_KILLED "УБИТО."
#define MSG_STOPPED "ОСТАНОВЛЕНО."
#define MSG_CONTROL_RETRACT "Откат mm:"
#define MSG_CONTROL_RETRACT_SWAP "своп Откат mm:"
#define MSG_CONTROL_RETRACTF "Откат V:"
#define MSG_CONTROL_RETRACT_ZLIFT "Прыжок mm:"
#define MSG_CONTROL_RETRACT_RECOVER "Возврат +mm:"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "своп Возврат +mm:"
#define MSG_CONTROL_RETRACT_RECOVERF "Возврат V:"
#define MSG_AUTORETRACT "АвтоОткат:"
#define MSG_CONTROL_RETRACT "Откат mm"
#define MSG_CONTROL_RETRACT_SWAP "своп Откат mm"
#define MSG_CONTROL_RETRACTF "Откат F"
#define MSG_CONTROL_RETRACT_ZLIFT "Прыжок mm"
#define MSG_CONTROL_RETRACT_RECOVER "Возврат +mm"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "своп Возврат +mm"
#define MSG_CONTROL_RETRACT_RECOVERF "Возврат F"
#define MSG_AUTORETRACT "АвтоОткат"
#define MSG_FILAMENTCHANGE "Change filament"
#define MSG_INIT_SDCARD "Init. SD-Card"
#define MSG_CNG_SDCARD "Change SD-Card"
#define MSG_ZPROBE_OUT "Z probe out. bed"
#define MSG_POSITION_UNKNOWN "Home X/Y before Z"
#define MSG_ZPROBE_ZOFFSET "Z Offset"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_BABYSTEP "Babystep"
#define MSG_BABYSTEP_X MSG_BABYSTEP " " MSG_X
#define MSG_BABYSTEP_Y MSG_BABYSTEP " " MSG_Y
#define MSG_BABYSTEP_Z MSG_BABYSTEP " " MSG_Z
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_HEATING_FAILED_LCD "Heating failed"
#define MSG_ERR_REDUNDANT_TEMP "Err: REDUNDANT TEMP ERROR"
#define MSG_ERR_REDUNDANT_TEMP "REDUNDANT TEMP ERROR"
#define MSG_THERMAL_RUNAWAY "THERMAL RUNAWAY"
#define MSG_ERR_MAXTEMP "Err: MAXTEMP"
#define MSG_ERR_MINTEMP "Err: MINTEMP"
#define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED"
#define MSG_HOTEND_AD595 "HOTEND AD595 Offset & Gain"
#define MSG_ERR_MAXTEMP "MAXTEMP ERROR"
#define MSG_ERR_MINTEMP "MINTEMP ERROR"
#define MSG_ERR_MAXTEMP_BED "MAXTEMP BED ERROR"
#define MSG_ERR_MINTEMP_BED "MINTEMP BED ERROR"
#define MSG_END_DAY "days"
#define MSG_END_HOUR "hours"
#define MSG_END_MINUTE "minutes"
#define MSG_ENDSTOPS_HIT "endstops hit: "
#define MSG_BABYSTEPPING "Babystepping"
#define MSG_BABYSTEPPING_X MSG_BABYSTEPPING " " MSG_X
#define MSG_BABYSTEPPING_Y MSG_BABYSTEPPING " " MSG_Y
#define MSG_BABYSTEPPING_Z MSG_BABYSTEPPING " " MSG_Z
#define MSG_ENDSTOP_XS MSG_X
#define MSG_ENDSTOP_YS MSG_Y
#define MSG_ENDSTOP_ZS MSG_Z
#define MSG_ENDSTOP_ZPS MSG_Z "P"
#define MSG_ENDSTOP_ES MSG_E
// Calibrate Delta
#if MECH(DELTA)
#define MSG_DELTA_CALIBRATE "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X "Calibrate X"
#define MSG_DELTA_CALIBRATE_Y "Calibrate Y"
#define MSG_DELTA_CALIBRATE_Z "Calibrate Z"
#define MSG_DELTA_CALIBRATE_X "Calibrate " MSG_X
#define MSG_DELTA_CALIBRATE_Y "Calibrate " MSG_Y
#define MSG_DELTA_CALIBRATE_Z "Calibrate " MSG_Z
#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center"
#endif // DELTA
// Scara
#if MECH(SCARA)
#define MSG_XSCALE "X Scale"
#define MSG_YSCALE "Y Scale"
#define MSG_SCALE "Scale"
#define MSG_XSCALE MSG_X " " MSG_SCALE
#define MSG_YSCALE MSG_Y " " MSG_SCALE
#endif
#define MSG_HEATING "Heating..."
#define MSG_HEATING_COMPLETE "Heating done."
#define MSG_BED_HEATING "Bed Heating."
#define MSG_BED_DONE "Bed done."
// Extra
#define MSG_LASER "Laser Preset"
#define MSG_CONFIG "Configuration"
#define MSG_BAUDRATE "Baudrate"
#define MSG_E_BOWDEN_LENGTH "Extrude " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH "Retract " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM "Purge " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_E_BOWDEN_LENGTH MSG_EXTRUDE " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_R_BOWDEN_LENGTH MSG_RETRACT " " STRINGIFY(BOWDEN_LENGTH) "mm"
#define MSG_PURGE_XMM MSG_PURGE " " STRINGIFY(LCD_PURGE_LENGTH) "mm"
#define MSG_RETRACT_XMM MSG_RETRACT " " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#define MSG_SAVED_POS "Saved position"
#define MSG_RESTORING_POS "Restoring position"
#define MSG_INVALID_POS_SLOT "Invalid slot, total slots: "
// Firmware Test
#if ENABLED(FIRMWARE_TEST)
#define MSG_FWTEST_YES "Put the Y command to go next"
#define MSG_FWTEST_NO "Put the N command to go next"
......@@ -180,10 +223,10 @@
#define MSG_FWTEST_04 "Start check MOTOR"
#define MSG_FWTEST_ATTENTION "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
#define MSG_FWTEST_END "Finish Test. Disable FIRMWARE_TEST and recompile."
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#define MSG_FWTEST_INTO "into "
#define MSG_FWTEST_ERROR "ERROR"
#define MSG_FWTEST_OK "OK"
#define MSG_FWTEST_NDEF "not defined"
#endif // FIRMWARE_TEST
#endif // LANGUAGE_RU_H
MarlinKimbra/macros.h
View file @ 521315e2
......@@ -10,7 +10,9 @@
#define SET_BIT(n,b,value) (n) ^= ((-value)^(n)) & (BIT(b))
// Macros for maths shortcuts
#define M_PI 3.1415926536
#ifndef M_PI
#define M_PI 3.1415926536
#endif
#define RADIANS(d) ((d)*M_PI/180.0)
#define DEGREES(r) ((r)*180.0/M_PI)
#define SIN_60 0.8660254037844386
......
MarlinKimbra/nextion_lcd.cpp
View file @ 521315e2
......@@ -14,17 +14,23 @@
#include "stepper.h"
#include "configuration_store.h"
#include "nextion_lcd.h"
#include "nextion_gfx.h"
#include <Nextion.h>
const float MaxWave = 0.2;
bool NextionON = false;
bool PageInfo = false;
bool gfxON = false;
char buffer[100] = {0};
uint32_t slidermaxval = 20;
char lcd_status_message[30] = WELCOME_MSG;
uint8_t lcd_status_message_level = 0;
static millis_t next_lcd_update_ms;
#if ENABLED(NEXTION_GFX)
GFX gfx = GFX(196, 194);
#endif
// Page
NexPage Pstart = NexPage(0, 0, "start");
NexPage Pinfo = NexPage(1, 0, "info");
......@@ -272,6 +278,7 @@
static void setpagesdcard() {
PageInfo = false;
gfxON = false;
Psdcard.show();
uint16_t fileCnt = card.getnrfilenames();
......@@ -429,10 +436,12 @@
void setpagePopCallback(void *ptr) {
if (ptr == &Menu) {
PageInfo = false;
gfxON = false;
Pmenu.show();
}
else if (ptr == &MSetup) {
PageInfo = false;
gfxON = false;
Psetup.show();
}
......@@ -487,6 +496,14 @@
Exit1.attachPop(ExitPopCallback);
Exit3.attachPop(ExitPopCallback);
#if ENABLED(NEXTION_GFX)
gfx.color_set(VC_AXIS + X_AXIS, 63488);
gfx.color_set(VC_AXIS + Y_AXIS, 2016);
gfx.color_set(VC_AXIS + Z_AXIS, 31);
gfx.color_set(VC_MOVE, 2047);
gfx.color_set(VC_TOOL, 65535);
#endif
#if ENABLED(SDSUPPORT)
MSD.attachPop(setpagePopCallback, &MSD);
sdlist.attachPop(sdlistPopCallback);
......@@ -533,8 +550,8 @@
itoa(T2, valuetemp, 10);
strcat(buffer, valuetemp);
uint32_t color = 1023;
uint32_t prc = (T1/(T2 + 0.1)) * 100;
uint32_t prc = (T1/(T2 + 0.01)) * 100;
if (prc >= 50 && prc < 75)
color = 65519;
else if (prc >= 75 && prc < 95)
......@@ -544,8 +561,11 @@
hotend_list[h]->setText(buffer);
hotend_list[h]->setColor(color);
graph_list[h]->addValue(0, (int)(T1 * MaxWave));
graph_list[h]->addValue(1, (int)(T2 * MaxWave));
if (!gfxON) {
graph_list[h]->addValue(0, (int)(T1 * MaxWave));
graph_list[h]->addValue(1, (int)(T2 * MaxWave));
}
}
static void coordtoLCD() {
......@@ -554,11 +574,7 @@
memset(buffer, 0, sizeof(buffer));
strcat(buffer, "X");
if (axis_known_position[X_AXIS]) {
#if MECH(DELTA)
valuetemp = ftostr30(current_position[X_AXIS]);
#else
valuetemp = ftostr3(current_position[X_AXIS]);
#endif
valuetemp = ftostr4sign(current_position[X_AXIS]);
strcat(buffer, valuetemp);
}
else
......@@ -566,11 +582,7 @@
strcat(buffer, " Y");
if (axis_known_position[Y_AXIS]) {
#if MECH(DELTA)
valuetemp = ftostr30(current_position[Y_AXIS]);
#else
valuetemp = ftostr3(current_position[Y_AXIS]);
#endif
valuetemp = ftostr4sign(current_position[Y_AXIS]);
strcat(buffer, valuetemp);
}
else
......@@ -664,95 +676,33 @@
void lcd_reset_alert_level() { lcd_status_message_level = 0; }
#if ENABLED(NEXTION_GFX)
void gfx_clear(float x, float y, float z) {
if (PageInfo) {
gfx.clear(x, y, z);
gfxON = true;
}
}
void gfx_cursor_to(float x, float y, float z) {
if (PageInfo && gfxON)
gfx.cursor_to(x, y, z);
}
void gfx_line_to(float x, float y, float z){
if (PageInfo && gfxON)
gfx.line_to(VC_TOOL, x, y, z);
}
#endif
/*********************************/
/** Number to string conversion **/
/*********************************/
char conv[8];
// Convert float to string with +123.4 format
char *ftostr3(const float &x) {
return itostr3((int)x);
}
// Convert int to string with 12 format
char *itostr2(const uint8_t &x) {
//sprintf(conv,"%5.1f",x);
int xx = x;
conv[0] = (xx / 10) % 10 + '0';
conv[1] = xx % 10 + '0';
conv[2] = 0;
return conv;
}
// Convert float to string with +123.4 format
char *ftostr31(const float &x) {
int xx = abs(x * 10);
conv[0] = (x >= 0) ? '+' : '-';
conv[1] = (xx / 1000) % 10 + '0';
conv[2] = (xx / 100) % 10 + '0';
conv[3] = (xx / 10) % 10 + '0';
conv[4] = '.';
conv[5] = xx % 10 + '0';
conv[6] = 0;
return conv;
}
// Convert float to string with 123.4 format, dropping sign
char *ftostr31ns(const float &x) {
int xx = abs(x * 10);
conv[0] = (xx / 1000) % 10 + '0';
conv[1] = (xx / 100) % 10 + '0';
conv[2] = (xx / 10) % 10 + '0';
conv[3] = '.';
conv[4] = xx % 10 + '0';
conv[5] = 0;
return conv;
}
// Convert float to string with 123.4 format
char *ftostr32(const float &x) {
long xx = abs(x * 100);
conv[0] = x >= 0 ? (xx / 10000) % 10 + '0' : '-';
conv[1] = (xx / 1000) % 10 + '0';
conv[2] = (xx / 100) % 10 + '0';
conv[3] = '.';
conv[4] = (xx / 10) % 10 + '0';
conv[5] = xx % 10 + '0';
conv[6] = 0;
return conv;
}
// Convert float to string with 1.234 format
char *ftostr43(const float &x) {
long xx = x * 1000;
if (xx >= 0) {
conv[0] = (xx / 1000) % 10 + '0';
}
else {
conv[0] = '-';
}
xx = abs(xx);
conv[1] = '.';
conv[2] = (xx / 100) % 10 + '0';
conv[3] = (xx / 10) % 10 + '0';
conv[4] = (xx) % 10 + '0';
conv[5] = 0;
return conv;
}
// Convert float to string with 1.23 format
char *ftostr12ns(const float &x) {
long xx=x*100;
xx=abs(xx);
conv[0]=(xx/100)%10+'0';
conv[1]='.';
conv[2]=(xx/10)%10+'0';
conv[3]=(xx)%10+'0';
conv[4]=0;
return conv;
}
// Convert float to rj string with _123, -123, _-12, or __-1 format
char *ftostr4sign(const float& x) { return itostr4sign((int)x); }
// Convert float to space-padded string with -_23.4_ format
char *ftostr32sp(const float &x) {
......@@ -800,144 +750,28 @@
return conv;
}
// Convert int to lj string with +123.0 format
char *itostr31(const int &x) {
conv[0] = x >= 0 ? '+' : '-';
// Convert int to rj string with _123, -123, _-12, or __-1 format
char* itostr4sign(const int& x) {
int xx = abs(x);
conv[1] = (xx / 100) % 10 + '0';
conv[2] = (xx / 10) % 10 + '0';
conv[3] = xx % 10 + '0';
conv[4] = '.';
conv[5] = '0';
conv[6] = 0;
return conv;
}
// Convert int to rj string with 123 or -12 format
char *itostr3(const int &x) {
int xx = x;
if (xx < 0) {
conv[0] = '-';
xx = -xx;
}
else
conv[0] = xx >= 100 ? (xx / 100) % 10 + '0' : ' ';
conv[1] = xx >= 10 ? (xx / 10) % 10 + '0' : ' ';
conv[2] = xx % 10 + '0';
conv[3] = 0;
return conv;
}
// Convert int to lj string with 123 format
char *itostr3left(const int &xx) {
int sign = 0;
if (xx >= 100) {
conv[0] = (xx / 100) % 10 + '0';
conv[1] = (xx / 10) % 10 + '0';
conv[2] = xx % 10 + '0';
conv[3] = 0;
conv[1] = (xx / 100) % 10 + '0';
conv[2] = (xx / 10) % 10 + '0';
}
else if (xx >= 10) {
conv[0] = (xx / 10) % 10 + '0';
conv[1] = xx % 10 + '0';
conv[2] = 0;
conv[0] = ' ';
sign = 1;
conv[2] = (xx / 10) % 10 + '0';
}
else {
conv[0] = xx % 10 + '0';
conv[1] = 0;
conv[0] = ' ';
conv[1] = ' ';
sign = 2;
}
return conv;
}
// Convert int to rj string with 1234 format
char *itostr4(const int &xx) {
conv[0] = xx >= 1000 ? (xx / 1000) % 10 + '0' : ' ';
conv[1] = xx >= 100 ? (xx / 100) % 10 + '0' : ' ';
conv[2] = xx >= 10 ? (xx / 10) % 10 + '0' : ' ';
conv[sign] = x < 0 ? '-' : ' ';
conv[3] = xx % 10 + '0';
conv[4] = 0;
return conv;
}
char *ltostr7(const long &xx) {
if (xx >= 1000000)
conv[0]=(xx/1000000)%10+'0';
else
conv[0]=' ';
if (xx >= 100000)
conv[1]=(xx/100000)%10+'0';
else
conv[1]=' ';
if (xx >= 10000)
conv[2]=(xx/10000)%10+'0';
else
conv[2]=' ';
if (xx >= 1000)
conv[3]=(xx/1000)%10+'0';
else
conv[3]=' ';
if (xx >= 100)
conv[4]=(xx/100)%10+'0';
else
conv[4]=' ';
if (xx >= 10)
conv[5]=(xx/10)%10+'0';
else
conv[5]=' ';
conv[6]=(xx)%10+'0';
conv[7]=0;
return conv;
}
// convert float to string with +123 format
char *ftostr30(const float &x) {
int xx=x;
conv[0]=(xx>=0)?'+':'-';
xx=abs(xx);
conv[1]=(xx/100)%10+'0';
conv[2]=(xx/10)%10+'0';
conv[3]=(xx)%10+'0';
conv[4]=0;
return conv;
}
// Convert float to rj string with 12345 format
char *ftostr5(const float &x) {
long xx = abs(x);
conv[0] = xx >= 10000 ? (xx / 10000) % 10 + '0' : ' ';
conv[1] = xx >= 1000 ? (xx / 1000) % 10 + '0' : ' ';
conv[2] = xx >= 100 ? (xx / 100) % 10 + '0' : ' ';
conv[3] = xx >= 10 ? (xx / 10) % 10 + '0' : ' ';
conv[4] = xx % 10 + '0';
conv[5] = 0;
return conv;
}
// Convert float to string with +1234.5 format
char *ftostr51(const float &x) {
long xx = abs(x * 10);
conv[0] = (x >= 0) ? '+' : '-';
conv[1] = (xx / 10000) % 10 + '0';
conv[2] = (xx / 1000) % 10 + '0';
conv[3] = (xx / 100) % 10 + '0';
conv[4] = (xx / 10) % 10 + '0';
conv[5] = '.';
conv[6] = xx % 10 + '0';
conv[7] = 0;
return conv;
}
// Convert float to string with +123.45 format
char *ftostr52(const float &x) {
conv[0] = (x >= 0) ? '+' : '-';
long xx = abs(x * 100);
conv[1] = (xx / 10000) % 10 + '0';
conv[2] = (xx / 1000) % 10 + '0';
conv[3] = (xx / 100) % 10 + '0';
conv[4] = '.';
conv[5] = (xx / 10) % 10 + '0';
conv[6] = xx % 10 + '0';
conv[7] = 0;
return conv;
}
#endif
MarlinKimbra/nextion_lcd.h
View file @ 521315e2
......@@ -39,25 +39,10 @@
#define LCD_MESSAGEPGM(x) lcd_setstatuspgm(PSTR(x))
#define LCD_ALERTMESSAGEPGM(x) lcd_setalertstatuspgm(PSTR(x))
char *itostr2(const uint8_t &x);
char *itostr31(const int &xx);
char *itostr3(const int &xx);
char *itostr3left(const int &xx);
char *itostr4(const int &xx);
char *ltostr7(const long &xx);
char *ftostr3(const float &x);
char *ftostr30(const float &x);
char *ftostr31ns(const float &x); // float to string without sign character
char *ftostr31(const float &x);
char *ftostr32(const float &x);
char *ftostr43(const float &x);
char *ftostr12ns(const float &x);
char *ftostr32sp(const float &x); // remove zero-padding from ftostr32
char *ftostr5(const float &x);
char *ftostr51(const float &x);
char *ftostr52(const float &x);
char* itostr4sign(const int& x);
char* ftostr4sign(const float& x);
char* ftostr32sp(const float& x); // remove zero-padding from ftostr32
#endif
#endif // NEXTIONLCD_H
MarlinKimbra/pins.h
View file @ 521315e2
......@@ -5351,7 +5351,7 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
/****************************************************************************************
*********** Available chip select pins for HW SPI are 4 10 52 77 ************************
/****************************************************************************************/
****************************************************************************************/
#if (SDSS == 4) || (SDSS == 10) || (SDSS == 52) || (SDSS == 77)
#if (SDSS == 4)
#define SPI_PIN 87
......@@ -5382,7 +5382,7 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
/****************************************************************************************
********************************* END MOTHERBOARD ***************************************
/****************************************************************************************/
****************************************************************************************/
#ifndef ORIG_HEATER_1_PIN
#define ORIG_HEATER_1_PIN -1
......@@ -5460,6 +5460,7 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
#if DISABLED(Z_PROBE_ENDSTOP) // Allow code to compile regardless of Z_PROBE_ENDSTOP setting.
#define Z_PROBE_PIN -1
#endif
/****************************************************************************************/
#if ENABLED(DISABLE_XMAX_ENDSTOP)
#undef X_MAX_PIN
......
MarlinKimbra/planner.cpp
View file @ 521315e2
......@@ -549,7 +549,7 @@ float junction_deviation = 0.1;
if (degHotend(extruder) < extrude_min_temp && !(debugLevel & DEBUG_DRYRUN)) {
position[E_AXIS] = target[E_AXIS]; //behave as if the move really took place, but ignore E part
de = 0; // no difference
ECHO_LM(ER, MSG_ERR_COLD_EXTRUDE_STOP);
ECHO_LM(ER, SERIAL_ERR_COLD_EXTRUDE_STOP);
}
}
......@@ -560,7 +560,7 @@ float junction_deviation = 0.1;
#endif
position[E_AXIS] = target[E_AXIS]; // Behave as if the move really took place, but ignore E part
de = 0; // no difference
ECHO_LM(ER, MSG_ERR_LONG_EXTRUDE_STOP);
ECHO_LM(ER, SERIAL_ERR_LONG_EXTRUDE_STOP);
#if ENABLED(EASY_LOAD)
}
allow_lengthy_extrude_once = false;
......
MarlinKimbra/stepper.cpp
View file @ 521315e2
......@@ -263,28 +263,28 @@ void endstops_hit_on_purpose() {
void checkHitEndstops() {
if (endstop_hit_bits) {
ECHO_SM(DB, MSG_ENDSTOPS_HIT);
ECHO_SM(DB, SERIAL_ENDSTOPS_HIT);
if (endstop_hit_bits & BIT(X_MIN)) {
ECHO_MV(MSG_ENDSTOP_X, (float)endstops_trigsteps[X_AXIS] / axis_steps_per_unit[X_AXIS]);
ECHO_MV(SERIAL_ENDSTOP_X, (float)endstops_trigsteps[X_AXIS] / axis_steps_per_unit[X_AXIS]);
LCD_MESSAGEPGM(MSG_ENDSTOPS_HIT MSG_ENDSTOP_XS);
}
if (endstop_hit_bits & BIT(Y_MIN)) {
ECHO_MV(MSG_ENDSTOP_Y, (float)endstops_trigsteps[Y_AXIS] / axis_steps_per_unit[Y_AXIS]);
ECHO_MV(SERIAL_ENDSTOP_Y, (float)endstops_trigsteps[Y_AXIS] / axis_steps_per_unit[Y_AXIS]);
LCD_MESSAGEPGM(MSG_ENDSTOPS_HIT MSG_ENDSTOP_YS);
}
if (endstop_hit_bits & BIT(Z_MIN)) {
ECHO_MV(MSG_ENDSTOP_Z, (float)endstops_trigsteps[Z_AXIS] / axis_steps_per_unit[Z_AXIS]);
ECHO_MV(SERIAL_ENDSTOP_Z, (float)endstops_trigsteps[Z_AXIS] / axis_steps_per_unit[Z_AXIS]);
LCD_MESSAGEPGM(MSG_ENDSTOPS_HIT MSG_ENDSTOP_ZS);
}
#if ENABLED(Z_PROBE_ENDSTOP)
if (endstop_hit_bits & BIT(Z_PROBE)) {
ECHO_MV(MSG_ENDSTOP_ZPS, (float)endstops_trigsteps[Z_AXIS] / axis_steps_per_unit[Z_AXIS]);
ECHO_MV(SERIAL_ENDSTOP_PROBE, (float)endstops_trigsteps[Z_AXIS] / axis_steps_per_unit[Z_AXIS]);
LCD_MESSAGEPGM(MSG_ENDSTOPS_HIT MSG_ENDSTOP_ZPS);
}
#endif
#if ENABLED(NPR2)
if (endstop_hit_bits & BIT(E_MIN)) {
ECHO_MV(MSG_ENDSTOP_E, (float)endstops_trigsteps[E_AXIS] / axis_steps_per_unit[E_AXIS]);
ECHO_MV(SERIAL_ENDSTOP_E, (float)endstops_trigsteps[E_AXIS] / axis_steps_per_unit[E_AXIS]);
LCD_MESSAGEPGM(MSG_ENDSTOPS_HIT MSG_ENDSTOP_ES);
}
#endif
......@@ -537,7 +537,7 @@ FORCE_INLINE unsigned short calc_timer(unsigned short step_rate) {
timer = (unsigned short)pgm_read_word_near(table_address);
timer -= (((unsigned short)pgm_read_word_near(table_address + 2) * (unsigned char)(step_rate & 0x0007)) >> 3);
}
if (timer < 100) { timer = 100; MYSERIAL.print(MSG_STEPPER_TOO_HIGH); MYSERIAL.println(step_rate); }//(20kHz this should never happen)
if (timer < 100) { timer = 100; MYSERIAL.print(SERIAL_STEPPER_TOO_HIGH); MYSERIAL.println(step_rate); }//(20kHz this should never happen)
return timer;
}
......@@ -1414,21 +1414,21 @@ void microstep_mode(uint8_t driver, uint8_t stepping_mode) {
}
void microstep_readings() {
ECHO_SM(DB, MSG_MICROSTEP_MS1_MS2);
ECHO_M(MSG_MICROSTEP_X);
ECHO_SM(DB, SERIAL_MICROSTEP_MS1_MS2);
ECHO_M(SERIAL_MICROSTEP_X);
ECHO_V(digitalRead(X_MS1_PIN));
ECHO_EV(digitalRead(X_MS2_PIN));
ECHO_SM(DB, MSG_MICROSTEP_Y);
ECHO_SM(DB, SERIAL_MICROSTEP_Y);
ECHO_V(digitalRead(Y_MS1_PIN));
ECHO_EV(digitalRead(Y_MS2_PIN));
ECHO_SM(DB, MSG_MICROSTEP_Z);
ECHO_SM(DB, SERIAL_MICROSTEP_Z);
ECHO_V(digitalRead(Z_MS1_PIN));
ECHO_EV(digitalRead(Z_MS2_PIN));
ECHO_SM(DB, MSG_MICROSTEP_E0);
ECHO_SM(DB, SERIAL_MICROSTEP_E0);
ECHO_V(digitalRead(E0_MS1_PIN));
ECHO_EV(digitalRead(E0_MS2_PIN));
#if HAS(MICROSTEPS_E1)
ECHO_SM(DB, MSG_MICROSTEP_E1);
ECHO_SM(DB, SERIAL_MICROSTEP_E1);
ECHO_V(digitalRead(E1_MS1_PIN));
ECHO_EV(digitalRead(E1_MS2_PIN));
#endif
......
MarlinKimbra/temperature.cpp
View file @ 521315e2
......@@ -233,9 +233,9 @@ void autotempShutdown() {
millis_t temp_ms = millis(), t1 = temp_ms, t2 = temp_ms;
long t_high = 0, t_low = 0;
long bias, d;
float Ku, Tu;
float Kp_temp, Ki_temp, Kd_temp;
long bias = 0, d = 0;
float Ku = 0, Tu = 0;
float Kp_temp = 0, Ki_temp = 0, Kd_temp = 0;
float max = 0, min = 10000;
#if HAS(AUTO_FAN)
......@@ -247,11 +247,11 @@ void autotempShutdown() {
|| hotend < 0
#endif
) {
ECHO_LM(ER, MSG_PID_BAD_EXTRUDER_NUM);
ECHO_LM(ER, SERIAL_PID_BAD_EXTRUDER_NUM);
return;
}
ECHO_LM(DB, MSG_PID_AUTOTUNE_START);
ECHO_LM(DB, SERIAL_PID_AUTOTUNE_START);
if (hotend < 0) {
ECHO_SM(DB, "BED");
}
......@@ -312,23 +312,23 @@ void autotempShutdown() {
bias = constrain(bias, 20, max_pow - 20);
d = (bias > max_pow / 2) ? max_pow - 1 - bias : bias;
ECHO_MV(MSG_BIAS, bias);
ECHO_MV(MSG_D, d);
ECHO_MV(MSG_T_MIN, min);
ECHO_MV(MSG_T_MAX, max);
ECHO_MV(SERIAL_BIAS, bias);
ECHO_MV(SERIAL_D, d);
ECHO_MV(SERIAL_T_MIN, min);
ECHO_MV(SERIAL_T_MAX, max);
if (cycles > 2) {
Ku = (4.0 * d) / (3.14159265 * (max - min) / 2.0);
Tu = ((float)(t_low + t_high) / 1000.0);
ECHO_MV(MSG_KU, Ku);
ECHO_EMV(MSG_TU, Tu);
ECHO_MV(SERIAL_KU, Ku);
ECHO_EMV(SERIAL_TU, Tu);
Kp_temp = 0.6 * Ku;
Ki_temp = 2 * Kp_temp / Tu;
Kd_temp = Kp_temp * Tu / 8;
ECHO_EM(MSG_CLASSIC_PID);
ECHO_MV(MSG_KP, Kp_temp);
ECHO_MV(MSG_KI, Ki_temp);
ECHO_EMV(MSG_KD, Kd_temp);
ECHO_EM(SERIAL_CLASSIC_PID);
ECHO_MV(SERIAL_KP, Kp_temp);
ECHO_MV(SERIAL_KI, Ki_temp);
ECHO_EMV(SERIAL_KD, Kd_temp);
}
else {
ECHO_E;
......@@ -344,7 +344,7 @@ void autotempShutdown() {
}
}
if (input > temp + MAX_OVERSHOOT_PID_AUTOTUNE) {
ECHO_LM(ER, MSG_PID_TEMP_TOO_HIGH);
ECHO_LM(ER, SERIAL_PID_TEMP_TOO_HIGH);
return;
}
......@@ -360,11 +360,11 @@ void autotempShutdown() {
// Over 2 minutes?
if (((ms - t1) + (ms - t2)) > (10L*60L*1000L*2L)) {
ECHO_LM(ER, MSG_PID_TIMEOUT);
ECHO_LM(ER, SERIAL_PID_TIMEOUT);
return;
}
if (cycles > ncycles) {
ECHO_LM(DB, MSG_PID_AUTOTUNE_FINISHED);
ECHO_LM(DB, SERIAL_PID_AUTOTUNE_FINISHED);
#if ENABLED(PIDTEMP)
if (hotend >= 0) {
PID_PARAM(Kp, hotend) = Kp_temp;
......@@ -372,9 +372,9 @@ void autotempShutdown() {
PID_PARAM(Kd, hotend) = scalePID_d(Kd_temp);
updatePID();
ECHO_SMV(DB, MSG_KP, PID_PARAM(Kp, hotend));
ECHO_MV(MSG_KI, unscalePID_i(PID_PARAM(Ki, hotend)));
ECHO_EMV(MSG_KD, unscalePID_d(PID_PARAM(Kd, hotend)));
ECHO_SMV(DB, SERIAL_KP, PID_PARAM(Kp, hotend));
ECHO_MV(SERIAL_KI, unscalePID_i(PID_PARAM(Ki, hotend)));
ECHO_EMV(SERIAL_KD, unscalePID_d(PID_PARAM(Kd, hotend)));
}
else {
ECHO_LMV(DB, "#define DEFAULT_bedKp ", Kp_temp);
......@@ -490,8 +490,8 @@ inline void _temp_error(int h, const char* serial_msg, const char* lcd_msg) {
if (IsRunning()) {
ECHO_S(ER);
PS_PGM(serial_msg);
ECHO_M(MSG_STOPPED_HEATER);
if (h >= 0) ECHO_EV((int)h); else ECHO_EM(MSG_HEATER_BED);
ECHO_M(SERIAL_STOPPED_HEATER);
if (h >= 0) ECHO_EV((int)h); else ECHO_EM(SERIAL_HEATER_BED);
#if ENABLED(ULTRA_LCD)
lcd_setalertstatuspgm(lcd_msg);
#endif
......@@ -508,10 +508,10 @@ inline void _temp_error(int h, const char* serial_msg, const char* lcd_msg) {
}
void max_temp_error(uint8_t h) {
_temp_error(h, PSTR(MSG_T_MAXTEMP), PSTR(MSG_ERR_MAXTEMP));
_temp_error(h, PSTR(SERIAL_T_MAXTEMP), PSTR(MSG_ERR_MAXTEMP));
}
void min_temp_error(uint8_t h) {
_temp_error(h, PSTR(MSG_T_MINTEMP), PSTR(MSG_ERR_MINTEMP));
_temp_error(h, PSTR(SERIAL_T_MINTEMP), PSTR(MSG_ERR_MINTEMP));
}
float get_pid_output(int h) {
......@@ -586,14 +586,14 @@ float get_pid_output(int h) {
#endif // PID_OPENLOOP
#if ENABLED(PID_DEBUG)
ECHO_SMV(DB, MSG_PID_DEBUG, h);
ECHO_MV(MSG_PID_DEBUG_INPUT, current_temperature[h]);
ECHO_MV(MSG_PID_DEBUG_OUTPUT, pid_output);
ECHO_MV(MSG_PID_DEBUG_PTERM, pTerm[h]);
ECHO_MV(MSG_PID_DEBUG_ITERM, iTerm[h]);
ECHO_MV(MSG_PID_DEBUG_DTERM, dTerm[h]);
ECHO_SMV(DB, SERIAL_PID_DEBUG, h);
ECHO_MV(SERIAL_PID_DEBUG_INPUT, current_temperature[h]);
ECHO_MV(SERIAL_PID_DEBUG_OUTPUT, pid_output);
ECHO_MV(SERIAL_PID_DEBUG_PTERM, pTerm[h]);
ECHO_MV(SERIAL_PID_DEBUG_ITERM, iTerm[h]);
ECHO_MV(SERIAL_PID_DEBUG_DTERM, dTerm[h]);
#if ENABLED(PID_ADD_EXTRUSION_RATE)
ECHO_MV(MSG_PID_DEBUG_CTERM, cTerm[h]);
ECHO_MV(SERIAL_PID_DEBUG_CTERM, cTerm[h]);
#endif
ECHO_E;
#endif // PID_DEBUG
......@@ -688,7 +688,7 @@ void manage_heater() {
// Has it failed to increase enough?
if (degHotend(h) < watch_target_temp[h]) {
// Stop!
_temp_error(h, PSTR(MSG_T_HEATING_FAILED), PSTR(MSG_HEATING_FAILED_LCD));
_temp_error(h, PSTR(SERIAL_T_HEATING_FAILED), PSTR(MSG_HEATING_FAILED_LCD));
}
else {
// Start again if the target is still far off
......@@ -779,7 +779,7 @@ static float analog2temp(int raw, uint8_t h) {
if (h >= HOTENDS)
#endif
{
ECHO_LVM(ER, (int)h, MSG_INVALID_EXTRUDER_NUM);
ECHO_LVM(ER, (int)h, SERIAL_INVALID_EXTRUDER_NUM);
kill(PSTR(MSG_KILLED));
return 0.0;
}
......@@ -811,6 +811,8 @@ static float analog2temp(int raw, uint8_t h) {
#if HEATER_USES_AD595
return ((raw * ((5.0 * 100.0) / 1024.0) / OVERSAMPLENR) * ad595_gain[h]) + ad595_offset[h];
#else
return 0;
#endif
}
......@@ -1232,7 +1234,7 @@ void tp_init() {
*state = TRRunaway;
break;
case TRRunaway:
_temp_error(heater_id, PSTR(MSG_T_THERMAL_RUNAWAY), PSTR(MSG_THERMAL_RUNAWAY));
_temp_error(heater_id, PSTR(SERIAL_T_THERMAL_RUNAWAY), PSTR(MSG_THERMAL_RUNAWAY));
}
}
......@@ -1846,8 +1848,8 @@ ISR(TIMER0_COMPB_vect) {
#else
#define GEBED >=
#endif
if (current_temperature_bed_raw GEBED bed_maxttemp_raw) _temp_error(-1, PSTR(MSG_T_MAXTEMP), PSTR(MSG_ERR_MAXTEMP_BED));
if (bed_minttemp_raw GEBED current_temperature_bed_raw) _temp_error(-1, PSTR(MSG_T_MINTEMP), PSTR(MSG_ERR_MINTEMP_BED));
if (current_temperature_bed_raw GEBED bed_maxttemp_raw) _temp_error(-1, PSTR(SERIAL_T_MAXTEMP), PSTR(MSG_ERR_MAXTEMP_BED));
if (bed_minttemp_raw GEBED current_temperature_bed_raw) _temp_error(-1, PSTR(SERIAL_T_MINTEMP), PSTR(MSG_ERR_MINTEMP_BED));
#endif
} // temp_count >= OVERSAMPLENR
......
MarlinKimbra/thermistortables.h
View file @ 521315e2
......@@ -666,55 +666,55 @@ This does not match the normal thermistor behaviour so we need to set the follow
#define HEATER_BED_RAW_LO_TEMP 0
#endif
const short temptable_20[][2] PROGMEM = {
{ 0 * OVERSAMPLENR , 0 },
{ 227 * OVERSAMPLENR , 1 },
{ 236 * OVERSAMPLENR , 10 },
{ 245 * OVERSAMPLENR , 20 },
{ 253 * OVERSAMPLENR , 30 },
{ 262 * OVERSAMPLENR , 40 },
{ 270 * OVERSAMPLENR , 50 },
{ 279 * OVERSAMPLENR , 60 },
{ 287 * OVERSAMPLENR , 70 },
{ 295 * OVERSAMPLENR , 80 },
{ 304 * OVERSAMPLENR , 90 },
{ 312 * OVERSAMPLENR , 100 },
{ 320 * OVERSAMPLENR , 110 },
{ 329 * OVERSAMPLENR , 120 },
{ 337 * OVERSAMPLENR , 130 },
{ 345 * OVERSAMPLENR , 140 },
{ 353 * OVERSAMPLENR , 150 },
{ 361 * OVERSAMPLENR , 160 },
{ 369 * OVERSAMPLENR , 170 },
{ 377 * OVERSAMPLENR , 180 },
{ 385 * OVERSAMPLENR , 190 },
{ 393 * OVERSAMPLENR , 200 },
{ 401 * OVERSAMPLENR , 210 },
{ 409 * OVERSAMPLENR , 220 },
{ 417 * OVERSAMPLENR , 230 },
{ 424 * OVERSAMPLENR , 240 },
{ 432 * OVERSAMPLENR , 250 },
{ 440 * OVERSAMPLENR , 260 },
{ 447 * OVERSAMPLENR , 270 },
{ 455 * OVERSAMPLENR , 280 },
{ 463 * OVERSAMPLENR , 290 },
{ 470 * OVERSAMPLENR , 300 },
{ 478 * OVERSAMPLENR , 310 },
{ 485 * OVERSAMPLENR , 320 },
{ 493 * OVERSAMPLENR , 330 },
{ 500 * OVERSAMPLENR , 340 },
{ 507 * OVERSAMPLENR , 350 },
{ 515 * OVERSAMPLENR , 360 },
{ 522 * OVERSAMPLENR , 370 },
{ 529 * OVERSAMPLENR , 380 },
{ 537 * OVERSAMPLENR , 390 },
{ 544 * OVERSAMPLENR , 400 },
{ 614 * OVERSAMPLENR , 500 },
{ 681 * OVERSAMPLENR , 600 },
{ 744 * OVERSAMPLENR , 700 },
{ 805 * OVERSAMPLENR , 800 },
{ 862 * OVERSAMPLENR , 900 },
{ 917 * OVERSAMPLENR , 1000 },
{ 968 * OVERSAMPLENR , 1100 }
{0 * OVERSAMPLENR, 0},
{227 * OVERSAMPLENR, 1},
{236 * OVERSAMPLENR, 10},
{245 * OVERSAMPLENR, 20},
{253 * OVERSAMPLENR, 30},
{262 * OVERSAMPLENR, 40},
{270 * OVERSAMPLENR, 50},
{279 * OVERSAMPLENR, 60},
{287 * OVERSAMPLENR, 70},
{295 * OVERSAMPLENR, 80},
{304 * OVERSAMPLENR, 90},
{312 * OVERSAMPLENR, 100},
{320 * OVERSAMPLENR, 110},
{329 * OVERSAMPLENR, 120},
{337 * OVERSAMPLENR, 130},
{345 * OVERSAMPLENR, 140},
{353 * OVERSAMPLENR, 150},
{361 * OVERSAMPLENR, 160},
{369 * OVERSAMPLENR, 170},
{377 * OVERSAMPLENR, 180},
{385 * OVERSAMPLENR, 190},
{393 * OVERSAMPLENR, 200},
{401 * OVERSAMPLENR, 210},
{409 * OVERSAMPLENR, 220},
{417 * OVERSAMPLENR, 230},
{424 * OVERSAMPLENR, 240},
{432 * OVERSAMPLENR, 250},
{440 * OVERSAMPLENR, 260},
{447 * OVERSAMPLENR, 270},
{455 * OVERSAMPLENR, 280},
{463 * OVERSAMPLENR, 290},
{470 * OVERSAMPLENR, 300},
{478 * OVERSAMPLENR, 310},
{485 * OVERSAMPLENR, 320},
{493 * OVERSAMPLENR, 330},
{500 * OVERSAMPLENR, 340},
{507 * OVERSAMPLENR, 350},
{515 * OVERSAMPLENR, 360},
{522 * OVERSAMPLENR, 370},
{529 * OVERSAMPLENR, 380},
{537 * OVERSAMPLENR, 390},
{544 * OVERSAMPLENR, 400},
{614 * OVERSAMPLENR, 500},
{681 * OVERSAMPLENR, 600},
{744 * OVERSAMPLENR, 700},
{805 * OVERSAMPLENR, 800},
{862 * OVERSAMPLENR, 900},
{917 * OVERSAMPLENR, 1000},
{968 * OVERSAMPLENR, 1100}
};
#endif
#if (THERMISTORHEATER_0 == 51) || (THERMISTORHEATER_1 == 51) || (THERMISTORHEATER_2 == 51) || (THERMISTORHEATER_3 == 51) || (THERMISTORBED == 51)
......
MarlinKimbra/ultralcd.cpp
View file @ 521315e2
......@@ -521,7 +521,7 @@ void lcd_set_home_offsets() {
encoderPosition = 0;
lcdDrawUpdate = 1;
}
if (lcdDrawUpdate) lcd_implementation_drawedit(msg, "");
if (lcdDrawUpdate) lcd_implementation_drawedit(msg, (char*)"");
if (LCD_CLICKED) lcd_goto_menu(lcd_tune_menu);
}
static void lcd_babystep_x() { _lcd_babystep(X_AXIS, PSTR(MSG_BABYSTEPPING_X)); }
......@@ -1740,7 +1740,10 @@ static void menu_action_function(menuFunc_t func) { (*func)(); }
#endif // SDSUPPORT
static void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { *ptr = !(*ptr); }
static void menu_action_setting_edit_bool(const char* pstr, bool* ptr) {
*ptr = !(*ptr);
}
static void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr, menuFunc_t callback) {
menu_action_setting_edit_bool(pstr, ptr);
(*callback)();
......
MarlinKimbra/ultralcd.h
View file @ 521315e2
......@@ -73,11 +73,18 @@
#define EN_C BIT(BLEN_C)
#define EN_B BIT(BLEN_B)
#define EN_A BIT(BLEN_A)
#define LCD_CLICKED (buttons&EN_C)
#if ENABLED(INVERT_CLICK_BUTTON)
#define LCD_CLICKED !(buttons&EN_C)
#else
#define LCD_CLICKED (buttons&EN_C)
#endif
#if ENABLED(BTN_BACK) && BTN_BACK > 0
#define EN_D BIT(BLEN_D)
#define LCD_BACK_CLICKED (buttons&EN_D)
#if ENABLED(INVERT_BACK_BUTTON)
#define LCD_BACK_CLICKED !(buttons&EN_D)
#else
#define LCD_BACK_CLICKED (buttons&EN_D)
#endif
#endif
#if ENABLED(REPRAPWORLD_KEYPAD)
#define EN_REPRAPWORLD_KEYPAD_F3 (BIT(BLEN_REPRAPWORLD_KEYPAD_F3))
......@@ -88,8 +95,11 @@
#define EN_REPRAPWORLD_KEYPAD_MIDDLE (BIT(BLEN_REPRAPWORLD_KEYPAD_MIDDLE))
#define EN_REPRAPWORLD_KEYPAD_DOWN (BIT(BLEN_REPRAPWORLD_KEYPAD_DOWN))
#define EN_REPRAPWORLD_KEYPAD_LEFT (BIT(BLEN_REPRAPWORLD_KEYPAD_LEFT))
#define LCD_CLICKED ((buttons&EN_C) || (buttons_reprapworld_keypad&EN_REPRAPWORLD_KEYPAD_F1))
#if ENABLED(INVERT_CLICK_BUTTON)
#define LCD_CLICKED !((buttons&EN_C) || (buttons_reprapworld_keypad&EN_REPRAPWORLD_KEYPAD_F1))
#else
#define LCD_CLICKED ((buttons&EN_C) || (buttons_reprapworld_keypad&EN_REPRAPWORLD_KEYPAD_F1))
#endif
#define REPRAPWORLD_KEYPAD_MOVE_Z_UP (buttons_reprapworld_keypad&EN_REPRAPWORLD_KEYPAD_F2)
#define REPRAPWORLD_KEYPAD_MOVE_Z_DOWN (buttons_reprapworld_keypad&EN_REPRAPWORLD_KEYPAD_F3)
#define REPRAPWORLD_KEYPAD_MOVE_X_LEFT (buttons_reprapworld_keypad&EN_REPRAPWORLD_KEYPAD_LEFT)
......
MarlinKimbra/ultralcd_implementation_hitachi_HD44780.h
View file @ 521315e2
......@@ -54,9 +54,18 @@
#if ENABLED(BTN_ENC) && BTN_ENC > -1
// the pause/stop/restart button is connected to BTN_ENC when used
#define B_ST (EN_C) // Map the pause/stop/resume button into its normalized functional name
#define LCD_CLICKED (buttons&(B_MI|B_RI|B_ST)) // pause/stop button also acts as click until we implement proper pause/stop.
#if ENABLED(INVERT_CLICK_BUTTON)
#define LCD_CLICKED !(buttons&(B_MI|B_RI|B_ST)) // pause/stop button also acts as click until we implement proper pause/stop.
#else
#define LCD_CLICKED (buttons&(B_MI|B_RI|B_ST)) // pause/stop button also acts as click until we implement proper pause/stop.
#endif
#else
#define LCD_CLICKED (buttons&(B_MI|B_RI))
#if ENABLED(INVERT_CLICK_BUTTON)
#define LCD_CLICKED !(buttons&(B_MI|B_RI))
#else
#define LCD_CLICKED (buttons&(B_MI|B_RI))
#endif
#endif
// I2C buttons take too long to read inside an interrupt context and so we read them during lcd_update
......@@ -69,12 +78,20 @@
#define B_MI (PANELOLU2_ENCODER_C<<B_I2C_BTN_OFFSET) // requires LiquidTWI2 library v1.2.3 or later
#define LCD_CLICKED (buttons&B_MI)
#if ENABLED(INVERT_CLICK_BUTTON)
#define LCD_CLICKED !(buttons&B_MI)
#else
#define LCD_CLICKED (buttons&B_MI)
#endif
// I2C buttons take too long to read inside an interrupt context and so we read them during lcd_update
#define LCD_HAS_SLOW_BUTTONS
#else
#define LCD_CLICKED (buttons&EN_C)
#if ENABLED(INVERT_CLICK_BUTTON)
#define LCD_CLICKED !(buttons&EN_C)
#else
#define LCD_CLICKED (buttons&EN_C)
#endif
#endif
#elif ENABLED(REPRAPWORLD_KEYPAD)
......@@ -99,15 +116,29 @@
#define EN_REPRAPWORLD_KEYPAD_DOWN BIT((BLEN_REPRAPWORLD_KEYPAD_DOWN+REPRAPWORLD_BTN_OFFSET))
#define EN_REPRAPWORLD_KEYPAD_LEFT BIT((BLEN_REPRAPWORLD_KEYPAD_LEFT+REPRAPWORLD_BTN_OFFSET))
//#define LCD_CLICKED ((buttons&EN_C) || (buttons&EN_REPRAPWORLD_KEYPAD_F1))
/*
#if ENABLED(INVERT_CLICK_BUTTON)
#define LCD_CLICKED !((buttons&EN_C) || (buttons&EN_REPRAPWORLD_KEYPAD_F1))
#else
#define LCD_CLICKED ((buttons&EN_C) || (buttons&EN_REPRAPWORLD_KEYPAD_F1))
#endif
*/
//#define REPRAPWORLD_KEYPAD_MOVE_Y_DOWN (buttons&EN_REPRAPWORLD_KEYPAD_DOWN)
//#define REPRAPWORLD_KEYPAD_MOVE_Y_UP (buttons&EN_REPRAPWORLD_KEYPAD_UP)
//#define REPRAPWORLD_KEYPAD_MOVE_HOME (buttons&EN_REPRAPWORLD_KEYPAD_MIDDLE)
#elif ENABLED(NEWPANEL)
#define LCD_CLICKED (buttons&EN_C)
#if ENABLED(INVERT_CLICK_BUTTON)
#define LCD_CLICKED !(buttons&EN_C)
#else
#define LCD_CLICKED (buttons&EN_C)
#endif
#if HAS(BTN_BACK)
#define LCD_BACK_CLICKED (buttons&EN_D)
#if ENABLED(INVERT_BACK_BUTTON)
#define LCD_BACK_CLICKED !(buttons&EN_D)
#else
#define LCD_BACK_CLICKED (buttons&EN_D)
#endif
#endif
#else // old style ULTIPANEL
......@@ -128,7 +159,11 @@
#define B_RI BIT(BL_RI)
#define B_ST BIT(BL_ST)
#define LCD_CLICKED (buttons&(B_MI|B_ST))
#if ENABLED(INVERT_CLICK_BUTTON)
#define LCD_CLICKED !(buttons&(B_MI|B_ST))
#else
#define LCD_CLICKED (buttons&(B_MI|B_ST))
#endif
#endif
#endif //ULTIPANEL
......
MarlinKimbra/ultralcd_st7920_u8glib_rrd.h
View file @ 521315e2
......@@ -111,7 +111,7 @@ u8g_dev_t u8g_dev_st7920_128x64_rrd_sw_spi = {u8g_dev_rrd_st7920_128x64_fn, &u8g
class U8GLIB_ST7920_128X64_RRD : public U8GLIB {
public:
U8GLIB_ST7920_128X64_RRD(uint8_t dummy) : U8GLIB(&u8g_dev_st7920_128x64_rrd_sw_spi) {}
U8GLIB_ST7920_128X64_RRD(int dummy) : U8GLIB(&u8g_dev_st7920_128x64_rrd_sw_spi) {}
};
......
README.md
View file @ 521315e2
<img align="right" src="Documentation/Logo/MarlinKimbra%20Logo%20GitHub.png" />
# MarlinKimbra 3D Printer Firmware
## Version 4.2.0 dev
## Version 4.2.2 dev
### Special thanks
* all Marlin8bit-developers.
......
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