소스 검색

Add proportional font adjustment ratio

- update example configs
Brian 7 년 전
부모
커밋
2604742191
25개의 변경된 파일234개의 추가작업 그리고 4개의 파일을 삭제
  1. 10
    0
      Marlin/Configuration_adv.h
  2. 10
    0
      Marlin/example_configurations/Cartesio/Configuration_adv.h
  3. 10
    0
      Marlin/example_configurations/Felix/Configuration_adv.h
  4. 10
    0
      Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h
  5. 10
    0
      Marlin/example_configurations/Hephestos/Configuration_adv.h
  6. 10
    0
      Marlin/example_configurations/Hephestos_2/Configuration_adv.h
  7. 10
    0
      Marlin/example_configurations/K8200/Configuration_adv.h
  8. 10
    0
      Marlin/example_configurations/K8400/Configuration_adv.h
  9. 10
    0
      Marlin/example_configurations/RigidBot/Configuration_adv.h
  10. 10
    0
      Marlin/example_configurations/SCARA/Configuration_adv.h
  11. 10
    0
      Marlin/example_configurations/TAZ4/Configuration_adv.h
  12. 10
    0
      Marlin/example_configurations/TinyBoy2/Configuration_adv.h
  13. 10
    0
      Marlin/example_configurations/WITBOX/Configuration_adv.h
  14. 10
    0
      Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
  15. 10
    0
      Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
  16. 10
    0
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  17. 10
    0
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  18. 10
    0
      Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
  19. 10
    0
      Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
  20. 10
    0
      Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h
  21. 10
    0
      Marlin/example_configurations/makibox/Configuration_adv.h
  22. 10
    0
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
  23. 10
    0
      Marlin/example_configurations/wt150/Configuration_adv.h
  24. 1
    1
      Marlin/serial.cpp
  25. 3
    3
      Marlin/ubl.cpp

+ 10
- 0
Marlin/Configuration_adv.h 파일 보기

@@ -1165,4 +1165,14 @@
1165 1165
  */
1166 1166
 //#define NO_WORKSPACE_OFFSETS
1167 1167
 
1168
+/**
1169
+ * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number
1170
+ * of spaces to be output by the ratio set below.  This allows for better alignment of output for commands
1171
+ * like G29 O, which renders a mesh/grid.
1172
+ *
1173
+ * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust
1174
+ * accordingly for your client and font.
1175
+ */
1176
+#define PROPORTIONAL_FONT_RATIO 1.0
1177
+
1168 1178
 #endif // CONFIGURATION_ADV_H

+ 10
- 0
Marlin/example_configurations/Cartesio/Configuration_adv.h 파일 보기

@@ -1158,4 +1158,14 @@
1158 1158
  */
1159 1159
 //#define NO_WORKSPACE_OFFSETS
1160 1160
 
1161
+/**
1162
+ * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number
1163
+ * of spaces to be output by the ratio set below.  This allows for better alignment of output for commands
1164
+ * like G29 O, which renders a mesh/grid.
1165
+ *
1166
+ * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust
1167
+ * accordingly for your client and font.
1168
+ */
1169
+#define PROPORTIONAL_FONT_RATIO 1.0
1170
+
1161 1171
 #endif // CONFIGURATION_ADV_H

+ 10
- 0
Marlin/example_configurations/Felix/Configuration_adv.h 파일 보기

@@ -1158,4 +1158,14 @@
1158 1158
  */
1159 1159
 //#define NO_WORKSPACE_OFFSETS
1160 1160
 
1161
+/**
1162
+ * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number
1163
+ * of spaces to be output by the ratio set below.  This allows for better alignment of output for commands
1164
+ * like G29 O, which renders a mesh/grid.
1165
+ *
1166
+ * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust
1167
+ * accordingly for your client and font.
1168
+ */
1169
+#define PROPORTIONAL_FONT_RATIO 1.0
1170
+
1161 1171
 #endif // CONFIGURATION_ADV_H

+ 10
- 0
Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h 파일 보기

@@ -1165,4 +1165,14 @@
1165 1165
  */
