bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🚸 Fix and update ProUI (#24477)

Browse Source
This commit is contained in:
Miguel Risco-Castillo
2022-07-14 00:00:33 -05:00
committed by Scott Lahteine
parent 3a19d34c75
commit 3c9789fda8
17 changed files with 376 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/module/planner.h
View File

@ -188,7 +188,7 @@ typedef struct {
* The "nominal" values are as-specified by G-code, and
* may never actually be reached due to acceleration limits.
*/
typedef struct block_t {
typedef struct PlannerBlock {
volatile block_flags_t flag; // Block flags

13
Marlin/src/module/settings.cpp
View File

@ -76,6 +76,7 @@
#include "../lcd/extui/ui_api.h"
#elif ENABLED(DWIN_LCD_PROUI)
#include "../lcd/e3v2/proui/dwin.h"
#include "../lcd/e3v2/proui/bedlevel_tools.h"
#endif
#if ENABLED(HOST_PROMPT_SUPPORT)
@ -2756,7 +2757,7 @@ void MarlinSettings::postprocess() {
#endif
persistentStore.access_start();
const uint16_t status = persistentStore.read_data(pos, dest, MESH_STORE_SIZE, &crc);
uint16_t status = persistentStore.read_data(pos, dest, MESH_STORE_SIZE, &crc);
persistentStore.access_finish();
#if ENABLED(OPTIMIZED_MESH_STORAGE)
@ -2769,6 +2770,16 @@ void MarlinSettings::postprocess() {
bedlevel.set_mesh_from_store(z_mesh_store, bedlevel.z_values);
#endif
#if ENABLED(DWIN_LCD_PROUI)
status = !BedLevelTools.meshvalidate();
if (status) {
bedlevel.invalidate();
LCD_MESSAGE(MSG_UBL_MESH_INVALID);
}
else
ui.status_printf(0, GET_TEXT_F(MSG_MESH_LOADED), bedlevel.storage_slot);
#endif
if (status) SERIAL_ECHOLNPGM("?Unable to load mesh data.");
else DEBUG_ECHOLNPGM("Mesh loaded from slot ", slot);