wp/Marlin-Ai3M
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for Travis CI and adjust tests

Browse Source
This commit is contained in:
David Ramiro
2019-03-28 11:12:57 +01:00
parent 6deb88102b
commit 625e264dfc
8 changed files with 7255 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Marlin/Marlin_main.cpp
View File

@@ -11015,21 +11015,22 @@ inline void gcode_M502() {
* Default values are used for omitted arguments.
*/
inline void gcode_M600() {
#ifdef SDSUPPORT
if (card.sdprinting) { // are we printing from sd?
#ifdef ANYCUBIC_TFT_DEBUG
SERIAL_ECHOLNPGM("DEBUG: Enter M600 TFTstate routine");
#endif
AnycubicTFT.TFTstate=ANYCUBIC_TFT_STATE_SDPAUSE_REQ; // enter correct display state to show resume button
#ifdef ANYCUBIC_TFT_DEBUG
SERIAL_ECHOLNPGM("DEBUG: Set TFTstate to SDPAUSE_REQ");
#endif
AnycubicTFT.PausedByFilamentChange=true; // set flag to ensure correct resume routine gets executed
#ifdef ANYCUBIC_TFT_DEBUG
SERIAL_ECHOLNPGM("DEBUG: Set filament change flag");
#endif
}
#ifdef ANYCUBIC_TFT_MODEL
#ifdef SDSUPPORT
if (card.sdprinting) { // are we printing from sd?
#ifdef ANYCUBIC_TFT_DEBUG
SERIAL_ECHOLNPGM("DEBUG: Enter M600 TFTstate routine");
#endif
AnycubicTFT.TFTstate=ANYCUBIC_TFT_STATE_SDPAUSE_REQ; // enter correct display state to show resume button
#ifdef ANYCUBIC_TFT_DEBUG
SERIAL_ECHOLNPGM("DEBUG: Set TFTstate to SDPAUSE_REQ");
#endif
AnycubicTFT.PausedByFilamentChange=true; // set flag to ensure correct resume routine gets executed
#ifdef ANYCUBIC_TFT_DEBUG
SERIAL_ECHOLNPGM("DEBUG: Set filament change flag");
#endif
}
#endif
#endif
point_t park_point = NOZZLE_PARK_POINT;

1959
Marlin/example_configurations/Anycubic/Ai3M12864/Configuration.h Normal file
View File

File diff suppressed because it is too large Load Diff

1654
Marlin/example_configurations/Anycubic/Ai3M12864/Configuration_adv.h Normal file
View File

File diff suppressed because it is too large Load Diff

1957
Marlin/example_configurations/Anycubic/Ai3MBLtouch/Configuration.h Normal file
View File

File diff suppressed because it is too large Load Diff

1654
Marlin/example_configurations/Anycubic/Ai3MBLtouch/Configuration_adv.h Normal file
View File

File diff suppressed because it is too large Load Diff

7
Marlin/pins_TRIGORILLA_14.h
View File

@@ -111,9 +111,12 @@
#endif
#endif
#if defined(ANYCUBIC_TFT_MODEL)
#if defined(ANYCUBIC_TFT_MODEL) || defined(REPRAP_DISCOUNT_SMART_CONTROLLER)
#define BEEPER_PIN 31
#define SD_DETECT_PIN 49
#else
#define BEEPER_PIN 31
#define SD_DETECT_PIN -1
#endif
// LCD
@@ -133,13 +136,11 @@
#define LCD_PINS_D7 29
#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
#define BEEPER_PIN 37
#define BTN_EN1 31
#define BTN_EN2 33
#define BTN_ENC 35
#define SD_DETECT_PIN 49
#elif defined(LCD_I2C_PANELOLU2)
#define BTN_EN1 47 //reverse if the encoder turns the wrong way.
#define BTN_EN2 43