1166 1166
 //#define NO_WORKSPACE_OFFSETS
1167 1167
 
1168
+/**
1169
+ * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number
1170
+ * of spaces to be output by the ratio set below.  This allows for better alignment of output for commands
1171
+ * like G29 O, which renders a mesh/grid.
1172
+ *
1173
+ * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust
1174
+ * accordingly for your client and font.
1175
+ */
1176
+#define PROPORTIONAL_FONT_RATIO 1.0
1177
+
1168 1178
 #endif // CONFIGURATION_ADV_H

+ 10
- 0
Marlin/example_configurations/Hephestos/Configuration_adv.h 파일 보기

@@ -1158,4 +1158,14 @@
1158 1158
  */
1159 1159
 //#define NO_WORKSPACE_OFFSETS
1160 1160
 
1161
+/**
1162
+ * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number
1163
+ * of spaces to be output by the ratio set below.  This allows for better alignment of output for commands
1164
+ * like G29 O, which renders a mesh/grid.
1165
+ *
1166
+ * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust
1167
+ * accordingly for your client and font.
1168
+ */
1169
+#define PROPORTIONAL_FONT_RATIO 1.0
1170
+
1161 1171
 #endif // CONFIGURATION_ADV_H

+ 10
- 0
Marlin/example_configurations/Hephestos_2/Configuration_adv.h 파일 보기

@@ -1142,4 +1142,14 @@
1142 1142
  */
1143 1143
 //#define NO_WORKSPACE_OFFSETS
1144 1144
 
1145
+/**
1146
+ * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number
1147
+ * of spaces to be output by the ratio set below.  This allows for better alignment of output for commands
1148
+ * like G29 O, which renders a mesh/grid.
1149
+ *
1150
+ * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust
1151
+ * accordingly for your client and font.
1152
+ */
1153
+#define PROPORTIONAL_FONT_RATIO 1.0
1154
+
1145 1155
 #endif // CONFIGURATION_ADV_H

+ 10
- 0
Marlin/example_configurations/K8200/Configuration_adv.h 파일 보기

@@ -1171,4 +1171,14 @@
1171 1171
  */
1172 1172
 //#define NO_WORKSPACE_OFFSETS
1173 1173
 
1174
+/**
1175
+ * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number
1176
+ * of spaces to be output by the ratio set below.  This allows for better alignment of output for commands
1177
+ * like G29 O, which renders a mesh/grid.
1178
+ *
1179
+ * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust
1180
+ * accordingly for your client and font.
1181
+ */
1182
+#define PROPORTIONAL_FONT_RATIO 1.0
1183
+
1174 1184
 #endif // CONFIGURATION_ADV_H

+ 10
- 0
Marlin/example_configurations/K8400/Configuration_adv.h 파일 보기

@@ -1158,4 +1158,14 @@
1158 1158
  */
1159 1159
 //#define NO_WORKSPACE_OFFSETS
1160 1160
 
1161
+/**
1162
+ * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number
1163
+ * of spaces to be output by the ratio set below.  This allows for better alignment of output for commands
1164
+ * like G29 O, which renders a mesh/grid.
1165
+ *
1166
+ * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust
1167
+ * accordingly for your client and font.
1168
+ */
1169
+#define PROPORTIONAL_FONT_RATIO 1.0
1170
+
1161 1171
 #endif // CONFIGURATION_ADV_H

+ 10
- 0
Marlin/example_configurations/RigidBot/Configuration_adv.h 파일 보기

@@ -1158,4 +1158,14 @@
1158 1158
  */
1159 1159
 //#define NO_WORKSPACE_OFFSETS
1160 1160
 
1161
+/**
1162
+ * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number
1163
+ * of spaces to be output by the ratio set below.  This allows for better alignment of output for commands
1164
+ * like G29 O, which renders a mesh/grid.
1165
+ *
1166
+ * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust
1167
+ * accordingly for your client and font.
1168
+ */
1169
+#define PROPORTIONAL_FONT_RATIO 1.0
1170
+
1161 1171
 #endif // CONFIGURATION_ADV_H

