diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index d3ee48a85..b51219dbc 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1165,4 +1165,14 @@ */ //#define NO_WORKSPACE_OFFSETS +/** + * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number + * of spaces to be output by the ratio set below. This allows for better alignment of output for commands + * like G29 O, which renders a mesh/grid. + * + * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust + * accordingly for your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + #endif // CONFIGURATION_ADV_H diff --git a/Marlin/example_configurations/Cartesio/Configuration_adv.h b/Marlin/example_configurations/Cartesio/Configuration_adv.h index f6f8c4020..c26dfb816 100644 --- a/Marlin/example_configurations/Cartesio/Configuration_adv.h +++ b/Marlin/example_configurations/Cartesio/Configuration_adv.h @@ -1158,4 +1158,14 @@ */ //#define NO_WORKSPACE_OFFSETS +/** + * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number + * of spaces to be output by the ratio set below. This allows for better alignment of output for commands + * like G29 O, which renders a mesh/grid. + * + * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust + * accordingly for your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + #endif // CONFIGURATION_ADV_H diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h index 4a334780f..176fd2ab2 100644 --- a/Marlin/example_configurations/Felix/Configuration_adv.h +++ b/Marlin/example_configurations/Felix/Configuration_adv.h @@ -1158,4 +1158,14 @@ */ //#define NO_WORKSPACE_OFFSETS +/** + * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number + * of spaces to be output by the ratio set below. This allows for better alignment of output for commands + * like G29 O, which renders a mesh/grid. + * + * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust + * accordingly for your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + #endif // CONFIGURATION_ADV_H diff --git a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h b/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h index 7867bddc7..b818e90f1 100644 --- a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h +++ b/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h @@ -1165,4 +1165,14 @@ */ //#define NO_WORKSPACE_OFFSETS +/** + * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number + * of spaces to be output by the ratio set below. This allows for better alignment of output for commands + * like G29 O, which renders a mesh/grid. + * + * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust + * accordingly for your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + #endif // CONFIGURATION_ADV_H diff --git a/Marlin/example_configurations/Hephestos/Configuration_adv.h b/Marlin/example_configurations/Hephestos/Configuration_adv.h index ab322752b..798d74177 100644 --- a/Marlin/example_configurations/Hephestos/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos/Configuration_adv.h @@ -1158,4 +1158,14 @@ */ //#define NO_WORKSPACE_OFFSETS +/** + * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number + * of spaces to be output by the ratio set below. This allows for better alignment of output for commands + * like G29 O, which renders a mesh/grid. + * + * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust + * accordingly for your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + #endif // CONFIGURATION_ADV_H diff --git a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h index b8ab84e48..a0c063576 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h @@ -1142,4 +1142,14 @@ */ //#define NO_WORKSPACE_OFFSETS +/** + * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number + * of spaces to be output by the ratio set below. This allows for better alignment of output for commands + * like G29 O, which renders a mesh/grid. + * + * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust + * accordingly for your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + #endif // CONFIGURATION_ADV_H diff --git a/Marlin/example_configurations/K8200/Configuration_adv.h b/Marlin/example_configurations/K8200/Configuration_adv.h index 32c9114ca..7f5268d93 100644 --- a/Marlin/example_configurations/K8200/Configuration_adv.h +++ b/Marlin/example_configurations/K8200/Configuration_adv.h @@ -1171,4 +1171,14 @@ */ //#define NO_WORKSPACE_OFFSETS +/** + * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number + * of spaces to be output by the ratio set below. This allows for better alignment of output for commands + * like G29 O, which renders a mesh/grid. + * + * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust + * accordingly for your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + #endif // CONFIGURATION_ADV_H diff --git a/Marlin/example_configurations/K8400/Configuration_adv.h b/Marlin/example_configurations/K8400/Configuration_adv.h index 7ffc9e04b..9ef3258f1 100644 --- a/Marlin/example_configurations/K8400/Configuration_adv.h +++ b/Marlin/example_configurations/K8400/Configuration_adv.h @@ -1158,4 +1158,14 @@ */ //#define NO_WORKSPACE_OFFSETS +/** + * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number + * of spaces to be output by the ratio set below. This allows for better alignment of output for commands + * like G29 O, which renders a mesh/grid. + * + * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust + * accordingly for your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + #endif // CONFIGURATION_ADV_H diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h index f259c0e42..3d6483b26 100644 --- a/Marlin/example_configurations/RigidBot/Configuration_adv.h +++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h @@ -1158,4 +1158,14 @@ */ //#define NO_WORKSPACE_OFFSETS +/** + * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number + * of spaces to be output by the ratio set below. This allows for better alignment of output for commands + * like G29 O, which renders a mesh/grid. + * + * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust + * accordingly for your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + #endif // CONFIGURATION_ADV_H diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h index a7ad075e5..9f6d22b2d 100644 --- a/Marlin/example_configurations/SCARA/Configuration_adv.h +++ b/Marlin/example_configurations/SCARA/Configuration_adv.h @@ -1158,4 +1158,14 @@ */ //#define NO_WORKSPACE_OFFSETS +/** + * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number + * of spaces to be output by the ratio set below. This allows for better alignment of output for commands + * like G29 O, which renders a mesh/grid. + * + * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust + * accordingly for your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + #endif // CONFIGURATION_ADV_H diff --git a/Marlin/example_configurations/TAZ4/Configuration_adv.h b/Marlin/example_configurations/TAZ4/Configuration_adv.h index 23e2226ff..8c510aab9 100644 --- a/Marlin/example_configurations/TAZ4/Configuration_adv.h +++ b/Marlin/example_configurations/TAZ4/Configuration_adv.h @@ -1158,4 +1158,14 @@ */ //#define NO_WORKSPACE_OFFSETS +/** + * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number + * of spaces to be output by the ratio set below. This allows for better alignment of output for commands + * like G29 O, which renders a mesh/grid. + * + * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust + * accordingly for your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + #endif // CONFIGURATION_ADV_H diff --git a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h index 94e357943..ee78175bc 100644 --- a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h +++ b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h @@ -1161,4 +1161,14 @@ */ //#define NO_WORKSPACE_OFFSETS +/** + * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number + * of spaces to be output by the ratio set below. This allows for better alignment of output for commands + * like G29 O, which renders a mesh/grid. + * + * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust + * accordingly for your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + #endif // CONFIGURATION_ADV_H diff --git a/Marlin/example_configurations/WITBOX/Configuration_adv.h b/Marlin/example_configurations/WITBOX/Configuration_adv.h index ab322752b..798d74177 100644 --- a/Marlin/example_configurations/WITBOX/Configuration_adv.h +++ b/Marlin/example_configurations/WITBOX/Configuration_adv.h @@ -1158,4 +1158,14 @@ */ //#define NO_WORKSPACE_OFFSETS +/** + * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number + * of spaces to be output by the ratio set below. This allows for better alignment of output for commands + * like G29 O, which renders a mesh/grid. + * + * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust + * accordingly for your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + #endif // CONFIGURATION_ADV_H diff --git a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h index 6fbc87f5f..010a1989d 100644 --- a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h +++ b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h @@ -1163,4 +1163,14 @@ */ //#define NO_WORKSPACE_OFFSETS +/** + * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number + * of spaces to be output by the ratio set below. This allows for better alignment of output for commands + * like G29 O, which renders a mesh/grid. + * + * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust + * accordingly for your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + #endif // CONFIGURATION_ADV_H diff --git a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h index ef7804587..b3f183a31 100644 --- a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h @@ -1162,4 +1162,14 @@ */ //#define NO_WORKSPACE_OFFSETS +/** + * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number + * of spaces to be output by the ratio set below. This allows for better alignment of output for commands + * like G29 O, which renders a mesh/grid. + * + * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust + * accordingly for your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + #endif // CONFIGURATION_ADV_H diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h index 057f30d71..deb74b6d6 100644 --- a/Marlin/example_configurations/delta/generic/Configuration_adv.h +++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h @@ -1160,4 +1160,14 @@ */ //#define NO_WORKSPACE_OFFSETS +/** + * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number + * of spaces to be output by the ratio set below. This allows for better alignment of output for commands + * like G29 O, which renders a mesh/grid. + * + * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust + * accordingly for your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + #endif // CONFIGURATION_ADV_H diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h index 057f30d71..deb74b6d6 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h @@ -1160,4 +1160,14 @@ */ //#define NO_WORKSPACE_OFFSETS +/** + * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number + * of spaces to be output by the ratio set below. This allows for better alignment of output for commands + * like G29 O, which renders a mesh/grid. + * + * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust + * accordingly for your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + #endif // CONFIGURATION_ADV_H diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h index 1b0cb7c48..8bb8f312a 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h @@ -1165,4 +1165,14 @@ */ //#define NO_WORKSPACE_OFFSETS +/** + * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number + * of spaces to be output by the ratio set below. This allows for better alignment of output for commands + * like G29 O, which renders a mesh/grid. + * + * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust + * accordingly for your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + #endif // CONFIGURATION_ADV_H diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h index f705314f4..aad4304e5 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h @@ -1160,4 +1160,14 @@ */ //#define NO_WORKSPACE_OFFSETS +/** + * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number + * of spaces to be output by the ratio set below. This allows for better alignment of output for commands + * like G29 O, which renders a mesh/grid. + * + * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust + * accordingly for your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + #endif // CONFIGURATION_ADV_H diff --git a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h b/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h index cf186a11e..3f38210b5 100644 --- a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h +++ b/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h @@ -1165,4 +1165,14 @@ */ #define NO_WORKSPACE_OFFSETS +/** + * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number + * of spaces to be output by the ratio set below. This allows for better alignment of output for commands + * like G29 O, which renders a mesh/grid. + * + * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust + * accordingly for your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + #endif // CONFIGURATION_ADV_H diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h index 9e1738a78..c8c38d60f 100644 --- a/Marlin/example_configurations/makibox/Configuration_adv.h +++ b/Marlin/example_configurations/makibox/Configuration_adv.h @@ -1158,4 +1158,14 @@ */ //#define NO_WORKSPACE_OFFSETS +/** + * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number + * of spaces to be output by the ratio set below. This allows for better alignment of output for commands + * like G29 O, which renders a mesh/grid. + * + * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust + * accordingly for your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + #endif // CONFIGURATION_ADV_H diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h index 76593f954..daf9e0d7d 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h @@ -1158,4 +1158,14 @@ */ //#define NO_WORKSPACE_OFFSETS +/** + * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number + * of spaces to be output by the ratio set below. This allows for better alignment of output for commands + * like G29 O, which renders a mesh/grid. + * + * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust + * accordingly for your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + #endif // CONFIGURATION_ADV_H diff --git a/Marlin/example_configurations/wt150/Configuration_adv.h b/Marlin/example_configurations/wt150/Configuration_adv.h index cbad1319d..81d5028b2 100644 --- a/Marlin/example_configurations/wt150/Configuration_adv.h +++ b/Marlin/example_configurations/wt150/Configuration_adv.h @@ -1161,4 +1161,14 @@ */ //#define NO_WORKSPACE_OFFSETS +/** + * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number + * of spaces to be output by the ratio set below. This allows for better alignment of output for commands + * like G29 O, which renders a mesh/grid. + * + * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust + * accordingly for your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + #endif // CONFIGURATION_ADV_H diff --git a/Marlin/serial.cpp b/Marlin/serial.cpp index 797c6107a..232a85c30 100644 --- a/Marlin/serial.cpp +++ b/Marlin/serial.cpp @@ -33,4 +33,4 @@ void serial_echopair_P(const char* s_P, float v) { serialprintPGM(s_P); void serial_echopair_P(const char* s_P, double v) { serialprintPGM(s_P); SERIAL_ECHO(v); } void serial_echopair_P(const char* s_P, unsigned long v) { serialprintPGM(s_P); SERIAL_ECHO(v); } -void serial_spaces(uint8_t count) { while (count--) MYSERIAL.write(' '); } +void serial_spaces(uint8_t count) { count *= (PROPORTIONAL_FONT_RATIO); while (count--) MYSERIAL.write(' '); } diff --git a/Marlin/ubl.cpp b/Marlin/ubl.cpp index 0f0c928e2..29e935a65 100644 --- a/Marlin/ubl.cpp +++ b/Marlin/ubl.cpp @@ -136,7 +136,7 @@ void unified_bed_leveling::display_map(const int map_type) { const bool map0 = map_type == 0; - constexpr uint8_t spaces = 11 * (GRID_MAX_POINTS_X - 2); + constexpr uint8_t spaces = 9 * (GRID_MAX_POINTS_X - 2); if (map0) { SERIAL_PROTOCOLLNPGM("\nBed Topography Report:\n"); @@ -145,7 +145,7 @@ serial_echo_xy(GRID_MAX_POINTS_X - 1, GRID_MAX_POINTS_Y - 1); SERIAL_EOL; serial_echo_xy(UBL_MESH_MIN_X, UBL_MESH_MAX_Y); - SERIAL_ECHO_SP(spaces - 3); + SERIAL_ECHO_SP(spaces); serial_echo_xy(UBL_MESH_MAX_X, UBL_MESH_MAX_Y); SERIAL_EOL; } @@ -190,7 +190,7 @@ if (map0) { serial_echo_xy(UBL_MESH_MIN_X, UBL_MESH_MIN_Y); - SERIAL_ECHO_SP(spaces + 1); + SERIAL_ECHO_SP(spaces + 4); serial_echo_xy(UBL_MESH_MAX_X, UBL_MESH_MIN_Y); SERIAL_EOL; serial_echo_xy(0, 0);