SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Patch up M290, M851

Browse source
This commit is contained in:
Scott Lahteine 2017-11-25 14:00:39 -06:00
parent d29cb646e3
commit be00e421a7
3 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Marlin/src/core/language.h
View file

@ -162,6 +162,7 @@
#define MSG_Z2_MIN "z2_min: " #define MSG_Z2_MIN "z2_min: "
#define MSG_Z2_MAX "z2_max: " #define MSG_Z2_MAX "z2_max: "
#define MSG_Z_PROBE "z_probe: " #define MSG_Z_PROBE "z_probe: "
#define MSG_PROBE_Z_OFFSET "Probe Z Offset"
#define MSG_FILAMENT_RUNOUT_SENSOR "filament: " #define MSG_FILAMENT_RUNOUT_SENSOR "filament: "
#define MSG_ERR_MATERIAL_INDEX "M145 S<index> out of range (0-1)" #define MSG_ERR_MATERIAL_INDEX "M145 S<index> out of range (0-1)"
#define MSG_ERR_M355_NONE "No case light" #define MSG_ERR_M355_NONE "No case light"

10
Marlin/src/gcode/motion/M290.cpp
View file

@ -29,6 +29,10 @@
#include "../../module/temperature.h" #include "../../module/temperature.h"
#include "../../module/planner.h" #include "../../module/planner.h"
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
#include "../../core/serial.h"
#endif
/** /**
* M290: Babystepping * M290: Babystepping
*/ */
@ -39,7 +43,7 @@ void GcodeSuite::M290() {
const float offs = constrain(parser.value_axis_units((AxisEnum)a), -2, 2); const float offs = constrain(parser.value_axis_units((AxisEnum)a), -2, 2);
thermalManager.babystep_axis((AxisEnum)a, offs * planner.axis_steps_per_mm[a]); thermalManager.babystep_axis((AxisEnum)a, offs * planner.axis_steps_per_mm[a]);
#if ENABLED(BABYSTEP_ZPROBE_OFFSET) #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
zprobe_zoffset += offs; if (a == Z_AXIS) zprobe_zoffset += offs;
#endif #endif
} }
#else #else
@ -51,6 +55,10 @@ void GcodeSuite::M290() {
#endif #endif
} }
#endif #endif
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
SERIAL_ECHO_START();
SERIAL_ECHOLNPAIR(MSG_PROBE_Z_OFFSET ": ", zprobe_zoffset);
#endif
} }
#endif // BABYSTEPPING #endif // BABYSTEPPING

16
Marlin/src/gcode/probe/M851.cpp
View file

@ -30,20 +30,16 @@
void GcodeSuite::M851() { void GcodeSuite::M851() {
SERIAL_ECHO_START(); SERIAL_ECHO_START();
SERIAL_ECHOPGM(MSG_ZPROBE_ZOFFSET " "); SERIAL_ECHOPGM(MSG_PROBE_Z_OFFSET);
if (parser.seen('Z')) { if (parser.seen('Z')) {
const float value = parser.value_linear_units(); const float value = parser.value_linear_units();
if (WITHIN(value, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX)) { if (!WITHIN(value, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX)) {
zprobe_zoffset = value; SERIAL_ECHOLNPGM(" " MSG_Z_MIN " " STRINGIFY(Z_PROBE_OFFSET_RANGE_MIN) " " MSG_Z_MAX " " STRINGIFY(Z_PROBE_OFFSET_RANGE_MAX));
SERIAL_ECHO(zprobe_zoffset); return;
} }
else zprobe_zoffset = value;
SERIAL_ECHOPGM(MSG_Z_MIN " " STRINGIFY(Z_PROBE_OFFSET_RANGE_MIN) " " MSG_Z_MAX " " STRINGIFY(Z_PROBE_OFFSET_RANGE_MAX));
} }
else SERIAL_ECHOLNPAIR(": ", zprobe_zoffset);
SERIAL_ECHOPAIR(": ", zprobe_zoffset);
SERIAL_EOL();
} }
#endif // HAS_BED_PROBE #endif // HAS_BED_PROBE