+ 10
- 0
Marlin/example_configurations/SCARA/Configuration_adv.h 파일 보기

@@ -1158,4 +1158,14 @@
1158 1158
  */
1159 1159
 //#define NO_WORKSPACE_OFFSETS
1160 1160
 
1161
+/**
1162
+ * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number
1163
+ * of spaces to be output by the ratio set below.  This allows for better alignment of output for commands
1164
+ * like G29 O, which renders a mesh/grid.
1165
+ *
1166
+ * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust
1167
+ * accordingly for your client and font.
1168
+ */
1169
+#define PROPORTIONAL_FONT_RATIO 1.0
1170
+
1161 1171
 #endif // CONFIGURATION_ADV_H

+ 10
- 0
Marlin/example_configurations/TAZ4/Configuration_adv.h 파일 보기

@@ -1158,4 +1158,14 @@
1158 1158
  */
1159 1159
 //#define NO_WORKSPACE_OFFSETS
1160 1160
 
1161
+/**
1162
+ * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number
1163
+ * of spaces to be output by the ratio set below.  This allows for better alignment of output for commands
1164
+ * like G29 O, which renders a mesh/grid.
1165
+ *
1166
+ * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust
1167
+ * accordingly for your client and font.
1168
+ */
1169
+#define PROPORTIONAL_FONT_RATIO 1.0
1170
+
1161 1171
 #endif // CONFIGURATION_ADV_H

+ 10
- 0
Marlin/example_configurations/TinyBoy2/Configuration_adv.h 파일 보기

@@ -1161,4 +1161,14 @@
1161 1161
  */
1162 1162
 //#define NO_WORKSPACE_OFFSETS
1163 1163
 
1164
+/**
1165
+ * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number
1166
+ * of spaces to be output by the ratio set below.  This allows for better alignment of output for commands
1167
+ * like G29 O, which renders a mesh/grid.
1168
+ *
1169
+ * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust
1170
+ * accordingly for your client and font.
1171
+ */
1172
+#define PROPORTIONAL_FONT_RATIO 1.0
1173
+
1164 1174
 #endif // CONFIGURATION_ADV_H

+ 10
- 0
Marlin/example_configurations/WITBOX/Configuration_adv.h 파일 보기

@@ -1158,4 +1158,14 @@
1158 1158
  */
1159 1159
 //#define NO_WORKSPACE_OFFSETS
1160 1160
 
1161
+/**
1162
+ * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number
1163
+ * of spaces to be output by the ratio set below.  This allows for better alignment of output for commands
1164
+ * like G29 O, which renders a mesh/grid.
1165
+ *
1166
+ * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust
1167
+ * accordingly for your client and font.
1168
+ */
1169
+#define PROPORTIONAL_FONT_RATIO 1.0
1170
+
1161 1171
 #endif // CONFIGURATION_ADV_H

+ 10
- 0
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h 파일 보기

@@ -1163,4 +1163,14 @@
1163 1163
  */
1164 1164
 //#define NO_WORKSPACE_OFFSETS
1165 1165
 
1166
+/**
1167
+ * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number
1168
+ * of spaces to be output by the ratio set below.  This allows for better alignment of output for commands
1169
+ * like G29 O, which renders a mesh/grid.
1170
+ *
1171
+ * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust
1172
+ * accordingly for your client and font.
1173
+ */
1174
+#define PROPORTIONAL_FONT_RATIO 1.0
1175
+
1166 1176
 #endif // CONFIGURATION_ADV_H

+ 10
- 0
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h 파일 보기

@@ -1162,4 +1162,14 @@
1162 1162
  */
1163 1163
 //#define NO_WORKSPACE_OFFSETS
1164 1164
 
1165
+/**
1166
+ * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number
1167
+ * of spaces to be output by the ratio set below.  This allows for better alignment of output for commands
1168
+ * like G29 O, which renders a mesh/grid.
1169
+ *
1170
+ * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust
1171
+ * accordingly for your client and font.
1172
+ */
1173
+#define PROPORTIONAL_FONT_RATIO 1.0
1174
+
1165 1175
 #endif // CONFIGURATION_ADV_H

