Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ANYCUBIC_LCD_CHIRON compilation #20807

Merged
merged 7 commits into from
Jan 21, 2021
Merged

Fix ANYCUBIC_LCD_CHIRON compilation #20807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
736a367
Require injected commands to be "pointers to const" rather than "cons…
sjasonsmith Jan 18, 2021
41e3351
Use injectCommands instead of injectCommands_P
sjasonsmith Jan 18, 2021
46e3b68
Add missing globals for Chiron LCD
sjasonsmith Jan 18, 2021
7aa285f
Standard Anycubic FG LCD beeper pin
thinkyhead Jan 19, 2021
025a0d0
pointer is const, chars not necessarily
thinkyhead Jan 19, 2021
c38446f
ibid.
thinkyhead Jan 19, 2021
af725c9
Define two stops for dual
thinkyhead Jan 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Marlin/src/lcd/extui/lib/anycubic_chiron/FileNavigator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 6 additions & 3 deletions Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ namespace Anycubic {
float ChironTFT::live_Zoffset;
file_menu_t ChironTFT::file_menu;

ChironTFT Chiron;

ChironTFT::ChironTFT(){}

void ChironTFT::Startup() {
Expand Down Expand Up @@ -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
}
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved
break;

case 16: { // A16 Set HotEnd temp A17 S170
Expand Down
23 changes: 23 additions & 0 deletions Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down