From 90f14367640a942697f9e00df5762afe4121c566 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Fri, 14 May 2021 08:19:12 +1200
Subject: [PATCH] Fix nextion compile error (#21884)
---
Marlin/src/lcd/extui/nextion/nextion_extui.cpp | 6 +++---
Marlin/src/lcd/extui/nextion/nextion_tft.cpp | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Marlin/src/lcd/extui/nextion/nextion_extui.cpp b/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
index 2ec8eeb30e7..a825bd502f1 100644
--- a/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
+++ b/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
@@ -26,12 +26,12 @@
* Nextion TFT support for Marlin
*/
-#include "../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
#if ENABLED(NEXTION_TFT)
-#include "ui_api.h"
-#include "lib/nextion/nextion_tft.h"
+#include "../ui_api.h"
+#include "nextion_tft.h"
namespace ExtUI {
diff --git a/Marlin/src/lcd/extui/nextion/nextion_tft.cpp b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
index 35a5bb7c683..90354426816 100644
--- a/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
+++ b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
@@ -645,6 +645,9 @@ void NextionTFT::UpdateOnChange() {
last_flow_speed = getFlow_percent(getActiveTool());
}
+ // tmppage Axis
+ static float last_get_axis_position_mmX = 999, last_get_axis_position_mmY = 999, last_get_axis_position_mmZ = 999;
+
// tmppage Progress + Layer + Time
if (isPrinting()) {
@@ -679,9 +682,6 @@ void NextionTFT::UpdateOnChange() {
}
}
- // tmppage Axis
- static float last_get_axis_position_mmX = 999, last_get_axis_position_mmY = 999, last_get_axis_position_mmZ = 999;
-
if (!WITHIN(last_get_axis_position_mmX - getAxisPosition_mm(X), -0.1, 0.1)) {
if (ELAPSED(ms, next_event_ms)) {
next_event_ms = ms + 30;
@@ -723,9 +723,9 @@ void NextionTFT::UpdateOnChange() {
last_homedZ = isAxisPositionKnown(Z);
}
- // tmppage IDEX Mode
- static uint8_t last_IDEX_Mode = 99;
#if ENABLED(DUAL_X_CARRIAGE)
+ // tmppage IDEX Mode
+ static uint8_t last_IDEX_Mode = 99;
if (last_IDEX_Mode != getIDEX_Mode()) {
SEND_VAL("tmppage.idexmode", getIDEX_Mode());
last_IDEX_Mode = getIDEX_Mode();