UBL devel debugging flag
This commit is contained in:
parent
4f042533a5
commit
a20eacaa48
@ -137,7 +137,6 @@
|
|||||||
#if ENABLED(ULTRA_LCD)
|
#if ENABLED(ULTRA_LCD)
|
||||||
extern char lcd_status_message[];
|
extern char lcd_status_message[];
|
||||||
#endif
|
#endif
|
||||||
extern float destination[XYZE];
|
|
||||||
void set_destination_from_current();
|
void set_destination_from_current();
|
||||||
void prepare_move_to_destination();
|
void prepare_move_to_destination();
|
||||||
inline void sync_plan_position_e() { planner.set_e_position_mm(current_position[E_AXIS]); }
|
inline void sync_plan_position_e() { planner.set_e_position_mm(current_position[E_AXIS]); }
|
||||||
|
@ -223,7 +223,7 @@ extern volatile bool wait_for_heatup;
|
|||||||
extern volatile bool wait_for_user;
|
extern volatile bool wait_for_user;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern float current_position[NUM_AXIS];
|
extern float current_position[XYZE], destination[XYZE];
|
||||||
|
|
||||||
// Workspace offsets
|
// Workspace offsets
|
||||||
#if HAS_WORKSPACE_OFFSET
|
#if HAS_WORKSPACE_OFFSET
|
||||||
|
@ -51,6 +51,59 @@
|
|||||||
safe_delay(10);
|
safe_delay(10);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if ENABLED(UBL_DEVEL_DEBUGGING)
|
||||||
|
|
||||||
|
static void debug_echo_axis(const AxisEnum axis) {
|
||||||
|
if (current_position[axis] == destination[axis])
|
||||||
|
SERIAL_ECHOPGM("-------------");
|
||||||
|
else
|
||||||
|
SERIAL_ECHO_F(destination[X_AXIS], 6);
|
||||||
|
}
|
||||||
|
|
||||||
|
void debug_current_and_destination(const char *title) {
|
||||||
|
|
||||||
|
// if the title message starts with a '!' it is so important, we are going to
|
||||||
|
// ignore the status of the g26_debug_flag
|
||||||
|
if (*title != '!' && !g26_debug_flag) return;
|
||||||
|
|
||||||
|
const float de = destination[E_AXIS] - current_position[E_AXIS];
|
||||||
|
|
||||||
|
if (de == 0.0) return; // Printing moves only
|
||||||
|
|
||||||
|
const float dx = destination[X_AXIS] - current_position[X_AXIS],
|
||||||
|
dy = destination[Y_AXIS] - current_position[Y_AXIS],
|
||||||
|
xy_dist = HYPOT(dx, dy);
|
||||||
|
|
||||||
|
if (xy_dist == 0.0) return;
|
||||||
|
|
||||||
|
SERIAL_ECHOPGM(" fpmm=");
|
||||||
|
const float fpmm = de / xy_dist;
|
||||||
|
SERIAL_ECHO_F(fpmm, 6);
|
||||||
|
|
||||||
|
SERIAL_ECHOPGM(" current=( ");
|
||||||
|
SERIAL_ECHO_F(current_position[X_AXIS], 6);
|
||||||
|
SERIAL_ECHOPGM(", ");
|
||||||
|
SERIAL_ECHO_F(current_position[Y_AXIS], 6);
|
||||||
|
SERIAL_ECHOPGM(", ");
|
||||||
|
SERIAL_ECHO_F(current_position[Z_AXIS], 6);
|
||||||
|
SERIAL_ECHOPGM(", ");
|
||||||
|
SERIAL_ECHO_F(current_position[E_AXIS], 6);
|
||||||
|
SERIAL_ECHOPGM(" ) destination=( ");
|
||||||
|
debug_echo_axis(X_AXIS);
|
||||||
|
SERIAL_ECHOPGM(", ");
|
||||||
|
debug_echo_axis(Y_AXIS);
|
||||||
|
SERIAL_ECHOPGM(", ");
|
||||||
|
debug_echo_axis(Z_AXIS);
|
||||||
|
SERIAL_ECHOPGM(", ");
|
||||||
|
debug_echo_axis(E_AXIS);
|
||||||
|
SERIAL_ECHOPGM(" ) ");
|
||||||
|
SERIAL_ECHO(title);
|
||||||
|
SERIAL_EOL();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // UBL_DEVEL_DEBUGGING
|
||||||
|
|
||||||
int8_t unified_bed_leveling::storage_slot;
|
int8_t unified_bed_leveling::storage_slot;
|
||||||
|
|
||||||
float unified_bed_leveling::z_values[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y];
|
float unified_bed_leveling::z_values[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y];
|
||||||
@ -174,7 +227,7 @@
|
|||||||
uint8_t error_flag = 0;
|
uint8_t error_flag = 0;
|
||||||
|
|
||||||
if (settings.calc_num_meshes() < 1) {
|
if (settings.calc_num_meshes() < 1) {
|
||||||
SERIAL_PROTOCOLLNPGM("?Insufficient EEPROM storage for a mesh of this size.");
|
SERIAL_PROTOCOLLNPGM("?Mesh too big for EEPROM.");
|
||||||
error_flag++;
|
error_flag++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -26,6 +26,9 @@
|
|||||||
#include "MarlinConfig.h"
|
#include "MarlinConfig.h"
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
|
//#define UBL_DEVEL_DEBUGGING
|
||||||
|
|
||||||
#include "Marlin.h"
|
#include "Marlin.h"
|
||||||
#include "planner.h"
|
#include "planner.h"
|
||||||
#include "math.h"
|
#include "math.h"
|
||||||
@ -41,7 +44,11 @@
|
|||||||
|
|
||||||
// ubl_motion.cpp
|
// ubl_motion.cpp
|
||||||
|
|
||||||
void debug_current_and_destination(const char * const title);
|
#if ENABLED(UBL_DEVEL_DEBUGGING)
|
||||||
|
void debug_current_and_destination(const char * const title);
|
||||||
|
#else
|
||||||
|
FORCE_INLINE void debug_current_and_destination(const char * const title) { UNUSED(title); }
|
||||||
|
#endif
|
||||||
|
|
||||||
// ubl_G29.cpp
|
// ubl_G29.cpp
|
||||||
|
|
||||||
|
@ -24,8 +24,6 @@
|
|||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
//#define UBL_DEVEL_DEBUGGING
|
|
||||||
|
|
||||||
#include "ubl.h"
|
#include "ubl.h"
|
||||||
#include "Marlin.h"
|
#include "Marlin.h"
|
||||||
#include "hex_print_routines.h"
|
#include "hex_print_routines.h"
|
||||||
@ -1165,12 +1163,12 @@
|
|||||||
|
|
||||||
static uint8_t ubl_state_at_invocation = 0;
|
static uint8_t ubl_state_at_invocation = 0;
|
||||||
|
|
||||||
#ifdef UBL_DEVEL_DEBUGGING
|
#if ENABLED(UBL_DEVEL_DEBUGGING)
|
||||||
static uint8_t ubl_state_recursion_chk = 0;
|
static uint8_t ubl_state_recursion_chk = 0;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void unified_bed_leveling::save_ubl_active_state_and_disable() {
|
void unified_bed_leveling::save_ubl_active_state_and_disable() {
|
||||||
#ifdef UBL_DEVEL_DEBUGGING
|
#if ENABLED(UBL_DEVEL_DEBUGGING)
|
||||||
ubl_state_recursion_chk++;
|
ubl_state_recursion_chk++;
|
||||||
if (ubl_state_recursion_chk != 1) {
|
if (ubl_state_recursion_chk != 1) {
|
||||||
SERIAL_ECHOLNPGM("save_ubl_active_state_and_disabled() called multiple times in a row.");
|
SERIAL_ECHOLNPGM("save_ubl_active_state_and_disabled() called multiple times in a row.");
|
||||||
@ -1186,7 +1184,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
void unified_bed_leveling::restore_ubl_active_state_and_leave() {
|
void unified_bed_leveling::restore_ubl_active_state_and_leave() {
|
||||||
#ifdef UBL_DEVEL_DEBUGGING
|
#if ENABLED(UBL_DEVEL_DEBUGGING)
|
||||||
if (--ubl_state_recursion_chk) {
|
if (--ubl_state_recursion_chk) {
|
||||||
SERIAL_ECHOLNPGM("restore_ubl_active_state_and_leave() called too many times.");
|
SERIAL_ECHOLNPGM("restore_ubl_active_state_and_leave() called too many times.");
|
||||||
#if ENABLED(NEWPANEL)
|
#if ENABLED(NEWPANEL)
|
||||||
@ -1267,7 +1265,7 @@
|
|||||||
SERIAL_EOL();
|
SERIAL_EOL();
|
||||||
safe_delay(50);
|
safe_delay(50);
|
||||||
|
|
||||||
#ifdef UBL_DEVEL_DEBUGGING
|
#if ENABLED(UBL_DEVEL_DEBUGGING)
|
||||||
SERIAL_PROTOCOLLNPAIR("ubl_state_at_invocation :", ubl_state_at_invocation);
|
SERIAL_PROTOCOLLNPAIR("ubl_state_at_invocation :", ubl_state_at_invocation);
|
||||||
SERIAL_EOL();
|
SERIAL_EOL();
|
||||||
SERIAL_PROTOCOLLNPAIR("ubl_state_recursion_chk :", ubl_state_recursion_chk);
|
SERIAL_PROTOCOLLNPAIR("ubl_state_recursion_chk :", ubl_state_recursion_chk);
|
||||||
|
@ -30,63 +30,12 @@
|
|||||||
#include <avr/io.h>
|
#include <avr/io.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
extern float destination[XYZE];
|
|
||||||
|
|
||||||
#if AVR_AT90USB1286_FAMILY // Teensyduino & Printrboard IDE extensions have compile errors without this
|
#if AVR_AT90USB1286_FAMILY // Teensyduino & Printrboard IDE extensions have compile errors without this
|
||||||
inline void set_current_from_destination() { COPY(current_position, destination); }
|
inline void set_current_from_destination() { COPY(current_position, destination); }
|
||||||
#else
|
#else
|
||||||
extern void set_current_from_destination();
|
extern void set_current_from_destination();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void debug_echo_axis(const AxisEnum axis) {
|
|
||||||
if (current_position[axis] == destination[axis])
|
|
||||||
SERIAL_ECHOPGM("-------------");
|
|
||||||
else
|
|
||||||
SERIAL_ECHO_F(destination[X_AXIS], 6);
|
|
||||||
}
|
|
||||||
|
|
||||||
void debug_current_and_destination(const char *title) {
|
|
||||||
|
|
||||||
// if the title message starts with a '!' it is so important, we are going to
|
|
||||||
// ignore the status of the g26_debug_flag
|
|
||||||
if (*title != '!' && !g26_debug_flag) return;
|
|
||||||
|
|
||||||
const float de = destination[E_AXIS] - current_position[E_AXIS];
|
|
||||||
|
|
||||||
if (de == 0.0) return; // Printing moves only
|
|
||||||
|
|
||||||
const float dx = destination[X_AXIS] - current_position[X_AXIS],
|
|
||||||
dy = destination[Y_AXIS] - current_position[Y_AXIS],
|
|
||||||
xy_dist = HYPOT(dx, dy);
|
|
||||||
|
|
||||||
if (xy_dist == 0.0) return;
|
|
||||||
|
|
||||||
SERIAL_ECHOPGM(" fpmm=");
|
|
||||||
const float fpmm = de / xy_dist;
|
|
||||||
SERIAL_ECHO_F(fpmm, 6);
|
|
||||||
|
|
||||||
SERIAL_ECHOPGM(" current=( ");
|
|
||||||
SERIAL_ECHO_F(current_position[X_AXIS], 6);
|
|
||||||
SERIAL_ECHOPGM(", ");
|
|
||||||
SERIAL_ECHO_F(current_position[Y_AXIS], 6);
|
|
||||||
SERIAL_ECHOPGM(", ");
|
|
||||||
SERIAL_ECHO_F(current_position[Z_AXIS], 6);
|
|
||||||
SERIAL_ECHOPGM(", ");
|
|
||||||
SERIAL_ECHO_F(current_position[E_AXIS], 6);
|
|
||||||
SERIAL_ECHOPGM(" ) destination=( ");
|
|
||||||
debug_echo_axis(X_AXIS);
|
|
||||||
SERIAL_ECHOPGM(", ");
|
|
||||||
debug_echo_axis(Y_AXIS);
|
|
||||||
SERIAL_ECHOPGM(", ");
|
|
||||||
debug_echo_axis(Z_AXIS);
|
|
||||||
SERIAL_ECHOPGM(", ");
|
|
||||||
debug_echo_axis(E_AXIS);
|
|
||||||
SERIAL_ECHOPGM(" ) ");
|
|
||||||
SERIAL_ECHO(title);
|
|
||||||
SERIAL_EOL();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void unified_bed_leveling::line_to_destination_cartesian(const float &feed_rate, uint8_t extruder) {
|
void unified_bed_leveling::line_to_destination_cartesian(const float &feed_rate, uint8_t extruder) {
|
||||||
/**
|
/**
|
||||||
* Much of the nozzle movement will be within the same cell. So we will do as little computation
|
* Much of the nozzle movement will be within the same cell. So we will do as little computation
|
||||||
|
@ -2755,7 +2755,6 @@ void kill_screen(const char* lcd_msg) {
|
|||||||
|
|
||||||
#if IS_KINEMATIC
|
#if IS_KINEMATIC
|
||||||
extern float feedrate_mm_s;
|
extern float feedrate_mm_s;
|
||||||
extern float destination[XYZE];
|
|
||||||
void set_destination_from_current();
|
void set_destination_from_current();
|
||||||
void prepare_move_to_destination();
|
void prepare_move_to_destination();
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user