zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix ExtUI compile (#17834)

Browse source
This commit is contained in:
mojocorp 2020-05-02 23:13:14 +02:00 committed by GitHub
parent 9b7807d40f
commit 93946c2868
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/lcd/extui_example.cpp
View file

@ -89,6 +89,7 @@ namespace ExtUI {
// whether successful or not. // whether successful or not.
} }
#if HAS_MESH
void onMeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) { void onMeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) {
// Called when any mesh points are updated // Called when any mesh points are updated
} }
@ -96,6 +97,7 @@ namespace ExtUI {
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 ExtUI::probe_state_t state) {
// Called to indicate a special condition // Called to indicate a special condition
} }
#endif
#if ENABLED(POWER_LOSS_RECOVERY) #if ENABLED(POWER_LOSS_RECOVERY)
void onPowerLossResume() { void onPowerLossResume() {

3
Marlin/src/lcd/extui_malyan_lcd.cpp
View file

@ -491,8 +491,11 @@ namespace ExtUI {
void onLoadSettings(const char*) {} void onLoadSettings(const char*) {}
void onConfigurationStoreWritten(bool) {} void onConfigurationStoreWritten(bool) {}
void onConfigurationStoreRead(bool) {} void onConfigurationStoreRead(bool) {}
#if HAS_MESH
void onMeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) {} 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 ExtUI::probe_state_t state) {}
#endif
#if ENABLED(POWER_LOSS_RECOVERY) #if ENABLED(POWER_LOSS_RECOVERY)
void onPowerLossResume() {} void onPowerLossResume() {}