Skip to content

Commit 3b8b975

Browse files
thinkyheadthinkyhead
committed
🎨 More lowercase (ProUI)
1 parent 238951a commit 3b8b975

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+2327
-2330
lines changed

‎Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ void unified_bed_leveling::shift_mesh_height() {
753753

754754
TERN_(HAS_MARLINUI_MENU, ui.capture());
755755
TERN_(EXTENSIBLE_UI, ExtUI::onLevelingStart());
756-
TERN_(DWIN_LCD_PROUI, DWIN_LevelingStart());
756+
TERN_(DWIN_LCD_PROUI, dwinLevelingStart());
757757

758758
save_ubl_active_state_and_disable(); // No bed level correction so only raw data is obtained
759759
grid_count_t count = GRID_MAX_POINTS;
@@ -814,7 +814,7 @@ void unified_bed_leveling::shift_mesh_height() {
814814
);
815815

816816
TERN_(EXTENSIBLE_UI, ExtUI::onLevelingDone());
817-
TERN_(DWIN_LCD_PROUI, DWIN_LevelingDone());
817+
TERN_(DWIN_LCD_PROUI, dwinLevelingDone());
818818
}
819819

820820
#endif // HAS_BED_PROBE

‎Marlin/src/feature/runout.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ void event_filament_runout(const uint8_t extruder) {
8888
#endif
8989

9090
TERN_(EXTENSIBLE_UI, ExtUI::onFilamentRunout(ExtUI::getTool(extruder)));
91-
TERN_(DWIN_LCD_PROUI, DWIN_FilamentRunout(extruder));
91+
TERN_(DWIN_LCD_PROUI, dwinFilamentRunout(extruder));
9292

9393
#if ANY(HOST_PROMPT_SUPPORT, HOST_ACTION_COMMANDS, MULTI_FILAMENT_SENSOR)
9494
const char tool = '0' + TERN0(MULTI_FILAMENT_SENSOR, extruder);

‎Marlin/src/gcode/bedlevel/abl/G29.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ G29_TYPE GcodeSuite::G29() {
426426
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> 3-point Leveling");
427427
points[0].z = points[1].z = points[2].z = 0; // Probe at 3 arbitrary points
428428
#elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
429-
TERN_(DWIN_LCD_PROUI, DWIN_LevelingStart());
429+
TERN_(DWIN_LCD_PROUI, dwinLevelingStart());
430430
#endif
431431

432432
TERN_(EXTENSIBLE_UI, ExtUI::onLevelingStart());
@@ -437,7 +437,7 @@ G29_TYPE GcodeSuite::G29() {
437437
#if ENABLED(PREHEAT_BEFORE_LEVELING)
438438
if (!abl.dryrun) probe.preheat_for_probing(LEVELING_NOZZLE_TEMP,
439439
#if ALL(DWIN_LCD_PROUI, HAS_HEATED_BED)
440-
HMI_data.BedLevT
440+
hmiData.BedLevT
441441
#else
442442
LEVELING_BED_TEMP
443443
#endif

‎Marlin/src/gcode/bedlevel/mbl/G29.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ void GcodeSuite::G29() {
143143
queue.inject(F("G29S2"));
144144

145145
TERN_(EXTENSIBLE_UI, ExtUI::onLevelingStart());
146-
TERN_(DWIN_LCD_PROUI, DWIN_LevelingStart());
146+
TERN_(DWIN_LCD_PROUI, dwinLevelingStart());
147147

148148
return;
149149
}
@@ -169,7 +169,7 @@ void GcodeSuite::G29() {
169169
// Save Z for the previous mesh position
170170
bedlevel.set_zigzag_z(mbl_probe_index - 1, current_position.z);
171171
TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ix, iy, current_position.z));
172-
TERN_(DWIN_LCD_PROUI, DWIN_MeshUpdate(_MIN(mbl_probe_index, GRID_MAX_POINTS), int(GRID_MAX_POINTS), current_position.z));
172+
TERN_(DWIN_LCD_PROUI, dwinMeshUpdate(_MIN(mbl_probe_index, GRID_MAX_POINTS), int(GRID_MAX_POINTS), current_position.z));
173173
SET_SOFT_ENDSTOP_LOOSE(false);
174174
}
175175
// If there's another point to sample, move there with optional lift.
@@ -236,7 +236,7 @@ void GcodeSuite::G29() {
236236
if (parser.seenval('Z')) {
237237
bedlevel.z_values[ix][iy] = parser.value_linear_units();
238238
TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ix, iy, bedlevel.z_values[ix][iy]));
239-
TERN_(DWIN_LCD_PROUI, DWIN_MeshUpdate(ix, iy, bedlevel.z_values[ix][iy]));
239+
TERN_(DWIN_LCD_PROUI, dwinMeshUpdate(ix, iy, bedlevel.z_values[ix][iy]));
240240
}
241241
else
242242
return echo_not_entered('Z');

‎Marlin/src/gcode/bedlevel/ubl/M421.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ void GcodeSuite::M421() {
6666
else if (!WITHIN(ij.x, 0, GRID_MAX_POINTS_X - 1) || !WITHIN(ij.y, 0, GRID_MAX_POINTS_Y - 1))
6767
SERIAL_ERROR_MSG(STR_ERR_MESH_XY);
6868
else {
69-
float &zval = bedlevel.z_values[ij.x][ij.y]; // Altering this Mesh Point
69+
float &zval = bedlevel.z_values[ij.x][ij.y]; // Altering this Mesh Point
7070
zval = hasN ? NAN : parser.value_linear_units() + (hasQ ? zval : 0); // N=NAN, Z=NEWVAL, or Q=ADDVAL
7171
TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ij.x, ij.y, zval)); // Ping ExtUI in case it's showing the mesh
72-
TERN_(DWIN_LCD_PROUI, DWIN_MeshUpdate(ij.x, ij.y, zval));
72+
TERN_(DWIN_LCD_PROUI, dwinMeshUpdate(ij.x, ij.y, zval));
7373
}
7474
}
7575

