Skip to content

Commit ec573df

Browse files
mriscocmriscoc
committed
Fix bugs and implement user feedback
1 parent c4b9837 commit ec573df

File tree

5 files changed

+27
-14
lines changed

5 files changed

+27
-14
lines changed

‎Marlin/src/lcd/e3v2/proui/dwin.cpp‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ void _drawXYZPosition(const bool force) {
735735
}
736736

737737
void updateVariable() {
738-
TERN_(DEBUG_DWIN,DWINUI::drawInt(COLOR_YELLOW, COLOR_BG_BLACK, 2, DWIN_WIDTH-6*DWINUI::fontWidth(), 6, checkkey));
738+
TERN_(DEBUG_DWIN,DWINUI::drawInt(COLOR_LIGHT_RED, COLOR_BG_BLACK, 2, DWIN_WIDTH-6*DWINUI::fontWidth(), 6, checkkey));
739739
TERN_(DEBUG_DWIN,DWINUI::drawInt(COLOR_YELLOW, COLOR_BG_BLACK, 2, DWIN_WIDTH-3*DWINUI::fontWidth(), 6, last_checkkey));
740740

741741
_drawXYZPosition(false);
@@ -1385,7 +1385,7 @@ void dwinHandleScreen() {
13851385
case ID_SetIntNoDraw: hmiSetNoDraw(); break;
13861386
case ID_PrintProcess: hmiPrinting(); break;
13871387
case ID_Popup: hmiPopup(); break;
1388-
case ID_Leveling: TERN_(PROUI_EX, hmiWaitForUser();) break;
1388+
case ID_Leveling: TERN_(PROUI_EX, hmiWaitForUser()); break;
13891389
#if HAS_LOCKSCREEN
13901390
case ID_Locked: hmiLockScreen(); break;
13911391
#endif
@@ -1437,7 +1437,7 @@ void hmiReturnScreen() {
14371437

14381438
void dwinHomingStart() {
14391439
DEBUG_ECHOLNPGM("dwinHomingStart");
1440-
hmiSaveProcessID(ID_Homing);
1440+
if (checkkey != ID_NothingToDo) hmiSaveProcessID(ID_Homing);
14411441
title.draw(GET_TEXT_F(MSG_HOMING));
14421442
dwinShowPopup(ICON_BLTouch, GET_TEXT_F(MSG_HOMING), GET_TEXT_F(MSG_PLEASE_WAIT));
14431443
}
@@ -1453,7 +1453,7 @@ void dwinHomingDone() {
14531453
#endif
14541454
if (last_checkkey == ID_PrintDone)
14551455
gotoPrintDone();
1456-
else
1456+
else if (checkkey != ID_NothingToDo)
14571457
hmiReturnScreen();
14581458
}
14591459

@@ -1463,10 +1463,10 @@ void dwinHomingDone() {
14631463
DEBUG_ECHOLNPGM("dwinLevelingStart");
14641464
#if HAS_BED_PROBE
14651465
hmiSaveProcessID(ID_Leveling);
1466-
TERN_(PROUI_EX,proUIEx.cancel_lev = 0);
14671466
title.draw(GET_TEXT_F(MSG_BED_LEVELING));
14681467
#if PROUI_EX
14691468
meshViewer.drawBackground(GRID_MAX_POINTS_X, GRID_MAX_POINTS_Y);
1469+
proUIEx.cancel_lev = 0;
14701470
DWINUI::drawButton(BTN_Cancel, 86, 305);
14711471
#else
14721472
dwinShowPopup(ICON_AutoLeveling, GET_TEXT_F(MSG_BED_LEVELING), GET_TEXT_F(MSG_PLEASE_WAIT), TERN(PROUI_EX, BTN_Cancel, 0));
@@ -1597,6 +1597,7 @@ void dwinHomingDone() {
15971597
void dwinPidTuning(tempcontrol_t result) {
15981598
hmiValue.tempControl = result;
15991599
switch (result) {
1600+
#if ENABLED(PIDTEMPBED)
16001601
case PIDTEMPBED_START:
16011602
hmiSaveProcessID(ID_PIDProcess);
16021603
#if HAS_PLOT
@@ -1605,6 +1606,8 @@ void dwinHomingDone() {
16051606
dwinDrawPopup(ICON_TempTooHigh, GET_TEXT_F(MSG_PID_AUTOTUNE), GET_TEXT_F(MSG_BED_IS_RUN));
16061607
#endif
16071608
break;
1609+
#endif
1610+
#if ENABLED(PIDTEMP)
16081611
case PIDTEMP_START:
16091612
hmiSaveProcessID(ID_PIDProcess);
16101613
#if HAS_PLOT
@@ -1613,6 +1616,7 @@ void dwinHomingDone() {
16131616
dwinDrawPopup(ICON_TempTooHigh, GET_TEXT_F(MSG_PID_AUTOTUNE), GET_TEXT_F(MSG_NOZZLE_IS_RUN));
16141617
#endif
16151618
break;
1619+
#endif
16161620
case PID_BAD_HEATER_ID:
16171621
checkkey = last_checkkey;
16181622
dwinPopupContinue(ICON_TempTooLow, GET_TEXT_F(MSG_PID_AUTOTUNE_FAILED), GET_TEXT_F(MSG_BAD_HEATER_ID));
@@ -2276,7 +2280,7 @@ void applyMove() {
22762280
#endif
22772281

22782282
#if HAS_HOME_OFFSET
2279-
void applyHomeOffset() { set_home_offset(hmiValue.select, menuData.value / MINUNITMULT); }
2283+
void applyHomeOffset() { set_home_offset((AxisEnum)hmiValue.select, menuData.value / MINUNITMULT); }
22802284
void setHomeOffsetX() { hmiValue.select = X_AXIS; setPFloatOnClick(-50, 50, UNITFDIGITS, applyHomeOffset); }
22812285
void setHomeOffsetY() { hmiValue.select = Y_AXIS; setPFloatOnClick(-50, 50, UNITFDIGITS, applyHomeOffset); }
22822286
void setHomeOffsetZ() { hmiValue.select = Z_AXIS; setPFloatOnClick( -2, 2, UNITFDIGITS, applyHomeOffset); }
@@ -2654,9 +2658,11 @@ void drawPrepareMenu() {
26542658

26552659
#if ALL(HAS_BED_PROBE, HAS_TRAMMING_WIZARD)
26562660
void runTrammingWizard() {
2661+
hmiSaveProcessID(ID_NothingToDo);
26572662
meshViewer.meshfont = font8x16;
26582663
trammingWizard();
26592664
meshViewer.meshfont = TERN(TJC_DISPLAY, font8x16, font6x12);
2665+
hmiSaveProcessID(ID_WaitResponse);
26602666
}
26612667
#endif
26622668

‎Marlin/src/lcd/e3v2/proui/dwinui.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ uint16_t Title::backColor = defColorTitleBg;
331331
void Title::draw(const char * const caption) {
332332
dwinDrawRectangle(1, backColor, 0, 0, DWIN_WIDTH - 1, TITLE_HEIGHT - 1);
333333
#if ENABLED(TITLE_CENTERED)
334-
drawCenteredString(false, DWIN_FONT_HEAD, textColor, backColor, (TITLE_HEIGHT - DWINUI::fontHeight(DWIN_FONT_HEAD)) / 2 - 1, caption);
334+
DWINUI::drawCenteredString(false, DWIN_FONT_HEAD, textColor, backColor, (TITLE_HEIGHT - DWINUI::fontHeight(DWIN_FONT_HEAD)) / 2 - 1, caption);
335335
#else
336336
dwinDrawString(false, DWIN_FONT_HEAD, textColor, backColor, 14, (TITLE_HEIGHT - DWINUI::fontHeight(DWIN_FONT_HEAD)) / 2 - 1, caption);
337337
#endif

‎Marlin/src/module/settings.cpp‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646

4747
// Check the integrity of data offsets.
4848
// Can be disabled for production build.
49-
//#define DEBUG_EEPROM_READWRITE
50-
//#define DEBUG_EEPROM_OBSERVE
49+
// #define DEBUG_EEPROM_READWRITE
50+
// #define DEBUG_EEPROM_OBSERVE
5151

5252
#include "settings.h"
5353

@@ -707,11 +707,12 @@ typedef struct SettingsDataStruct {
707707

708708
} SettingsData;
709709

710-
//static_assert(sizeof(SettingsData) <= MARLIN_EEPROM_SIZE, "EEPROM too small to contain SettingsData!");
710+
constexpr size_t settingsdata_size = sizeof(SettingsData);
711+
static_assert(settingsdata_size <= MARLIN_EEPROM_SIZE, "EEPROM too small to contain SettingsData!");
711712

712713
MarlinSettings settings;
713714

714-
uint16_t MarlinSettings::datasize() { return sizeof(SettingsData); }
715+
uint16_t MarlinSettings::datasize() { return settingsdata_size; }
715716

716717
/**
717718
* Post-process after Retrieve or Reset
@@ -846,11 +847,16 @@ void MarlinSettings::postprocess() {
846847
#endif
847848

848849
#if ENABLED(DEBUG_EEPROM_OBSERVE)
849-
#define EEPROM_READ(V...) do{ SERIAL_ECHOLNPGM("READ: ", F(STRINGIFY(FIRST(V)))); EEPROM_READ_(V); }while(0)
850-
#define EEPROM_READ_ALWAYS(V...) do{ SERIAL_ECHOLNPGM("READ: ", F(STRINGIFY(FIRST(V)))); EEPROM_READ_ALWAYS_(V); }while(0)
850+
#define EEPROM_READ(V...) do{ SERIAL_ECHOPGM("READ: ", F(STRINGIFY(FIRST(V)))); EEPROM_READ_(V); SERIAL_ECHOLNPGM(" CRC: ", working_crc); }while(0)
851+
#define EEPROM_READ_ALWAYS(V...) do{ SERIAL_ECHOPGM("READ: ", F(STRINGIFY(FIRST(V)))); EEPROM_READ_ALWAYS_(V); SERIAL_ECHOLNPGM(" CRC: ", working_crc); }while(0)
852+
#define EEPROM_WRITE(V...) do{ SERIAL_ECHOPGM("WRITE: ", F(STRINGIFY(FIRST(V)))); EEPROM_WRITE_(V); SERIAL_ECHOLNPGM(" CRC: ", working_crc); }while(0)
853+
// #define EEPROM_READ(V...) do{ SERIAL_ECHOLNPGM("READ: ", F(STRINGIFY(FIRST(V)))); EEPROM_READ_(V); }while(0)
854+
// #define EEPROM_READ_ALWAYS(V...) do{ SERIAL_ECHOLNPGM("READ: ", F(STRINGIFY(FIRST(V)))); EEPROM_READ_ALWAYS_(V); }while(0)
855+
// #define EEPROM_WRITE(V...) do{ SERIAL_ECHOLNPGM("WRITE: ", F(STRINGIFY(FIRST(V)))); EEPROM_WRITE_(V); }while(0)
851856
#else
852857
#define EEPROM_READ(V...) EEPROM_READ_(V)
853858
#define EEPROM_READ_ALWAYS(V...) EEPROM_READ_ALWAYS_(V)
859+
#define EEPROM_WRITE(V...) EEPROM_WRITE_(V)
854860
#endif
855861

856862
const char version[4] = EEPROM_VERSION;

‎Marlin/src/module/settings.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ class MarlinSettings {
132132
static void EEPROM_SKIP(const T &VAR) { eeprom_index += sizeof(VAR); }
133133

134134
template<typename T>
135-
static void EEPROM_WRITE(const T &VAR) {
135+
static void EEPROM_WRITE_(const T &VAR) {
136136
persistentStore.write_data(eeprom_index, (const uint8_t *) &VAR, sizeof(VAR), &working_crc);
137137
}
138138

‎Marlin/src/pins/stm32f4/pins_CREALITY_CR4NTxxC10.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@
203203
* ------
204204
* EXP1
205205
*/
206+
206207
#define EXP1_01_PIN PC0
207208
#define EXP1_02_PIN PB2
208209
#define EXP1_03_PIN PA2

0 commit comments

Comments
 (0)