andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

🐛 Fix UBL 'R' parameter and adjust 'P' (#22129)

vanilla_fb_2.0.x
Katelyn Schiesser 4 years ago
committed by Scott Lahteine
parent
3b0a40cd5d
commit
a7135d429b
4 changed files with 23 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Marlin/src/feature/bedlevel/ubl/ubl.cpp
  2. 8
      Marlin/src/feature/bedlevel/ubl/ubl.h
  3. 28
      Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
  4. 6
      Marlin/src/lcd/menu/menu_ubl.cpp

4
Marlin/src/feature/bedlevel/ubl/ubl.cpp
View File

@ -164,7 +164,7 @@ static void serial_echo_column_labels(const uint8_t sp) {
* 2: TODO: Display on Graphical LCD * 2: TODO: Display on Graphical LCD
* 4: Compact Human-Readable * 4: Compact Human-Readable
*/ */
void unified_bed_leveling::display_map(const int map_type) { void unified_bed_leveling::display_map(const uint8_t map_type) {
const bool was = gcode.set_autoreport_paused(true); const bool was = gcode.set_autoreport_paused(true);
constexpr uint8_t eachsp = 1 + 6 + 1, // [-3.567] constexpr uint8_t eachsp = 1 + 6 + 1, // [-3.567]
@ -263,7 +263,7 @@ bool unified_bed_leveling::sanity_check() {
void GcodeSuite::M1004() { void GcodeSuite::M1004() {
#define ALIGN_GCODE TERN(Z_STEPPER_AUTO_ALIGN, "G34", "") #define ALIGN_GCODE TERN(Z_STEPPER_AUTO_ALIGN, "G34", "")
#define PROBE_GCODE TERN(HAS_BED_PROBE, "G29P1\nG29P3", "G29P4R255") #define PROBE_GCODE TERN(HAS_BED_PROBE, "G29P1\nG29P3", "G29P4R")
#if HAS_HOTEND #if HAS_HOTEND
if (parser.seenval('H')) { // Handle H# parameter to set Hotend temp if (parser.seenval('H')) { // Handle H# parameter to set Hotend temp

8
Marlin/src/feature/bedlevel/ubl/ubl.h
View File

@ -47,10 +47,10 @@ struct mesh_index_pair;
typedef struct { typedef struct {
bool C_seen; bool C_seen;
int8_t V_verbosity, int8_t KLS_storage_slot;
uint8_t R_repetition,
V_verbosity,
P_phase, P_phase,
R_repetition,
KLS_storage_slot,
T_map_type; T_map_type;
float B_shim_thickness, float B_shim_thickness,
C_constant; C_constant;
@ -98,7 +98,7 @@ public:
static void report_state(); static void report_state();
static void save_ubl_active_state_and_disable(); static void save_ubl_active_state_and_disable();
static void restore_ubl_active_state_and_leave(); static void restore_ubl_active_state_and_leave();
static void display_map(const int) _O0; static void display_map(const uint8_t) _O0;
static mesh_index_pair find_closest_mesh_point_of_type(const MeshPointType, const xy_pos_t&, const bool=false, MeshFlags *done_flags=nullptr) _O0; static mesh_index_pair find_closest_mesh_point_of_type(const MeshPointType, const xy_pos_t&, const bool=false, MeshFlags *done_flags=nullptr) _O0;
static mesh_index_pair find_furthest_invalid_mesh_point() _O0; static mesh_index_pair find_furthest_invalid_mesh_point() _O0;
static void reset(); static void reset();

28
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View File

@ -305,7 +305,7 @@ void unified_bed_leveling::G29() {
bool probe_deployed = false; bool probe_deployed = false;
if (G29_parse_parameters()) return; // Abort on parameter error if (G29_parse_parameters()) return; // Abort on parameter error
const int8_t p_val = parser.intval('P', -1); const uint8_t p_val = parser.byteval('P');
const bool may_move = p_val == 1 || p_val == 2 || p_val == 4 || parser.seen_test('J'); const bool may_move = p_val == 1 || p_val == 2 || p_val == 4 || parser.seen_test('J');
#if ENABLED(HAS_MULTI_HOTEND) #if ENABLED(HAS_MULTI_HOTEND)
const uint8_t old_tool_index = active_extruder; const uint8_t old_tool_index = active_extruder;
@ -321,7 +321,7 @@ void unified_bed_leveling::G29() {
// Invalidate one or more nearby mesh points, possibly all. // Invalidate one or more nearby mesh points, possibly all.
if (parser.seen('I')) { if (parser.seen('I')) {
int16_t count = parser.has_value() ? parser.value_int() : 1; uint8_t count = parser.has_value() ? parser.value_byte() : 1;
bool invalidate_all = count >= GRID_MAX_POINTS; bool invalidate_all = count >= GRID_MAX_POINTS;
if (!invalidate_all) { if (!invalidate_all) {
while (count--) { while (count--) {
@ -345,7 +345,7 @@ void unified_bed_leveling::G29() {
} }
if (parser.seen('Q')) { if (parser.seen('Q')) {
const int test_pattern = parser.has_value() ? parser.value_int() : -99; const int16_t test_pattern = parser.has_value() ? parser.value_int() : -99;
if (!WITHIN(test_pattern, -1, 2)) { if (!WITHIN(test_pattern, -1, 2)) {
SERIAL_ECHOLNPGM("Invalid test_pattern value. (-1 to 2)\n"); SERIAL_ECHOLNPGM("Invalid test_pattern value. (-1 to 2)\n");
return; return;
@ -592,7 +592,7 @@ void unified_bed_leveling::G29() {
// //
if (parser.seen('L')) { // Load Current Mesh Data if (parser.seen('L')) { // Load Current Mesh Data
param.KLS_storage_slot = parser.has_value() ? parser.value_int() : storage_slot; param.KLS_storage_slot = parser.has_value() ? (int8_t)parser.value_int() : storage_slot;
int16_t a = settings.calc_num_meshes(); int16_t a = settings.calc_num_meshes();
@ -617,10 +617,10 @@ void unified_bed_leveling::G29() {
// //
if (parser.seen('S')) { // Store (or Save) Current Mesh Data if (parser.seen('S')) { // Store (or Save) Current Mesh Data
param.KLS_storage_slot = parser.has_value() ? parser.value_int() : storage_slot; param.KLS_storage_slot = parser.has_value() ? (int8_t)parser.value_int() : storage_slot;
if (param.KLS_storage_slot == -1) // Special case, the user wants to 'Export' the mesh to the if (param.KLS_storage_slot == -1) // Special case: 'Export' the mesh to the
return report_current_mesh(); // host program to be saved on the user's computer return report_current_mesh(); // host so it can be saved in a file.
int16_t a = settings.calc_num_meshes(); int16_t a = settings.calc_num_meshes();
@ -673,7 +673,7 @@ void unified_bed_leveling::G29() {
*/ */
void unified_bed_leveling::adjust_mesh_to_mean(const bool cflag, const_float_t offset) { void unified_bed_leveling::adjust_mesh_to_mean(const bool cflag, const_float_t offset) {
float sum = 0; float sum = 0;
int n = 0; uint8_t n = 0;
GRID_LOOP(x, y) GRID_LOOP(x, y)
if (!isnan(z_values[x][y])) { if (!isnan(z_values[x][y])) {
sum += z_values[x][y]; sum += z_values[x][y];
@ -734,7 +734,7 @@ void unified_bed_leveling::shift_mesh_height() {
do { do {
if (do_ubl_mesh_map) display_map(param.T_map_type); if (do_ubl_mesh_map) display_map(param.T_map_type);
const int point_num = (GRID_MAX_POINTS) - count + 1; const uint8_t point_num = (GRID_MAX_POINTS - count) + 1;
SERIAL_ECHOLNPAIR("Probing mesh point ", point_num, "/", GRID_MAX_POINTS, "."); SERIAL_ECHOLNPAIR("Probing mesh point ", point_num, "/", GRID_MAX_POINTS, ".");
TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_MESH), point_num, int(GRID_MAX_POINTS))); TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_MESH), point_num, int(GRID_MAX_POINTS)));
@ -1083,7 +1083,7 @@ bool unified_bed_leveling::G29_parse_parameters() {
param.R_repetition = 0; param.R_repetition = 0;
if (parser.seen('R')) { if (parser.seen('R')) {
param.R_repetition = parser.has_value() ? parser.value_int() : GRID_MAX_POINTS; param.R_repetition = parser.has_value() ? parser.value_byte() : GRID_MAX_POINTS;
NOMORE(param.R_repetition, GRID_MAX_POINTS); NOMORE(param.R_repetition, GRID_MAX_POINTS);
if (param.R_repetition < 1) { if (param.R_repetition < 1) {
SERIAL_ECHOLNPGM("?(R)epetition count invalid (1+).\n"); SERIAL_ECHOLNPGM("?(R)epetition count invalid (1+).\n");
@ -1091,14 +1091,14 @@ bool unified_bed_leveling::G29_parse_parameters() {
} }
} }
param.V_verbosity = parser.intval('V'); param.V_verbosity = parser.byteval('V');
if (!WITHIN(param.V_verbosity, 0, 4)) { if (!WITHIN(param.V_verbosity, 0, 4)) {
SERIAL_ECHOLNPGM("?(V)erbose level implausible (0-4).\n"); SERIAL_ECHOLNPGM("?(V)erbose level implausible (0-4).\n");
err_flag = true; err_flag = true;
} }
if (parser.seen('P')) { if (parser.seen('P')) {
const int pv = parser.value_int(); const uint8_t pv = parser.value_byte();
#if !HAS_BED_PROBE #if !HAS_BED_PROBE
if (pv == 1) { if (pv == 1) {
SERIAL_ECHOLNPGM("G29 P1 requires a probe.\n"); SERIAL_ECHOLNPGM("G29 P1 requires a probe.\n");
@ -1181,7 +1181,7 @@ bool unified_bed_leveling::G29_parse_parameters() {
} }
#endif #endif
param.T_map_type = parser.intval('T'); param.T_map_type = parser.byteval('T');
if (!WITHIN(param.T_map_type, 0, 2)) { if (!WITHIN(param.T_map_type, 0, 2)) {
SERIAL_ECHOLNPGM("Invalid map type.\n"); SERIAL_ECHOLNPGM("Invalid map type.\n");
return UBL_ERR; return UBL_ERR;
@ -1833,7 +1833,7 @@ void unified_bed_leveling::smart_fill_mesh() {
return; return;
} }
param.KLS_storage_slot = parser.value_int(); param.KLS_storage_slot = (int8_t)parser.value_int();
float tmp_z_values[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y]; float tmp_z_values[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y];
settings.load_mesh(param.KLS_storage_slot, &tmp_z_values); settings.load_mesh(param.KLS_storage_slot, &tmp_z_values);

6
Marlin/src/lcd/menu/menu_ubl.cpp
View File

@ -176,7 +176,7 @@ void _menu_ubl_height_adjust() {
void _lcd_ubl_edit_mesh() { void _lcd_ubl_edit_mesh() {
START_MENU(); START_MENU();
BACK_ITEM(MSG_UBL_TOOLS); BACK_ITEM(MSG_UBL_TOOLS);
GCODES_ITEM(MSG_UBL_FINE_TUNE_ALL, PSTR("G29P4R999T")); GCODES_ITEM(MSG_UBL_FINE_TUNE_ALL, PSTR("G29P4RT"));
GCODES_ITEM(MSG_UBL_FINE_TUNE_CLOSEST, PSTR("G29P4T")); GCODES_ITEM(MSG_UBL_FINE_TUNE_CLOSEST, PSTR("G29P4T"));
SUBMENU(MSG_UBL_MESH_HEIGHT_ADJUST, _menu_ubl_height_adjust); SUBMENU(MSG_UBL_MESH_HEIGHT_ADJUST, _menu_ubl_height_adjust);
ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status); ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
@ -594,9 +594,9 @@ void _menu_ubl_tools() {
GCODES_ITEM(MSG_UBL_1_BUILD_COLD_MESH, PSTR("G29NP1")); GCODES_ITEM(MSG_UBL_1_BUILD_COLD_MESH, PSTR("G29NP1"));
GCODES_ITEM(MSG_UBL_2_SMART_FILLIN, PSTR("G29P3T0")); GCODES_ITEM(MSG_UBL_2_SMART_FILLIN, PSTR("G29P3T0"));
SUBMENU(MSG_UBL_3_VALIDATE_MESH_MENU, _lcd_ubl_validate_mesh); SUBMENU(MSG_UBL_3_VALIDATE_MESH_MENU, _lcd_ubl_validate_mesh);
GCODES_ITEM(MSG_UBL_4_FINE_TUNE_ALL, PSTR("G29P4R999T")); GCODES_ITEM(MSG_UBL_4_FINE_TUNE_ALL, PSTR("G29P4RT"));
SUBMENU(MSG_UBL_5_VALIDATE_MESH_MENU, _lcd_ubl_validate_mesh); SUBMENU(MSG_UBL_5_VALIDATE_MESH_MENU, _lcd_ubl_validate_mesh);
GCODES_ITEM(MSG_UBL_6_FINE_TUNE_ALL, PSTR("G29P4R999T")); GCODES_ITEM(MSG_UBL_6_FINE_TUNE_ALL, PSTR("G29P4RT"));
ACTION_ITEM(MSG_UBL_7_SAVE_MESH, _lcd_ubl_save_mesh_cmd); ACTION_ITEM(MSG_UBL_7_SAVE_MESH, _lcd_ubl_save_mesh_cmd);
END_MENU(); END_MENU();
} }

Write Preview
Loading…
Cancel
Save