Skip to content

Commit 238951a

Browse files
committed
🎨 More more lowercase (partial ProUI)
Followup to #25939
1 parent 78b3426 commit 238951a

16 files changed

+224
-224
lines changed

Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -217,13 +217,13 @@ bool BedLevelToolsClass::meshvalidate() {
217217
const float v_max = abs(get_max_value()), v_min = abs(get_min_value()), range = _MAX(v_min, v_max);
218218

219219
// Clear background from previous selection and select new square
220-
DWIN_Draw_Rectangle(1, Color_Bg_Black, _MAX(0, padding_x - gridline_width), _MAX(0, padding_y_top - gridline_width), padding_x + total_width_px, padding_y_top + total_width_px);
220+
dwinDrawRectangle(1, Color_Bg_Black, _MAX(0, padding_x - gridline_width), _MAX(0, padding_y_top - gridline_width), padding_x + total_width_px, padding_y_top + total_width_px);
221221
if (selected >= 0) {
222222
const auto selected_y = selected / (GRID_MAX_POINTS_X);
223223
const auto selected_x = selected - (GRID_MAX_POINTS_X) * selected_y;
224224
const auto start_y_px = padding_y_top + selected_y * cell_height_px;
225225
const auto start_x_px = padding_x + selected_x * cell_width_px;
226-
DWIN_Draw_Rectangle(1, Color_White, _MAX(0, start_x_px - gridline_width), _MAX(0, start_y_px - gridline_width), start_x_px + cell_width_px, start_y_px + cell_height_px);
226+
dwinDrawRectangle(1, Color_White, _MAX(0, start_x_px - gridline_width), _MAX(0, start_y_px - gridline_width), start_x_px + cell_width_px, start_y_px + cell_height_px);
227227
}
228228

229229
// Draw value square grid
@@ -233,7 +233,7 @@ bool BedLevelToolsClass::meshvalidate() {
233233
const auto end_x_px = start_x_px + cell_width_px - 1 - gridline_width;
234234
const auto start_y_px = padding_y_top + ((GRID_MAX_POINTS_Y) - y - 1) * cell_height_px;
235235
const auto end_y_px = start_y_px + cell_height_px - 1 - gridline_width;
236-
DWIN_Draw_Rectangle(1, // RGB565 colors: http://www.barth-dev.de/online/rgb565-color-picker/
236+
dwinDrawRectangle(1, // RGB565 colors: http://www.barth-dev.de/online/rgb565-color-picker/
237237
isnan(bedlevel.z_values[x][y]) ? Color_Grey : ( // gray if undefined
238238
(bedlevel.z_values[x][y] < 0 ?
239239
(uint16_t)round(0x1F * -bedlevel.z_values[x][y] / (!viewer_asymmetric_range ? range : v_min)) << 11 : // red if mesh point value is negative
@@ -249,7 +249,7 @@ bool BedLevelToolsClass::meshvalidate() {
249249
if (viewer_print_value) {
250250
int8_t offset_x, offset_y = cell_height_px / 2 - 6;
251251
if (isnan(bedlevel.z_values[x][y])) { // undefined
252-
DWIN_Draw_String(false, font6x12, Color_White, Color_Bg_Blue, start_x_px + cell_width_px / 2 - 5, start_y_px + offset_y, F("X"));
252+
dwinDrawString(false, font6x12, Color_White, Color_Bg_Blue, start_x_px + cell_width_px / 2 - 5, start_y_px + offset_y, F("X"));
253253
}
254254
else { // has value
255255
if (GRID_MAX_POINTS_X < 10)
@@ -258,8 +258,8 @@ bool BedLevelToolsClass::meshvalidate() {
258258
sprintf_P(buf, PSTR("%02i"), (uint16_t)(abs(bedlevel.z_values[x][y] - (int16_t)bedlevel.z_values[x][y]) * 100));
259259
offset_x = cell_width_px / 2 - 3 * (strlen(buf)) - 2;
260260
if (!(GRID_MAX_POINTS_X < 10))
261-
DWIN_Draw_String(false, font6x12, Color_White, Color_Bg_Blue, start_x_px - 2 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, F("."));
262-
DWIN_Draw_String(false, font6x12, Color_White, Color_Bg_Blue, start_x_px + 1 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, buf);
261+
dwinDrawString(false, font6x12, Color_White, Color_Bg_Blue, start_x_px - 2 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, F("."));
262+
dwinDrawString(false, font6x12, Color_White, Color_Bg_Blue, start_x_px + 1 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, buf);
263263
}
264264
safe_delay(10);
265265
LCD_SERIAL.flushTX();

0 commit comments

Comments
 (0)