Compare commits
9 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
0440770618 | ||
|
c66f3559d7 | ||
|
1183a5b51c | ||
|
2bc946edab | ||
|
3afc5c0dc1 | ||
|
f03df0b280 | ||
|
b035c464dd | ||
|
7071629534 | ||
|
23609b0d40 |
@@ -3462,20 +3462,20 @@
|
|||||||
// Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
|
// Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
|
||||||
// which is not as annoying as with the hardware PWM. On the other hand, if this frequency
|
// which is not as annoying as with the hardware PWM. On the other hand, if this frequency
|
||||||
// is too low, you should also increment SOFT_PWM_SCALE.
|
// is too low, you should also increment SOFT_PWM_SCALE.
|
||||||
#define FAN_SOFT_PWM
|
//#define FAN_SOFT_PWM
|
||||||
|
|
||||||
// Incrementing this by 1 will double the software PWM frequency,
|
// Incrementing this by 1 will double the software PWM frequency,
|
||||||
// affecting heaters, and the fan if FAN_SOFT_PWM is enabled.
|
// affecting heaters, and the fan if FAN_SOFT_PWM is enabled.
|
||||||
// However, control resolution will be halved for each increment;
|
// However, control resolution will be halved for each increment;
|
||||||
// at zero value, there are 128 effective control positions.
|
// at zero value, there are 128 effective control positions.
|
||||||
// :[0,1,2,3,4,5,6,7]
|
// :[0,1,2,3,4,5,6,7]
|
||||||
#define SOFT_PWM_SCALE 5
|
//#define SOFT_PWM_SCALE 2
|
||||||
|
|
||||||
// If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
|
// If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
|
||||||
// be used to mitigate the associated resolution loss. If enabled,
|
// be used to mitigate the associated resolution loss. If enabled,
|
||||||
// some of the PWM cycles are stretched so on average the desired
|
// some of the PWM cycles are stretched so on average the desired
|
||||||
// duty cycle is attained.
|
// duty cycle is attained.
|
||||||
#define SOFT_PWM_DITHER
|
//#define SOFT_PWM_DITHER
|
||||||
|
|
||||||
// Temperature status LEDs that display the hotend and bed temperature.
|
// Temperature status LEDs that display the hotend and bed temperature.
|
||||||
// If all hotends, bed temperature, and target temperature are under 54C
|
// If all hotends, bed temperature, and target temperature are under 54C
|
||||||
|
@@ -41,10 +41,10 @@
|
|||||||
* here we define this default string as the date where the latest release
|
* here we define this default string as the date where the latest release
|
||||||
* version was tagged.
|
* version was tagged.
|
||||||
*/
|
*/
|
||||||
#define CUSTOM_BUILD_VERSION "1.4.0"
|
#define CUSTOM_BUILD_VERSION "1.4.3"
|
||||||
|
|
||||||
#ifndef STRING_DISTRIBUTION_DATE
|
#ifndef STRING_DISTRIBUTION_DATE
|
||||||
#define STRING_DISTRIBUTION_DATE "2022-02-07"
|
#define STRING_DISTRIBUTION_DATE "2022-02-18"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -499,21 +499,20 @@ inline void AnycubicTouchscreenClass::StopPrint()
|
|||||||
{
|
{
|
||||||
card.abortFilePrintSoon();
|
card.abortFilePrintSoon();
|
||||||
|
|
||||||
#ifdef ANYCUBIC_TFT_DEBUG
|
|
||||||
SERIAL_ECHOLNPGM("DEBUG: Stopped and cleared");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
print_job_timer.stop();
|
print_job_timer.stop();
|
||||||
thermalManager.disable_all_heaters();
|
thermalManager.disable_all_heaters();
|
||||||
thermalManager.zero_fan_speeds();
|
thermalManager.zero_fan_speeds();
|
||||||
|
|
||||||
|
#ifdef ANYCUBIC_TFT_DEBUG
|
||||||
|
SERIAL_ECHOLNPGM("DEBUG: Stopped and cleared");
|
||||||
|
#endif
|
||||||
|
|
||||||
ai3m_pause_state = 0;
|
ai3m_pause_state = 0;
|
||||||
#ifdef ANYCUBIC_TFT_DEBUG
|
#ifdef ANYCUBIC_TFT_DEBUG
|
||||||
SERIAL_ECHOPGM("DEBUG: AI3M Pause State: ", ai3m_pause_state);
|
SERIAL_ECHOPGM("DEBUG: AI3M Pause State: ", ai3m_pause_state);
|
||||||
SERIAL_EOL();
|
SERIAL_EOL();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
IsParked = true;
|
|
||||||
TFTstate = ANYCUBIC_TFT_STATE_SDSTOP_REQ;
|
TFTstate = ANYCUBIC_TFT_STATE_SDSTOP_REQ;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -588,21 +587,10 @@ void AnycubicTouchscreenClass::ReheatNozzle() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void AnycubicTouchscreenClass::ParkAfterStop(){
|
void AnycubicTouchscreenClass::ParkAfterStop(){
|
||||||
// only park the nozzle if homing was done before
|
|
||||||
if (!homing_needed_error()) {
|
|
||||||
// raize nozzle by 25mm respecting Z_MAX_POS
|
|
||||||
do_blocking_move_to_z(_MIN(current_position[Z_AXIS] + 25, Z_MAX_POS), 5);
|
|
||||||
#ifdef ANYCUBIC_TFT_DEBUG
|
|
||||||
SERIAL_ECHOLNPGM("DEBUG: SDSTOP: Park Z");
|
|
||||||
#endif
|
|
||||||
// move bed and hotend to park position
|
|
||||||
do_blocking_move_to_xy((X_MIN_POS + 10), (Y_MAX_POS - 10), 100);
|
|
||||||
#ifdef ANYCUBIC_TFT_DEBUG
|
|
||||||
SERIAL_ECHOLNPGM("DEBUG: SDSTOP: Park XY");
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
queue.enqueue_now_P(PSTR("M84")); // disable stepper motors
|
queue.enqueue_now_P(PSTR("M84")); // disable stepper motors
|
||||||
queue.enqueue_now_P(PSTR("M27")); // force report of SD status
|
queue.enqueue_now_P(PSTR("M27")); // force report of SD status
|
||||||
|
|
||||||
ai3m_pause_state = 0;
|
ai3m_pause_state = 0;
|
||||||
#ifdef ANYCUBIC_TFT_DEBUG
|
#ifdef ANYCUBIC_TFT_DEBUG
|
||||||
SERIAL_ECHOPGM("DEBUG: AI3M Pause State: ", ai3m_pause_state);
|
SERIAL_ECHOPGM("DEBUG: AI3M Pause State: ", ai3m_pause_state);
|
||||||
@@ -741,7 +729,7 @@ void AnycubicTouchscreenClass::HandleSpecialMenu() {
|
|||||||
else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTOUCH_L)) != NULL)
|
else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTOUCH_L)) != NULL)
|
||||||
|| (strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTOUCH_S)) != NULL)) {
|
|| (strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTOUCH_S)) != NULL)) {
|
||||||
SERIAL_ECHOLNPGM("Special Menu: BLTouch Leveling");
|
SERIAL_ECHOLNPGM("Special Menu: BLTouch Leveling");
|
||||||
queue.inject_P(PSTR("G28\nG29\nM500\nG90\nM300 S440 P200\nM300 S660 P250\nM300 S880 P300\nG1 Z30 F4000\nG1 X0 F4000\nG91\nM84"));
|
queue.inject_P(PSTR("G28\nG29\nM500\nG90\nM300 S440 P200\nM300 S660 P250\nM300 S880 P300\nG1 Z30 F4000\nG1 X0 F4000\nG91\nM84\nM420 S1"));
|
||||||
buzzer.tone(105, 1108);
|
buzzer.tone(105, 1108);
|
||||||
buzzer.tone(210, 1661);
|
buzzer.tone(210, 1661);
|
||||||
}
|
}
|
||||||
@@ -862,7 +850,7 @@ void AnycubicTouchscreenClass::HandleSpecialMenu() {
|
|||||||
|| (strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_MENU_S)) != NULL)) {
|
|| (strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_MENU_S)) != NULL)) {
|
||||||
SERIAL_ECHOLNPGM("Special Menu: Enter Easy Level Menu");
|
SERIAL_ECHOLNPGM("Special Menu: Enter Easy Level Menu");
|
||||||
LevelMenu = true;
|
LevelMenu = true;
|
||||||
queue.inject_P(PSTR("G28\nG90\nG1 Z5\nG1 X15 Y15 F4000\nG1 Z0"));
|
queue.inject_P(PSTR("G28\nM420 S0\nG90\nG1 Z5\nG1 X15 Y15 F4000\nG1 Z0"));
|
||||||
}
|
}
|
||||||
else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_P1_L)) != NULL)
|
else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_P1_L)) != NULL)
|
||||||
|| (strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_P1_S)) != NULL)) {
|
|| (strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_P1_S)) != NULL)) {
|
||||||
@@ -930,7 +918,7 @@ void AnycubicTouchscreenClass::HandleSpecialMenu() {
|
|||||||
|| (strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_EXIT_S)) != NULL)) {
|
|| (strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_EXIT_S)) != NULL)) {
|
||||||
SERIAL_ECHOLNPGM("Special Menu: Exit Easy Level Menu");
|
SERIAL_ECHOLNPGM("Special Menu: Exit Easy Level Menu");
|
||||||
LevelMenu = false;
|
LevelMenu = false;
|
||||||
queue.inject_P(PSTR("G90\nG1 Z10\nG1 X15 Y15 F4000"));
|
queue.inject_P(PSTR("G90\nG1 Z10\nG1 X15 Y15 F4000\nM420 S1"));
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@@ -2286,6 +2274,9 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() {
|
|||||||
WRITE(HEATER_0_PIN, 0);
|
WRITE(HEATER_0_PIN, 0);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(KNUTWURST_MEGA_P)
|
||||||
case 51:
|
case 51:
|
||||||
if (CodeSeen('H')) {
|
if (CodeSeen('H')) {
|
||||||
queue.enqueue_now_P(PSTR("G1 Z5 F500"));
|
queue.enqueue_now_P(PSTR("G1 Z5 F500"));
|
||||||
@@ -2310,9 +2301,9 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() {
|
|||||||
else if (CodeSeen('L')) {
|
else if (CodeSeen('L')) {
|
||||||
queue.enqueue_now_P(PSTR("G1 X100 Y100 Z50 F5000"));
|
queue.enqueue_now_P(PSTR("G1 X100 Y100 Z50 F5000"));
|
||||||
}
|
}
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Before Width: | Height: | Size: 549 KiB |
BIN
images/4MAX.jpg
Before Width: | Height: | Size: 122 KiB |
Before Width: | Height: | Size: 168 KiB |
Before Width: | Height: | Size: 60 KiB |
Before Width: | Height: | Size: 59 KiB |
Before Width: | Height: | Size: 91 KiB |
Before Width: | Height: | Size: 92 KiB |
Before Width: | Height: | Size: 374 KiB |
Before Width: | Height: | Size: 154 KiB |
Before Width: | Height: | Size: 594 KiB |
Before Width: | Height: | Size: 274 KiB |
Before Width: | Height: | Size: 303 KiB |
Before Width: | Height: | Size: 147 KiB |
Before Width: | Height: | Size: 55 KiB |
Before Width: | Height: | Size: 270 KiB |
Before Width: | Height: | Size: 234 KiB |
Before Width: | Height: | Size: 690 KiB |
Before Width: | Height: | Size: 473 KiB |
Before Width: | Height: | Size: 718 KiB |
Before Width: | Height: | Size: 570 KiB |
Before Width: | Height: | Size: 592 KiB |
Before Width: | Height: | Size: 382 KiB |
Before Width: | Height: | Size: 56 KiB |
Before Width: | Height: | Size: 82 KiB |
Before Width: | Height: | Size: 53 KiB |
Before Width: | Height: | Size: 80 KiB |
Before Width: | Height: | Size: 61 KiB |
Before Width: | Height: | Size: 84 KiB |
Before Width: | Height: | Size: 55 KiB |
Before Width: | Height: | Size: 79 KiB |
BIN
images/MegaM.jpg
Before Width: | Height: | Size: 104 KiB |
Before Width: | Height: | Size: 103 KiB |
BIN
images/MegaS.jpg
Before Width: | Height: | Size: 105 KiB |
Before Width: | Height: | Size: 65 KiB |
BIN
images/MegaX.jpg
Before Width: | Height: | Size: 96 KiB |
Before Width: | Height: | Size: 58 KiB |
Before Width: | Height: | Size: 57 KiB |
Before Width: | Height: | Size: 87 KiB |
Before Width: | Height: | Size: 1.1 MiB |
Before Width: | Height: | Size: 857 KiB |
Before Width: | Height: | Size: 234 KiB |
Before Width: | Height: | Size: 269 KiB |
Before Width: | Height: | Size: 568 KiB |
Before Width: | Height: | Size: 340 KiB |
Before Width: | Height: | Size: 362 KiB |
Before Width: | Height: | Size: 442 KiB |
Before Width: | Height: | Size: 265 KiB |
Before Width: | Height: | Size: 420 KiB |
Before Width: | Height: | Size: 367 KiB |
Before Width: | Height: | Size: 627 KiB |
Before Width: | Height: | Size: 405 KiB |
Before Width: | Height: | Size: 72 KiB |
Before Width: | Height: | Size: 376 KiB |
Before Width: | Height: | Size: 112 KiB |
Before Width: | Height: | Size: 98 KiB |
Before Width: | Height: | Size: 591 KiB |
Before Width: | Height: | Size: 374 KiB |
Before Width: | Height: | Size: 752 KiB |
Before Width: | Height: | Size: 834 KiB |
Before Width: | Height: | Size: 80 KiB |
Before Width: | Height: | Size: 70 KiB |
Before Width: | Height: | Size: 58 KiB |
Before Width: | Height: | Size: 73 KiB |
Before Width: | Height: | Size: 79 KiB |
Before Width: | Height: | Size: 89 KiB |
Before Width: | Height: | Size: 61 KiB |
Before Width: | Height: | Size: 81 KiB |
Before Width: | Height: | Size: 73 KiB |
Before Width: | Height: | Size: 98 KiB |
Before Width: | Height: | Size: 88 KiB |
Before Width: | Height: | Size: 77 KiB |
Before Width: | Height: | Size: 104 KiB |
Before Width: | Height: | Size: 86 KiB |
Before Width: | Height: | Size: 104 KiB |
Before Width: | Height: | Size: 94 KiB |
Before Width: | Height: | Size: 84 KiB |
Before Width: | Height: | Size: 66 KiB |
Before Width: | Height: | Size: 888 KiB |
Before Width: | Height: | Size: 776 KiB |
Before Width: | Height: | Size: 571 KiB |
Before Width: | Height: | Size: 559 KiB |
Before Width: | Height: | Size: 310 KiB |
Before Width: | Height: | Size: 243 KiB |
Before Width: | Height: | Size: 188 KiB |
Before Width: | Height: | Size: 85 KiB |
Before Width: | Height: | Size: 173 KiB |
Before Width: | Height: | Size: 279 KiB |
Before Width: | Height: | Size: 178 KiB |
Before Width: | Height: | Size: 241 KiB |
Before Width: | Height: | Size: 355 KiB |
Before Width: | Height: | Size: 607 KiB |
Before Width: | Height: | Size: 5.7 KiB |
Before Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 596 KiB |
Before Width: | Height: | Size: 602 KiB |
Before Width: | Height: | Size: 577 KiB |
Before Width: | Height: | Size: 144 KiB |