‎Marlin/src/gcode/config/M302.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void GcodeSuite::M302() {
5151
if (seen_S) {
5252
thermalManager.extrude_min_temp = parser.value_celsius();
5353
thermalManager.allow_cold_extrude = (thermalManager.extrude_min_temp == 0);
54-
TERN_(DWIN_LCD_PROUI, HMI_data.ExtMinT = thermalManager.extrude_min_temp);
54+
TERN_(DWIN_LCD_PROUI, hmiData.ExtMinT = thermalManager.extrude_min_temp);
5555
}
5656

5757
if (parser.seen('P'))

‎Marlin/src/gcode/control/M997.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
*/
3434
void GcodeSuite::M997() {
3535

36-
TERN_(DWIN_LCD_PROUI, DWIN_RebootScreen());
36+
TERN_(DWIN_LCD_PROUI, dwinRebootScreen());
3737

3838
flashFirmware(parser.intval('S'));
3939

‎Marlin/src/gcode/lcd/M0_M1.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ void GcodeSuite::M0_M1() {
7373
ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_USERWAIT));
7474
#elif ENABLED(DWIN_LCD_PROUI)
7575
if (parser.string_arg)
76-
DWIN_Popup_Confirm(ICON_BLTouch, parser.string_arg, GET_TEXT_F(MSG_USERWAIT));
76+
dwinPopupConfirm(ICON_BLTouch, parser.string_arg, GET_TEXT_F(MSG_USERWAIT));
7777
else
78-
DWIN_Popup_Confirm(ICON_BLTouch, GET_TEXT_F(MSG_STOPPED), GET_TEXT_F(MSG_USERWAIT));
78+
dwinPopupConfirm(ICON_BLTouch, GET_TEXT_F(MSG_STOPPED), GET_TEXT_F(MSG_USERWAIT));
7979
#else
8080

8181
if (parser.string_arg) {

‎Marlin/src/gcode/lcd/M73.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void GcodeSuite::M73() {
5151

5252
#if ENABLED(DWIN_LCD_PROUI)
5353

54-
DWIN_M73();
54+
dwinM73();
5555

5656
#else
5757

‎Marlin/src/gcode/sd/M1001.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949

5050
#if ENABLED(EXTENSIBLE_UI)
5151
#include "../../lcd/extui/ui_api.h"
52-
#elif ENABLED(DWIN_LCD_PROUI)
53-
#include "../../lcd/e3v2/proui/dwin.h"
5452
#endif
5553

5654
#if ENABLED(HOST_ACTION_COMMANDS)

‎Marlin/src/gcode/stats/M75-M78.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
void GcodeSuite::M75() {
4040
startOrResumeJob();
4141
#if ENABLED(DWIN_LCD_PROUI)
42-
if (!IS_SD_PRINTING()) DWIN_Print_Header(parser.string_arg && parser.string_arg[0] ? parser.string_arg : GET_TEXT(MSG_HOST_START_PRINT));
42+
if (!IS_SD_PRINTING()) dwinPrintHeader(parser.string_arg && parser.string_arg[0] ? parser.string_arg : GET_TEXT(MSG_HOST_START_PRINT));
4343
#endif
4444
}
4545

‎Marlin/src/gcode/temp/M303.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
#if ENABLED(EXTENSIBLE_UI)
3333
#include "../../lcd/extui/ui_api.h"
34-
#elif ENABLED(DWIN_LCD_PROUI)
34+
#elif ENABLED(PROUI_PID_TUNE)
3535
#include "../../lcd/e3v2/proui/dwin.h"
3636
#endif
3737

@@ -69,7 +69,7 @@ void GcodeSuite::M303() {
6969
SERIAL_ECHOPGM(STR_PID_AUTOTUNE);
7070
SERIAL_ECHOLNPGM(STR_PID_BAD_HEATER_ID);
7171
TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_BAD_HEATER_ID));
72-
TERN_(DWIN_PID_TUNE, DWIN_PidTuning(PID_BAD_HEATER_ID));
72+
TERN_(PROUI_PID_TUNE, dwinPidTuning(PID_BAD_HEATER_ID));
7373
return;
7474
}
7575

@@ -79,7 +79,7 @@ void GcodeSuite::M303() {
7979
const celsius_t temp = seenS ? parser.value_celsius() : default_temp;
8080
const bool u = parser.boolval('U');
8181

82-
TERN_(DWIN_PID_TUNE, DWIN_StartM303(seenC, c, seenS, hid, temp));
82+
TERN_(PROUI_PID_TUNE, dwinStartM303(seenC, c, seenS, hid, temp));
8383

8484
IF_DISABLED(BUSY_WHILE_HEATING, KEEPALIVE_STATE(NOT_BUSY));
8585

‎Marlin/src/inc/Conditionals_post.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -2386,10 +2386,10 @@
23862386

23872387
#if ENABLED(DWIN_LCD_PROUI)
23882388
#if ANY(PIDTEMP, PIDTEMPBED)
2389-
#define DWIN_PID_TUNE 1
2389+
#define PROUI_PID_TUNE 1
23902390
#endif
2391-
#if ANY(DWIN_PID_TUNE, MPC_AUTOTUNE) && DISABLED(DISABLE_TUNING_GRAPH)
2392-
#define SHOW_TUNING_GRAPH 1
2391+
#if ANY(PROUI_PID_TUNE, MPC_AUTOTUNE) && DISABLED(DISABLE_TUNING_GRAPH)
2392+
#define PROUI_TUNING_GRAPH 1
23932393
#endif
23942394
#endif
23952395

‎Marlin/src/lcd/e3v2/creality/dwin.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ void dwinDrawLabel(const uint8_t row, FSTR_P title) {
573573
dwinDrawLabel(row, (char*)title);
574574
}
575575

576-
void dwinDrawSigned_Float(uint8_t size, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, int32_t value) {
576+
void dwinDrawSignedFloat(uint8_t size, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, int32_t value) {
577577
dwinDrawString(true, size, Color_White, bColor, x - 8, y, value < 0 ? F("-") : F(" "));
578578
dwinDrawFloatValue(true, true, 0, size, Color_White, bColor, iNum, fNum, x, y, value < 0 ? -value : value);
579579
}
@@ -591,11 +591,11 @@ void drawEditFloat3(const uint8_t row, const uint16_t value, const bool active=f
591591
}
592592

593593
void drawEditSignedFloat2(const uint8_t row, const float value, const bool active=false) {
594-
dwinDrawSigned_Float(font8x16, active ? Select_Color : Color_Bg_Black, 2, UNITFDIGITS + 1, 220 + 8 - UNITFDIGITS * 8, EBASE(row), value);
594+
dwinDrawSignedFloat(font8x16, active ? Select_Color : Color_Bg_Black, 2, UNITFDIGITS + 1, 220 + 8 - UNITFDIGITS * 8, EBASE(row), value);
595595
}
596596

597597
void drawEditSignedFloat3(const uint8_t row, const float value, const bool active=false) {
598-
dwinDrawSigned_Float(font8x16, active ? Select_Color : Color_Bg_Black, 3, UNITFDIGITS, 220 - UNITFDIGITS * 8, EBASE(row), value);
598+
dwinDrawSignedFloat(font8x16, active ? Select_Color : Color_Bg_Black, 3, UNITFDIGITS, 220 - UNITFDIGITS * 8, EBASE(row), value);
599599
}
600600

601601
void drawStatInt(const uint16_t xpos, const uint16_t ypos, const uint16_t value) {
@@ -1653,7 +1653,7 @@ void _draw_xyz_position(const bool force) {
16531653
//SERIAL_EOL();
16541654
}
16551655

1656-
void update_variable() {
1656+
void updateVariable() {
16571657
#if HAS_HOTEND
16581658
static celsius_t _hotendtemp = 0, _hotendtarget = 0;
16591659
const celsius_t hc = thermalManager.wholeDegHotend(0),
@@ -4062,7 +4062,7 @@ void eachMomentUpdate() {
40624062
const millis_t ms = millis();
40634063
if (ELAPSED(ms, next_var_update_ms)) {
40644064
next_var_update_ms = ms + DWIN_VAR_UPDATE_INTERVAL;
4065-
update_variable();
4065+
updateVariable();
40664066
}
40674067

40684068
if (PENDING(ms, next_rts_update_ms)) return;

‎Marlin/src/lcd/e3v2/creality/dwin.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,8 @@ void hmiMaxJerkXYZE();
198198
void hmiStepXYZE();
199199
void hmiSetLanguageCache();
200200

201-
void update_variable();
202-
void dwinDrawSigned_Float(uint8_t size, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value);
201+
void updateVariable();
202+
void dwinDrawSignedFloat(uint8_t size, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value);
203203

204204
// SD Card
205205
void hmiSDCardInit();

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

+23-23
Original file line numberDiff line numberDiff line change
@@ -63,29 +63,29 @@
6363
#include "dwin_popup.h"
6464
#include "bedlevel_tools.h"
6565

66-
BedLevelToolsClass bedLevelTools;
66+
BedLevelTools bedLevelTools;
6767

6868
#if ENABLED(USE_UBL_VIEWER)
69-
bool BedLevelToolsClass::viewer_asymmetric_range = false;
70-
bool BedLevelToolsClass::viewer_print_value = false;
69+
bool BedLevelTools::viewer_asymmetric_range = false;
70+
bool BedLevelTools::viewer_print_value = false;
7171
#endif
72-
bool BedLevelToolsClass::goto_mesh_value = false;
73-
uint8_t BedLevelToolsClass::mesh_x = 0;
74-
uint8_t BedLevelToolsClass::mesh_y = 0;
75-
uint8_t BedLevelToolsClass::tilt_grid = 1;
72+
bool BedLevelTools::goto_mesh_value = false;
73+
uint8_t BedLevelTools::mesh_x = 0;
74+
uint8_t BedLevelTools::mesh_y = 0;
75+
uint8_t BedLevelTools::tilt_grid = 1;
7676

7777
bool drawing_mesh = false;
7878
char cmd[MAX_CMD_SIZE+16], str_1[16], str_2[16], str_3[16];
7979

8080
#if ENABLED(AUTO_BED_LEVELING_UBL)
8181

82-
void BedLevelToolsClass::manual_value_update(const uint8_t mesh_x, const uint8_t mesh_y, bool undefined/*=false*/) {
82+
void BedLevelTools::manual_value_update(const uint8_t mesh_x, const uint8_t mesh_y, bool undefined/*=false*/) {
8383
sprintf_P(cmd, PSTR("M421 I%i J%i Z%s %s"), mesh_x, mesh_y, dtostrf(current_position.z, 1, 3, str_1), undefined ? "N" : "");
8484
gcode.process_subcommands_now(cmd);
8585
planner.synchronize();
8686
}
8787

88-
bool BedLevelToolsClass::create_plane_from_mesh() {
88+
bool BedLevelTools::create_plane_from_mesh() {
8989
struct linear_fit_data lsf_results;
9090
incremental_LSF_reset(&lsf_results);
9191
GRID_LOOP(x, y) {
@@ -125,15 +125,15 @@ char cmd[MAX_CMD_SIZE+16], str_1[16], str_2[16], str_3[16];
125125

126126
#else
127127

128-
void BedLevelToolsClass::manual_value_update(const uint8_t mesh_x, const uint8_t mesh_y) {
128+
void BedLevelTools::manual_value_update(const uint8_t mesh_x, const uint8_t mesh_y) {
129129
sprintf_P(cmd, PSTR("G29 I%i J%i Z%s"), mesh_x, mesh_y, dtostrf(current_position.z, 1, 3, str_1));
130130
gcode.process_subcommands_now(cmd);
131131
planner.synchronize();
132132
}
133133

134134
#endif
135135

136-
void BedLevelToolsClass::manual_move(const uint8_t mesh_x, const uint8_t mesh_y, bool zmove/*=false*/) {
136+
void BedLevelTools::manual_move(const uint8_t mesh_x, const uint8_t mesh_y, bool zmove/*=false*/) {
137137
gcode.process_subcommands_now(F("G28O"));
138138
if (zmove) {
139139
planner.synchronize();
@@ -142,8 +142,8 @@ void BedLevelToolsClass::manual_move(const uint8_t mesh_x, const uint8_t mesh_y,
142142
planner.synchronize();
143143
}
144144
else {
145-
DWIN_Show_Popup(ICON_BLTouch, F("Moving to Point"), F("Please wait until done."));
146-
HMI_SaveProcessID(NothingToDo);
145+
dwinShowPopup(ICON_BLTouch, F("Moving to Point"), F("Please wait until done."));
146+
hmiSaveProcessID(ID_NothingToDo);
147147
sprintf_P(cmd, PSTR("G0 F300 Z%s"), dtostrf(Z_CLEARANCE_BETWEEN_PROBES, 1, 3, str_1));
148148
gcode.process_subcommands_now(cmd);
149149
sprintf_P(cmd, PSTR("G42 F4000 I%i J%i"), mesh_x, mesh_y);
@@ -152,24 +152,24 @@ void BedLevelToolsClass::manual_move(const uint8_t mesh_x, const uint8_t mesh_y,
152152
current_position.z = goto_mesh_value ? bedlevel.z_values[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
153153
planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
154154
planner.synchronize();
155-
HMI_ReturnScreen();
155+
hmiReturnScreen();
156156
}
157157
}
158158

159159
// Move / Probe methods. As examples, not yet used.
160-
void BedLevelToolsClass::MoveToXYZ() {
160+
void BedLevelTools::MoveToXYZ() {
161161
bedLevelTools.goto_mesh_value = true;
162162
bedLevelTools.manual_move(bedLevelTools.mesh_x, bedLevelTools.mesh_y, false);
163163
}
164-
void BedLevelToolsClass::MoveToXY() {
164+
void BedLevelTools::MoveToXY() {
165165
bedLevelTools.goto_mesh_value = false;
166166
bedLevelTools.manual_move(bedLevelTools.mesh_x, bedLevelTools.mesh_y, false);
167167
}
168-
void BedLevelToolsClass::MoveToZ() {
168+
void BedLevelTools::MoveToZ() {
169169
bedLevelTools.goto_mesh_value = true;
170170
bedLevelTools.manual_move(bedLevelTools.mesh_x, bedLevelTools.mesh_y, true);
171171
}
172-
void BedLevelToolsClass::ProbeXY() {
172+
void BedLevelTools::ProbeXY() {
173173
const uint16_t Clear = Z_CLEARANCE_DEPLOY_PROBE;
174174
sprintf_P(cmd, PSTR("G28O\nG0Z%i\nG30X%sY%s"),
175175
Clear,
@@ -180,7 +180,7 @@ void BedLevelToolsClass::ProbeXY() {
180180
}
181181

182182
// Accessors
183-
float BedLevelToolsClass::get_max_value() {
183+
float BedLevelTools::get_max_value() {
184184
float max = __FLT_MAX__ * -1;
185185
GRID_LOOP(x, y) {
186186
if (!isnan(bedlevel.z_values[x][y]) && bedlevel.z_values[x][y] > max)
@@ -189,7 +189,7 @@ float BedLevelToolsClass::get_max_value() {
189189
return max;
190190
}
191191

192-
float BedLevelToolsClass::get_min_value() {
192+
float BedLevelTools::get_min_value() {
193193
float min = __FLT_MAX__;
194194
GRID_LOOP(x, y) {
195195
if (!isnan(bedlevel.z_values[x][y]) && bedlevel.z_values[x][y] < min)
@@ -199,7 +199,7 @@ float BedLevelToolsClass::get_min_value() {
199199
}
200200

201201
// Return 'true' if mesh is good and within LCD limits
202-
bool BedLevelToolsClass::meshvalidate() {
202+
bool BedLevelTools::meshvalidate() {
203203
GRID_LOOP(x, y) {
204204
const float v = bedlevel.z_values[x][y];
205205
if (isnan(v) || !WITHIN(v, UBL_Z_OFFSET_MIN, UBL_Z_OFFSET_MAX)) return false;
@@ -209,7 +209,7 @@ bool BedLevelToolsClass::meshvalidate() {
209209

210210
#if ENABLED(USE_UBL_VIEWER)
211211

212-
void BedLevelToolsClass::Draw_Bed_Mesh(int16_t selected /*= -1*/, uint8_t gridline_width /*= 1*/, uint16_t padding_x /*= 8*/, uint16_t padding_y_top /*= 40 + 53 - 7*/) {
212+
void BedLevelTools::drawBedMesh(int16_t selected /*= -1*/, uint8_t gridline_width /*= 1*/, uint16_t padding_x /*= 8*/, uint16_t padding_y_top /*= 40 + 53 - 7*/) {
213213
drawing_mesh = true;
214214
const uint16_t total_width_px = DWIN_WIDTH - padding_x - padding_x;
215215
const uint16_t cell_width_px = total_width_px / (GRID_MAX_POINTS_X);
@@ -267,7 +267,7 @@ bool BedLevelToolsClass::meshvalidate() {
267267
}
268268
}
269269

270-
void BedLevelToolsClass::Set_Mesh_Viewer_Status() { // TODO: draw gradient with values as a legend instead
270+
void BedLevelTools::setMeshViewerStatus() { // TODO: draw gradient with values as a legend instead
271271
float v_max = abs(get_max_value()), v_min = abs(get_min_value()), range = _MAX(v_min, v_max);
272272
if (v_min > 3e+10F) v_min = 0.0000001;
273273
if (v_max > 3e+10F) v_max = 0.0000001;

‎Marlin/src/lcd/e3v2/proui/bedlevel_tools.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
#define UBL_Z_OFFSET_MIN -3.0
5353
#define UBL_Z_OFFSET_MAX 3.0
5454

55-
class BedLevelToolsClass {
55+
class BedLevelTools {
5656
public:
5757
#if ENABLED(USE_UBL_VIEWER)
5858
static bool viewer_asymmetric_range;
@@ -78,9 +78,9 @@ class BedLevelToolsClass {
7878
static float get_min_value();
7979
static bool meshvalidate();
8080
#if ENABLED(USE_UBL_VIEWER)
81-
static void Draw_Bed_Mesh(int16_t selected = -1, uint8_t gridline_width = 1, uint16_t padding_x = 8, uint16_t padding_y_top = 40 + 53 - 7);
82-
static void Set_Mesh_Viewer_Status();
81+
static void drawBedMesh(int16_t selected = -1, uint8_t gridline_width = 1, uint16_t padding_x = 8, uint16_t padding_y_top = 40 + 53 - 7);
82+
static void setMeshViewerStatus();
8383
#endif
8484
};
8585

86-
extern BedLevelToolsClass bedLevelTools;
86+
extern BedLevelTools bedLevelTools;

0 commit comments

Comments
 (0)