bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Robin nano V2, TFT LVGL UI parameters, and more (#18500)

Browse Source
This commit is contained in:
MKS-Sean
2020-07-25 13:52:07 +08:00
committed by Scott Lahteine
parent c5ec80d6c7
commit d20d459132
90 changed files with 11656 additions and 4119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/module/motion.cpp
View File

@ -1098,11 +1098,7 @@ void prepare_line_to_destination() {
}
uint8_t axes_need_homing(uint8_t axis_bits/*=0x07*/) {
#if ENABLED(HOME_AFTER_DEACTIVATE)
#define HOMED_FLAGS axis_known_position
#else
#define HOMED_FLAGS axis_homed
#endif
#define HOMED_FLAGS TERN(HOME_AFTER_DEACTIVATE, axis_known_position, axis_homed)
// Clear test bits that are homed
if (TEST(axis_bits, X_AXIS) && TEST(HOMED_FLAGS, X_AXIS)) CBI(axis_bits, X_AXIS);
if (TEST(axis_bits, Y_AXIS) && TEST(HOMED_FLAGS, Y_AXIS)) CBI(axis_bits, Y_AXIS);

2
Marlin/src/module/stepper.cpp
View File

@ -2551,7 +2551,7 @@ void Stepper::init() {
AXIS_INIT(Z, Z);
#endif
#if E_STEPPERS > 0 && HAS_E0_STEP
#if E_STEPPERS && HAS_E0_STEP
E_AXIS_INIT(0);
#endif
#if E_STEPPERS > 1 && HAS_E1_STEP

4
Marlin/src/module/stepper/indirection.h
View File

@ -865,14 +865,14 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
#endif
#ifndef ENABLE_AXIS_E0
#if E_STEPPERS > 0 && HAS_E0_ENABLE
#if E_STEPPERS && HAS_E0_ENABLE
#define ENABLE_AXIS_E0() ENABLE_STEPPER_E0()
#else
#define ENABLE_AXIS_E0() NOOP
#endif
#endif
#ifndef DISABLE_AXIS_E0
#if E_STEPPERS > 0 && HAS_E0_ENABLE
#if E_STEPPERS && HAS_E0_ENABLE
#define DISABLE_AXIS_E0() DISABLE_STEPPER_E0()
#else
#define DISABLE_AXIS_E0() NOOP