2016-07-14 22:40:11 +02:00
|
|
|
/**
|
|
|
|
* 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/>.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2016-07-30 03:56:26 +02:00
|
|
|
#include "utility.h"
|
2017-09-06 13:28:32 +02:00
|
|
|
|
|
|
|
#include "../Marlin.h"
|
|
|
|
#include "../module/temperature.h"
|
2016-07-14 22:40:11 +02:00
|
|
|
|
2016-07-30 03:56:26 +02:00
|
|
|
void safe_delay(millis_t ms) {
|
2016-07-14 22:40:11 +02:00
|
|
|
while (ms > 50) {
|
|
|
|
ms -= 50;
|
|
|
|
delay(50);
|
|
|
|
thermalManager.manage_heater();
|
|
|
|
}
|
|
|
|
delay(ms);
|
2017-04-29 00:36:31 +02:00
|
|
|
thermalManager.manage_heater(); // This keeps us safe if too many small safe_delay() calls are made
|
2016-07-14 22:40:11 +02:00
|
|
|
}
|
2016-08-21 01:05:54 +02:00
|
|
|
|
2017-05-07 03:00:56 +02:00
|
|
|
#if ENABLED(EEPROM_SETTINGS)
|
|
|
|
|
|
|
|
void crc16(uint16_t *crc, const void * const data, uint16_t cnt) {
|
2017-05-11 16:48:16 +02:00
|
|
|
uint8_t *ptr = (uint8_t *)data;
|
|
|
|
while (cnt--) {
|
2017-05-07 03:00:56 +02:00
|
|
|
*crc = (uint16_t)(*crc ^ (uint16_t)(((uint16_t)*ptr++) << 8));
|
|
|
|
for (uint8_t x = 0; x < 8; x++)
|
|
|
|
*crc = (uint16_t)((*crc & 0x8000) ? ((uint16_t)(*crc << 1) ^ 0x1021) : (*crc << 1));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif // EEPROM_SETTINGS
|
|
|
|
|
2016-08-21 01:05:54 +02:00
|
|
|
#if ENABLED(ULTRA_LCD)
|
|
|
|
|
2017-04-22 20:24:21 +02:00
|
|
|
char conv[8] = { 0 };
|
2016-08-21 01:05:54 +02:00
|
|
|
|
|
|
|
#define DIGIT(n) ('0' + (n))
|
|
|
|
#define DIGIMOD(n, f) DIGIT((n)/(f) % 10)
|
|
|
|
#define RJDIGIT(n, f) ((n) >= (f) ? DIGIMOD(n, f) : ' ')
|
|
|
|
#define MINUSOR(n, alt) (n >= 0 ? (alt) : (n = -n, '-'))
|
|
|
|
|
2017-06-14 04:42:40 +02:00
|
|
|
// Convert unsigned int to string 123 format
|
|
|
|
char* i8tostr3(const uint8_t xx) {
|
|
|
|
conv[4] = RJDIGIT(xx, 100);
|
|
|
|
conv[5] = RJDIGIT(xx, 10);
|
2017-04-22 20:24:21 +02:00
|
|
|
conv[6] = DIGIMOD(xx, 1);
|
2017-06-14 04:42:40 +02:00
|
|
|
return &conv[4];
|
2016-08-21 01:05:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Convert signed int to rj string with 123 or -12 format
|
2017-06-14 04:42:40 +02:00
|
|
|
char* itostr3(const int x) {
|
2016-08-21 01:05:54 +02:00
|
|
|
int xx = x;
|
2017-04-22 20:24:21 +02:00
|
|
|
conv[4] = MINUSOR(xx, RJDIGIT(xx, 100));
|
|
|
|
conv[5] = RJDIGIT(xx, 10);
|
|
|
|
conv[6] = DIGIMOD(xx, 1);
|
|
|
|
return &conv[4];
|
2016-08-21 01:05:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Convert unsigned int to lj string with 123 format
|
2017-06-14 04:42:40 +02:00
|
|
|
char* itostr3left(const int xx) {
|
2017-04-22 20:24:21 +02:00
|
|
|
char *str = &conv[6];
|
|
|
|
*str = DIGIMOD(xx, 1);
|
2016-08-21 01:05:54 +02:00
|
|
|
if (xx >= 10) {
|
|
|
|
*(--str) = DIGIMOD(xx, 10);
|
|
|
|
if (xx >= 100)
|
|
|
|
*(--str) = DIGIMOD(xx, 100);
|
|
|
|
}
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2016-12-05 15:25:09 +01:00
|
|
|
// Convert signed int to rj string with 1234, _123, -123, _-12, or __-1 format
|
2018-04-29 07:51:36 +02:00
|
|
|
char* itostr4sign(const int x) {
|
2017-04-22 20:24:21 +02:00
|
|
|
const bool neg = x < 0;
|
|
|
|
const int xx = neg ? -x : x;
|
2016-12-05 15:25:09 +01:00
|
|
|
if (x >= 1000) {
|
2017-04-22 20:24:21 +02:00
|
|
|
conv[3] = DIGIMOD(xx, 1000);
|
|
|
|
conv[4] = DIGIMOD(xx, 100);
|
|
|
|
conv[5] = DIGIMOD(xx, 10);
|
2016-08-21 01:05:54 +02:00
|
|
|
}
|
|
|
|
else {
|
2016-12-05 15:25:09 +01:00
|
|
|
if (xx >= 100) {
|
2017-04-22 20:24:21 +02:00
|
|
|
conv[3] = neg ? '-' : ' ';
|
|
|
|
conv[4] = DIGIMOD(xx, 100);
|
|
|
|
conv[5] = DIGIMOD(xx, 10);
|
2016-08-21 01:05:54 +02:00
|
|
|
}
|
|
|
|
else {
|
2017-04-28 20:35:11 +02:00
|
|
|
conv[3] = ' ';
|
2017-04-22 20:24:21 +02:00
|
|
|
conv[4] = ' ';
|
2016-12-05 15:25:09 +01:00
|
|
|
if (xx >= 10) {
|
2017-04-22 20:24:21 +02:00
|
|
|
conv[4] = neg ? '-' : ' ';
|
|
|
|
conv[5] = DIGIMOD(xx, 10);
|
2016-12-05 15:25:09 +01:00
|
|
|
}
|
|
|
|
else {
|
2017-04-22 20:24:21 +02:00
|
|
|
conv[5] = neg ? '-' : ' ';
|
2016-12-05 15:25:09 +01:00
|
|
|
}
|
2016-08-21 01:05:54 +02:00
|
|
|
}
|
|
|
|
}
|
2017-04-22 20:24:21 +02:00
|
|
|
conv[6] = DIGIMOD(xx, 1);
|
|
|
|
return &conv[3];
|
2016-08-21 01:05:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Convert unsigned float to string with 1.23 format
|
2017-05-28 18:33:22 +02:00
|
|
|
char* ftostr12ns(const float &x) {
|
2018-04-29 07:51:36 +02:00
|
|
|
const long xx = ((x < 0 ? -x : x) + 0.001) * 100;
|
2017-04-22 20:24:21 +02:00
|
|
|
conv[3] = DIGIMOD(xx, 100);
|
|
|
|
conv[4] = '.';
|
|
|
|
conv[5] = DIGIMOD(xx, 10);
|
|
|
|
conv[6] = DIGIMOD(xx, 1);
|
|
|
|
return &conv[3];
|
2016-08-21 01:05:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Convert signed float to fixed-length string with 023.45 / -23.45 format
|
2018-04-29 07:51:36 +02:00
|
|
|
char* ftostr32(const float &x) {
|
|
|
|
long xx = FIXFLOAT(x) * 100;
|
2017-04-22 20:24:21 +02:00
|
|
|
conv[1] = MINUSOR(xx, DIGIMOD(xx, 10000));
|
|
|
|
conv[2] = DIGIMOD(xx, 1000);
|
|
|
|
conv[3] = DIGIMOD(xx, 100);
|
|
|
|
conv[4] = '.';
|
|
|
|
conv[5] = DIGIMOD(xx, 10);
|
|
|
|
conv[6] = DIGIMOD(xx, 1);
|
|
|
|
return &conv[1];
|
2016-08-21 01:05:54 +02:00
|
|
|
}
|
|
|
|
|
2016-12-05 15:58:26 +01:00
|
|
|
#if ENABLED(LCD_DECIMAL_SMALL_XY)
|
|
|
|
|
|
|
|
// Convert float to rj string with 1234, _123, -123, _-12, 12.3, _1.2, or -1.2 format
|
2018-04-29 07:51:36 +02:00
|
|
|
char* ftostr4sign(const float &fx) {
|
|
|
|
const int x = FIXFLOAT(fx) * 10;
|
2017-04-09 17:25:35 +02:00
|
|
|
if (!WITHIN(x, -99, 999)) return itostr4sign((int)fx);
|
2017-04-22 20:24:21 +02:00
|
|
|
const bool neg = x < 0;
|
|
|
|
const int xx = neg ? -x : x;
|
|
|
|
conv[3] = neg ? '-' : (xx >= 100 ? DIGIMOD(xx, 100) : ' ');
|
|
|
|
conv[4] = DIGIMOD(xx, 10);
|
|
|
|
conv[5] = '.';
|
|
|
|
conv[6] = DIGIMOD(xx, 1);
|
|
|
|
return &conv[3];
|
2016-12-01 15:40:57 +01:00
|
|
|
}
|
2016-12-05 15:58:26 +01:00
|
|
|
|
|
|
|
#endif // LCD_DECIMAL_SMALL_XY
|
2016-12-01 15:40:57 +01:00
|
|
|
|
2016-08-21 01:05:54 +02:00
|
|
|
// Convert float to fixed-length string with +123.4 / -123.4 format
|
2017-05-28 18:33:22 +02:00
|
|
|
char* ftostr41sign(const float &x) {
|
2018-04-29 07:51:36 +02:00
|
|
|
int xx = FIXFLOAT(x) * 10;
|
2017-04-22 20:24:21 +02:00
|
|
|
conv[1] = MINUSOR(xx, '+');
|
|
|
|
conv[2] = DIGIMOD(xx, 1000);
|
|
|
|
conv[3] = DIGIMOD(xx, 100);
|
|
|
|
conv[4] = DIGIMOD(xx, 10);
|
|
|
|
conv[5] = '.';
|
|
|
|
conv[6] = DIGIMOD(xx, 1);
|
|
|
|
return &conv[1];
|
2016-08-21 01:05:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Convert signed float to string (6 digit) with -1.234 / _0.000 / +1.234 format
|
2017-05-28 18:33:22 +02:00
|
|
|
char* ftostr43sign(const float &x, char plus/*=' '*/) {
|
2018-04-29 07:51:36 +02:00
|
|
|
long xx = FIXFLOAT(x) * 1000;
|
2017-04-22 20:24:21 +02:00
|
|
|
conv[1] = xx ? MINUSOR(xx, plus) : ' ';
|
|
|
|
conv[2] = DIGIMOD(xx, 1000);
|
|
|
|
conv[3] = '.';
|
|
|
|
conv[4] = DIGIMOD(xx, 100);
|
|
|
|
conv[5] = DIGIMOD(xx, 10);
|
|
|
|
conv[6] = DIGIMOD(xx, 1);
|
|
|
|
return &conv[1];
|
2016-08-21 01:05:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Convert unsigned float to rj string with 12345 format
|
2017-05-28 18:33:22 +02:00
|
|
|
char* ftostr5rj(const float &x) {
|
2017-04-22 20:24:21 +02:00
|
|
|
const long xx = x < 0 ? -x : x;
|
|
|
|
conv[2] = RJDIGIT(xx, 10000);
|
|
|
|
conv[3] = RJDIGIT(xx, 1000);
|
|
|
|
conv[4] = RJDIGIT(xx, 100);
|
|
|
|
conv[5] = RJDIGIT(xx, 10);
|
|
|
|
conv[6] = DIGIMOD(xx, 1);
|
|
|
|
return &conv[2];
|
2016-08-21 01:05:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Convert signed float to string with +1234.5 format
|
2017-05-28 18:33:22 +02:00
|
|
|
char* ftostr51sign(const float &x) {
|
2018-04-29 07:51:36 +02:00
|
|
|
long xx = FIXFLOAT(x) * 10;
|
2016-08-21 01:05:54 +02:00
|
|
|
conv[0] = MINUSOR(xx, '+');
|
|
|
|
conv[1] = DIGIMOD(xx, 10000);
|
|
|
|
conv[2] = DIGIMOD(xx, 1000);
|
|
|
|
conv[3] = DIGIMOD(xx, 100);
|
|
|
|
conv[4] = DIGIMOD(xx, 10);
|
|
|
|
conv[5] = '.';
|
|
|
|
conv[6] = DIGIMOD(xx, 1);
|
|
|
|
return conv;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Convert signed float to string with +123.45 format
|
2017-05-28 18:33:22 +02:00
|
|
|
char* ftostr52sign(const float &x) {
|
2018-04-29 07:51:36 +02:00
|
|
|
long xx = FIXFLOAT(x) * 100;
|
2016-08-21 01:05:54 +02:00
|
|
|
conv[0] = MINUSOR(xx, '+');
|
|
|
|
conv[1] = DIGIMOD(xx, 10000);
|
|
|
|
conv[2] = DIGIMOD(xx, 1000);
|
|
|
|
conv[3] = DIGIMOD(xx, 100);
|
|
|
|
conv[4] = '.';
|
|
|
|
conv[5] = DIGIMOD(xx, 10);
|
|
|
|
conv[6] = DIGIMOD(xx, 1);
|
|
|
|
return conv;
|
|
|
|
}
|
|
|
|
|
2016-12-12 14:35:02 +01:00
|
|
|
// Convert unsigned float to string with 1234.56 format omitting trailing zeros
|
2017-05-28 18:33:22 +02:00
|
|
|
char* ftostr62rj(const float &x) {
|
2018-04-29 07:51:36 +02:00
|
|
|
const long xx = ((x < 0 ? -x : x) + 0.001) * 100;
|
2016-12-12 14:35:02 +01:00
|
|
|
conv[0] = RJDIGIT(xx, 100000);
|
|
|
|
conv[1] = RJDIGIT(xx, 10000);
|
|
|
|
conv[2] = RJDIGIT(xx, 1000);
|
|
|
|
conv[3] = DIGIMOD(xx, 100);
|
|
|
|
conv[4] = '.';
|
|
|
|
conv[5] = DIGIMOD(xx, 10);
|
|
|
|
conv[6] = DIGIMOD(xx, 1);
|
2016-11-15 23:01:30 +01:00
|
|
|
return conv;
|
|
|
|
}
|
|
|
|
|
2016-08-21 01:05:54 +02:00
|
|
|
// Convert signed float to space-padded string with -_23.4_ format
|
2017-05-28 18:33:22 +02:00
|
|
|
char* ftostr52sp(const float &x) {
|
2018-04-29 07:51:36 +02:00
|
|
|
long xx = FIXFLOAT(x) * 100;
|
2016-08-21 01:05:54 +02:00
|
|
|
uint8_t dig;
|
2017-04-22 20:24:21 +02:00
|
|
|
conv[1] = MINUSOR(xx, RJDIGIT(xx, 10000));
|
|
|
|
conv[2] = RJDIGIT(xx, 1000);
|
|
|
|
conv[3] = DIGIMOD(xx, 100);
|
2016-08-21 01:05:54 +02:00
|
|
|
|
|
|
|
if ((dig = xx % 10)) { // second digit after decimal point?
|
2017-04-22 20:24:21 +02:00
|
|
|
conv[4] = '.';
|
|
|
|
conv[5] = DIGIMOD(xx, 10);
|
|
|
|
conv[6] = DIGIT(dig);
|
2016-08-21 01:05:54 +02:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
if ((dig = (xx / 10) % 10)) { // first digit after decimal point?
|
2017-04-22 20:24:21 +02:00
|
|
|
conv[4] = '.';
|
|
|
|
conv[5] = DIGIT(dig);
|
2016-08-21 01:05:54 +02:00
|
|
|
}
|
|
|
|
else // nothing after decimal point
|
2017-04-22 20:24:21 +02:00
|
|
|
conv[4] = conv[5] = ' ';
|
|
|
|
conv[6] = ' ';
|
2016-08-21 01:05:54 +02:00
|
|
|
}
|
2017-04-22 20:24:21 +02:00
|
|
|
return &conv[1];
|
2016-08-21 01:05:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif // ULTRA_LCD
|
2017-09-06 13:28:32 +02:00
|
|
|
|
|
|
|
#if ENABLED(DEBUG_LEVELING_FEATURE)
|
|
|
|
|
|
|
|
#include "../module/probe.h"
|
|
|
|
#include "../module/motion.h"
|
|
|
|
#include "../module/stepper.h"
|
|
|
|
#include "../feature/bedlevel/bedlevel.h"
|
|
|
|
|
|
|
|
void log_machine_info() {
|
|
|
|
SERIAL_ECHOPGM("Machine Type: ");
|
|
|
|
#if ENABLED(DELTA)
|
|
|
|
SERIAL_ECHOLNPGM("Delta");
|
|
|
|
#elif IS_SCARA
|
|
|
|
SERIAL_ECHOLNPGM("SCARA");
|
|
|
|
#elif IS_CORE
|
|
|
|
SERIAL_ECHOLNPGM("Core");
|
|
|
|
#else
|
|
|
|
SERIAL_ECHOLNPGM("Cartesian");
|
|
|
|
#endif
|
|
|
|
|
|
|
|
SERIAL_ECHOPGM("Probe: ");
|
|
|
|
#if ENABLED(PROBE_MANUALLY)
|
|
|
|
SERIAL_ECHOLNPGM("PROBE_MANUALLY");
|
|
|
|
#elif ENABLED(FIX_MOUNTED_PROBE)
|
|
|
|
SERIAL_ECHOLNPGM("FIX_MOUNTED_PROBE");
|
|
|
|
#elif ENABLED(BLTOUCH)
|
|
|
|
SERIAL_ECHOLNPGM("BLTOUCH");
|
2018-04-02 06:54:12 +02:00
|
|
|
#elif HAS_Z_SERVO_PROBE
|
2017-09-06 13:28:32 +02:00
|
|
|
SERIAL_ECHOLNPGM("SERVO PROBE");
|
|
|
|
#elif ENABLED(Z_PROBE_SLED)
|
|
|
|
SERIAL_ECHOLNPGM("Z_PROBE_SLED");
|
|
|
|
#elif ENABLED(Z_PROBE_ALLEN_KEY)
|
|
|
|
SERIAL_ECHOLNPGM("Z_PROBE_ALLEN_KEY");
|
|
|
|
#else
|
|
|
|
SERIAL_ECHOLNPGM("NONE");
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if HAS_BED_PROBE
|
|
|
|
SERIAL_ECHOPAIR("Probe Offset X:", X_PROBE_OFFSET_FROM_EXTRUDER);
|
|
|
|
SERIAL_ECHOPAIR(" Y:", Y_PROBE_OFFSET_FROM_EXTRUDER);
|
|
|
|
SERIAL_ECHOPAIR(" Z:", zprobe_zoffset);
|
|
|
|
#if X_PROBE_OFFSET_FROM_EXTRUDER > 0
|
|
|
|
SERIAL_ECHOPGM(" (Right");
|
|
|
|
#elif X_PROBE_OFFSET_FROM_EXTRUDER < 0
|
|
|
|
SERIAL_ECHOPGM(" (Left");
|
|
|
|
#elif Y_PROBE_OFFSET_FROM_EXTRUDER != 0
|
|
|
|
SERIAL_ECHOPGM(" (Middle");
|
|
|
|
#else
|
|
|
|
SERIAL_ECHOPGM(" (Aligned With");
|
|
|
|
#endif
|
|
|
|
#if Y_PROBE_OFFSET_FROM_EXTRUDER > 0
|
|
|
|
SERIAL_ECHOPGM("-Back");
|
|
|
|
#elif Y_PROBE_OFFSET_FROM_EXTRUDER < 0
|
|
|
|
SERIAL_ECHOPGM("-Front");
|
|
|
|
#elif X_PROBE_OFFSET_FROM_EXTRUDER != 0
|
|
|
|
SERIAL_ECHOPGM("-Center");
|
|
|
|
#endif
|
|
|
|
if (zprobe_zoffset < 0)
|
|
|
|
SERIAL_ECHOPGM(" & Below");
|
|
|
|
else if (zprobe_zoffset > 0)
|
|
|
|
SERIAL_ECHOPGM(" & Above");
|
|
|
|
else
|
|
|
|
SERIAL_ECHOPGM(" & Same Z as");
|
|
|
|
SERIAL_ECHOLNPGM(" Nozzle)");
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if HAS_ABL
|
|
|
|
SERIAL_ECHOPGM("Auto Bed Leveling: ");
|
|
|
|
#if ENABLED(AUTO_BED_LEVELING_LINEAR)
|
|
|
|
SERIAL_ECHOPGM("LINEAR");
|
|
|
|
#elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
|
|
|
SERIAL_ECHOPGM("BILINEAR");
|
|
|
|
#elif ENABLED(AUTO_BED_LEVELING_3POINT)
|
|
|
|
SERIAL_ECHOPGM("3POINT");
|
|
|
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
|
|
|
SERIAL_ECHOPGM("UBL");
|
|
|
|
#endif
|
2017-10-14 00:21:25 +02:00
|
|
|
if (planner.leveling_active) {
|
2017-09-06 13:28:32 +02:00
|
|
|
SERIAL_ECHOLNPGM(" (enabled)");
|
2018-01-23 18:43:38 +01:00
|
|
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
|
|
|
if (planner.z_fade_height)
|
|
|
|
SERIAL_ECHOLNPAIR("Z Fade: ", planner.z_fade_height);
|
|
|
|
#endif
|
2017-09-06 13:28:32 +02:00
|
|
|
#if ABL_PLANAR
|
|
|
|
const float diff[XYZ] = {
|
|
|
|
stepper.get_axis_position_mm(X_AXIS) - current_position[X_AXIS],
|
|
|
|
stepper.get_axis_position_mm(Y_AXIS) - current_position[Y_AXIS],
|
|
|
|
stepper.get_axis_position_mm(Z_AXIS) - current_position[Z_AXIS]
|
|
|
|
};
|
|
|
|
SERIAL_ECHOPGM("ABL Adjustment X");
|
|
|
|
if (diff[X_AXIS] > 0) SERIAL_CHAR('+');
|
|
|
|
SERIAL_ECHO(diff[X_AXIS]);
|
|
|
|
SERIAL_ECHOPGM(" Y");
|
|
|
|
if (diff[Y_AXIS] > 0) SERIAL_CHAR('+');
|
|
|
|
SERIAL_ECHO(diff[Y_AXIS]);
|
|
|
|
SERIAL_ECHOPGM(" Z");
|
|
|
|
if (diff[Z_AXIS] > 0) SERIAL_CHAR('+');
|
|
|
|
SERIAL_ECHO(diff[Z_AXIS]);
|
2018-01-23 18:43:38 +01:00
|
|
|
#else
|
|
|
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
|
|
|
SERIAL_ECHOPGM("UBL Adjustment Z");
|
|
|
|
const float rz = ubl.get_z_correction(current_position[X_AXIS], current_position[Y_AXIS]);
|
|
|
|
#elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
|
|
|
SERIAL_ECHOPGM("ABL Adjustment Z");
|
|
|
|
const float rz = bilinear_z_offset(current_position);
|
|
|
|
#endif
|
|
|
|
SERIAL_ECHO(ftostr43sign(rz, '+'));
|
|
|
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
|
|
|
if (planner.z_fade_height) {
|
|
|
|
SERIAL_ECHOPAIR(" (", ftostr43sign(rz * planner.fade_scaling_factor_for_z(current_position[Z_AXIS]), '+'));
|
|
|
|
SERIAL_CHAR(')');
|
|
|
|
}
|
|
|
|
#endif
|
2017-09-06 13:28:32 +02:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
else
|
|
|
|
SERIAL_ECHOLNPGM(" (disabled)");
|
|
|
|
|
|
|
|
SERIAL_EOL();
|
|
|
|
|
|
|
|
#elif ENABLED(MESH_BED_LEVELING)
|
|
|
|
|
|
|
|
SERIAL_ECHOPGM("Mesh Bed Leveling");
|
2017-10-14 00:21:25 +02:00
|
|
|
if (planner.leveling_active) {
|
2017-09-06 13:28:32 +02:00
|
|
|
SERIAL_ECHOLNPGM(" (enabled)");
|
2018-01-23 18:43:38 +01:00
|
|
|
SERIAL_ECHOPAIR("MBL Adjustment Z", ftostr43sign(mbl.get_z(current_position[X_AXIS], current_position[Y_AXIS], 1.0), '+'));
|
|
|
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
|
|
|
if (planner.z_fade_height) {
|
|
|
|
SERIAL_ECHOPAIR(" (", ftostr43sign(
|
|
|
|
mbl.get_z(current_position[X_AXIS], current_position[Y_AXIS], planner.fade_scaling_factor_for_z(current_position[Z_AXIS])), '+'
|
|
|
|
));
|
|
|
|
SERIAL_CHAR(')');
|
|
|
|
}
|
|
|
|
#endif
|
2017-09-06 13:28:32 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
SERIAL_ECHOPGM(" (disabled)");
|
|
|
|
|
|
|
|
SERIAL_EOL();
|
|
|
|
|
|
|
|
#endif // MESH_BED_LEVELING
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif // DEBUG_LEVELING_FEATURE
|