Browse Source

Обновление с офф. гита

pull/4/head
Sergey 4 years ago
parent
commit
d4ba67ff2c
  1. 4
      Marlin/src/gcode/calibrate/G28.cpp
  2. 12
      platformio.ini

4
Marlin/src/gcode/calibrate/G28.cpp

@ -312,14 +312,14 @@ void GcodeSuite::G28() {
#endif
const float z_homing_height =
ENABLED(UNKNOWN_Z_NO_RAISE) && TEST(axis_known_position, Z_AXIS)
ENABLED(UNKNOWN_Z_NO_RAISE) && !TEST(axis_known_position, Z_AXIS)
? 0
: (parser.seenval('R') ? parser.value_linear_units() : Z_HOMING_HEIGHT);
if (z_homing_height && (doX || doY || (ENABLED(Z_SAFE_HOMING) && doZ))) {
// Raise Z before homing any other axes and z is not already high enough (never lower z)
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Raise Z (before homing) by ", z_homing_height);
do_z_clearance(z_homing_height, TEST(axis_known_position, Z_AXIS), DISABLED(UNKNOWN_Z_NO_RAISE));
do_z_clearance(z_homing_height, true, DISABLED(UNKNOWN_Z_NO_RAISE));
}
#if ENABLED(QUICK_HOME)

12
platformio.ini

@ -88,6 +88,16 @@ extra_scripts = ${common.extra_scripts}
build_flags = ${common.build_flags}
lib_deps = ${common.lib_deps}
monitor_speed = 250000
monitor_flags =
--quiet
--echo
--eol
LF
--filter
colorize
--filter
time
#################################
# #
@ -969,4 +979,4 @@ src_filter = ${common.default_src_filter} +<src/HAL/LINUX>
platform = atmelavr
board = megaatmega2560
build_flags = -c -H -std=gnu++11 -Wall -Os -D__MARLIN_FIRMWARE__
src_filter = +<src/Marlin.cpp>
src_filter = +<src/MarlinCore.cpp>

Loading…
Cancel
Save