From 0a279cf6669283f120b8d8702c401df984269886 Mon Sep 17 00:00:00 2001 From: Jason Smith Date: Thu, 21 Jan 2021 01:44:03 -0800 Subject: [PATCH] Fix ANYCUBIC_LCD_CHIRON compilation (#20807) Co-authored-by: Scott Lahteine --- .../lib/anycubic_chiron/FileNavigator.cpp | 2 ++ .../extui/lib/anycubic_chiron/chiron_tft.cpp | 9 +++++--- Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h | 23 +++++++++++++++++++ 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/Marlin/src/lcd/extui/lib/anycubic_chiron/FileNavigator.cpp b/Marlin/src/lcd/extui/lib/anycubic_chiron/FileNavigator.cpp index fb4c84abb4..19f8ec81bc 100644 --- a/Marlin/src/lcd/extui/lib/anycubic_chiron/FileNavigator.cpp +++ b/Marlin/src/lcd/extui/lib/anycubic_chiron/FileNavigator.cpp @@ -44,6 +44,8 @@ using namespace ExtUI; namespace Anycubic { + FileNavigator filenavigator; + FileList FileNavigator::filelist; // Instance of the Marlin file API char FileNavigator::currentfoldername[MAX_PATH_LEN]; // Current folder path uint16_t FileNavigator::lastindex; diff --git a/Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.cpp b/Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.cpp index b0053895a7..61057b5b10 100644 --- a/Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.cpp +++ b/Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.cpp @@ -54,6 +54,8 @@ namespace Anycubic { float ChironTFT::live_Zoffset; file_menu_t ChironTFT::file_menu; + ChironTFT Chiron; + ChironTFT::ChironTFT(){} void ChironTFT::Startup() { @@ -574,10 +576,11 @@ namespace Anycubic { } break; case 15: // A15 Resuming from outage - if (printer_state == AC_printer_resuming_from_power_outage) + if (printer_state == AC_printer_resuming_from_power_outage) { // Need to home here to restore the Z position - injectCommands_P(AC_cmnd_power_loss_recovery); - injectCommands_P(PSTR("M1000")); // home and start recovery + injectCommands(AC_cmnd_power_loss_recovery); + injectCommands("M1000"); // home and start recovery + } break; case 16: { // A16 Set HotEnd temp A17 S170 diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h index 2e9aba02cf..dfe86b12b7 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h @@ -60,6 +60,13 @@ #else #define X_MIN_PIN P1_26 // E0DET #endif +#elif ENABLED(X_DUAL_ENDSTOPS) + #ifndef X_MIN_PIN + #define X_MIN_PIN P1_29 // X-STOP + #endif + #ifndef X_MAX_PIN + #define X_MAX_PIN P1_26 // E0DET + #endif #else #define X_STOP_PIN P1_29 // X-STOP #endif @@ -71,6 +78,13 @@ #else #define Y_MIN_PIN P1_25 // E1DET #endif +#elif ENABLED(Y_DUAL_ENDSTOPS) + #ifndef Y_MIN_PIN + #define Y_MIN_PIN P1_28 // Y-STOP + #endif + #ifndef Y_MAX_PIN + #define Y_MAX_PIN P1_25 // E1DET + #endif #else #define Y_STOP_PIN P1_28 // Y-STOP #endif @@ -82,6 +96,13 @@ #else #define Z_MIN_PIN P1_00 // PWRDET #endif +#elif ENABLED(Z_MULTI_ENDSTOPS) + #ifndef Z_MIN_PIN + #define Z_MIN_PIN P1_27 // Z-STOP + #endif + #ifndef Z_MAX_PIN + #define Z_MAX_PIN P1_00 // PWRDET + #endif #else #ifndef Z_STOP_PIN #define Z_STOP_PIN P1_27 // Z-STOP @@ -337,6 +358,8 @@ #define LCD_PINS_ENABLE EXPA1_05_PIN #define LCD_PINS_D4 EXPA1_07_PIN + #define BEEPER_PIN EXPA1_10_PIN + #elif ENABLED(CR10_STOCKDISPLAY) #define BTN_ENC EXPA1_09_PIN // (58) open-drain #define LCD_PINS_RS EXPA1_04_PIN