From 0822bcbff8c0f52e1ab57b09e00f6fff3dd9d0b3 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Thu, 25 Apr 2019 23:35:43 -0400 Subject: [PATCH] Bump in the night --- Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp | 6 +++--- Marlin/src/lcd/extensible_ui/ui_api.cpp | 1 + Marlin/src/lcd/extensible_ui/ui_api.h | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp b/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp index 24e2018cf4..8dff184d00 100644 --- a/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp +++ b/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp @@ -70,13 +70,13 @@ char commandbuf[30]; if (ExtUI::getMeshValid()) { //bed_mesh_t bedMesh = ExtUI::getMeshArray(); - for(int xCount = 0; xCount < GRID_MAX_POINTS_X; xCount++) + for(int xCount = 0; xCount < GRID_MAX_POINTS_X; xCount++) { - for(int yCount = 0; yCount < GRID_MAX_POINTS_X; yCount++) + for(int yCount = 0; yCount < GRID_MAX_POINTS_X; yCount++) { if((showcount++) < 16) { - rtscheck.RTS_SndData(getMeshArray[xCount][yCount] *10000, AutolevelVal + (15-showcount-1)*2); + rtscheck.RTS_SndData(getMeshPoint(xCount, yCount) *10000, AutolevelVal + (15-showcount-1)*2); rtscheck.RTS_SndData(showcount,AutolevelIcon); } } diff --git a/Marlin/src/lcd/extensible_ui/ui_api.cpp b/Marlin/src/lcd/extensible_ui/ui_api.cpp index 4b5c0477c7..54b9f06358 100644 --- a/Marlin/src/lcd/extensible_ui/ui_api.cpp +++ b/Marlin/src/lcd/extensible_ui/ui_api.cpp @@ -715,6 +715,7 @@ namespace ExtUI { #if HAS_MESH bool getMeshValid() { return leveling_is_valid(); } //bed_mesh_t getMeshArray = Z_VALUES_ARR; + float getMeshPoint(const uint8_t xpos, const uint8_t ypos) { return Z_VALUES(xpos,ypos);} void setMeshPoint(const uint8_t xpos, const uint8_t ypos, const float zoff) { if (WITHIN(xpos, 0, GRID_MAX_POINTS_X) && WITHIN(ypos, 0, GRID_MAX_POINTS_Y)) { Z_VALUES(xpos, ypos) = zoff; diff --git a/Marlin/src/lcd/extensible_ui/ui_api.h b/Marlin/src/lcd/extensible_ui/ui_api.h index be18c711ba..550fc7f2fb 100644 --- a/Marlin/src/lcd/extensible_ui/ui_api.h +++ b/Marlin/src/lcd/extensible_ui/ui_api.h @@ -115,7 +115,8 @@ namespace ExtUI { #if HAS_MESH #include "../../feature/bedlevel/bedlevel.h" bool getMeshValid(); - float *getMeshArray[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y] = &Z_VALUES_ARR; + //float *getMeshArray[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y] = &Z_VALUES_ARR; + float getMeshPoint(const uint8_t xpos, const uint8_t ypos); void setMeshPoint(const uint8_t xpos, const uint8_t ypos, const float zval); void onMeshUpdate(const uint8_t xpos, const uint8_t ypos, const float zval); #endif