+ 10
- 0
Marlin/example_configurations/delta/generic/Configuration_adv.h 파일 보기

@@ -1160,4 +1160,14 @@
1160 1160
  */
1161 1161
 //#define NO_WORKSPACE_OFFSETS
1162 1162
 
1163
+/**
1164
+ * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number
1165
+ * of spaces to be output by the ratio set below.  This allows for better alignment of output for commands
1166
+ * like G29 O, which renders a mesh/grid.
1167
+ *
1168
+ * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust
1169
+ * accordingly for your client and font.
1170
+ */
1171
+#define PROPORTIONAL_FONT_RATIO 1.0
1172
+
1163 1173
 #endif // CONFIGURATION_ADV_H

+ 10
- 0
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h 파일 보기

@@ -1160,4 +1160,14 @@
1160 1160
  */
1161 1161
 //#define NO_WORKSPACE_OFFSETS
1162 1162
 
1163
+/**
1164
+ * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number
1165
+ * of spaces to be output by the ratio set below.  This allows for better alignment of output for commands
1166
+ * like G29 O, which renders a mesh/grid.
1167
+ *
1168
+ * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust
1169
+ * accordingly for your client and font.
1170
+ */
1171
+#define PROPORTIONAL_FONT_RATIO 1.0
1172
+
1163 1173
 #endif // CONFIGURATION_ADV_H

+ 10
- 0
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h 파일 보기

@@ -1165,4 +1165,14 @@
1165 1165
  */
1166 1166
 //#define NO_WORKSPACE_OFFSETS
1167 1167
 
1168
+/**
1169
+ * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number
1170
+ * of spaces to be output by the ratio set below.  This allows for better alignment of output for commands
1171
+ * like G29 O, which renders a mesh/grid.
1172
+ *
1173
+ * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust
1174
+ * accordingly for your client and font.
1175
+ */
1176
+#define PROPORTIONAL_FONT_RATIO 1.0
1177
+
1168 1178
 #endif // CONFIGURATION_ADV_H

+ 10
- 0
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h 파일 보기

@@ -1160,4 +1160,14 @@
1160 1160
  */
1161 1161
 //#define NO_WORKSPACE_OFFSETS
1162 1162
 
1163
+/**
1164
+ * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number
1165
+ * of spaces to be output by the ratio set below.  This allows for better alignment of output for commands
1166
+ * like G29 O, which renders a mesh/grid.
1167
+ *
1168
+ * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust
1169
+ * accordingly for your client and font.
1170
+ */
1171
+#define PROPORTIONAL_FONT_RATIO 1.0
1172
+
1163 1173
 #endif // CONFIGURATION_ADV_H

+ 10
- 0
Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h 파일 보기

@@ -1165,4 +1165,14 @@
1165 1165
  */
1166 1166
 #define NO_WORKSPACE_OFFSETS
1167 1167
 
1168
+/**
1169
+ * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number
1170
+ * of spaces to be output by the ratio set below.  This allows for better alignment of output for commands
1171
+ * like G29 O, which renders a mesh/grid.
1172
+ *
1173
+ * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust
1174
+ * accordingly for your client and font.
1175
+ */
1176
+#define PROPORTIONAL_FONT_RATIO 1.0
1177
+
1168 1178
 #endif // CONFIGURATION_ADV_H

+ 10
- 0
Marlin/example_configurations/makibox/Configuration_adv.h 파일 보기

@@ -1158,4 +1158,14 @@
1158 1158
  */
1159 1159
 //#define NO_WORKSPACE_OFFSETS
1160 1160
 
1161
+/**
1162
+ * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number
1163
+ * of spaces to be output by the ratio set below.  This allows for better alignment of output for commands
1164
+ * like G29 O, which renders a mesh/grid.
1165
+ *
1166
+ * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust
1167
+ * accordingly for your client and font.
1168
+ */
1169
+#define PROPORTIONAL_FONT_RATIO 1.0
1170
+
1161 1171
 #endif // CONFIGURATION_ADV_H

