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

🚸 Update Ender3 V2/S1 Pro UI (#23878)

Browse Source
This commit is contained in:
Miguel Risco-Castillo
2022-03-11 15:06:49 -05:00
committed by Scott Lahteine
parent b045c91f26
commit eabeac29fd
40 changed files with 1577 additions and 1211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1467,16 +1467,18 @@ void MarlinSettings::postprocess() {
//
#if ENABLED(DWIN_LCD_PROUI)
{
_FIELD_TEST(dwin_data);
char dwin_data[eeprom_data_size] = { 0 };
DWIN_StoreSettings(dwin_data);
_FIELD_TEST(dwin_data);
EEPROM_WRITE(dwin_data);
}
#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
#endif
#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
{
_FIELD_TEST(dwin_settings);
char dwin_settings[CrealityDWIN.eeprom_data_size] = { 0 };
CrealityDWIN.Save_Settings(dwin_settings);
_FIELD_TEST(dwin_settings);
EEPROM_WRITE(dwin_settings);
}
#endif

3
Marlin/src/module/stepper.cpp
View File

@ -497,6 +497,9 @@ void Stepper::enable_axis(const AxisEnum axis) {
bool Stepper::disable_axis(const AxisEnum axis) {
mark_axis_disabled(axis);
TERN_(DWIN_LCD_PROUI, set_axis_untrusted(axis)); // MRISCOC workaround: https://github.com/MarlinFirmware/Marlin/issues/23095
// If all the axes that share the enabled bit are disabled
const bool can_disable = can_axis_disable(axis);
if (can_disable) {

2
Marlin/src/module/temperature.cpp
View File

@ -821,7 +821,7 @@ volatile bool Temperature::raw_temps_ready = false;
hal.idletask();
// Run UI update
TERN(HAS_DWIN_E3V2_BASIC, DWIN_Update(), ui.update());
TERN(DWIN_CREALITY_LCD, DWIN_Update(), ui.update());
}
wait_for_heatup = false;