jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix-2.1.x' into pr/26754

Browse Source
This commit is contained in:
Scott Lahteine
2024-06-02 14:26:36 -05:00
parent dbf0f5faec 95f81d2565
commit 81e4698097
28 changed files with 272 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/Configuration_adv.h
+2 -8
View File
@@ -1185,20 +1185,14 @@
* Zero Vibration (ZV) Input Shaping for X and/or Y movements.
*
* This option uses a lot of SRAM for the step buffer. The buffer size is
* calculated automatically from SHAPING_FREQ_[XY], DEFAULT_AXIS_STEPS_PER_UNIT,
* calculated automatically from SHAPING_FREQ_[XYZ], DEFAULT_AXIS_STEPS_PER_UNIT,
* DEFAULT_MAX_FEEDRATE and ADAPTIVE_STEP_SMOOTHING. The default calculation can
* be overridden by setting SHAPING_MIN_FREQ and/or SHAPING_MAX_FEEDRATE.
* The higher the frequency and the lower the feedrate, the smaller the buffer.
* If the buffer is too small at runtime, input shaping will have reduced
* effectiveness during high speed movements.
*
* Tune with M593 D<factor> F<frequency>:
*
* D<factor> Set the zeta/damping factor. If axes (X, Y, etc.) are not specified, set for all axes.
* F<frequency> Set the frequency. If axes (X, Y, etc.) are not specified, set for all axes.
* T[map] Input Shaping type, 0:ZV, 1:EI, 2:2H EI (not implemented yet)
* X<1> Set the given parameters only for the X axis.
* Y<1> Set the given parameters only for the Y axis.
* Tune with M593 D<factor> F<frequency>
*/
//#define INPUT_SHAPING_X
//#define INPUT_SHAPING_Y
Marlin/Version.h
+1 -1
View File
@@ -41,7 +41,7 @@
* here we define this default string as the date where the latest release
* version was tagged.
*/
//#define STRING_DISTRIBUTION_DATE "2024-05-21"
//#define STRING_DISTRIBUTION_DATE "2024-05-29"
/**
* Defines a generic printer name to be output to the LCD after booting Marlin.
Marlin/src/core/macros.h
+3 -3
View File
@@ -197,8 +197,8 @@
#define ENABLED(V...) DO(ENA,&&,V)
#define DISABLED(V...) DO(DIS,&&,V)
#define ANY(V...) !DISABLED(V)
#define ALL ENABLED
#define NONE DISABLED
#define ALL(V...) ENABLED(V)
#define NONE(V...) DISABLED(V)
#define COUNT_ENABLED(V...) DO(ENA,+,V)
#define MANY(V...) (COUNT_ENABLED(V) > 1)
@@ -630,7 +630,7 @@
#define DEFER4(M) M EMPTY EMPTY EMPTY EMPTY()()()()
// Force define expansion
#define EVAL EVAL16
#define EVAL(V...) EVAL16(V)
#define EVAL4096(V...) EVAL2048(EVAL2048(V))
#define EVAL2048(V...) EVAL1024(EVAL1024(V))
#define EVAL1024(V...) EVAL512(EVAL512(V))
Marlin/src/gcode/gcode.cpp
+4
View File
@@ -1110,6 +1110,10 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
case 1002: M1002(); break; // M1002: [INTERNAL] Tool-change and Relative E Move
#endif
#if ENABLED(ONE_CLICK_PRINT)
case 1003: M1003(); break; // M1003: [INTERNAL] Set the current dir to /
#endif
#if ENABLED(UBL_MESH_WIZARD)
case 1004: M1004(); break; // M1004: UBL Mesh Wizard
#endif
Marlin/src/gcode/gcode.h
+4
View File
@@ -1276,6 +1276,10 @@ private:
static void M1002();
#endif
#if ENABLED(ONE_CLICK_PRINT)
static void M1003();
#endif
#if ENABLED(UBL_MESH_WIZARD)
static void M1004();
#endif
Marlin/src/gcode/sd/M1003.cpp
+36
View File
@@ -0,0 +1,36 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
#include "../../inc/MarlinConfig.h"
#if ENABLED(ONE_CLICK_PRINT)
#include "../gcode.h"
#include "../../sd/cardreader.h"
/**
* M1003: Set the current dir to /. Should come after 'M24'.
* Prevents the SD menu getting stuck in the newest file's workDir.
*/
void GcodeSuite::M1003() { card.cdroot(); }
#endif // ONE_CLICK_PRINT
Marlin/src/inc/Version.h
+1 -1
View File
@@ -42,7 +42,7 @@
* version was tagged.
*/
#ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2024-05-21"
#define STRING_DISTRIBUTION_DATE "2024-05-29"
#endif
/**
Marlin/src/lcd/e3v2/proui/dwin.cpp
+3 -3
View File
@@ -3316,7 +3316,7 @@ void drawFilSetMenu() {
if (SET_MENU(filSetMenu, MSG_FILAMENT_SET, 9)) {
BACK_ITEM(drawAdvancedSettingsMenu);
#if HAS_FILAMENT_SENSOR
EDIT_ITEM(ICON_Runout, MSG_RUNOUT_ENABLE, onDrawChkbMenu, setRunoutEnable, &runout.enabled);
EDIT_ITEM(ICON_Runout, MSG_RUNOUT_SENSOR, onDrawChkbMenu, setRunoutEnable, &runout.enabled);
#endif
#if HAS_FILAMENT_RUNOUT_DISTANCE
EDIT_ITEM(ICON_Runout, MSG_RUNOUT_DISTANCE_MM, onDrawPFloatMenu, setRunoutDistance, &runout.runout_distance());
@@ -3407,7 +3407,7 @@ void drawTuneMenu() {
MENU_ITEM(ICON_FilMan, MSG_FILAMENTCHANGE, onDrawMenuItem, changeFilament);
#endif
#if HAS_FILAMENT_SENSOR
EDIT_ITEM(ICON_Runout, MSG_RUNOUT_ENABLE, onDrawChkbMenu, setRunoutEnable, &runout.enabled);
EDIT_ITEM(ICON_Runout, MSG_RUNOUT_SENSOR, onDrawChkbMenu, setRunoutEnable, &runout.enabled);
#endif
#if ENABLED(PROUI_ITEM_PLR)
EDIT_ITEM(ICON_Pwrlossr, MSG_OUTAGE_RECOVERY, onDrawChkbMenu, setPwrLossr, &recovery.enabled);
@@ -3487,7 +3487,7 @@ void drawTuneMenu() {
void drawInputShaping_menu() {
checkkey = ID_Menu;
if (SET_MENU(inputShapingMenu, MSG_INPUT_SHAPING, 5)) {
if (SET_MENU(inputShapingMenu, MSG_INPUT_SHAPING, 1 PLUS_TERN0(INPUT_SHAPING_X, 2) PLUS_TERN0(INPUT_SHAPING_Y, 2) PLUS_TERN0(INPUT_SHAPING_Z, 2))) {
BACK_ITEM(drawMotionMenu);
#if ENABLED(INPUT_SHAPING_X)
MENU_ITEM(ICON_ShapingX, MSG_SHAPING_A_FREQ, onDrawShapingXFreq, setShapingXFreq);
Marlin/src/lcd/extui/dgus_e3s1pro/DGUSDisplay.cpp
+2 -2
View File
@@ -337,8 +337,8 @@ void DGUSDisplay::processRx() {
size_t DGUSDisplay::getFreeTxBuffer() {
return (
#ifdef LCD_SERIAL_GET_TX_BUFFER_FREE
LCD_SERIAL_GET_TX_BUFFER_FREE()
#ifdef LCD_SERIAL_TX_BUFFER_FREE
LCD_SERIAL_TX_BUFFER_FREE()
#else
SIZE_MAX
#endif
Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp
+2 -2
View File
@@ -334,8 +334,8 @@ void DGUSDisplay::processRx() {
size_t DGUSDisplay::getFreeTxBuffer() {
return (
#ifdef LCD_SERIAL_GET_TX_BUFFER_FREE
LCD_SERIAL_GET_TX_BUFFER_FREE()
#ifdef LCD_SERIAL_TX_BUFFER_FREE
LCD_SERIAL_TX_BUFFER_FREE()
#else
SIZE_MAX
#endif
Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp
+1 -1
View File
@@ -50,7 +50,7 @@ namespace ExtUI {
screen.printerKilled(error, component);
}
void onMediaMounted() { TERN_(HAS_MEDIA, screen.sdCardInserted()); }
void onMediaMounted() { TERN_(HAS_MEDIA, screen.sdCardInserted()); }
void onMediaError() { TERN_(HAS_MEDIA, screen.sdCardError()); }
void onMediaRemoved() { TERN_(HAS_MEDIA, screen.sdCardRemoved()); }
Marlin/src/lcd/language/language_de.h
+24 -27
View File
@@ -85,9 +85,9 @@ namespace LanguageNarrow_de {
LSTR MSG_LEVEL_BED_DONE = _UxGT("Nivellieren fertig!");
LSTR MSG_Z_FADE_HEIGHT = _UxGT("Ausblendhöhe");
LSTR MSG_SET_HOME_OFFSETS = _UxGT("Setze Homeversatz");
LSTR MSG_HOME_OFFSET_X = _UxGT("Homeversatz X");
LSTR MSG_HOME_OFFSET_Y = _UxGT("Homeversatz Y");
LSTR MSG_HOME_OFFSET_Z = _UxGT("Homeversatz Z");
LSTR MSG_HOME_OFFSET_X = _UxGT("Homeversatz X"); // DWIN
LSTR MSG_HOME_OFFSET_Y = _UxGT("Homeversatz Y"); // DWIN
LSTR MSG_HOME_OFFSET_Z = _UxGT("Homeversatz Z"); // DWIN
LSTR MSG_HOME_OFFSETS_APPLIED = _UxGT("Homeversatz aktiv");
LSTR MSG_TRAMMING_WIZARD = _UxGT("Tramming Assistent");
LSTR MSG_SELECT_ORIGIN = _UxGT("Wählen Sie Ursprung");
@@ -590,30 +590,30 @@ namespace LanguageNarrow_de {
LSTR MSG_CASE_LIGHT_BRIGHTNESS = _UxGT("Helligkeit");
LSTR MSG_KILL_EXPECTED_PRINTER = _UxGT("Falscher Drucker");
LSTR MSG_COLORS_GET = _UxGT("Farbe");
LSTR MSG_COLORS_SELECT = _UxGT("Farben auswählen");
LSTR MSG_COLORS_APPLIED = _UxGT("Farben verwenden");
LSTR MSG_COLORS_RED = _UxGT("Rot");
LSTR MSG_COLORS_GREEN = _UxGT("Grün");
LSTR MSG_COLORS_BLUE = _UxGT("Blau");
LSTR MSG_COLORS_WHITE = _UxGT("Weiß");
LSTR MSG_UI_LANGUAGE = _UxGT("UI Sprache");
LSTR MSG_SOUND_ENABLE = _UxGT("Ton aktivieren");
LSTR MSG_LOCKSCREEN = _UxGT("Bildschirm sperren");
LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Drucker ist gesperrt,");
LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Scrollen zum Entsper.");
LSTR MSG_COLORS_GET = _UxGT("Farbe"); // ProUI
LSTR MSG_COLORS_SELECT = _UxGT("Farben auswählen"); // ProUI
LSTR MSG_COLORS_APPLIED = _UxGT("Farben verwenden"); // ProUI
LSTR MSG_COLORS_RED = _UxGT("Rot"); // ProUI / JyersUI
LSTR MSG_COLORS_GREEN = _UxGT("Grün"); // ProUI / JyersUI
LSTR MSG_COLORS_BLUE = _UxGT("Blau"); // ProUI / JyersUI
LSTR MSG_COLORS_WHITE = _UxGT("Weiß"); // ProUI
LSTR MSG_UI_LANGUAGE = _UxGT("UI Sprache"); // ProUI
LSTR MSG_SOUND_ENABLE = _UxGT("Ton aktivieren"); // ProUI
LSTR MSG_LOCKSCREEN = _UxGT("Bildschirm sperren"); // ProUI
LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Drucker ist gesperrt,"); // ProUI
LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Scrollen zum Entsper."); // ProUI
LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Auf Neustart warten"); // ProUI
LSTR MSG_PLEASE_PREHEAT = _UxGT("Bitte vorheizen"); // ProUI
LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Auf Neustart warten");
LSTR MSG_PLEASE_PREHEAT = _UxGT("Bitte vorheizen");
LSTR MSG_INFO_PRINT_COUNT = _UxGT("Drucke");
LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Komplette");
LSTR MSG_INFO_PRINT_TIME = _UxGT("Gesamte");
LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Längste");
LSTR MSG_INFO_PRINT_FILAMENT = _UxGT("Extrud.");
LSTR MSG_INFO_MIN_TEMP = _UxGT("Min Temp");
LSTR MSG_INFO_MAX_TEMP = _UxGT("Max Temp");
LSTR MSG_INFO_PSU = _UxGT("Netzteil");
LSTR MSG_DRIVE_STRENGTH = _UxGT("Motorleistung");
LSTR MSG_DAC_PERCENT_N = _UxGT("@ Treiber %");
LSTR MSG_ERROR_TMC = _UxGT("TMC Verbindungsfehler");
@@ -625,14 +625,11 @@ namespace LanguageNarrow_de {
LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER = _UxGT("FORTS. OPTIONEN:");
LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE = _UxGT("Mehr entladen");
LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME = _UxGT("Druck weiter");
LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Löschen o. fortfah.?");
LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Löschen o. fortfah.?"); // ProUI
LSTR MSG_FILAMENT_CHANGE_NOZZLE = _UxGT(" Düse: ");
LSTR MSG_RUNOUT_SENSOR = _UxGT("Runout-Sensor");
LSTR MSG_RUNOUT_DISTANCE_MM = _UxGT("Runout-Weg mm");
LSTR MSG_RUNOUT_ENABLE = _UxGT("Runout aktivieren");
LSTR MSG_RUNOUT_ACTIVE = _UxGT("Runout aktiv");
LSTR MSG_INVERT_EXTRUDER = _UxGT("Invert Extruder");
LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Extruder Min Temp.");
LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Extruder Min Temp."); // ProUI
LSTR MSG_FANCHECK = _UxGT("Lüftergeschw. prüfen");
LSTR MSG_KILL_HOMING_FAILED = _UxGT("Homing gescheitert");
LSTR MSG_LCD_PROBING_FAILED = _UxGT("Probing gescheitert");
@@ -764,10 +761,10 @@ namespace LanguageNarrow_de {
namespace LanguageWide_de {
using namespace LanguageNarrow_de;
#if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Kein Medium eingelegt.");
LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Bitte auf Neustart warten.");
LSTR MSG_PLEASE_PREHEAT = _UxGT("Bitte das Hotend vorheizen.");
LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Druckzähler zurücksetzen");
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Kein Medium eingelegt."); // ProUI
LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Bitte auf Neustart warten."); // ProUI
LSTR MSG_PLEASE_PREHEAT = _UxGT("Bitte das Hotend vorheizen."); // ProUI
LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Druckzähler zurücksetzen"); // ProUI
LSTR MSG_INFO_PRINT_COUNT = _UxGT("Gesamte Drucke");
LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Komplette Drucke");
LSTR MSG_INFO_PRINT_TIME = _UxGT("Gesamte Druckzeit");
Marlin/src/lcd/language/language_en.h
+30 -33
View File
@@ -109,9 +109,9 @@ namespace LanguageNarrow_en {
LSTR MSG_LEVEL_BED_DONE = _UxGT("Leveling Done!");
LSTR MSG_Z_FADE_HEIGHT = _UxGT("Fade Height");
LSTR MSG_SET_HOME_OFFSETS = _UxGT("Set Home Offsets");
LSTR MSG_HOME_OFFSET_X = _UxGT("Home Offset X");
LSTR MSG_HOME_OFFSET_Y = _UxGT("Home Offset Y");
LSTR MSG_HOME_OFFSET_Z = _UxGT("Home Offset Z");
LSTR MSG_HOME_OFFSET_X = _UxGT("Home Offset X"); // DWIN
LSTR MSG_HOME_OFFSET_Y = _UxGT("Home Offset Y"); // DWIN
LSTR MSG_HOME_OFFSET_Z = _UxGT("Home Offset Z"); // DWIN
LSTR MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets Applied");
LSTR MSG_ERR_M428_TOO_FAR = _UxGT("MIN/MAX Too Far");
LSTR MSG_TRAMMING_WIZARD = _UxGT("Tramming Wizard");
@@ -425,12 +425,12 @@ namespace LanguageNarrow_en {
LSTR MSG_SHAPING_DISABLE = _UxGT("Disable @ shaping");
LSTR MSG_SHAPING_FREQ = _UxGT("@ frequency");
LSTR MSG_SHAPING_ZETA = _UxGT("@ damping");
LSTR MSG_SHAPING_A_FREQ = STR_A _UxGT(" frequency");
LSTR MSG_SHAPING_B_FREQ = STR_B _UxGT(" frequency");
LSTR MSG_SHAPING_A_ZETA = STR_A _UxGT(" damping ");
LSTR MSG_SHAPING_B_ZETA = STR_B _UxGT(" damping ");
LSTR MSG_SHAPING_X_ENABLE = _UxGT("Enable X shaping");
LSTR MSG_SHAPING_Y_ENABLE = _UxGT("Enable Y shaping");
LSTR MSG_SHAPING_A_FREQ = STR_A _UxGT(" frequency"); // ProUI
LSTR MSG_SHAPING_B_FREQ = STR_B _UxGT(" frequency"); // ProUI
LSTR MSG_SHAPING_C_FREQ = STR_C _UxGT(" frequency"); // ProUI
LSTR MSG_SHAPING_A_ZETA = STR_A _UxGT(" damping"); // ProUI
LSTR MSG_SHAPING_B_ZETA = STR_B _UxGT(" damping"); // ProUI
LSTR MSG_SHAPING_C_ZETA = STR_C _UxGT(" damping"); // ProUI
LSTR MSG_XY_FREQUENCY_LIMIT = _UxGT("XY Freq Limit");
LSTR MSG_XY_FREQUENCY_FEEDRATE = _UxGT("Min FR Factor");
LSTR MSG_STEPS_PER_MM = _UxGT("Steps/mm");
@@ -679,31 +679,31 @@ namespace LanguageNarrow_en {
LSTR MSG_CASE_LIGHT_BRIGHTNESS = _UxGT("Light Brightness");
LSTR MSG_KILL_EXPECTED_PRINTER = _UxGT("INCORRECT PRINTER");
LSTR MSG_COLORS_GET = _UxGT("Get Color");
LSTR MSG_COLORS_SELECT = _UxGT("Select Colors");
LSTR MSG_COLORS_APPLIED = _UxGT("Colors applied");
LSTR MSG_COLORS_RED = _UxGT("Red");
LSTR MSG_COLORS_GREEN = _UxGT("Green");
LSTR MSG_COLORS_BLUE = _UxGT("Blue");
LSTR MSG_COLORS_WHITE = _UxGT("White");
LSTR MSG_UI_LANGUAGE = _UxGT("UI Language");
LSTR MSG_SOUND_ENABLE = _UxGT("Enable sound");
LSTR MSG_LOCKSCREEN = _UxGT("Lock Screen");
LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Printer is Locked,");
LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Scroll to unlock.");
LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Please wait until reboot.");
LSTR MSG_COLORS_GET = _UxGT("Get Color"); // ProUI
LSTR MSG_COLORS_SELECT = _UxGT("Select Colors"); // ProUI
LSTR MSG_COLORS_APPLIED = _UxGT("Colors applied"); // ProUI
LSTR MSG_COLORS_RED = _UxGT("Red"); // ProUI / JyersUI
LSTR MSG_COLORS_GREEN = _UxGT("Green"); // ProUI / JyersUI
LSTR MSG_COLORS_BLUE = _UxGT("Blue"); // ProUI / JyersUI
LSTR MSG_COLORS_WHITE = _UxGT("White"); // ProUI
LSTR MSG_UI_LANGUAGE = _UxGT("UI Language"); // ProUI
LSTR MSG_SOUND_ENABLE = _UxGT("Enable sound"); // ProUI
LSTR MSG_LOCKSCREEN = _UxGT("Lock Screen"); // ProUI
LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Printer is Locked,"); // ProUI
LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Scroll to unlock."); // ProUI
LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Please wait for reboot."); // ProUI
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("No Media"); // ProUI
LSTR MSG_PLEASE_PREHEAT = _UxGT("Please Preheat"); // ProUI
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("No Media");
LSTR MSG_PLEASE_PREHEAT = _UxGT("Please Preheat");
LSTR MSG_INFO_PRINT_COUNT = _UxGT("Prints");
LSTR MSG_INFO_PRINT_TIME = _UxGT("Total");
LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Longest");
LSTR MSG_INFO_PRINT_FILAMENT = _UxGT("Extruded");
LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Completed");
LSTR MSG_INFO_MIN_TEMP = _UxGT("Min Temp");
LSTR MSG_INFO_MAX_TEMP = _UxGT("Max Temp");
LSTR MSG_INFO_PSU = _UxGT("PSU");
LSTR MSG_DRIVE_STRENGTH = _UxGT("Drive Strength");
LSTR MSG_DAC_PERCENT_N = _UxGT("@ Driver %");
LSTR MSG_ERROR_TMC = _UxGT("TMC CONNECTION ERROR");
@@ -715,14 +715,11 @@ namespace LanguageNarrow_en {
LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER = _UxGT("RESUME OPTIONS:");
LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE = _UxGT("Purge more");
LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME = _UxGT("Continue");
LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Purge or Continue?");
LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Purge or Continue?"); // ProUI
LSTR MSG_FILAMENT_CHANGE_NOZZLE = _UxGT(" Nozzle: ");
LSTR MSG_RUNOUT_SENSOR = _UxGT("Runout Sensor");
LSTR MSG_RUNOUT_DISTANCE_MM = _UxGT("Runout Dist mm");
LSTR MSG_RUNOUT_ENABLE = _UxGT("Enable Runout");
LSTR MSG_RUNOUT_ACTIVE = _UxGT("Runout Active");
LSTR MSG_INVERT_EXTRUDER = _UxGT("Invert Extruder");
LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Extruder Min Temp.");
LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Extruder Min Temp."); // ProUI
LSTR MSG_FANCHECK = _UxGT("Fan Tacho Check");
LSTR MSG_KILL_HOMING_FAILED = _UxGT("Homing Failed");
LSTR MSG_LCD_PROBING_FAILED = _UxGT("Probing Failed");
@@ -921,9 +918,9 @@ namespace LanguageWide_en {
LSTR MSG_MEDIA_MENU = _UxGT("Select from ") MEDIA_TYPE_EN;
LSTR MSG_TURN_OFF = _UxGT("Turn off the printer");
LSTR MSG_END_LOOPS = _UxGT("End Repeat Loops");
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("No media inserted.");
LSTR MSG_PLEASE_PREHEAT = _UxGT("Please preheat the hot end.");
LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Reset Print Count");
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("No media inserted."); // ProUI
LSTR MSG_PLEASE_PREHEAT = _UxGT("Please preheat the hot end."); // ProUI
LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Reset Print Count"); // ProUI
LSTR MSG_INFO_PRINT_COUNT = _UxGT("Print Count");
LSTR MSG_INFO_PRINT_TIME = _UxGT("Print Time");
LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Longest Job Time");
Marlin/src/lcd/language/language_fr.h
+3 -3
View File
@@ -69,9 +69,9 @@ namespace LanguageNarrow_fr {
LSTR MSG_LEVEL_BED_DONE = _UxGT("Mise à niveau OK!");
LSTR MSG_Z_FADE_HEIGHT = _UxGT("Hauteur lissée");
LSTR MSG_SET_HOME_OFFSETS = _UxGT("Régl. décal origine");
LSTR MSG_HOME_OFFSET_X = _UxGT("Décal. origine X");
LSTR MSG_HOME_OFFSET_Y = _UxGT("Décal. origine Y");
LSTR MSG_HOME_OFFSET_Z = _UxGT("Décal. origine Z");
LSTR MSG_HOME_OFFSET_X = _UxGT("Décal. origine X"); // DWIN
LSTR MSG_HOME_OFFSET_Y = _UxGT("Décal. origine Y"); // DWIN
LSTR MSG_HOME_OFFSET_Z = _UxGT("Décal. origine Z"); // DWIN
LSTR MSG_HOME_OFFSETS_APPLIED = _UxGT("Décalages appliqués");
LSTR MSG_TRAMMING_WIZARD = _UxGT("Assistant Molettes");
LSTR MSG_SELECT_ORIGIN = _UxGT("Molette du lit"); // Not a selection of the origin
Marlin/src/lcd/language/language_fr_na.h
+3 -3
View File
@@ -69,9 +69,9 @@ namespace LanguageNarrow_fr_na {
LSTR MSG_LEVEL_BED_DONE = _UxGT("Mise a niveau OK!");
LSTR MSG_Z_FADE_HEIGHT = _UxGT("Hauteur lissee");
LSTR MSG_SET_HOME_OFFSETS = _UxGT("Regl. decal origine");
LSTR MSG_HOME_OFFSET_X = _UxGT("Decal. origine X");
LSTR MSG_HOME_OFFSET_Y = _UxGT("Decal. origine Y");
LSTR MSG_HOME_OFFSET_Z = _UxGT("Decal. origine Z");
LSTR MSG_HOME_OFFSET_X = _UxGT("Decal. origine X"); // DWIN
LSTR MSG_HOME_OFFSET_Y = _UxGT("Decal. origine Y"); // DWIN
LSTR MSG_HOME_OFFSET_Z = _UxGT("Decal. origine Z"); // DWIN
LSTR MSG_HOME_OFFSETS_APPLIED = _UxGT("Decalages appliques");
LSTR MSG_TRAMMING_WIZARD = _UxGT("Assistant Molettes");
LSTR MSG_SELECT_ORIGIN = _UxGT("Molette du lit"); // Not a selection of the origin
Marlin/src/lcd/language/language_hu.h
+3 -3
View File
@@ -76,9 +76,9 @@ namespace LanguageNarrow_hu {
LSTR MSG_LEVEL_BED_DONE = _UxGT("Szintezés kész!");
LSTR MSG_Z_FADE_HEIGHT = _UxGT("Szint csökkentés");
LSTR MSG_SET_HOME_OFFSETS = _UxGT("Kezdöpont eltolás");
LSTR MSG_HOME_OFFSET_X = _UxGT("X Kezdö eltol.");
LSTR MSG_HOME_OFFSET_Y = _UxGT("Y Kezdö eltol.");
LSTR MSG_HOME_OFFSET_Z = _UxGT("Z Kezdö eltol.");
LSTR MSG_HOME_OFFSET_X = _UxGT("X Kezdö eltol."); // DWIN
LSTR MSG_HOME_OFFSET_Y = _UxGT("Y Kezdö eltol."); // DWIN
LSTR MSG_HOME_OFFSET_Z = _UxGT("Z Kezdö eltol."); // DWIN
LSTR MSG_HOME_OFFSETS_APPLIED = _UxGT("Eltolás beállítva.");
LSTR MSG_TRAMMING_WIZARD = _UxGT("Elektromos varázsló");
LSTR MSG_SELECT_ORIGIN = _UxGT("Eredeti választása");
Marlin/src/lcd/language/language_it.h
+31 -33
View File
@@ -102,9 +102,9 @@ namespace LanguageNarrow_it {
LSTR MSG_LEVEL_BED_DONE = _UxGT("Livel. terminato!");
LSTR MSG_Z_FADE_HEIGHT = _UxGT("Dissolvi altezza");
LSTR MSG_SET_HOME_OFFSETS = _UxGT("Imp. offset home");
LSTR MSG_HOME_OFFSET_X = _UxGT("Offset home X");
LSTR MSG_HOME_OFFSET_Y = _UxGT("Offset home Y");
LSTR MSG_HOME_OFFSET_Z = _UxGT("Offset home Z");
LSTR MSG_HOME_OFFSET_X = _UxGT("Offset home X"); // DWIN
LSTR MSG_HOME_OFFSET_Y = _UxGT("Offset home Y"); // DWIN
LSTR MSG_HOME_OFFSET_Z = _UxGT("Offset home Z"); // DWIN
LSTR MSG_HOME_OFFSETS_APPLIED = _UxGT("Offset applicato");
LSTR MSG_ERR_M428_TOO_FAR = _UxGT("Err: Troppo lontano!");
LSTR MSG_TRAMMING_WIZARD = _UxGT("Wizard Tramming");
@@ -403,12 +403,12 @@ namespace LanguageNarrow_it {
LSTR MSG_SHAPING_DISABLE = _UxGT("Disabil. shaping @");
LSTR MSG_SHAPING_FREQ = _UxGT("Frequenza @");
LSTR MSG_SHAPING_ZETA = _UxGT("Smorzamento @");
LSTR MSG_SHAPING_A_FREQ = _UxGT("Frequenza ") STR_A;
LSTR MSG_SHAPING_B_FREQ = _UxGT("Frequenza ") STR_B;
LSTR MSG_SHAPING_A_ZETA = _UxGT("Smorzamento ") STR_A _UxGT(" ");
LSTR MSG_SHAPING_B_ZETA = _UxGT("Smorzamento ") STR_B _UxGT(" ");
LSTR MSG_SHAPING_X_ENABLE = _UxGT("Abilita shaping X");
LSTR MSG_SHAPING_Y_ENABLE = _UxGT("Abilita shaping Y");
LSTR MSG_SHAPING_A_FREQ = _UxGT("Frequenza ") STR_A; // ProUI
LSTR MSG_SHAPING_B_FREQ = _UxGT("Frequenza ") STR_B; // ProUI
LSTR MSG_SHAPING_C_FREQ = _UxGT("Frequenza ") STR_C; // ProUI
LSTR MSG_SHAPING_A_ZETA = _UxGT("Smorzamento ") STR_A; // ProUI
LSTR MSG_SHAPING_B_ZETA = _UxGT("Smorzamento ") STR_B; // ProUI
LSTR MSG_SHAPING_C_ZETA = _UxGT("Smorzamento ") STR_C; // ProUI
LSTR MSG_XY_FREQUENCY_LIMIT = _UxGT("Frequenza max");
LSTR MSG_XY_FREQUENCY_FEEDRATE = _UxGT("Feed min");
LSTR MSG_STEPS_PER_MM = _UxGT("Passi/mm");
@@ -657,31 +657,31 @@ namespace LanguageNarrow_it {
LSTR MSG_CASE_LIGHT_BRIGHTNESS = _UxGT("Luminosità Luci");
LSTR MSG_KILL_EXPECTED_PRINTER = _UxGT("STAMPANTE ERRATA");
LSTR MSG_COLORS_GET = _UxGT("Ottieni colori");
LSTR MSG_COLORS_SELECT = _UxGT("Selez.colori");
LSTR MSG_COLORS_APPLIED = _UxGT("Colori applicati");
LSTR MSG_COLORS_RED = _UxGT("Rosso");
LSTR MSG_COLORS_GREEN = _UxGT("Verde");
LSTR MSG_COLORS_BLUE = _UxGT("Blu");
LSTR MSG_COLORS_WHITE = _UxGT("Bianco");
LSTR MSG_UI_LANGUAGE = _UxGT("Lingua UI");
LSTR MSG_SOUND_ENABLE = _UxGT("Abilita suono");
LSTR MSG_LOCKSCREEN = _UxGT("Blocca schermo");
LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Stamp. bloccata,");
LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Scroll x sbloccare.");
LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Attendere fino al riavvio.");
LSTR MSG_COLORS_GET = _UxGT("Ottieni colori"); // ProUI
LSTR MSG_COLORS_SELECT = _UxGT("Selez.colori"); // ProUI
LSTR MSG_COLORS_APPLIED = _UxGT("Colori applicati"); // ProUI
LSTR MSG_COLORS_RED = _UxGT("Rosso"); // ProUI / JyersUI
LSTR MSG_COLORS_GREEN = _UxGT("Verde"); // ProUI / JyersUI
LSTR MSG_COLORS_BLUE = _UxGT("Blu"); // ProUI / JyersUI
LSTR MSG_COLORS_WHITE = _UxGT("Bianco"); // ProUI
LSTR MSG_UI_LANGUAGE = _UxGT("Lingua UI"); // ProUI
LSTR MSG_SOUND_ENABLE = _UxGT("Abilita suono"); // ProUI
LSTR MSG_LOCKSCREEN = _UxGT("Blocca schermo"); // ProUI
LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Stamp. bloccata,"); // ProUI
LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Scroll x sbloccare."); // ProUI
LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Attendere fino al riavvio."); // ProUI
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("No supporto"); // ProUI
LSTR MSG_PLEASE_PREHEAT = _UxGT("Prerisc. ugello."); // ProUI
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("No supporto");
LSTR MSG_PLEASE_PREHEAT = _UxGT("Prerisc. ugello.");
LSTR MSG_INFO_PRINT_COUNT = _UxGT("Stampe");
LSTR MSG_INFO_PRINT_TIME = _UxGT("Durata");
LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Più lungo");
LSTR MSG_INFO_PRINT_FILAMENT = _UxGT("Estruso");
LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Completate");
LSTR MSG_INFO_MIN_TEMP = _UxGT("Temp min");
LSTR MSG_INFO_MAX_TEMP = _UxGT("Temp max");
LSTR MSG_INFO_PSU = _UxGT("Alimentatore");
LSTR MSG_DRIVE_STRENGTH = _UxGT("Potenza drive");
LSTR MSG_DAC_PERCENT_N = _UxGT("Driver @ %");
LSTR MSG_ERROR_TMC = _UxGT("ERR.CONNESSIONE TMC");
@@ -693,14 +693,12 @@ namespace LanguageNarrow_it {
LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER = _UxGT("OPZIONI RIPRESA:");
LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE = _UxGT("Spurga di più");
LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME = _UxGT("Riprendi stampa");
LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Spurga o continua?");
LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Spurga o continua?"); // ProUI
LSTR MSG_FILAMENT_CHANGE_NOZZLE = _UxGT(" Ugello: ");
LSTR MSG_RUNOUT_SENSOR = _UxGT("Sens.filo termin."); // Max 17 characters
LSTR MSG_RUNOUT_DISTANCE_MM = _UxGT("Dist mm filo term.");
LSTR MSG_RUNOUT_ENABLE = _UxGT("Abil.filo termin.");
LSTR MSG_RUNOUT_ACTIVE = _UxGT("Filo termin. attivo");
LSTR MSG_INVERT_EXTRUDER = _UxGT("Inverti estrusore");
LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Temp.min estrusore");
LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Temp.min estrusore"); // ProUI
LSTR MSG_FANCHECK = _UxGT("Verif.tacho vent."); // Max 17 characters
LSTR MSG_KILL_HOMING_FAILED = _UxGT("Home fallito");
LSTR MSG_LCD_PROBING_FAILED = _UxGT("Sondaggio fallito");
@@ -880,9 +878,9 @@ namespace LanguageWide_it {
LSTR MSG_MEDIA_MENU = _UxGT("Selez.da supporto");
LSTR MSG_TURN_OFF = _UxGT("Spegni la stampante");
LSTR MSG_END_LOOPS = _UxGT("Termina i cicli di ripetizione");
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Nessun supporto inserito.");
LSTR MSG_PLEASE_PREHEAT = _UxGT("Si prega di preriscaldare l'ugello.");
LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Azzera i contatori di stampa");
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Nessun supporto inserito."); // ProUI
LSTR MSG_PLEASE_PREHEAT = _UxGT("Si prega di preriscaldare l'ugello."); // ProUI
LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Azzera i contatori di stampa"); // ProUI
LSTR MSG_INFO_PRINT_COUNT = _UxGT("Contatori di stampa");
LSTR MSG_INFO_PRINT_TIME = _UxGT("Tempo totale");
LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Lavoro più lungo");
Marlin/src/lcd/language/language_ru.h
+24 -27
View File
@@ -73,9 +73,6 @@ namespace LanguageNarrow_ru {
LSTR MSG_Z_FADE_HEIGHT = _UxGT("Лимит выранивания");
LSTR MSG_SET_HOME_OFFSETS = _UxGT("Установ.смещ.дома");
LSTR MSG_HOME_OFFSET_X = _UxGT("Смещ. дома X");
LSTR MSG_HOME_OFFSET_Y = _UxGT("Смещ. дома Y");
LSTR MSG_HOME_OFFSET_Z = _UxGT("Смещ. дома Z");
LSTR MSG_HOME_OFFSETS_APPLIED = _UxGT("Смещения применены");
LSTR MSG_SELECT_ORIGIN = _UxGT("Выберите ноль");
@@ -778,30 +775,30 @@ namespace LanguageNarrow_ru {
LSTR MSG_DELTA_CALIBRATION_IN_PROGRESS = _UxGT("Делаю дельта-калибровку");
LSTR MSG_RESET_STATS = _UxGT("Сбросить статистику печати?");
LSTR MSG_FAN_SPEED_FAULT = _UxGT("Сбой скорости кулера");
LSTR MSG_COLORS_GET = _UxGT("Получить цвет");
LSTR MSG_COLORS_SELECT = _UxGT("Выбрать цвета");
LSTR MSG_COLORS_APPLIED = _UxGT("Цвета применены");
LSTR MSG_COLORS_RED = _UxGT("Красный");
LSTR MSG_COLORS_GREEN = _UxGT("Зелёный");
LSTR MSG_COLORS_BLUE = _UxGT("Синий");
LSTR MSG_COLORS_WHITE = _UxGT("Белый");
LSTR MSG_UI_LANGUAGE = _UxGT("UI Language");
LSTR MSG_SOUND_ENABLE = _UxGT("Включить звук");
LSTR MSG_LOCKSCREEN = _UxGT("Блокировать экран");
LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Принтер заблокирован,");
LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Крутить для разблокировки.");
LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Ждите перезагрузки.");
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Нет носителя.");
LSTR MSG_PLEASE_PREHEAT = _UxGT("Нагрейте сопло.");
LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Сбросить счетчик");
LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Прочистить или продолжить?");
LSTR MSG_RUNOUT_ENABLE = _UxGT("Включить датч.филамента");
LSTR MSG_RUNOUT_ACTIVE = _UxGT("Датч.филам. активен");
LSTR MSG_INVERT_EXTRUDER = _UxGT("Инвертировать экструдер");
LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Миню темп. экструдера.");
LSTR MSG_COLORS_GET = _UxGT("Получить цвет"); // ProUI
LSTR MSG_COLORS_SELECT = _UxGT("Выбрать цвета"); // ProUI
LSTR MSG_COLORS_APPLIED = _UxGT("Цвета применены"); // ProUI
LSTR MSG_COLORS_RED = _UxGT("Красный"); // ProUI / JyersUI
LSTR MSG_COLORS_GREEN = _UxGT("Зелёный"); // ProUI / JyersUI
LSTR MSG_COLORS_BLUE = _UxGT("Синий"); // ProUI / JyersUI
LSTR MSG_COLORS_WHITE = _UxGT("Белый"); // ProUI
LSTR MSG_UI_LANGUAGE = _UxGT("UI Language"); // ProUI
LSTR MSG_SOUND_ENABLE = _UxGT("Включить звук"); // ProUI
LSTR MSG_LOCKSCREEN = _UxGT("Блокировать экран"); // ProUI
LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Принтер заблокирован,"); // ProUI
LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Крутить для разблокировки."); // ProUI
LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Ждите перезагрузки."); // ProUI
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Нет носителя."); // ProUI
LSTR MSG_PLEASE_PREHEAT = _UxGT("Нагрейте сопло."); // ProUI
LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Сбросить счетчик"); // ProUI
LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Прочистить или продолжить?"); // ProUI
LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Миню темп. экструдера."); // ProUI
LSTR MSG_FANCHECK = _UxGT("Пров.тахометра кулера");
LSTR MSG_MMU2_REMOVE_AND_CLICK = _UxGT("Уберите и кликните...");
LSTR MSG_REHEATDONE = _UxGT("Нагрето");
LSTR MSG_XATC = _UxGT("Помощник перекоса X");
LSTR MSG_XATC_DONE = _UxGT("Перекос Х настроен!");
LSTR MSG_XATC_UPDATE_Z_OFFSET = _UxGT("Новое смещение Z-зонда ");
@@ -832,9 +829,9 @@ namespace LanguageWide_ru {
LSTR MSG_ADVANCED_SETTINGS = _UxGT("Расширенные настройки");
LSTR MSG_KILL_SUBCALL_OVERFLOW = _UxGT("Переполнение вызова");
LSTR MSG_SET_HOME_OFFSETS = _UxGT("Установ. смещения дома");
LSTR MSG_HOME_OFFSET_X = _UxGT("Смещение дома X");
LSTR MSG_HOME_OFFSET_Y = _UxGT("Смещение дома Y");
LSTR MSG_HOME_OFFSET_Z = _UxGT("Смещение дома Z");
LSTR MSG_HOME_OFFSET_X = _UxGT("Смещение дома X"); // DWIN
LSTR MSG_HOME_OFFSET_Y = _UxGT("Смещение дома Y"); // DWIN
LSTR MSG_HOME_OFFSET_Z = _UxGT("Смещение дома Z"); // DWIN
LSTR MSG_LAST_VALUE_SP = _UxGT("Последнее значение ");
LSTR MSG_SPINDLE_MENU = _UxGT("Управлен.шпинделем");
LSTR MSG_LASER_TOGGLE = _UxGT("Переключить лазер");
Marlin/src/lcd/language/language_sk.h
+24 -27
View File
@@ -99,9 +99,9 @@ namespace LanguageNarrow_sk {
LSTR MSG_LEVEL_BED_DONE = _UxGT("Vyrovnanie hotové!");
LSTR MSG_Z_FADE_HEIGHT = _UxGT("Výška rovnania");
LSTR MSG_SET_HOME_OFFSETS = _UxGT("Nastav. dom. ofsety");
LSTR MSG_HOME_OFFSET_X = _UxGT("X Ofset");
LSTR MSG_HOME_OFFSET_Y = _UxGT("Y Ofset");
LSTR MSG_HOME_OFFSET_Z = _UxGT("Z Ofset");
LSTR MSG_HOME_OFFSET_X = _UxGT("X Ofset"); // DWIN
LSTR MSG_HOME_OFFSET_Y = _UxGT("Y Ofset"); // DWIN
LSTR MSG_HOME_OFFSET_Z = _UxGT("Z Ofset"); // DWIN
LSTR MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastavené");
LSTR MSG_ERR_M428_TOO_FAR = _UxGT("Chyba: Príliš ďaleko!");
LSTR MSG_TRAMMING_WIZARD = _UxGT("Spriev. vyrovn.");
@@ -633,31 +633,31 @@ namespace LanguageNarrow_sk {
LSTR MSG_CASE_LIGHT_BRIGHTNESS = _UxGT("Jas svetla");
LSTR MSG_KILL_EXPECTED_PRINTER = _UxGT("Nesprávna tlačiareň");
LSTR MSG_COLORS_GET = _UxGT("Zvoliť farbu");
LSTR MSG_COLORS_SELECT = _UxGT("Zvoliť farby");
LSTR MSG_COLORS_APPLIED = _UxGT("Farby aplikované");
LSTR MSG_COLORS_RED = _UxGT("Červená");
LSTR MSG_COLORS_GREEN = _UxGT("Zelená");
LSTR MSG_COLORS_BLUE = _UxGT("Modrá");
LSTR MSG_COLORS_WHITE = _UxGT("Biela");
LSTR MSG_UI_LANGUAGE = _UxGT("Jazyk rozhrania");
LSTR MSG_SOUND_ENABLE = _UxGT("Povoliť zvuky");
LSTR MSG_LOCKSCREEN = _UxGT("Uzamknúť obrazovku");
LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Tlačiareň je uzamknutá,");
LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("potiahnite pre odomknutie.");
LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Prosím čakajte do reštartu.");
LSTR MSG_COLORS_GET = _UxGT("Zvoliť farbu"); // ProUI
LSTR MSG_COLORS_SELECT = _UxGT("Zvoliť farby"); // ProUI
LSTR MSG_COLORS_APPLIED = _UxGT("Farby aplikované"); // ProUI
LSTR MSG_COLORS_RED = _UxGT("Červená"); // ProUI / JyersUI
LSTR MSG_COLORS_GREEN = _UxGT("Zelená"); // ProUI / JyersUI
LSTR MSG_COLORS_BLUE = _UxGT("Modrá"); // ProUI / JyersUI
LSTR MSG_COLORS_WHITE = _UxGT("Biela"); // ProUI
LSTR MSG_UI_LANGUAGE = _UxGT("Jazyk rozhrania"); // ProUI
LSTR MSG_SOUND_ENABLE = _UxGT("Povoliť zvuky"); // ProUI
LSTR MSG_LOCKSCREEN = _UxGT("Uzamknúť obrazovku"); // ProUI
LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Tlačiareň je uzamknutá,"); // ProUI
LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("potiahnite pre odomknutie."); // ProUI
LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Prosím čakajte do reštartu."); // ProUI
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Žiadna karta"); // ProUI
LSTR MSG_PLEASE_PREHEAT = _UxGT("Prosím zahrejte"); // ProUI
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Žiadna karta");
LSTR MSG_PLEASE_PREHEAT = _UxGT("Prosím zahrejte");
LSTR MSG_INFO_PRINT_COUNT = _UxGT("Tlače");
LSTR MSG_INFO_PRINT_TIME = _UxGT("Čas");
LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Najdlhšia");
LSTR MSG_INFO_PRINT_FILAMENT = _UxGT("Vytlačené");
LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Dokončené");
LSTR MSG_INFO_MIN_TEMP = _UxGT("Teplota min");
LSTR MSG_INFO_MAX_TEMP = _UxGT("Teplota max");
LSTR MSG_INFO_PSU = _UxGT("Nap. zdroj");
LSTR MSG_DRIVE_STRENGTH = _UxGT("Budenie motorov");
LSTR MSG_DAC_PERCENT_N = _UxGT("@ Motor %");
LSTR MSG_ERROR_TMC = _UxGT("CHYBA KOMUNIKÁ. TMC");
@@ -669,14 +669,11 @@ namespace LanguageNarrow_sk {
LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER = _UxGT("MOŽNOSTI POKRAČ.:");
LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE = _UxGT("Vytlačiť viacej");
LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME = _UxGT("Obnoviť tlač");
LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Vytlač. alebo pokrač.?");
LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Vytlač. alebo pokrač.?"); // ProUI
LSTR MSG_FILAMENT_CHANGE_NOZZLE = _UxGT(" Tryska: ");
LSTR MSG_RUNOUT_SENSOR = _UxGT("Senzor filamentu");
LSTR MSG_RUNOUT_DISTANCE_MM = _UxGT("Vzd. mm fil. senz.");
LSTR MSG_RUNOUT_ENABLE = _UxGT("Zapnúť senzor");
LSTR MSG_RUNOUT_ACTIVE = _UxGT("Senz. fil. zapn.");
LSTR MSG_INVERT_EXTRUDER = _UxGT("Invert. extrudér");
LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Min. tepl. extrud.");
LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Min. tepl. extrud."); // ProUI
LSTR MSG_FANCHECK = _UxGT("Kontrola rýchl.");
LSTR MSG_KILL_HOMING_FAILED = _UxGT("Parkovanie zlyhalo");
LSTR MSG_LCD_PROBING_FAILED = _UxGT("Kalibrácia zlyhala");
@@ -812,9 +809,9 @@ namespace LanguageWide_sk {
LSTR MSG_MEDIA_MENU = _UxGT("Vytlačiť z karty");
LSTR MSG_TURN_OFF = _UxGT("Vypnite tlačiareň");
LSTR MSG_END_LOOPS = _UxGT("Ukončiť opak. sluč.");
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Nie je vložená karta.");
LSTR MSG_PLEASE_PREHEAT = _UxGT("Prosím zahrejte hotend.");
LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Vynulovať počítadlo");
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Nie je vložená karta."); // ProUI
LSTR MSG_PLEASE_PREHEAT = _UxGT("Prosím zahrejte hotend."); // ProUI
LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Vynulovať počítadlo"); // ProUI
LSTR MSG_INFO_PRINT_COUNT = _UxGT("Počet tlačí");
LSTR MSG_INFO_PRINT_TIME = _UxGT("Celkový čas");
LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Najdlhšia tlač");
Marlin/src/lcd/language/language_tr.h
+30 -33
View File
@@ -101,9 +101,9 @@ namespace LanguageNarrow_tr {
LSTR MSG_LEVEL_BED_DONE = _UxGT("Seviyeleme Tamam!");
LSTR MSG_Z_FADE_HEIGHT = _UxGT("Kaçınma Yüksekliği");
LSTR MSG_SET_HOME_OFFSETS = _UxGT("Ofset Ayarla");
LSTR MSG_HOME_OFFSET_X = _UxGT("X Ofset Sıfırla");
LSTR MSG_HOME_OFFSET_Y = _UxGT("Y Ofset Sıfırla");
LSTR MSG_HOME_OFFSET_Z = _UxGT("Z Ofset Sıfırla");
LSTR MSG_HOME_OFFSET_X = _UxGT("X Ofset Sıfırla"); // DWIN
LSTR MSG_HOME_OFFSET_Y = _UxGT("Y Ofset Sıfırla"); // DWIN
LSTR MSG_HOME_OFFSET_Z = _UxGT("Z Ofset Sıfırla"); // DWIN
LSTR MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofset Tamam");
LSTR MSG_ERR_M428_TOO_FAR = _UxGT("MIN/MAX Çok Fazla");
LSTR MSG_TRAMMING_WIZARD = _UxGT("Hizalama Sihirbazı");
@@ -403,12 +403,12 @@ namespace LanguageNarrow_tr {
LSTR MSG_SHAPING_DISABLE = _UxGT("@ Biçimlemeyi Kapat");
LSTR MSG_SHAPING_FREQ = _UxGT("@ frekans");
LSTR MSG_SHAPING_ZETA = _UxGT("@ sönümleme");
LSTR MSG_SHAPING_A_FREQ = STR_A _UxGT(" frekansı");
LSTR MSG_SHAPING_B_FREQ = STR_B _UxGT(" frekansı");
LSTR MSG_SHAPING_A_ZETA = STR_A _UxGT(" sönümleme ");
LSTR MSG_SHAPING_B_ZETA = STR_B _UxGT(" sönümleme ");
LSTR MSG_SHAPING_X_ENABLE = _UxGT("X şekilleme etkin");
LSTR MSG_SHAPING_Y_ENABLE = _UxGT("Y şekilleme etkin");
LSTR MSG_SHAPING_A_FREQ = STR_A _UxGT(" frekansı"); // ProUI
LSTR MSG_SHAPING_B_FREQ = STR_B _UxGT(" frekansı"); // ProUI
LSTR MSG_SHAPING_C_FREQ = STR_C _UxGT(" frekansı"); // ProUI
LSTR MSG_SHAPING_A_ZETA = STR_A _UxGT(" sönümleme"); // ProUI
LSTR MSG_SHAPING_B_ZETA = STR_B _UxGT(" sönümleme"); // ProUI
LSTR MSG_SHAPING_C_ZETA = STR_C _UxGT(" sönümleme"); // ProUI
LSTR MSG_XY_FREQUENCY_LIMIT = _UxGT("XY Frek. Sınırı");
LSTR MSG_XY_FREQUENCY_FEEDRATE = _UxGT("Min FR Factörü");
LSTR MSG_STEPS_PER_MM = _UxGT("Adım/mm");
@@ -657,31 +657,31 @@ namespace LanguageNarrow_tr {
LSTR MSG_CASE_LIGHT_BRIGHTNESS = _UxGT("Işık Parlaklğı");
LSTR MSG_KILL_EXPECTED_PRINTER = _UxGT("HATALI YAZICI");
LSTR MSG_COLORS_GET = _UxGT("Renk Al");
LSTR MSG_COLORS_SELECT = _UxGT("Renkleri Seç");
LSTR MSG_COLORS_APPLIED = _UxGT("Uygulanan renkler");
LSTR MSG_COLORS_RED = _UxGT("Kırmızı");
LSTR MSG_COLORS_GREEN = _UxGT("Yeşil");
LSTR MSG_COLORS_BLUE = _UxGT("Mavi");
LSTR MSG_COLORS_WHITE = _UxGT("Beyaz");
LSTR MSG_UI_LANGUAGE = _UxGT("UI Dili");
LSTR MSG_SOUND_ENABLE = _UxGT("Sesi etkinleştir");
LSTR MSG_LOCKSCREEN = _UxGT("Kilit Ekranı");
LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Yazıcı Kilitlendi,");
LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Açmak için kaydırın.");
LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Y.Başlatma bekleyin.");
LSTR MSG_COLORS_GET = _UxGT("Renk Al"); // ProUI
LSTR MSG_COLORS_SELECT = _UxGT("Renkleri Seç"); // ProUI
LSTR MSG_COLORS_APPLIED = _UxGT("Uygulanan renkler"); // ProUI
LSTR MSG_COLORS_RED = _UxGT("Kırmızı"); // ProUI / JyersUI
LSTR MSG_COLORS_GREEN = _UxGT("Yeşil"); // ProUI / JyersUI
LSTR MSG_COLORS_BLUE = _UxGT("Mavi"); // ProUI / JyersUI
LSTR MSG_COLORS_WHITE = _UxGT("Beyaz"); // ProUI
LSTR MSG_UI_LANGUAGE = _UxGT("UI Dili"); // ProUI
LSTR MSG_SOUND_ENABLE = _UxGT("Sesi etkinleştir"); // ProUI
LSTR MSG_LOCKSCREEN = _UxGT("Kilit Ekranı"); // ProUI
LSTR MSG_LOCKSCREEN_LOCKED = _UxGT("Yazıcı Kilitlendi,"); // ProUI
LSTR MSG_LOCKSCREEN_UNLOCK = _UxGT("Açmak için kaydırın."); // ProUI
LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Y.Başlatma bekleyin."); // ProUI
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Medya Yok"); // ProUI
LSTR MSG_PLEASE_PREHEAT = _UxGT("Ön Isıtma Lütfen"); // ProUI
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Medya Yok");
LSTR MSG_PLEASE_PREHEAT = _UxGT("Ön Isıtma Lütfen");
LSTR MSG_INFO_PRINT_COUNT = _UxGT("Baskı");
LSTR MSG_INFO_PRINT_TIME = _UxGT("Süre");
LSTR MSG_INFO_PRINT_LONGEST = _UxGT("En Uzun");
LSTR MSG_INFO_PRINT_FILAMENT = _UxGT("Filaman");
LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Tamamlanan");
LSTR MSG_INFO_MIN_TEMP = _UxGT("Min Sıc.");
LSTR MSG_INFO_MAX_TEMP = _UxGT("Max Sıc.");
LSTR MSG_INFO_PSU = _UxGT("Güç Kaynağı");
LSTR MSG_DRIVE_STRENGTH = _UxGT("Sürücü Gücü");
LSTR MSG_DAC_PERCENT_N = _UxGT("@ Sürücü %");
LSTR MSG_ERROR_TMC = _UxGT("TMC BAĞLANTI HATASI");
@@ -693,14 +693,11 @@ namespace LanguageNarrow_tr {
LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER = _UxGT("Seçenekler:");
LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE = _UxGT("Daha Fazla Temizle");
LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME = _UxGT("Baskıyı sürdür");
LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Temizle veya Devam?");
LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Temizle veya Devam?"); // ProUI
LSTR MSG_FILAMENT_CHANGE_NOZZLE = _UxGT(" Nozul: ");
LSTR MSG_RUNOUT_SENSOR = _UxGT("Fil. Sensörü");
LSTR MSG_RUNOUT_DISTANCE_MM = _UxGT("Aşınma Farkı mm");
LSTR MSG_RUNOUT_ENABLE = _UxGT("Fil. Sens. Aç");
LSTR MSG_RUNOUT_ACTIVE = _UxGT("Fil. Sens. Aktif");
LSTR MSG_INVERT_EXTRUDER = _UxGT("Ekstruder Ters Çevir");
LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Ekstruder Min Isı");
LSTR MSG_EXTRUDER_MIN_TEMP = _UxGT("Ekstruder Min Isı"); // ProUI
LSTR MSG_FANCHECK = _UxGT("Fan Takosu Kontrolü");
LSTR MSG_KILL_HOMING_FAILED = _UxGT("Sıfırlama Başarısız");
LSTR MSG_LCD_PROBING_FAILED = _UxGT("Probing Başarısız");
@@ -899,9 +896,9 @@ namespace LanguageWide_tr {
LSTR MSG_MEDIA_MENU = _UxGT("SD Karttan Yazdır");
LSTR MSG_TURN_OFF = _UxGT("Yazıcıyı kapat");
LSTR MSG_END_LOOPS = _UxGT("Tekrr Döngüler Bitir");
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Ortam yerleştirilmedi.");
LSTR MSG_PLEASE_PREHEAT = _UxGT("Lütfen önce hotend'i ısıtın.");
LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Baskı Sayısını Sıfırla");
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Ortam yerleştirilmedi."); // ProUI
LSTR MSG_PLEASE_PREHEAT = _UxGT("Lütfen önce hotend'i ısıtın."); // ProUI
LSTR MSG_INFO_PRINT_COUNT_RESET = _UxGT("Baskı Sayısını Sıfırla"); // ProUI
LSTR MSG_INFO_PRINT_COUNT = _UxGT("Baskı Sayısı");
LSTR MSG_INFO_PRINT_TIME = _UxGT("Toplam Baskı Süresi");
LSTR MSG_INFO_PRINT_LONGEST = _UxGT("En Uzun Baskı Süresi");
Marlin/src/lcd/language/language_uk.h
+22 -22
View File
@@ -73,9 +73,6 @@ namespace LanguageNarrow_uk {
LSTR MSG_LEVEL_BED_DONE = _UxGT("Завершено!");
LSTR MSG_Z_FADE_HEIGHT = _UxGT("Висота спаду");
LSTR MSG_SET_HOME_OFFSETS = _UxGT("Встан. зміщ. дому");
LSTR MSG_HOME_OFFSET_X = _UxGT("Зміщ. дому X");
LSTR MSG_HOME_OFFSET_Y = _UxGT("Зміщ. дому Y");
LSTR MSG_HOME_OFFSET_Z = _UxGT("Зміщ. дому Z");
LSTR MSG_HOME_OFFSETS_APPLIED = _UxGT("Зміщення прийняті");
LSTR MSG_SELECT_ORIGIN = _UxGT("Оберіть нуль");
LSTR MSG_LAST_VALUE_SP = _UxGT("Останнє знач. ");
@@ -539,28 +536,31 @@ namespace LanguageNarrow_uk {
LSTR MSG_CASE_LIGHT_BRIGHTNESS = _UxGT("Яскравість світла");
LSTR MSG_KILL_EXPECTED_PRINTER = _UxGT("НЕ ТОЙ ПРИНТЕР");
LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Завершено");
LSTR MSG_INFO_PRINT_FILAMENT = _UxGT("Екструдовано");
LSTR MSG_PLEASE_PREHEAT = _UxGT("Нагрійте хотенд");
LSTR MSG_COLORS_GET = _UxGT("Отримати колір");
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Немає носія");
LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Перезавантаж...");
LSTR MSG_COLORS_GET = _UxGT("Отримати колір"); // ProUI
LSTR MSG_COLORS_SELECT = _UxGT("Кольори"); // ProUI
LSTR MSG_COLORS_APPLIED = _UxGT("Кольори застос."); // ProUI
LSTR MSG_COLORS_RED = _UxGT("Червоний"); // ProUI / JyersUI
LSTR MSG_COLORS_GREEN = _UxGT("Зелений"); // ProUI / JyersUI
LSTR MSG_COLORS_BLUE = _UxGT("Синій"); // ProUI / JyersUI
LSTR MSG_COLORS_WHITE = _UxGT("Білий"); // ProUI
LSTR MSG_UI_LANGUAGE = _UxGT("Мова"); // ProUI
LSTR MSG_SOUND_ENABLE = _UxGT("Дозволити звук"); // ProUI
LSTR MSG_LOCKSCREEN = _UxGT("Блокувати екран"); // ProUI
//MSG_LOCKSCREEN_LOCKED
//MSG_LOCKSCREEN_UNLOCK
LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Перезавантаж..."); // ProUI
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Немає носія"); // ProUI
LSTR MSG_PLEASE_PREHEAT = _UxGT("Нагрійте хотенд"); // ProUI
LSTR MSG_INFO_PRINT_COUNT = _UxGT("Друків");
LSTR MSG_INFO_PRINT_TIME = _UxGT("Загалом");
LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Найдовше");
LSTR MSG_COLORS_SELECT = _UxGT("Кольори");
LSTR MSG_COLORS_APPLIED = _UxGT("Кольори застос.");
LSTR MSG_COLORS_RED = _UxGT("Червоний");
LSTR MSG_COLORS_GREEN = _UxGT("Зелений");
LSTR MSG_COLORS_BLUE = _UxGT("Синій");
LSTR MSG_COLORS_WHITE = _UxGT("Білий");
LSTR MSG_UI_LANGUAGE = _UxGT("Мова");
LSTR MSG_SOUND_ENABLE = _UxGT("Дозволити звук");
LSTR MSG_LOCKSCREEN = _UxGT("Блокувати екран");
LSTR MSG_INFO_PRINT_FILAMENT = _UxGT("Екструдовано");
LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Завершено");
LSTR MSG_INFO_MIN_TEMP = _UxGT("Мін. ") LCD_STR_THERMOMETER;
LSTR MSG_INFO_MAX_TEMP = _UxGT("Макс. ") LCD_STR_THERMOMETER;
LSTR MSG_INFO_PSU = _UxGT("Блок жив-ня");
LSTR MSG_DRIVE_STRENGTH = _UxGT("Сила мотору");
LSTR MSG_DAC_PERCENT_N = _UxGT("Драйвер @, %");
LSTR MSG_ERROR_TMC = _UxGT("ЗБІЙ ЗВ'ЯЗКУ З TMC");
@@ -703,9 +703,9 @@ namespace LanguageWide_uk {
LSTR MSG_KILL_SUBCALL_OVERFLOW = _UxGT("Переповнення виклику");
LSTR MSG_LCD_SOFT_ENDSTOPS = _UxGT("Програмні кінцевики");
LSTR MSG_SET_HOME_OFFSETS = _UxGT("Встанов. зміщення дому");
LSTR MSG_HOME_OFFSET_X = _UxGT("Зміщення дому X");
LSTR MSG_HOME_OFFSET_Y = _UxGT("Зміщення дому Y");
LSTR MSG_HOME_OFFSET_Z = _UxGT("Зміщення дому Z");
LSTR MSG_HOME_OFFSET_X = _UxGT("Зміщення дому X"); // DWIN
LSTR MSG_HOME_OFFSET_Y = _UxGT("Зміщення дому Y"); // DWIN
LSTR MSG_HOME_OFFSET_Z = _UxGT("Зміщення дому Z"); // DWIN
LSTR MSG_LAST_VALUE_SP = _UxGT("Останнє значення ");
LSTR MSG_LASER_POWER = _UxGT("Потужність лазера");
LSTR MSG_SPINDLE_TOGGLE = _UxGT("Перемкн. шпіндель");
Marlin/src/lcd/menu/menu_one_click_print.cpp
+10 -3
View File
@@ -25,6 +25,13 @@
#if ENABLED(ONE_CLICK_PRINT)
#include "menu.h"
#include "../../gcode/queue.h"
static void one_click_print_done() {
ui.return_to_status();
ui.reset_status();
queue.enqueue_one_now(F("M1003")); // Make sure SD card browsing doesn't break!
}
void one_click_print() {
ui.goto_screen([]{
@@ -33,9 +40,9 @@ void one_click_print() {
GET_TEXT_F(MSG_BUTTON_PRINT), GET_TEXT_F(MSG_BUTTON_CANCEL),
[]{
card.openAndPrintFile(card.filename);
ui.return_to_status();
ui.reset_status();
}, nullptr,
one_click_print_done();
},
one_click_print_done,
GET_TEXT_F(MSG_START_PRINT), filename, F("?")
);
});
Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
+2 -1
View File
@@ -158,7 +158,8 @@
#define LCD_BRIGHTNESS_DEFAULT TFT_BACKLIGHT_PWM
#endif
#if ENABLED(ONBOARD_SDIO)
#if SD_CONNECTION_IS(ONBOARD)
#define ONBOARD_SDIO
#define SD_SS_PIN -1 // else SDSS set to PA4 in M43 (spi_pins.h)
#endif
Marlin/src/sd/cardreader.cpp
+2 -2
View File
@@ -902,11 +902,11 @@ void CardReader::write_command(char * const buf) {
* Select the newest file and ask the user if they want to print it.
*/
bool CardReader::one_click_check() {
const bool found = selectNewestFile();
const bool found = selectNewestFile(); // Changes the current workDir if found
if (found) {
//SERIAL_ECHO_MSG(" OCP File: ", longest_filename(), "\n");
//ui.init();
one_click_print();
one_click_print(); // Restores workkDir to root (eventually)
}
return found;
}
buildroot/tests/STM32F103RC_btt_USB
+1 -1
View File
@@ -10,7 +10,7 @@ set -e
# Build with the default configurations
#
restore_configs
opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_V1_1 SERIAL_PORT 1 SERIAL_PORT_2 -1 TEMP_SENSOR_SOC 1
opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_V1_1 SERIAL_PORT 1 SERIAL_PORT_2 -1 TEMP_SENSOR_SOC 100
exec_test $1 $2 "BigTreeTech SKR Mini v1.1 - SOC Temperature" "$3"
# clean up
buildroot/tests/rambo
+1 -1
View File
@@ -29,7 +29,7 @@ opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TE
ADVANCED_PAUSE_FEATURE FILAMENT_LOAD_UNLOAD_GCODES FILAMENT_UNLOAD_ALL_EXTRUDERS \
PASSWORD_FEATURE PASSWORD_ON_STARTUP PASSWORD_ON_SD_PRINT_MENU PASSWORD_AFTER_SD_PRINT_END PASSWORD_AFTER_SD_PRINT_ABORT \
AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DISTINCT_E_FACTORS \
SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE \
SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE ONE_CLICK_PRINT NO_SD_AUTOSTART \
BACKLASH_COMPENSATION BACKLASH_GCODE BAUD_RATE_GCODE BEZIER_CURVE_SUPPORT \
FWRETRACT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
PSU_CONTROL LED_POWEROFF_TIMEOUT PS_OFF_CONFIRM PS_OFF_SOUND POWER_OFF_WAIT_FOR_COOLDOWN \
ini/features.ini
+1 -1
View File
@@ -183,7 +183,7 @@ HAS_MENU_LED = build_src_filter=+<src/lcd/menu/menu_le
HAS_MENU_MEDIA = build_src_filter=+<src/lcd/menu/menu_media.cpp>
HAS_MENU_MIXER = build_src_filter=+<src/lcd/menu/menu_mixer.cpp>
HAS_MENU_MMU2 = build_src_filter=+<src/lcd/menu/menu_mmu2.cpp>
HAS_MENU_ONE_CLICK_PRINT = build_src_filter=+<src/lcd/menu/menu_one_click_print.cpp>
HAS_MENU_ONE_CLICK_PRINT = build_src_filter=+<src/lcd/menu/menu_one_click_print.cpp> +<src/gcode/sd/M1003.cpp>
HAS_MENU_PASSWORD = build_src_filter=+<src/lcd/menu/menu_password.cpp>
HAS_MENU_POWER_MONITOR = build_src_filter=+<src/lcd/menu/menu_power_monitor.cpp>
HAS_MENU_CUTTER = build_src_filter=+<src/lcd/menu/menu_spindle_laser.cpp>
ini/samd51.ini
+2 -1
View File
@@ -15,11 +15,12 @@
[env:SAMD51_grandcentral_m4]
platform = atmelsam
board = adafruit_grandcentral_m4
build_flags = ${common.build_flags} -std=gnu++17
build_flags = ${common.build_flags} -std=gnu++17 -DUSE_TINYUSB
build_unflags = -std=gnu++11
build_src_filter = ${common.default_src_filter} +<src/HAL/SAMD51>
lib_deps = ${common.lib_deps}
SoftwareSerialM
Adafruit TinyUSB Library
extra_scripts = ${common.extra_scripts}
pre:buildroot/share/PlatformIO/scripts/SAMD51_grandcentral_m4.py
custom_marlin.HAS_MEDIA = SdFat - Adafruit Fork, Adafruit SPIFlash