+ 10
- 0
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h 파일 보기

@@ -1158,4 +1158,14 @@
1158 1158
  */
1159 1159
 //#define NO_WORKSPACE_OFFSETS
1160 1160
 
1161
+/**
1162
+ * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number
1163
+ * of spaces to be output by the ratio set below.  This allows for better alignment of output for commands
1164
+ * like G29 O, which renders a mesh/grid.
1165
+ *
1166
+ * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust
1167
+ * accordingly for your client and font.
1168
+ */
1169
+#define PROPORTIONAL_FONT_RATIO 1.0
1170
+
1161 1171
 #endif // CONFIGURATION_ADV_H

+ 10
- 0
Marlin/example_configurations/wt150/Configuration_adv.h 파일 보기

@@ -1161,4 +1161,14 @@
1161 1161
  */
1162 1162
 //#define NO_WORKSPACE_OFFSETS
1163 1163
 
1164
+/**
1165
+ * This affects the way Marlin outputs blacks of spaces via serial connection by multiplying the number
1166
+ * of spaces to be output by the ratio set below.  This allows for better alignment of output for commands
1167
+ * like G29 O, which renders a mesh/grid.
1168
+ *
1169
+ * For clients that use a fixed-width font (like OctoPrint), leave this at 1.0; otherwise, adjust
1170
+ * accordingly for your client and font.
1171
+ */
1172
+#define PROPORTIONAL_FONT_RATIO 1.0
1173
+
1164 1174
 #endif // CONFIGURATION_ADV_H

+ 1
- 1
Marlin/serial.cpp 파일 보기

@@ -33,4 +33,4 @@ void serial_echopair_P(const char* s_P, float v)         { serialprintPGM(s_P);
33 33
 void serial_echopair_P(const char* s_P, double v)        { serialprintPGM(s_P); SERIAL_ECHO(v); }
34 34
 void serial_echopair_P(const char* s_P, unsigned long v) { serialprintPGM(s_P); SERIAL_ECHO(v); }
35 35
 
36
-void serial_spaces(uint8_t count) { while (count--) MYSERIAL.write(' '); }
36
+void serial_spaces(uint8_t count) { count *= (PROPORTIONAL_FONT_RATIO); while (count--) MYSERIAL.write(' '); }

+ 3
- 3
Marlin/ubl.cpp 파일 보기

@@ -136,7 +136,7 @@
136 136
 
137 137
   void unified_bed_leveling::display_map(const int map_type) {
138 138
     const bool map0 = map_type == 0;
139
-    constexpr uint8_t spaces = 11 * (GRID_MAX_POINTS_X - 2);
139
+    constexpr uint8_t spaces = 9 * (GRID_MAX_POINTS_X - 2);
140 140
 
141 141
     if (map0) {
142 142
       SERIAL_PROTOCOLLNPGM("\nBed Topography Report:\n");
@@ -145,7 +145,7 @@
145 145
       serial_echo_xy(GRID_MAX_POINTS_X - 1, GRID_MAX_POINTS_Y - 1);
146 146
       SERIAL_EOL;
147 147
       serial_echo_xy(UBL_MESH_MIN_X, UBL_MESH_MAX_Y);
148
-      SERIAL_ECHO_SP(spaces - 3);
148
+      SERIAL_ECHO_SP(spaces);
149 149
       serial_echo_xy(UBL_MESH_MAX_X, UBL_MESH_MAX_Y);
150 150
       SERIAL_EOL;
151 151
     }
@@ -190,7 +190,7 @@
190 190
 
191 191
     if (map0) {
192 192
       serial_echo_xy(UBL_MESH_MIN_X, UBL_MESH_MIN_Y);
193
-      SERIAL_ECHO_SP(spaces + 1);
193
+      SERIAL_ECHO_SP(spaces + 4);
194 194
       serial_echo_xy(UBL_MESH_MAX_X, UBL_MESH_MIN_Y);
195 195
       SERIAL_EOL;
196 196
       serial_echo_xy(0, 0);

Loading…
취소
저장