Kadah
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
14 additions and
2 deletions
-
Marlin/src/feature/mixing.cpp
-
Marlin/src/gcode/feature/mixing/M166.cpp
|
|
|
@ -180,7 +180,12 @@ void Mixer::refresh_collector(const float proportion/*=1.0*/, const uint8_t t/*= |
|
|
|
} |
|
|
|
|
|
|
|
void Mixer::update_gradient_for_planner_z() { |
|
|
|
update_gradient_for_z(planner.get_axis_position_mm(Z_AXIS)); |
|
|
|
#if ENABLED(DELTA) |
|
|
|
get_cartesian_from_steppers(); |
|
|
|
update_gradient_for_z(cartes.z); |
|
|
|
#else |
|
|
|
update_gradient_for_z(planner.get_axis_position_mm(Z_AXIS)); |
|
|
|
#endif |
|
|
|
} |
|
|
|
|
|
|
|
#endif // GRADIENT_MIX
|
|
|
|
|
|
|
|
@ -86,7 +86,14 @@ void GcodeSuite::M166() { |
|
|
|
echo_zt(mixer.gradient.end_vtool, mixer.gradient.end_z); |
|
|
|
|
|
|
|
mixer.update_mix_from_gradient(); |
|
|
|
SERIAL_ECHOPAIR(" ; Current Z", planner.get_axis_position_mm(Z_AXIS)); |
|
|
|
|
|
|
|
SERIAL_ECHOPGM(" ; Current Z"); |
|
|
|
#if ENABLED(DELTA) |
|
|
|
get_cartesian_from_steppers(); |
|
|
|
SERIAL_ECHO(cartes.z); |
|
|
|
#else |
|
|
|
SERIAL_ECHO(planner.get_axis_position_mm(Z_AXIS)); |
|
|
|
#endif |
|
|
|
echo_mix(); |
|
|
|
} |
|
|
|
|
|
|
|
|
