bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🧑‍💻 Fewer string macros

Browse Source
This commit is contained in:
Scott Lahteine
2022-01-10 02:51:34 -06:00
parent 41f80a4498
commit eb8d819325
46 changed files with 910 additions and 921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/module/motion.cpp
View File

@ -1319,9 +1319,9 @@ void prepare_line_to_destination() {
TEST(axis_bits, X_AXIS) ? "X" : "",
TEST(axis_bits, Y_AXIS) ? "Y" : "",
TEST(axis_bits, Z_AXIS) ? "Z" : "",
TEST(axis_bits, I_AXIS) ? AXIS4_STR : "",
TEST(axis_bits, J_AXIS) ? AXIS5_STR : "",
TEST(axis_bits, K_AXIS) ? AXIS6_STR : ""
TEST(axis_bits, I_AXIS) ? STR_I : "",
TEST(axis_bits, J_AXIS) ? STR_J : "",
TEST(axis_bits, K_AXIS) ? STR_K : ""
)
);
SERIAL_ECHO_START();

6
Marlin/src/module/planner.cpp
View File

@ -1867,13 +1867,13 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
" B:", target.b, " (", db, " steps)"
" C:", target.c, " (", dc, " steps)"
#if HAS_I_AXIS
" " AXIS4_STR ":", target.i, " (", di, " steps)"
" " STR_I ":", target.i, " (", di, " steps)"
#endif
#if HAS_J_AXIS
" " AXIS5_STR ":", target.j, " (", dj, " steps)"
" " STR_J ":", target.j, " (", dj, " steps)"
#endif
#if HAS_K_AXIS
" " AXIS6_STR ":", target.k, " (", dk, " steps)"
" " STR_K ":", target.k, " (", dk, " steps)"
#endif
#if HAS_EXTRUDERS
" E:", target.e, " (", de, " steps)"

4
Marlin/src/module/temperature.cpp
View File

@ -218,8 +218,8 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
#else
#define _COOLER_FSTR(h)
#endif
#define _E_FSTR(h,N) ((HOTENDS) > N && (h) == N) ? F(LCD_STR_E##N) :
#define HEATER_FSTR(h) _BED_FSTR(h) _CHAMBER_FSTR(h) _COOLER_FSTR(h) _E_FSTR(h,1) _E_FSTR(h,2) _E_FSTR(h,3) _E_FSTR(h,4) _E_FSTR(h,5) F(LCD_STR_E0)
#define _E_FSTR(h,N) ((HOTENDS) > N && (h) == N) ? F(STR_E##N) :
#define HEATER_FSTR(h) _BED_FSTR(h) _CHAMBER_FSTR(h) _COOLER_FSTR(h) _E_FSTR(h,1) _E_FSTR(h,2) _E_FSTR(h,3) _E_FSTR(h,4) _E_FSTR(h,5) _E_FSTR(h,6) _E_FSTR(h,7) F(STR_E0)
//
// Initialize MAX TC objects/SPI