|
@@ -34,8 +34,8 @@
|
34
|
34
|
#include "game/game.h"
|
35
|
35
|
#endif
|
36
|
36
|
|
37
|
|
-#define STATIC_PAIR(MSG, VALUE, CNTR) do{ strcpy_P(buffer, PSTR(": ")); strcpy(buffer + 2, VALUE); STATIC_ITEM(MSG, CNTR, false, buffer); }while(0)
|
38
|
|
-#define STATIC_PAIR_P(MSG, PVALUE, CNTR) do{ strcpy_P(buffer, PSTR(": ")); strcpy_P(buffer + 2, PSTR(PVALUE)); STATIC_ITEM(MSG, CNTR, false, buffer); }while(0)
|
|
37
|
+#define STATIC_PAIR(MSG, VALUE, STYL) do{ strcpy_P(buffer, PSTR(": ")); strcpy(buffer + 2, VALUE); STATIC_ITEM(MSG, STYL, buffer); }while(0)
|
|
38
|
+#define STATIC_PAIR_P(MSG, PVALUE, STYL) do{ strcpy_P(buffer, PSTR(": ")); strcpy_P(buffer + 2, PSTR(PVALUE)); STATIC_ITEM(MSG, STYL, buffer); }while(0)
|
39
|
39
|
|
40
|
40
|
#if ENABLED(PRINTCOUNTER)
|
41
|
41
|
|
|
@@ -55,33 +55,33 @@
|
55
|
55
|
|
56
|
56
|
printStatistics stats = print_job_timer.getStats();
|
57
|
57
|
|
58
|
|
- START_SCREEN(); // 12345678901234567890
|
59
|
|
- STATIC_PAIR(MSG_INFO_PRINT_COUNT, i16tostr3left(stats.totalPrints), false); // Print Count: 999
|
60
|
|
- STATIC_PAIR(MSG_INFO_COMPLETED_PRINTS, i16tostr3left(stats.finishedPrints), false); // Completed : 666
|
|
58
|
+ START_SCREEN(); // 12345678901234567890
|
|
59
|
+ STATIC_PAIR(MSG_INFO_PRINT_COUNT, i16tostr3left(stats.totalPrints), SS_LEFT); // Print Count: 999
|
|
60
|
+ STATIC_PAIR(MSG_INFO_COMPLETED_PRINTS, i16tostr3left(stats.finishedPrints), SS_LEFT); // Completed : 666
|
61
|
61
|
|
62
|
|
- STATIC_PAIR_P(MSG_INFO_PRINT_TIME, "", false); // Total print Time:
|
63
|
|
- STATIC_ITEM("> ", false, false, duration_t(stats.printTime).toString(buffer)); // > 99y 364d 23h 59m 59s
|
|
62
|
+ STATIC_PAIR_P(MSG_INFO_PRINT_TIME, "", SS_LEFT); // Total print Time:
|
|
63
|
+ STATIC_ITEM("> ", SS_LEFT, duration_t(stats.printTime).toString(buffer)); // > 99y 364d 23h 59m 59s
|
64
|
64
|
|
65
|
|
- STATIC_PAIR_P(MSG_INFO_PRINT_LONGEST, "", false); // Longest job time:
|
66
|
|
- STATIC_ITEM("> ", false, false, duration_t(stats.longestPrint).toString(buffer)); // > 99y 364d 23h 59m 59s
|
|
65
|
+ STATIC_PAIR_P(MSG_INFO_PRINT_LONGEST, "", SS_LEFT); // Longest job time:
|
|
66
|
+ STATIC_ITEM("> ", SS_LEFT, duration_t(stats.longestPrint).toString(buffer)); // > 99y 364d 23h 59m 59s
|
67
|
67
|
|
68
|
|
- STATIC_PAIR_P(MSG_INFO_PRINT_FILAMENT, "", false); // Extruded total:
|
|
68
|
+ STATIC_PAIR_P(MSG_INFO_PRINT_FILAMENT, "", SS_LEFT); // Extruded total:
|
69
|
69
|
sprintf_P(buffer, PSTR("%ld.%im"), long(stats.filamentUsed / 1000), int16_t(stats.filamentUsed / 100) % 10);
|
70
|
|
- STATIC_ITEM("> ", false, false, buffer); // > 125m
|
|
70
|
+ STATIC_ITEM("> ", SS_LEFT, buffer); // > 125m
|
71
|
71
|
|
72
|
72
|
#if SERVICE_INTERVAL_1 > 0
|
73
|
|
- STATIC_ITEM(SERVICE_NAME_1 MSG_SERVICE_IN, false, false); // Service X in:
|
74
|
|
- STATIC_ITEM("> ", false, false, duration_t(stats.nextService1).toString(buffer)); // > 7d 12h 11m 10s
|
|
73
|
+ STATIC_ITEM(SERVICE_NAME_1 MSG_SERVICE_IN, SS_LEFT); // Service X in:
|
|
74
|
+ STATIC_ITEM("> ", SS_LEFT, duration_t(stats.nextService1).toString(buffer)); // > 7d 12h 11m 10s
|
75
|
75
|
#endif
|
76
|
76
|
|
77
|
77
|
#if SERVICE_INTERVAL_2 > 0
|
78
|
|
- STATIC_ITEM(SERVICE_NAME_2 MSG_SERVICE_IN, false, false);
|
79
|
|
- STATIC_ITEM("> ", false, false, duration_t(stats.nextService2).toString(buffer));
|
|
78
|
+ STATIC_ITEM(SERVICE_NAME_2 MSG_SERVICE_IN, SS_LEFT);
|
|
79
|
+ STATIC_ITEM("> ", SS_LEFT, duration_t(stats.nextService2).toString(buffer));
|
80
|
80
|
#endif
|
81
|
81
|
|
82
|
82
|
#if SERVICE_INTERVAL_3 > 0
|
83
|
|
- STATIC_ITEM(SERVICE_NAME_3 MSG_SERVICE_IN, false, false);
|
84
|
|
- STATIC_ITEM("> ", false, false, duration_t(stats.nextService3).toString(buffer));
|
|
83
|
+ STATIC_ITEM(SERVICE_NAME_3 MSG_SERVICE_IN, SS_LEFT);
|
|
84
|
+ STATIC_ITEM("> ", SS_LEFT, duration_t(stats.nextService3).toString(buffer));
|
85
|
85
|
#endif
|
86
|
86
|
|
87
|
87
|
END_SCREEN();
|
|
@@ -105,63 +105,63 @@ void menu_info_thermistors() {
|
105
|
105
|
#if EXTRUDERS
|
106
|
106
|
#define THERMISTOR_ID TEMP_SENSOR_0
|
107
|
107
|
#include "../thermistornames.h"
|
108
|
|
- STATIC_ITEM("T0: " THERMISTOR_NAME, false, true);
|
109
|
|
- STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_0_MINTEMP), false);
|
110
|
|
- STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_0_MAXTEMP), false);
|
|
108
|
+ STATIC_ITEM("T0: " THERMISTOR_NAME, SS_INVERT);
|
|
109
|
+ STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_0_MINTEMP), SS_LEFT);
|
|
110
|
+ STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_0_MAXTEMP), SS_LEFT);
|
111
|
111
|
#endif
|
112
|
112
|
|
113
|
113
|
#if TEMP_SENSOR_1 != 0
|
114
|
114
|
#undef THERMISTOR_ID
|
115
|
115
|
#define THERMISTOR_ID TEMP_SENSOR_1
|
116
|
116
|
#include "../thermistornames.h"
|
117
|
|
- STATIC_ITEM("T1: " THERMISTOR_NAME, false, true);
|
118
|
|
- STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_1_MINTEMP), false);
|
119
|
|
- STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_1_MAXTEMP), false);
|
|
117
|
+ STATIC_ITEM("T1: " THERMISTOR_NAME, SS_INVERT);
|
|
118
|
+ STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_1_MINTEMP), SS_LEFT);
|
|
119
|
+ STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_1_MAXTEMP), SS_LEFT);
|
120
|
120
|
#endif
|
121
|
121
|
|
122
|
122
|
#if TEMP_SENSOR_2 != 0
|
123
|
123
|
#undef THERMISTOR_ID
|
124
|
124
|
#define THERMISTOR_ID TEMP_SENSOR_2
|
125
|
125
|
#include "../thermistornames.h"
|
126
|
|
- STATIC_ITEM("T2: " THERMISTOR_NAME, false, true);
|
127
|
|
- STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_2_MINTEMP), false);
|
128
|
|
- STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_2_MAXTEMP), false);
|
|
126
|
+ STATIC_ITEM("T2: " THERMISTOR_NAME, SS_INVERT);
|
|
127
|
+ STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_2_MINTEMP), SS_LEFT);
|
|
128
|
+ STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_2_MAXTEMP), SS_LEFT);
|
129
|
129
|
#endif
|
130
|
130
|
|
131
|
131
|
#if TEMP_SENSOR_3 != 0
|
132
|
132
|
#undef THERMISTOR_ID
|
133
|
133
|
#define THERMISTOR_ID TEMP_SENSOR_3
|
134
|
134
|
#include "../thermistornames.h"
|
135
|
|
- STATIC_ITEM("T3: " THERMISTOR_NAME, false, true);
|
136
|
|
- STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_3_MINTEMP), false);
|
137
|
|
- STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_3_MAXTEMP), false);
|
|
135
|
+ STATIC_ITEM("T3: " THERMISTOR_NAME, SS_INVERT);
|
|
136
|
+ STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_3_MINTEMP), SS_LEFT);
|
|
137
|
+ STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_3_MAXTEMP), SS_LEFT);
|
138
|
138
|
#endif
|
139
|
139
|
|
140
|
140
|
#if TEMP_SENSOR_4 != 0
|
141
|
141
|
#undef THERMISTOR_ID
|
142
|
142
|
#define THERMISTOR_ID TEMP_SENSOR_4
|
143
|
143
|
#include "../thermistornames.h"
|
144
|
|
- STATIC_ITEM("T4: " THERMISTOR_NAME, false, true);
|
145
|
|
- STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_4_MINTEMP), false);
|
146
|
|
- STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_4_MAXTEMP), false);
|
|
144
|
+ STATIC_ITEM("T4: " THERMISTOR_NAME, SS_INVERT);
|
|
145
|
+ STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_4_MINTEMP), SS_LEFT);
|
|
146
|
+ STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_4_MAXTEMP), SS_LEFT);
|
147
|
147
|
#endif
|
148
|
148
|
|
149
|
149
|
#if TEMP_SENSOR_5 != 0
|
150
|
150
|
#undef THERMISTOR_ID
|
151
|
151
|
#define THERMISTOR_ID TEMP_SENSOR_5
|
152
|
152
|
#include "../thermistornames.h"
|
153
|
|
- STATIC_ITEM("T5: " THERMISTOR_NAME, false, true);
|
154
|
|
- STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_5_MINTEMP), false);
|
155
|
|
- STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_5_MAXTEMP), false);
|
|
153
|
+ STATIC_ITEM("T5: " THERMISTOR_NAME, SS_INVERT);
|
|
154
|
+ STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_5_MINTEMP), SS_LEFT);
|
|
155
|
+ STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_5_MAXTEMP), SS_LEFT);
|
156
|
156
|
#endif
|
157
|
157
|
|
158
|
158
|
#if HAS_HEATED_BED
|
159
|
159
|
#undef THERMISTOR_ID
|
160
|
160
|
#define THERMISTOR_ID TEMP_SENSOR_BED
|
161
|
161
|
#include "../thermistornames.h"
|
162
|
|
- STATIC_ITEM("TBed:" THERMISTOR_NAME, false, true);
|
163
|
|
- STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(BED_MINTEMP), false);
|
164
|
|
- STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(BED_MAXTEMP), false);
|
|
162
|
+ STATIC_ITEM("TBed:" THERMISTOR_NAME, SS_INVERT);
|
|
163
|
+ STATIC_PAIR_P(MSG_INFO_MIN_TEMP, STRINGIFY(BED_MINTEMP), SS_LEFT);
|
|
164
|
+ STATIC_PAIR_P(MSG_INFO_MAX_TEMP, STRINGIFY(BED_MAXTEMP), SS_LEFT);
|
165
|
165
|
#endif
|
166
|
166
|
END_SCREEN();
|
167
|
167
|
}
|
|
@@ -179,13 +179,13 @@ void menu_info_board() {
|
179
|
179
|
char buffer[21]; // for STATIC_PAIR_P
|
180
|
180
|
|
181
|
181
|
START_SCREEN();
|
182
|
|
- STATIC_ITEM(BOARD_INFO_NAME, true, true); // MyPrinterController
|
|
182
|
+ STATIC_ITEM(BOARD_INFO_NAME, SS_CENTER|SS_INVERT); // MyPrinterController
|
183
|
183
|
#ifdef BOARD_WEBSITE_URL
|
184
|
|
- STATIC_ITEM(BOARD_WEBSITE_URL, false, false); // www.my3dprinter.com
|
|
184
|
+ STATIC_ITEM(BOARD_WEBSITE_URL, SS_LEFT); // www.my3dprinter.com
|
185
|
185
|
#endif
|
186
|
|
- STATIC_PAIR_P(MSG_INFO_BAUDRATE, STRINGIFY(BAUDRATE), true); // Baud: 250000
|
187
|
|
- STATIC_PAIR_P(MSG_INFO_PROTOCOL, PROTOCOL_VERSION, true); // Protocol: 1.0
|
188
|
|
- STATIC_PAIR_P(MSG_INFO_PSU, PSU_NAME, true);
|
|
186
|
+ STATIC_PAIR_P(MSG_INFO_BAUDRATE, STRINGIFY(BAUDRATE), SS_CENTER); // Baud: 250000
|
|
187
|
+ STATIC_PAIR_P(MSG_INFO_PROTOCOL, PROTOCOL_VERSION, SS_CENTER); // Protocol: 1.0
|
|
188
|
+ STATIC_PAIR_P(MSG_INFO_PSU, PSU_NAME, SS_CENTER);
|
189
|
189
|
END_SCREEN();
|
190
|
190
|
}
|
191
|
191
|
|
|
@@ -215,22 +215,22 @@ void menu_info_board() {
|
215
|
215
|
#endif
|
216
|
216
|
);
|
217
|
217
|
START_SCREEN();
|
218
|
|
- STATIC_ITEM(MSG_MARLIN, true, true); // Marlin
|
219
|
|
- STATIC_ITEM(SHORT_BUILD_VERSION, true); // x.x.x-Branch
|
220
|
|
- STATIC_ITEM(STRING_DISTRIBUTION_DATE, true); // YYYY-MM-DD HH:MM
|
221
|
|
- STATIC_ITEM(MACHINE_NAME, true); // My3DPrinter
|
222
|
|
- STATIC_ITEM(WEBSITE_URL, true); // www.my3dprinter.com
|
223
|
|
- STATIC_ITEM(MSG_INFO_EXTRUDERS ": " STRINGIFY(EXTRUDERS), true); // Extruders: 2
|
|
218
|
+ STATIC_ITEM(MSG_MARLIN, SS_CENTER|SS_INVERT); // Marlin
|
|
219
|
+ STATIC_ITEM(SHORT_BUILD_VERSION); // x.x.x-Branch
|
|
220
|
+ STATIC_ITEM(STRING_DISTRIBUTION_DATE); // YYYY-MM-DD HH:MM
|
|
221
|
+ STATIC_ITEM(MACHINE_NAME); // My3DPrinter
|
|
222
|
+ STATIC_ITEM(WEBSITE_URL); // www.my3dprinter.com
|
|
223
|
+ STATIC_ITEM(MSG_INFO_EXTRUDERS ": " STRINGIFY(EXTRUDERS)); // Extruders: 2
|
224
|
224
|
#if ENABLED(AUTO_BED_LEVELING_3POINT)
|
225
|
|
- STATIC_ITEM(MSG_3POINT_LEVELING, true); // 3-Point Leveling
|
|
225
|
+ STATIC_ITEM(MSG_3POINT_LEVELING); // 3-Point Leveling
|
226
|
226
|
#elif ENABLED(AUTO_BED_LEVELING_LINEAR)
|
227
|
|
- STATIC_ITEM(MSG_LINEAR_LEVELING, true); // Linear Leveling
|
|
227
|
+ STATIC_ITEM(MSG_LINEAR_LEVELING); // Linear Leveling
|
228
|
228
|
#elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
229
|
|
- STATIC_ITEM(MSG_BILINEAR_LEVELING, true); // Bi-linear Leveling
|
|
229
|
+ STATIC_ITEM(MSG_BILINEAR_LEVELING); // Bi-linear Leveling
|
230
|
230
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
231
|
|
- STATIC_ITEM(MSG_UBL_LEVELING, true); // Unified Bed Leveling
|
|
231
|
+ STATIC_ITEM(MSG_UBL_LEVELING); // Unified Bed Leveling
|
232
|
232
|
#elif ENABLED(MESH_BED_LEVELING)
|
233
|
|
- STATIC_ITEM(MSG_MESH_LEVELING, true); // Mesh Leveling
|
|
233
|
+ STATIC_ITEM(MSG_MESH_LEVELING); // Mesh Leveling
|
234
|
234
|
#endif
|
235
|
235
|
END_SCREEN();
|
236
|
236
|
}
|
|
@@ -252,15 +252,15 @@ void menu_info() {
|
252
|
252
|
#endif
|
253
|
253
|
));
|
254
|
254
|
#else
|
255
|
|
- MENU_ITEM(submenu, MSG_INFO_PRINTER_MENU, menu_info_printer); // Printer Info >
|
256
|
|
- MENU_ITEM(submenu, MSG_INFO_BOARD_MENU, menu_info_board); // Board Info >
|
|
255
|
+ MENU_ITEM(submenu, MSG_INFO_PRINTER_MENU, menu_info_printer); // Printer Info >
|
|
256
|
+ MENU_ITEM(submenu, MSG_INFO_BOARD_MENU, menu_info_board); // Board Info >
|
257
|
257
|
#if EXTRUDERS
|
258
|
|
- MENU_ITEM(submenu, MSG_INFO_THERMISTOR_MENU, menu_info_thermistors); // Thermistors >
|
|
258
|
+ MENU_ITEM(submenu, MSG_INFO_THERMISTOR_MENU, menu_info_thermistors); // Thermistors >
|
259
|
259
|
#endif
|
260
|
260
|
#endif
|
261
|
261
|
|
262
|
262
|
#if ENABLED(PRINTCOUNTER)
|
263
|
|
- MENU_ITEM(submenu, MSG_INFO_STATS_MENU, menu_info_stats); // Printer Stats >
|
|
263
|
+ MENU_ITEM(submenu, MSG_INFO_STATS_MENU, menu_info_stats); // Printer Stats >
|
264
|
264
|
#endif
|
265
|
265
|
|
266
|
266
|
#if HAS_GAMES
|