2017-10-25 15:49:34 -05:00
|
|
|
/**
|
|
|
|
* Marlin 3D Printer Firmware
|
2020-02-03 08:00:57 -06:00
|
|
|
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
2017-10-25 15:49:34 -05:00
|
|
|
*
|
|
|
|
* Based on Sprinter and grbl.
|
2019-06-27 23:57:50 -05:00
|
|
|
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
|
2017-10-25 15:49:34 -05:00
|
|
|
*
|
|
|
|
* This program is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2020-07-22 22:20:14 -05:00
|
|
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
2017-10-25 15:49:34 -05:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "../../inc/MarlinConfig.h"
|
|
|
|
|
|
|
|
#if ENABLED(BABYSTEPPING)
|
|
|
|
|
|
|
|
#include "../gcode.h"
|
2019-04-06 18:04:34 -05:00
|
|
|
#include "../../feature/babystep.h"
|
2017-10-25 15:49:34 -05:00
|
|
|
#include "../../module/probe.h"
|
|
|
|
#include "../../module/temperature.h"
|
|
|
|
#include "../../module/planner.h"
|
|
|
|
|
2017-11-25 14:00:39 -06:00
|
|
|
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
|
|
|
|
#include "../../core/serial.h"
|
|
|
|
#endif
|
|
|
|
|
2019-09-28 16:58:48 -05:00
|
|
|
#if ENABLED(MESH_BED_LEVELING)
|
|
|
|
#include "../../feature/bedlevel/bedlevel.h"
|
|
|
|
#endif
|
|
|
|
|
2017-11-25 16:27:21 -06:00
|
|
|
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
|
2018-09-24 20:46:56 -05:00
|
|
|
|
2019-09-29 04:25:39 -05:00
|
|
|
FORCE_INLINE void mod_probe_offset(const float &offs) {
|
2020-06-07 18:44:35 -05:00
|
|
|
if (TERN1(BABYSTEP_HOTEND_Z_OFFSET, active_extruder == 0)) {
|
2020-02-01 04:21:36 -06:00
|
|
|
probe.offset.z += offs;
|
2018-09-24 09:40:48 -05:00
|
|
|
SERIAL_ECHO_START();
|
2020-06-07 18:44:35 -05:00
|
|
|
SERIAL_ECHOLNPAIR(STR_PROBE_OFFSET " " STR_Z, probe.offset.z);
|
2018-09-24 20:46:56 -05:00
|
|
|
}
|
2019-09-27 04:38:43 -05:00
|
|
|
else {
|
|
|
|
#if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
|
2019-09-29 04:25:39 -05:00
|
|
|
hotend_offset[active_extruder].z -= offs;
|
2018-09-24 20:46:56 -05:00
|
|
|
SERIAL_ECHO_START();
|
2020-02-26 03:02:03 -06:00
|
|
|
SERIAL_ECHOLNPAIR(STR_PROBE_OFFSET STR_Z ": ", hotend_offset[active_extruder].z);
|
2019-09-27 04:38:43 -05:00
|
|
|
#endif
|
|
|
|
}
|
2017-11-25 16:27:21 -06:00
|
|
|
}
|
2018-09-24 20:46:56 -05:00
|
|
|
|
2017-11-25 16:27:21 -06:00
|
|
|
#endif
|
|
|
|
|
2017-10-25 15:49:34 -05:00
|
|
|
/**
|
|
|
|
* M290: Babystepping
|
2019-06-18 00:25:38 -05:00
|
|
|
*
|
2019-09-28 16:58:48 -05:00
|
|
|
* Send 'R' or no parameters for a report.
|
|
|
|
*
|
2019-06-18 00:25:38 -05:00
|
|
|
* X<linear> - Distance to step X
|
|
|
|
* Y<linear> - Distance to step Y
|
|
|
|
* Z<linear> - Distance to step Z
|
|
|
|
* S<linear> - Distance to step Z (alias for Z)
|
|
|
|
*
|
|
|
|
* With BABYSTEP_ZPROBE_OFFSET:
|
2019-09-28 16:58:48 -05:00
|
|
|
* P0 - Don't adjust the Z probe offset
|
2017-10-25 15:49:34 -05:00
|
|
|
*/
|
|
|
|
void GcodeSuite::M290() {
|
|
|
|
#if ENABLED(BABYSTEP_XY)
|
2020-03-01 10:36:15 -06:00
|
|
|
LOOP_XYZ(a)
|
|
|
|
if (parser.seenval(XYZ_CHAR(a)) || (a == Z_AXIS && parser.seenval('S'))) {
|
2017-11-16 00:27:24 -06:00
|
|
|
const float offs = constrain(parser.value_axis_units((AxisEnum)a), -2, 2);
|
2019-04-06 18:04:34 -05:00
|
|
|
babystep.add_mm((AxisEnum)a, offs);
|
2017-10-25 15:49:34 -05:00
|
|
|
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
|
2019-09-29 04:25:39 -05:00
|
|
|
if (a == Z_AXIS && (!parser.seen('P') || parser.value_bool())) mod_probe_offset(offs);
|
2017-10-25 15:49:34 -05:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
if (parser.seenval('Z') || parser.seenval('S')) {
|
2017-11-11 22:14:21 -06:00
|
|
|
const float offs = constrain(parser.value_axis_units(Z_AXIS), -2, 2);
|
2019-04-06 18:04:34 -05:00
|
|
|
babystep.add_mm(Z_AXIS, offs);
|
2017-10-25 15:49:34 -05:00
|
|
|
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
|
2019-09-29 04:25:39 -05:00
|
|
|
if (!parser.seen('P') || parser.value_bool()) mod_probe_offset(offs);
|
2017-10-25 15:49:34 -05:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
#endif
|
2019-09-28 16:58:48 -05:00
|
|
|
|
|
|
|
if (!parser.seen("XYZ") || parser.seen('R')) {
|
|
|
|
SERIAL_ECHO_START();
|
|
|
|
|
|
|
|
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
|
2020-02-26 03:02:03 -06:00
|
|
|
SERIAL_ECHOLNPAIR(STR_PROBE_OFFSET " " STR_Z, probe.offset.z);
|
2019-09-28 16:58:48 -05:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
|
|
|
|
{
|
2019-11-29 04:45:07 -06:00
|
|
|
SERIAL_ECHOLNPAIR_P(
|
|
|
|
PSTR("Hotend "), int(active_extruder)
|
2019-09-28 16:58:48 -05:00
|
|
|
#if ENABLED(BABYSTEP_XY)
|
2019-11-29 04:45:07 -06:00
|
|
|
, PSTR("Offset X"), hotend_offset[active_extruder].x
|
|
|
|
, SP_Y_STR, hotend_offset[active_extruder].y
|
|
|
|
, SP_Z_STR
|
|
|
|
#else
|
|
|
|
, PSTR("Offset Z")
|
2019-09-28 16:58:48 -05:00
|
|
|
#endif
|
2019-11-29 04:45:07 -06:00
|
|
|
, hotend_offset[active_extruder].z
|
2019-09-28 16:58:48 -05:00
|
|
|
);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if ENABLED(MESH_BED_LEVELING)
|
|
|
|
SERIAL_ECHOLNPAIR("MBL Adjust Z", mbl.z_offset);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if ENABLED(BABYSTEP_DISPLAY_TOTAL)
|
|
|
|
{
|
2019-11-29 04:45:07 -06:00
|
|
|
SERIAL_ECHOLNPAIR_P(
|
2019-09-28 16:58:48 -05:00
|
|
|
#if ENABLED(BABYSTEP_XY)
|
2019-11-29 04:45:07 -06:00
|
|
|
PSTR("Babystep X"), babystep.axis_total[X_AXIS]
|
|
|
|
, SP_Y_STR, babystep.axis_total[Y_AXIS]
|
|
|
|
, SP_Z_STR
|
|
|
|
#else
|
2019-11-30 06:54:14 -06:00
|
|
|
PSTR("Babystep Z")
|
2019-09-28 16:58:48 -05:00
|
|
|
#endif
|
2020-02-24 05:29:13 -06:00
|
|
|
, babystep.axis_total[BS_AXIS_IND(Z_AXIS)]
|
2019-09-28 16:58:48 -05:00
|
|
|
);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
2017-10-25 15:49:34 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif // BABYSTEPPING
|