3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2026-01-03 13:20:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

🧑‍💻 Save some string space

Browse source
This commit is contained in:
Scott Lahteine 2025-11-05 19:18:23 -06:00
parent 924c2ca0fe
commit ce7edc6223
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View file

@ -397,7 +397,7 @@ void unified_bed_leveling::G29() {
if (parser.seen('Q')) { if (parser.seen('Q')) {
const int16_t test_pattern = parser.has_value() ? parser.value_int() : -99; const int16_t test_pattern = parser.has_value() ? parser.value_int() : -99;
if (!WITHIN(test_pattern, TERN0(UBL_DEVEL_DEBUGGING, -1), 2)) { if (!WITHIN(test_pattern, TERN0(UBL_DEVEL_DEBUGGING, -1), 2)) {
SERIAL_ECHOLNPGM("?Invalid (Q) test pattern. (" TERN(UBL_DEVEL_DEBUGGING, "-1", "0") " to 2)\n"); SERIAL_ECHOLN(F("?Invalid "), F("(Q) test pattern. (" TERN(UBL_DEVEL_DEBUGGING, "-1", "0") " to 2)\n"));
return; return;
} }
SERIAL_ECHOLNPGM("Applying test pattern.\n"); SERIAL_ECHOLNPGM("Applying test pattern.\n");
@ -648,7 +648,7 @@ void unified_bed_leveling::G29() {
} }
if (!WITHIN(param.KLS_storage_slot, 0, a - 1)) { if (!WITHIN(param.KLS_storage_slot, 0, a - 1)) {
SERIAL_ECHOLNPGM("?Invalid storage slot.\n?Use 0 to ", a - 1); SERIAL_ECHOLN(F("?Invalid "), F("storage slot.\n?Use 0 to "), a - 1);
return; return;
} }
@ -676,7 +676,7 @@ void unified_bed_leveling::G29() {
} }
if (!WITHIN(param.KLS_storage_slot, 0, a - 1)) { if (!WITHIN(param.KLS_storage_slot, 0, a - 1)) {
SERIAL_ECHOLNPGM("?Invalid storage slot.\n?Use 0 to ", a - 1); SERIAL_ECHOLN(F("?Invalid "), F("storage slot.\n?Use 0 to "), a - 1);
goto LEAVE; goto LEAVE;
} }
@ -1182,7 +1182,7 @@ bool unified_bed_leveling::G29_parse_parameters() {
#if HAS_BED_PROBE #if HAS_BED_PROBE
param.J_grid_size = parser.value_byte(); param.J_grid_size = parser.value_byte();
if (param.J_grid_size && !WITHIN(param.J_grid_size, 2, 9)) { if (param.J_grid_size && !WITHIN(param.J_grid_size, 2, 9)) {
SERIAL_ECHOLNPGM("?Invalid grid size (J) specified (2-9).\n"); SERIAL_ECHOLN(F("?Invalid "), F("grid size (J) specified (2-9).\n"));
err_flag = true; err_flag = true;
} }
#else #else
@ -1851,7 +1851,7 @@ void unified_bed_leveling::smart_fill_mesh() {
} }
if (!parser.has_value() || !WITHIN(parser.value_int(), 0, a - 1)) { if (!parser.has_value() || !WITHIN(parser.value_int(), 0, a - 1)) {
SERIAL_ECHOLNPGM("?Invalid storage slot.\n?Use 0 to ", a - 1); SERIAL_ECHOLN(F("?Invalid "), F("storage slot.\n?Use 0 to "), a - 1);
return; return;
} }

12
Marlin/src/gcode/feature/ft_motion/M493.cpp
View file

@ -224,7 +224,7 @@ void GcodeSuite::M493() {
const ftMotionShaper_t shaperVal = seenC ? (ftMotionShaper_t)parser.value_byte() : ftMotionShaper_NONE; const ftMotionShaper_t shaperVal = seenC ? (ftMotionShaper_t)parser.value_byte() : ftMotionShaper_NONE;
const bool goodShaper = WITHIN(shaperVal, ftMotionShaper_NONE, ftMotionShaper_MZV); const bool goodShaper = WITHIN(shaperVal, ftMotionShaper_NONE, ftMotionShaper_MZV);
if (seenC && !goodShaper) { if (seenC && !goodShaper) {
SERIAL_ECHOLNPGM("?Invalid (C)ompensator value. (0-", int(ftMotionShaper_MZV)); SERIAL_ECHOLN(F("?Invalid "), F("(C)ompensator value. (0-"), int(ftMotionShaper_MZV));
return; return;
} }
auto set_shaper = [&](const AxisEnum axis, ftMotionShaper_t newsh) { auto set_shaper = [&](const AxisEnum axis, ftMotionShaper_t newsh) {
@ -267,12 +267,12 @@ void GcodeSuite::M493() {
flag.report = true; flag.report = true;
break; break;
default: default:
SERIAL_ECHOLNPGM("?Invalid (D)ynamic Frequency Mode value."); SERIAL_ECHOLN(F("?Invalid "), F("(D)ynamic Frequency Mode value."));
break; break;
} }
} }
else { else {
SERIAL_ECHOLNPGM("?Wrong shaper for (D)ynamic Frequency mode ", ftMotion.cfg.dynFreqMode, "."); SERIAL_ECHOLNPGM("?Wrong shaper for (D)ynamic Frequency Mode ", ftMotion.cfg.dynFreqMode, ".");
} }
} }
@ -288,7 +288,7 @@ void GcodeSuite::M493() {
const float baseFreqVal = seenA ? parser.value_float() : 0.0f; const float baseFreqVal = seenA ? parser.value_float() : 0.0f;
const bool goodBaseFreq = seenA && WITHIN(baseFreqVal, FTM_MIN_SHAPE_FREQ, (FTM_FS) / 2); const bool goodBaseFreq = seenA && WITHIN(baseFreqVal, FTM_MIN_SHAPE_FREQ, (FTM_FS) / 2);
if (seenA && !goodBaseFreq) if (seenA && !goodBaseFreq)
SERIAL_ECHOLN(F("?Invalid (A) Base Frequency value. ("), int(FTM_MIN_SHAPE_FREQ), C('-'), int((FTM_FS) / 2), C(')')); SERIAL_ECHOLN(F("?Invalid "), F("(A) Base Frequency value. ("), int(FTM_MIN_SHAPE_FREQ), C('-'), int((FTM_FS) / 2), C(')'));
#if HAS_DYNAMIC_FREQ #if HAS_DYNAMIC_FREQ
// Dynamic Frequency parameter // Dynamic Frequency parameter
@ -303,14 +303,14 @@ void GcodeSuite::M493() {
const float zetaVal = seenI ? parser.value_float() : 0.0f; const float zetaVal = seenI ? parser.value_float() : 0.0f;
const bool goodZeta = seenI && WITHIN(zetaVal, 0.01f, 1.0f); const bool goodZeta = seenI && WITHIN(zetaVal, 0.01f, 1.0f);
if (seenI && !goodZeta) if (seenI && !goodZeta)
SERIAL_ECHOLNPGM("?Invalid (I) Zeta value. (0.01-1.0)"); // Zeta out of range SERIAL_ECHOLN(F("?Invalid "), F("(I) Zeta value. (0.01-1.0)")); // Zeta out of range
// Vibration Tolerance parameter // Vibration Tolerance parameter
const bool seenQ = parser.seenval('Q'); const bool seenQ = parser.seenval('Q');
const float vtolVal = seenQ ? parser.value_float() : 0.0f; const float vtolVal = seenQ ? parser.value_float() : 0.0f;
const bool goodVtol = seenQ && WITHIN(vtolVal, 0.00f, 1.0f); const bool goodVtol = seenQ && WITHIN(vtolVal, 0.00f, 1.0f);
if (seenQ && !goodVtol) if (seenQ && !goodVtol)
SERIAL_ECHOLNPGM("?Invalid (Q) Vibration Tolerance value. (0.0-1.0)"); // VTol out of range SERIAL_ECHOLN(F("?Invalid "), F("(Q) Vibration Tolerance value. (0.0-1.0)")); // VTol out of range
const bool apply_xy = !parser.seen("XYZE"); const bool apply_xy = !parser.seen("XYZE");

6
Marlin/src/gcode/feature/ft_motion/M494.cpp
View file

@ -97,7 +97,7 @@ void GcodeSuite::M494() {
report = true; report = true;
} }
else else
SERIAL_ECHOLNPGM("?Invalid trajectory type [T] value. Use 0=TRAPEZOIDAL, 1=POLY5, 2=POLY6"); SERIAL_ECHOLN(F("?Invalid "), F("trajectory type [T] value. Use 0=TRAPEZOIDAL, 1=POLY5, 2=POLY6"));
} }
// Parse overshoot parameter. // Parse overshoot parameter.
@ -108,7 +108,7 @@ void GcodeSuite::M494() {
report = true; report = true;
} }
else else
SERIAL_ECHOLNPGM("?Invalid overshoot [O] value. Range 1.25-1.875"); SERIAL_ECHOLN(F("?Invalid "), F("overshoot [O] value. Range 1.25-1.875"));
} }
#if ENABLED(FTM_SMOOTHING) #if ENABLED(FTM_SMOOTHING)
@ -121,7 +121,7 @@ void GcodeSuite::M494() {
report = true; \ report = true; \
} \ } \
else \ else \
SERIAL_ECHOLNPGM("?Invalid ", C(N), " smoothing time [", C(CHARIFY(A)), "] value."); \ SERIAL_ECHOLN("?Invalid ", C(N), " smoothing time [", C(CHARIFY(A)), "] value."); \
} }
CARTES_GANG( CARTES_GANG(

2
Marlin/src/module/settings.cpp
View file

@ -3126,7 +3126,7 @@ void MarlinSettings::postprocess() {
#if ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_UBL)
inline void ubl_invalid_slot(const int s) { inline void ubl_invalid_slot(const int s) {
DEBUG_ECHOLNPGM("?Invalid slot.\n", s, " mesh slots available."); DEBUG_ECHOLN(F("?Invalid "), F("slot.\n"), s, F(" mesh slots available."));
UNUSED(s); UNUSED(s);
} }