MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Followup to meshCount patch

Browse Source
This commit is contained in:
Scott Lahteine 2019-11-20 04:57:04 -06:00
parent e81b946f06
commit ab9f0f2c4f
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/gcode/bedlevel/abl/G29.cpp
View File

@ -225,7 +225,7 @@ G29_TYPE GcodeSuite::G29() {
#if ABL_GRID #if ABL_GRID
#if ENABLED(PROBE_MANUALLY) #if ENABLED(PROBE_MANUALLY)
ABL_VAR xy_uint8_t meshCount; ABL_VAR xy_int8_t meshCount;
#endif #endif
ABL_VAR xy_float_t probe_position_lf, probe_position_rb; ABL_VAR xy_float_t probe_position_lf, probe_position_rb;

3
Marlin/src/lcd/extensible_ui/ui_api.h
View File

@ -137,8 +137,7 @@ namespace ExtUI {
bed_mesh_t& getMeshArray(); bed_mesh_t& getMeshArray();
float getMeshPoint(const xy_uint8_t &pos); float getMeshPoint(const xy_uint8_t &pos);
void setMeshPoint(const xy_uint8_t &pos, const float zval); void setMeshPoint(const xy_uint8_t &pos, const float zval);
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);
inline void onMeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) { onMeshUpdate((uint8_t)xpos, (uint8_t)ypos, zval); }
inline void onMeshUpdate(const xy_int8_t &pos, const float zval) { onMeshUpdate(pos.x, pos.y, zval); } inline void onMeshUpdate(const xy_int8_t &pos, const float zval) { onMeshUpdate(pos.x, pos.y, zval); }
#endif #endif
#endif #endif

2
Marlin/src/lcd/extui_example.cpp
View File

@ -89,7 +89,7 @@ namespace ExtUI {
// whether successful or not. // 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 // This is called when any mesh points are updated
} }
} }