Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: MarlinFirmware/Marlin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 866a567794465b44f434f7b8f8537d8372dc6e19
Choose a base ref
..
head repository: MarlinFirmware/Marlin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b1c6a99701faaf8bdb93d43aafc34b18ff0484c6
Choose a head ref
Showing with 21 additions and 42 deletions.
  1. +5 −0 Marlin/src/MarlinCore.cpp
  2. +2 −3 Marlin/src/gcode/calibrate/G28.cpp
  3. +1 −2 Marlin/src/gcode/gcode.h
  4. +13 −37 Marlin/src/lcd/extui/dgus_creality_lcd.cpp
5 changes: 5 additions & 0 deletions Marlin/src/MarlinCore.cpp
View file
Original file line number Diff line number Diff line change
@@ -61,6 +61,7 @@
#include "sd/cardreader.h"

#include "lcd/marlinui.h"

#if HAS_TOUCH_XPT2046
#include "lcd/touch/touch_buttons.h"
#endif
@@ -78,6 +79,10 @@
#include "lcd/dwin/e3v2/rotary_encoder.h"
#endif

#if ENABLED(EXTENSIBLE_UI)
#include "lcd/extui/ui_api.h"
#endif

#if HAS_ETHERNET
#include "feature/ethernet.h"
#endif
5 changes: 2 additions & 3 deletions Marlin/src/gcode/calibrate/G28.cpp
View file
Original file line number Diff line number Diff line change
@@ -65,8 +65,7 @@
#define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
#include "../../core/debug_out.h"

bool is_homing = false;
bool is_homing_z = false;
bool is_homing, is_homing_z; // = false

#if ENABLED(QUICK_HOME)

@@ -217,7 +216,7 @@ void GcodeSuite::G28() {
TERN_(DWIN_CREALITY_LCD, HMI_flag.home_flag = true);

TERN_(EXTENSIBLE_UI, ExtUI::onHomingStart());

is_homing = true;

#if ENABLED(DUAL_X_CARRIAGE)
3 changes: 1 addition & 2 deletions Marlin/src/gcode/gcode.h
View file
Original file line number Diff line number Diff line change
@@ -298,8 +298,7 @@
#include "../inc/MarlinConfig.h"
#include "parser.h"

extern bool is_homing;
extern bool is_homing_z;
extern bool is_homing, is_homing_z;

#if ENABLED(I2C_POSITION_ENCODERS)
#include "../feature/encoder_i2c.h"
50 changes: 13 additions & 37 deletions Marlin/src/lcd/extui/dgus_creality_lcd.cpp
View file
Original file line number Diff line number Diff line change
@@ -81,13 +81,10 @@ namespace ExtUI {

void onPrintTimerStopped() {}

void onFilamentRunout(const extruder_t extruder) {
ScreenHandler.FilamentRunout();
}
void onFilamentRunout(const extruder_t extruder) { ScreenHandler.FilamentRunout(); }

void onUserConfirmed() {
SERIAL_ECHOLN("User confirmation invoked");

SERIAL_ECHOLNPGM("User confirmation invoked");
ScreenHandler.SetupConfirmAction(nullptr);
ExtUI::setUserConfirmed();
}
@@ -104,7 +101,7 @@ namespace ExtUI {
ScreenHandler.sendinfoscreen(PSTR("Confirmation required"), msg, NUL_STR, NUL_STR, true, true, false, true);
}
else if (ScreenHandler.getCurrentScreen() == DGUSLCD_SCREEN_POPUP) {
SERIAL_ECHOLNPAIR("User confirmation canceled");
SERIAL_ECHOLNPGM("User confirmation canceled");

//ScreenHandler.SetupConfirmAction(nullptr);
ScreenHandler.setstatusmessagePGM(nullptr);
@@ -114,22 +111,13 @@ namespace ExtUI {

void onStatusChanged(const char * const msg) { ScreenHandler.setstatusmessage(msg); }

void onFactoryReset() {
ScreenHandler.OnFactoryReset();
}
void onFactoryReset() { ScreenHandler.OnFactoryReset(); }

void onHomingStart() {
ScreenHandler.OnHomingStart();
}
void onHomingStart() { ScreenHandler.OnHomingStart(); }
void onHomingComplete() { ScreenHandler.OnHomingComplete(); }

void onHomingComplete() {
ScreenHandler.OnHomingComplete();
}
void onPrintFinished() { ScreenHandler.OnPrintFinished(); }

void onPrintFinished() {
ScreenHandler.OnPrintFinished();
}

void onStoreSettings(char *buff) {
// Called when saving to EEPROM (i.e. M500). If the ExtUI needs
// permanent data to be stored, it can write up to eeprom_data_size bytes
@@ -161,26 +149,18 @@ namespace ExtUI {
}

#if HAS_MESH
void onMeshLevelingStart() {
ScreenHandler.OnMeshLevelingStart();
}
void onMeshLevelingStart() { ScreenHandler.OnMeshLevelingStart(); }

void onMeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) {
}

void onMeshUpdate(const int8_t xpos, const int8_t ypos, const ExtUI::probe_state_t state) {
}
void onMeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) { }
void onMeshUpdate(const int8_t xpos, const int8_t ypos, const ExtUI::probe_state_t state) { }

void onMeshCallback(const int8_t xpos, const int8_t ypos, const float zval) {
ScreenHandler.OnMeshLevelingUpdate(xpos, ypos);
}

void onMeshCallback(const int8_t xpos, const int8_t ypos, const ExtUI::probe_state_t state) {
// Only called for UBL
if (state == MESH_START) {
ScreenHandler.OnMeshLevelingStart();
}

if (state == MESH_START) ScreenHandler.OnMeshLevelingStart();
ScreenHandler.OnMeshLevelingUpdate(xpos, ypos);
}
#endif
@@ -214,13 +194,9 @@ namespace ExtUI {
}
#endif

void onSteppersDisabled() {
ScreenHandler.HandleStepperState(false);
}
void onSteppersDisabled() { ScreenHandler.HandleStepperState(false); }

void onSteppersEnabled() {
ScreenHandler.HandleStepperState(true);
}
void onSteppersEnabled() { ScreenHandler.HandleStepperState(true); }

}
#endif // HAS_DGUS_LCD