Skip to content

use _MIN in settings,cpp #28537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 2 commits into from
Aug 25, 2026
+1 −1
Merged

use _MIN in settings,cpp #28537

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ece5657
use _MIN
ellensp Aug 24, 2026
c08a7a8
Merge branch 'bugfix-2.1.x' into pr/28537
thinkyhead Aug 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/src/module/settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3190,7 +3190,7 @@ void MarlinSettings::postprocess() {
#define MESH_STORE_SIZE sizeof(TERN(OPTIMIZED_MESH_STORAGE, mesh_store_t, bedlevel.z_values))

uint16_t MarlinSettings::calc_num_meshes() {
return MIN(MAX_SAVED_MESHES, (meshes_end - meshes_start_index()) / MESH_STORE_SIZE);
return _MIN(uint16_t(MAX_SAVED_MESHES), uint16_t((meshes_end - meshes_start_index()) / MESH_STORE_SIZE));
}

int MarlinSettings::mesh_slot_offset(const int8_t slot) {
Expand Down
Loading