Browse Source

Fix nextion compile error (#21884)

ellensp 4 years ago
parent
commit
90f1436764
No account linked to committer's email address

+ 3
- 3
Marlin/src/lcd/extui/nextion/nextion_extui.cpp View File

26
  * Nextion TFT support for Marlin
26
  * Nextion TFT support for Marlin
27
  */
27
  */
28
 
28
 
29
-#include "../../inc/MarlinConfigPre.h"
29
+#include "../../../inc/MarlinConfigPre.h"
30
 
30
 
31
 #if ENABLED(NEXTION_TFT)
31
 #if ENABLED(NEXTION_TFT)
32
 
32
 
33
-#include "ui_api.h"
34
-#include "lib/nextion/nextion_tft.h"
33
+#include "../ui_api.h"
34
+#include "nextion_tft.h"
35
 
35
 
36
 namespace ExtUI {
36
 namespace ExtUI {
37
 
37
 

+ 5
- 5
Marlin/src/lcd/extui/nextion/nextion_tft.cpp View File

645
     last_flow_speed = getFlow_percent(getActiveTool());
645
     last_flow_speed = getFlow_percent(getActiveTool());
646
   }
646
   }
647
 
647
 
648
+  // tmppage Axis
649
+  static float last_get_axis_position_mmX = 999, last_get_axis_position_mmY = 999, last_get_axis_position_mmZ = 999;
650
+
648
   // tmppage Progress + Layer + Time
651
   // tmppage Progress + Layer + Time
649
   if (isPrinting()) {
652
   if (isPrinting()) {
650
 
653
 
679
     }
682
     }
680
   }
683
   }
681
 
684
 
682
-  // tmppage Axis
683
-  static float last_get_axis_position_mmX = 999, last_get_axis_position_mmY = 999, last_get_axis_position_mmZ = 999;
684
-
685
   if (!WITHIN(last_get_axis_position_mmX - getAxisPosition_mm(X), -0.1, 0.1)) {
685
   if (!WITHIN(last_get_axis_position_mmX - getAxisPosition_mm(X), -0.1, 0.1)) {
686
     if (ELAPSED(ms, next_event_ms)) {
686
     if (ELAPSED(ms, next_event_ms)) {
687
       next_event_ms = ms + 30;
687
       next_event_ms = ms + 30;
723
     last_homedZ = isAxisPositionKnown(Z);
723
     last_homedZ = isAxisPositionKnown(Z);
724
   }
724
   }
725
 
725
 
726
-  // tmppage IDEX Mode
727
-  static uint8_t last_IDEX_Mode = 99;
728
   #if ENABLED(DUAL_X_CARRIAGE)
726
   #if ENABLED(DUAL_X_CARRIAGE)
727
+    // tmppage IDEX Mode
728
+    static uint8_t last_IDEX_Mode = 99;
729
     if (last_IDEX_Mode != getIDEX_Mode()) {
729
     if (last_IDEX_Mode != getIDEX_Mode()) {
730
       SEND_VAL("tmppage.idexmode", getIDEX_Mode());
730
       SEND_VAL("tmppage.idexmode", getIDEX_Mode());
731
       last_IDEX_Mode = getIDEX_Mode();
731
       last_IDEX_Mode = getIDEX_Mode();

Loading…
Cancel
Save