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

🎨 Misc patches from ProUI

Browse Source 
Co-Authored-By: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
This commit is contained in:
Scott Lahteine
2025-11-17 17:28:13 -06:00
parent e6a615d882
commit 4f39b9c09d
18 changed files with 47 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/src/core/mstring.h
+2 -3
View File
@@ -280,12 +280,11 @@ public:
// Quick hash to detect change (e.g., to avoid expensive drawing)
typedef IF<ENABLED(DJB2_HASH), uint32_t, uint16_t>::type hash_t;
hash_t hash() const {
const int sz = length();
#if ENABLED(DJB2_HASH)
hash_t hval = 5381;
char c;
while ((c = *str++)) hval += (hval << 5) + c; // = hval * 33 + c
for (int i = 0; i < sz; i++) hval += (hval << 5) + str[i]; // = hval * 33 + c
#else
const int sz = length();
hash_t hval = hash_t(sz);
for (int i = 0; i < sz; i++) hval = ((hval << 1) | (hval >> 15)) ^ str[i]; // ROL, XOR
#endif
Marlin/src/feature/powerloss.cpp
+1 -1
View File
@@ -99,7 +99,7 @@ PrintJobRecovery recovery;
/**
* Clear the recovery info
*/
void PrintJobRecovery::init() { info = {}; }
void PrintJobRecovery::init() { info = { 0 }; }
/**
* Enable or disable then call changed()
Marlin/src/gcode/config/M575.cpp
+10 -9
View File
@@ -53,15 +53,6 @@ void GcodeSuite::M575() {
case 115200: case 250000: case 500000: case 1000000: {
const int8_t port = parser.intval('P', -99);
const bool set1 = (port == -99 || port == 0);
if (set1) SERIAL_ECHO_MSG(" Serial ", AS_DIGIT(0), " baud rate set to ", baud);
#if HAS_MULTI_SERIAL
const bool set2 = (port == -99 || port == 1);
if (set2) SERIAL_ECHO_MSG(" Serial ", AS_DIGIT(1), " baud rate set to ", baud);
#ifdef SERIAL_PORT_3
const bool set3 = (port == -99 || port == 2);
if (set3) SERIAL_ECHO_MSG(" Serial ", AS_DIGIT(2), " baud rate set to ", baud);
#endif
#endif
SERIAL_FLUSH();
@@ -73,6 +64,16 @@ void GcodeSuite::M575() {
#endif
#endif
if (set1) SERIAL_ECHO_MSG(" Serial ", AS_DIGIT(0), " baud rate set to ", baud);
#if HAS_MULTI_SERIAL
const bool set2 = (port == -99 || port == 1);
if (set2) SERIAL_ECHO_MSG(" Serial ", AS_DIGIT(1), " baud rate set to ", baud);
#ifdef SERIAL_PORT_3
const bool set3 = (port == -99 || port == 2);
if (set3) SERIAL_ECHO_MSG(" Serial ", AS_DIGIT(2), " baud rate set to ", baud);
#endif
#endif
} break;
default: SERIAL_ECHO_MSG("?(B)aud rate implausible.");
}
Marlin/src/lcd/e3v2/creality/dwin.cpp
+2 -2
View File
@@ -1972,7 +1972,7 @@ void hmiSDCardUpdate() {
if (hmiFlag.home_flag) return;
if (DWIN_lcd_sd_status != card.isMounted()) {
DWIN_lcd_sd_status = card.isMounted();
//SERIAL_ECHOLNPGM("HMI_SDCardUpdate: ", DWIN_lcd_sd_status);
//SERIAL_ECHOLNPGM("hmiSDCardUpdate: ", DWIN_lcd_sd_status);
if (DWIN_lcd_sd_status) {
if (checkkey == ID_SelectFile)
redrawSDList();
@@ -4224,7 +4224,7 @@ void eachMomentUpdate() {
if (encoder_diffState == ENCODER_DIFF_ENTER) {
recovery_flag = false;
if (hmiFlag.select_flag) break;
queue.inject(F("M1000C"));
TERN_(POWER_LOSS_RECOVERY, queue.inject(F("M1000C")));
hmiStartFrame(true);
return;
}
Marlin/src/lcd/e3v2/jyersui/dwin.h
+1
View File
@@ -126,6 +126,7 @@ enum colorID : uint8_t {
};
#define Custom_Colors 10
#define COLOR_AQUA RGB(0x00, 0x3F, 0x1F)
#define COLOR_LIGHT_WHITE 0xBDD7
#define COLOR_GREEN RGB(0x00, 0x3F, 0x00)
#define COLOR_LIGHT_GREEN 0x3460
Marlin/src/lcd/e3v2/proui/dwin.cpp
+3 -3
View File
@@ -466,8 +466,8 @@ void popupPauseOrStop() {
FSTR_P errorstr;
uint8_t icon;
switch (state) {
case 0: errorstr = GET_TEXT_F(MSG_TEMP_TOO_LOW); icon = ICON_TempTooLow; break;
case 1: errorstr = GET_TEXT_F(MSG_TEMP_TOO_HIGH); icon = ICON_TempTooHigh; break;
case 0: errorstr = GET_TEXT_F(DGUS_MSG_TEMP_TOO_LOW); icon = ICON_TempTooLow; break;
case 1: errorstr = GET_TEXT_F(DGUS_MSG_TEMP_TOO_HIGH); icon = ICON_TempTooHigh; break;
default: errorstr = GET_TEXT_F(MSG_ERR_HEATING_FAILED); icon = ICON_Temperature; break; // May be thermal runaway, temp malfunction, etc.
}
dwinShowPopup(icon, heaterstr, errorstr, BTN_Continue);
@@ -1744,7 +1744,7 @@ void dwinLevelingDone() {
break;
case PID_TEMP_TOO_HIGH:
checkkey = last_checkkey;
dwinPopupConfirm(ICON_TempTooHigh, GET_TEXT_F(MSG_PID_AUTOTUNE_FAILED), GET_TEXT_F(MSG_TEMP_TOO_HIGH));
dwinPopupConfirm(ICON_TempTooHigh, GET_TEXT_F(MSG_PID_AUTOTUNE_FAILED), GET_TEXT_F(DGUS_MSG_TEMP_TOO_HIGH));
break;
case AUTOTUNE_DONE:
checkkey = last_checkkey;
Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
+1 -1
View File
@@ -597,7 +597,7 @@ void DGUSRxHandler::filamentMove(DGUS_VP &vp, void *data_ptr) {
}
if (ExtUI::getActualTemp_celsius(extruder) < (float)EXTRUDE_MINTEMP) {
screen.setStatusMessage(GET_TEXT_F(MSG_TEMP_TOO_LOW));
screen.setStatusMessage(GET_TEXT_F(DGUS_MSG_TEMP_TOO_LOW));
return;
}
Marlin/src/lcd/language/language_de.h
+4 -3
View File
@@ -73,7 +73,7 @@ namespace LanguageNarrow_de {
LSTR MSG_TRAM_C = _UxGT("Mitte");
LSTR MSG_TRAM_BL = _UxGT("Hinten Links");
LSTR MSG_TRAM_BR = _UxGT("Hinten Rechts");
LSTR MSG_MANUAL_MESH = _UxGT("Manuelles Netz");
LSTR MSG_MANUAL_MESH = _UxGT("manuelles Netz");
LSTR MSG_AUTO_MESH = _UxGT("Netz auto. erstellen");
LSTR MSG_AUTO_Z_ALIGN = _UxGT("Z-Achsen ausgleichen");
LSTR MSG_ITERATION = _UxGT("G34 Iteration: %i");
@@ -324,8 +324,6 @@ namespace LanguageNarrow_de {
LSTR MSG_PID_CYCLE = _UxGT("PID Zyklus");
LSTR MSG_PID_AUTOTUNE_DONE = _UxGT("PID Tuning fertig");
LSTR MSG_PID_AUTOTUNE_FAILED = _UxGT("PID Autotune fehlge.!");
LSTR MSG_BAD_HEATER_ID = _UxGT("ungültiger Extruder.");
LSTR MSG_TEMP_TOO_HIGH = _UxGT("Temperatur zu hoch.");
LSTR MSG_PID_BAD_HEATER_ID = _UxGT("Autotune fehlge.! Ungültiger Extruder");
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Autotune fehlge.! Temperatur zu hoch.");
LSTR MSG_PID_TIMEOUT = _UxGT("Autotune fehlge.! Timeout.");
@@ -759,6 +757,9 @@ namespace LanguageNarrow_de {
LSTR MSG_HOST_SHUTDOWN = _UxGT("Host abschalten");
// DGUS-Specific message strings, not used elsewhere
LSTR DGUS_MSG_TEMP_TOO_HIGH = _UxGT("Temperatur zu hoch.");
LSTR MSG_SHORT_DAY = _UxGT("t"); // One character only
LSTR MSG_SHORT_HOUR = _UxGT("h"); // One character only
LSTR MSG_SHORT_MINUTE = _UxGT("m"); // One character only
Marlin/src/lcd/language/language_en.h
+2 -4
View File
@@ -414,10 +414,6 @@ namespace LanguageNarrow_en {
LSTR MSG_TEMP_BED = _UxGT("Bed Temperature");
LSTR MSG_TEMP_CHAMBER = _UxGT("Chamber Temperature");
LSTR MSG_BAD_HEATER_ID = _UxGT("Bad extruder.");
LSTR MSG_TEMP_TOO_HIGH = _UxGT("Temperature too high.");
LSTR MSG_TEMP_TOO_LOW = _UxGT("Temperature too low");
LSTR MSG_PID_BAD_HEATER_ID = _UxGT("Autotune failed! Bad extruder.");
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Autotune failed! Temperature too high.");
LSTR MSG_PID_TIMEOUT = _UxGT("Autotune failed! Timeout.");
@@ -1014,6 +1010,8 @@ namespace LanguageNarrow_en {
LSTR DGUS_MSG_NOT_WHILE_PRINTING = _UxGT("Not allowed during print");
LSTR DGUS_MSG_NOT_WHILE_IDLE = _UxGT("Not allowed while idle");
LSTR DGUS_MSG_NO_FILE_SELECTED = _UxGT("No file selected");
LSTR DGUS_MSG_TEMP_TOO_LOW = _UxGT("Temperature too low");
LSTR DGUS_MSG_TEMP_TOO_HIGH = _UxGT("Temperature too high.");
LSTR DGUS_MSG_EXECUTING_COMMAND = _UxGT("Executing command...");
LSTR DGUS_MSG_BED_PID_DISABLED = _UxGT("Bed PID disabled");
LSTR DGUS_MSG_PID_DISABLED = _UxGT("PID disabled");
Marlin/src/lcd/language/language_fr.h
+1 -2
View File
@@ -262,8 +262,6 @@ namespace LanguageNarrow_fr {
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Echec Autotune! Temp. trop haute");
LSTR MSG_PID_TIMEOUT = _UxGT("Echec Autotune! Opér. expirée");
LSTR MSG_TEMP_TOO_LOW = _UxGT("Temperature trop basse");
LSTR MSG_SELECT_E = _UxGT("Sélectionner *");
LSTR MSG_ACC = _UxGT("Accélération");
LSTR MSG_JERK = _UxGT("Jerk");
@@ -607,6 +605,7 @@ namespace LanguageNarrow_fr {
LSTR DGUS_MSG_NOT_WHILE_PRINTING = _UxGT("Impossible pendant une impression");
LSTR DGUS_MSG_NOT_WHILE_IDLE = _UxGT("Impossible tant que l'imprimante est en attente");
LSTR DGUS_MSG_NO_FILE_SELECTED = _UxGT("Aucun fichier selectionne");
LSTR DGUS_MSG_TEMP_TOO_LOW = _UxGT("Temperature trop basse");
LSTR DGUS_MSG_EXECUTING_COMMAND = _UxGT("Execution de la commande...");
LSTR DGUS_MSG_BED_PID_DISABLED = _UxGT("Bed PID desactive");
LSTR DGUS_MSG_PID_DISABLED = _UxGT("PID desactive");
Marlin/src/lcd/language/language_fr_na.h
+1 -2
View File
@@ -262,8 +262,6 @@ namespace LanguageNarrow_fr_na {
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Echec Autotune! Temp. trop haute");
LSTR MSG_PID_TIMEOUT = _UxGT("Echec Autotune! Oper. expiree");
LSTR MSG_TEMP_TOO_LOW = _UxGT("Temperature trop basse");
LSTR MSG_SELECT_E = _UxGT("Selectionner *");
LSTR MSG_ACC = _UxGT("Acceleration");
LSTR MSG_JERK = _UxGT("Jerk");
@@ -610,6 +608,7 @@ namespace LanguageNarrow_fr_na {
LSTR DGUS_MSG_NOT_WHILE_PRINTING = _UxGT("Impossible pendant une impression");
LSTR DGUS_MSG_NOT_WHILE_IDLE = _UxGT("Impossible tant que l'imprimante est en attente");
LSTR DGUS_MSG_NO_FILE_SELECTED = _UxGT("Aucun fichier selectionne");
LSTR DGUS_MSG_TEMP_TOO_LOW = _UxGT("Temperature trop basse");
LSTR DGUS_MSG_EXECUTING_COMMAND = _UxGT("Execution de la commande...");
LSTR DGUS_MSG_BED_PID_DISABLED = _UxGT("Bed PID desactive");
LSTR DGUS_MSG_PID_DISABLED = _UxGT("PID desactive");
Marlin/src/lcd/language/language_it.h
+2 -4
View File
@@ -391,10 +391,6 @@ namespace LanguageNarrow_it {
LSTR MSG_TEMP_BED = _UxGT("Temperatura piatto");
LSTR MSG_TEMP_CHAMBER = _UxGT("Temperature camera");
LSTR MSG_BAD_HEATER_ID = _UxGT("Estrusore invalido.");
LSTR MSG_TEMP_TOO_HIGH = _UxGT("Temp.troppo alta.");
LSTR MSG_TEMP_TOO_LOW = _UxGT("Temp. troppo bassa");
LSTR MSG_PID_BAD_HEATER_ID = _UxGT("Calibrazione fallita! Estrusore errato.");
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Calibrazione fallita! Temperatura troppo alta.");
LSTR MSG_PID_TIMEOUT = _UxGT("Calibrazione fallita! Tempo scaduto.");
@@ -939,6 +935,8 @@ namespace LanguageNarrow_it {
LSTR DGUS_MSG_NOT_WHILE_PRINTING = _UxGT("Non ammesso durante la stampa");
LSTR DGUS_MSG_NOT_WHILE_IDLE = _UxGT("Non ammesso mentre è in riposo");
LSTR DGUS_MSG_NO_FILE_SELECTED = _UxGT("Nessun file selezionato");
LSTR DGUS_MSG_TEMP_TOO_LOW = _UxGT("Temperatura troppo bassa");
LSTR DGUS_MSG_TEMP_TOO_HIGH = _UxGT("Temp.troppo alta.");
LSTR DGUS_MSG_EXECUTING_COMMAND = _UxGT("Esecuzione del comando...");
LSTR DGUS_MSG_BED_PID_DISABLED = _UxGT("PID piatto disabilitato");
LSTR DGUS_MSG_PID_DISABLED = _UxGT("PID disabilitato");
Marlin/src/lcd/language/language_ru.h
+3 -2
View File
@@ -708,8 +708,6 @@ namespace LanguageNarrow_ru {
LSTR MSG_CUTTER = _UxGT("Резак");
LSTR MSG_PID_CYCLE = _UxGT("Циклы PID");
LSTR MSG_PID_AUTOTUNE_FAILED = _UxGT("Автонастройка PID не удалась!");
LSTR MSG_BAD_HEATER_ID = _UxGT("Неверный экструдер.");
LSTR MSG_TEMP_TOO_HIGH = _UxGT("Слишком высокая температура.");
LSTR MSG_MPC_MEASURING_AMBIENT = _UxGT("Тест потери тепла");
LSTR MSG_MPC_HEATING_PAST_200 = _UxGT("Нагрев выше >200C");
LSTR MSG_MPC_COOLING_TO_AMBIENT = _UxGT("Охлаждение до окружающей");
@@ -824,6 +822,9 @@ namespace LanguageNarrow_ru {
LSTR MSG_FTM_MASS_BASED = _UxGT("Mass-based");
LSTR MSG_FTM_BASE_FREQ_N = _UxGT("@ Base Freq.");
LSTR MSG_FTM_DFREQ_K_N = _UxGT("@ Dyn. Freq.");
// DGUS-Specific message strings, not used elsewhere
LSTR DGUS_MSG_TEMP_TOO_HIGH = _UxGT("Слишком высокая температура.");
}
namespace LanguageWide_ru {
Marlin/src/lcd/language/language_sk.h
+3 -2
View File
@@ -344,8 +344,6 @@ namespace LanguageNarrow_sk {
LSTR MSG_PID_CYCLE = _UxGT("Cykly PID");
LSTR MSG_PID_AUTOTUNE_DONE = _UxGT("Kal. PID dokončená");
LSTR MSG_PID_AUTOTUNE_FAILED = _UxGT("Kal. PID zlyhala!");
LSTR MSG_BAD_HEATER_ID = _UxGT("Zlý extrudér");
LSTR MSG_TEMP_TOO_HIGH = _UxGT("Príliš vysoká tepl.");
LSTR MSG_PID_BAD_HEATER_ID = _UxGT("Auto-kal. zlyhala! Zlý extrúder.");
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Auto-kal. zlyhala! Príliš vysoká tepl.");
LSTR MSG_PID_TIMEOUT = _UxGT("Auto-kal. zlyhala! Čas vypršal.");
@@ -800,6 +798,9 @@ namespace LanguageNarrow_sk {
LSTR MSG_USB_DISK = _UxGT("USB disk");
LSTR MSG_HOST_SHUTDOWN = _UxGT("Vypnúť hosta");
// DGUS-Specific message strings, not used elsewhere
LSTR DGUS_MSG_TEMP_TOO_HIGH = _UxGT("Príliš vysoká tepl.");
}
namespace LanguageWide_sk {
Marlin/src/lcd/language/language_tr.h
+2 -3
View File
@@ -347,9 +347,6 @@ namespace LanguageNarrow_tr {
LSTR MSG_PID_CYCLE = _UxGT("PID Döngüleri");
LSTR MSG_PID_AUTOTUNE_DONE = _UxGT("PID ayarı yapıldı");
LSTR MSG_PID_AUTOTUNE_FAILED = _UxGT("Kalibrasyon başarısız!");
LSTR MSG_BAD_HEATER_ID = _UxGT("Kötü ekstruder.");
LSTR MSG_TEMP_TOO_HIGH = _UxGT("Sıcaklık çok yüksek.");
LSTR MSG_TEMP_TOO_LOW = _UxGT("Sıcaklık çok düşük");
LSTR MSG_PID_BAD_HEATER_ID = _UxGT("Kalibrasyon başarısız! Kötü ekstruder.");
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Kalibrasyon başarısız! Sıcaklık çok yüksek.");
LSTR MSG_PID_TIMEOUT = _UxGT("Kalibrasyon başarısız! Zaman aşımı.");
@@ -869,6 +866,8 @@ namespace LanguageNarrow_tr {
LSTR DGUS_MSG_NOT_WHILE_PRINTING = _UxGT("Yazdırma sırasında izin verilmez");
LSTR DGUS_MSG_NOT_WHILE_IDLE = _UxGT("Boştayken izin verilmez");
LSTR DGUS_MSG_NO_FILE_SELECTED = _UxGT("Seçili dosya yok");
LSTR DGUS_MSG_TEMP_TOO_LOW = _UxGT("Sıcaklık çok düşük");
LSTR DGUS_MSG_TEMP_TOO_HIGH = _UxGT("Sıcaklık çok yüksek.");
LSTR DGUS_MSG_EXECUTING_COMMAND = _UxGT("Komut yürütülüyor...");
LSTR DGUS_MSG_BED_PID_DISABLED = _UxGT("Tabla PID pasif");
LSTR DGUS_MSG_PID_DISABLED = _UxGT("PID devre dışı");
buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h
+1 -1
View File
@@ -31,7 +31,7 @@ extern "C" {
#define PA0 PIN_A0 // | 0 | A0 | | | | |
#define PA1 PIN_A1 // | 1 | A1 | | | | |
#define PA2 PIN_A2 // | 2 | A2 | USART2_TX | | | |
#define PA3 PIN_A3 // | 2 | A3, DAC_OUT1** | USART2_RX | | | |
#define PA3 PIN_A3 // | 3 | A3, DAC_OUT1** | USART2_RX | | | |
#define PA4 PIN_A4 // | 4 | A4, DAC_OUT2** | | | SPI1_SS | |
#define PA5 PIN_A5 // | 5 | A5 | | | SPI1_SCK | |
#define PA6 PIN_A6 // | 6 | A6 | | | SPI1_MISO | |
buildroot/share/PlatformIO/variants/MARLIN_F401RC_CREALITY/ldscript.ld
+5 -6
View File
@@ -1,8 +1,7 @@
/*
*****************************************************************************
**
** File : LinkerScript.ld
** File : ldscript.ld
**
** Abstract : Linker script for STM32F401RETx Device with
** 512KByte FLASH, 96KByte RAM
@@ -55,13 +54,13 @@ ENTRY(Reset_Handler)
_estack = 0x20010000; /* end of RAM */
/* Generate a link error if heap and stack don't fit into RAM */
_Min_Heap_Size = 0x200;; /* required amount of heap */
_Min_Stack_Size = 0x400;; /* required amount of stack */
_Min_Heap_Size = 0x200; /* required amount of heap */
_Min_Stack_Size = 0x400; /* required amount of stack */
/* Specify the memory areas */
MEMORY
{
FLASH (rx) : ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
FLASH (rx) : ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 64K
}
@@ -150,7 +149,7 @@ SECTIONS
. = ALIGN(4);
.bss :
{
/* This is used by the startup in order to initialize the .bss secion */
/* This is used by the startup in order to initialize the .bss section */
_sbss = .; /* define a global symbol at bss start */
__bss_start__ = _sbss;
*(.bss)
buildroot/share/PlatformIO/variants/MARLIN_F401RC_CREALITY/variant.h
+3 -1
View File
@@ -101,7 +101,7 @@ extern "C" {
// UART Definitions
//#define ENABLE_HWSERIAL1 done automatically by the #define SERIAL_UART_INSTANCE below
#define ENABLE_HWSERIAL2
#define ENABLE_HWSERIAL6
// Define here Serial instance number to map on Serial generic name (if not already used by SerialUSB)
#define SERIAL_UART_INSTANCE 1 //1 for Serial = Serial1 (USART1)
@@ -118,6 +118,8 @@ extern "C" {
#define PIN_SERIAL1_TX PA9
#define PIN_SERIAL2_RX PA3
#define PIN_SERIAL2_TX PA2
#define PIN_SERIAL6_RX PC7
#define PIN_SERIAL6_TX PC6
#ifdef __cplusplus
} // extern "C"