1104054d73
* Add Formbot Raptor board Co-Authored-By: InsanityAutomation <insanityautomation@users.noreply.github.com> * Add a second Z probe Z offset Co-Authored-By: InsanityAutomation <insanityautomation@users.noreply.github.com> * Modify method to utilize live adjustment of hotend z offset Should probably move config option to babystepping and rename as it may now apply to all multiextruder systems * Move config item and catchup other code to current method
84 lines
2.7 KiB
C++
84 lines
2.7 KiB
C++
/**
|
|
* Marlin 3D Printer Firmware
|
|
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
|
*
|
|
* Based on Sprinter and grbl.
|
|
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
|
*
|
|
* 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
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
#include "../../inc/MarlinConfig.h"
|
|
|
|
#if ENABLED(BABYSTEPPING)
|
|
|
|
#include "../gcode.h"
|
|
#include "../../module/probe.h"
|
|
#include "../../module/temperature.h"
|
|
#include "../../module/planner.h"
|
|
|
|
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
|
|
#include "../../core/serial.h"
|
|
#endif
|
|
|
|
|
|
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
|
|
FORCE_INLINE void mod_zprobe_zoffset(const float &offs) {
|
|
#if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
|
|
if (active_extruder == 0)
|
|
{
|
|
zprobe_zoffset += offs;
|
|
SERIAL_ECHO_START();
|
|
SERIAL_ECHOLNPAIR(MSG_PROBE_Z_OFFSET ": ", zprobe_zoffset);
|
|
} else {
|
|
hotend_offset[Z_AXIS][active_extruder] -= offs;
|
|
SERIAL_ECHO_START();
|
|
SERIAL_ECHOLNPAIR(MSG_IDEX_Z_OFFSET ": ", hotend_offset[Z_AXIS][active_extruder]);
|
|
}
|
|
#else
|
|
zprobe_zoffset += offs;
|
|
SERIAL_ECHO_START();
|
|
SERIAL_ECHOLNPAIR(MSG_PROBE_Z_OFFSET ": ", zprobe_zoffset);
|
|
#endif
|
|
|
|
}
|
|
#endif
|
|
|
|
/**
|
|
* M290: Babystepping
|
|
*/
|
|
void GcodeSuite::M290() {
|
|
#if ENABLED(BABYSTEP_XY)
|
|
for (uint8_t a = X_AXIS; a <= Z_AXIS; a++)
|
|
if (parser.seenval(axis_codes[a]) || (a == Z_AXIS && parser.seenval('S'))) {
|
|
const float offs = constrain(parser.value_axis_units((AxisEnum)a), -2, 2);
|
|
thermalManager.babystep_axis((AxisEnum)a, offs * planner.axis_steps_per_mm[a]);
|
|
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
|
|
if (a == Z_AXIS && (!parser.seen('P') || parser.value_bool())) mod_zprobe_zoffset(offs);
|
|
#endif
|
|
}
|
|
#else
|
|
if (parser.seenval('Z') || parser.seenval('S')) {
|
|
const float offs = constrain(parser.value_axis_units(Z_AXIS), -2, 2);
|
|
thermalManager.babystep_axis(Z_AXIS, offs * planner.axis_steps_per_mm[Z_AXIS]);
|
|
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
|
|
if (!parser.seen('P') || parser.value_bool()) mod_zprobe_zoffset(offs);
|
|
#endif
|
|
}
|
|
#endif
|
|
}
|
|
|
|
#endif // BABYSTEPPING
|