From ab9f0f2c4fcb118323171c3c9d259a4cb494a254 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 20 Nov 2019 04:57:04 -0600 Subject: [PATCH] Followup to meshCount patch --- Marlin/src/gcode/bedlevel/abl/G29.cpp | 2 +- Marlin/src/lcd/extensible_ui/ui_api.h | 3 +-- Marlin/src/lcd/extui_example.cpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp index 57ec6193d..d78155375 100644 --- a/Marlin/src/gcode/bedlevel/abl/G29.cpp +++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp @@ -225,7 +225,7 @@ G29_TYPE GcodeSuite::G29() { #if ABL_GRID #if ENABLED(PROBE_MANUALLY) - ABL_VAR xy_uint8_t meshCount; + ABL_VAR xy_int8_t meshCount; #endif ABL_VAR xy_float_t probe_position_lf, probe_position_rb; diff --git a/Marlin/src/lcd/extensible_ui/ui_api.h b/Marlin/src/lcd/extensible_ui/ui_api.h index 6f852cdd8..85953d814 100644 --- a/Marlin/src/lcd/extensible_ui/ui_api.h +++ b/Marlin/src/lcd/extensible_ui/ui_api.h @@ -137,8 +137,7 @@ namespace ExtUI { bed_mesh_t& getMeshArray(); float getMeshPoint(const xy_uint8_t &pos); void setMeshPoint(const xy_uint8_t &pos, const float zval); - void onMeshUpdate(const uint8_t xpos, const uint8_t ypos, const float zval); - inline void onMeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) { onMeshUpdate((uint8_t)xpos, (uint8_t)ypos, zval); } + void onMeshUpdate(const int8_t xpos, const int8_t ypos, const float zval); inline void onMeshUpdate(const xy_int8_t &pos, const float zval) { onMeshUpdate(pos.x, pos.y, zval); } #endif #endif diff --git a/Marlin/src/lcd/extui_example.cpp b/Marlin/src/lcd/extui_example.cpp index 9bdc0ddfe..9a00db5f8 100644 --- a/Marlin/src/lcd/extui_example.cpp +++ b/Marlin/src/lcd/extui_example.cpp @@ -89,7 +89,7 @@ namespace ExtUI { // whether successful or not. } - void onMeshUpdate(const uint8_t xpos, const uint8_t ypos, const float zval) { + void onMeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) { // This is called when any mesh points are updated } }